Merge remote-tracking branch 'eclipse/6.x' into merge-to-master
# Conflicts: nothing much complicated
diff --git a/.gitignore b/.gitignore
index b326fa7..f425af1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
*.class
target/
.idea
+nbproject/
nbactions.xml
nb-configuration.xml
.classpath
@@ -18,8 +19,16 @@
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 +38,27 @@
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/
diff --git a/Jenkinsfile b/Jenkinsfile
index b9c863a..17a8bbc 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,7 +38,11 @@
"connector_group_3",
"connector_group_4",
"jdbc_all",
- "persistence_all"
+ "persistence_all",
+ "naming_all",
+ "deployment_all",
+ "security_all",
+ "webservice_all"
]
def parallelStagesMap = jobs.collectEntries {
diff --git a/README.md b/README.md
index 2503293..e5da273 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@
### 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
@@ -65,26 +65,31 @@
:warning: if the script fails, sometimes it doesn't stop the domain and you have to do that manually.
-* `./runTests.sh 7.0.0 batch_all` - Usual time: 4 minutes
-* `./runTests.sh 7.0.0 cdi_all` - Usual time: 6 minutes
-* `./runTests.sh 7.0.0 connector_group_1` - Usual time: 16 minutes
-* `./runTests.sh 7.0.0 connector_group_2` - Usual time: 3 minutes
-* `./runTests.sh 7.0.0 connector_group_3` - Usual time: 4 minutes
-* `./runTests.sh 7.0.0 connector_group_4` - Usual time: 16 minutes
-* `./runTests.sh 7.0.0 deployment_all` - Not fixed yet
-* `./runTests.sh 7.0.0 ejb_group_1` - Usual time: 10 minutes
-* `./runTests.sh 7.0.0 ejb_group_2` - Usual time: 7 minutes
-* `./runTests.sh 7.0.0 ejb_group_3` - Usual time: 18 minutes
-* `./runTests.sh 7.0.0 ejb_group_embedded` - Usual time: 4 minutes
-* `./runTests.sh 7.0.0 jdbc_all` - Usual time: 20 minutes
-* `./runTests.sh 7.0.0 persistence_all` - Usual time: 3 minutes
-* `./runTests.sh 7.0.0 web_jsp` - Usual time: 8 minutes
+* `./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
-* There are many tests under appserver/tests subdirectories; they are still waiting for someone's attention.
+* `./gfbuild.sh archive_bundles && ./gftest.sh ql_gf_full_profile_all` - Usual time: 4 minutes
+
+* many tests under appserver/tests subdirectories; they are still waiting for someone's attention.
## Basic Usage
diff --git a/appserver/admin/template/src/main/resources/config/domain.xml b/appserver/admin/template/src/main/resources/config/domain.xml
index 11b43e7..a2275bc 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 @@
<jvm-options>-XX:NewRatio=2</jvm-options>
<jvm-options>-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar</jvm-options>
- <jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
- <jvm-options>--add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED</jvm-options>
+ <jvm-options>--add-opens=java.base/java.io=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=java.base/java.lang=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=java.base/java.util=ALL-UNNAMED</jvm-options>
- <jvm-options>--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED</jvm-options>
+ <jvm-options>--add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=java.naming/javax.naming.spi=ALL-UNNAMED</jvm-options>
+ <jvm-options>--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED</jvm-options>
+ <jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED</jvm-options>
</java-config>
<network-config>
@@ -398,12 +399,13 @@
<jvm-options>-Dorg.glassfish.gmbal.no.multipleUpperBoundsException=true</jvm-options>
<jvm-options>-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar</jvm-options>
- <jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
- <jvm-options>--add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED</jvm-options>
+ <jvm-options>--add-opens=java.base/java.io=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=java.base/java.lang=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=java.base/java.util=ALL-UNNAMED</jvm-options>
- <jvm-options>--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED</jvm-options>
+ <jvm-options>--add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=java.naming/javax.naming.spi=ALL-UNNAMED</jvm-options>
+ <jvm-options>--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED</jvm-options>
+ <jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED</jvm-options>
</java-config>
<availability-service>
@@ -461,7 +463,7 @@
</thread-pools>
<group-management-service/>
<!--%%%DEFAULT_TOKENS_HERE%%%-->
- <system-property name="ASADMIN_LISTENER_PORT" value="24848"/>
+ <system-property name="ASADMIN_LISTENER_PORT" value="24848" />
<system-property name="HTTP_LISTENER_PORT" value="28080"/>
<system-property name="HTTP_SSL_LISTENER_PORT" value="28181"/>
<system-property name="IIOP_LISTENER_PORT" value="23700"/>
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 c5009e2..5afabb5 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 @@
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 @@
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 @@
return System.getenv(ACCJava_ENV_VAR_NAME);
}
- File endorsed() {
- return new File(lib(), "endorsed");
- }
-
File ext() {
return new File(lib(), "ext");
}
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 f110fb3..0000000
--- 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");
-
-}
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 0b0eaea..ca09031 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 @@
private static final String LINE_SEP = System.getProperty("line.separator");
- private static final List<String> DO_NOT_SERVE_LIST =
- Collections.EMPTY_LIST; //Arrays.asList("glassfish/modules/jaxb-osgi.jar");
+ private static final List<String> 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<String,AutoSignedContent> appLevelSignedSystemContent =
- new HashMap<String,AutoSignedContent>();
+ private final Map<String, AutoSignedContent> 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<String,Set<AppClientServerApplication>> contributingAppClients =
- new HashMap<String,Set<AppClientServerApplication>>();
+ private final HashMap<String, Set<AppClientServerApplication>> contributingAppClients = new HashMap<>();
- private final ConcurrentHashMap<String,AppClientHTTPAdapter> httpAdapters = new
- ConcurrentHashMap<String, AppClientHTTPAdapter>();
+ private final ConcurrentHashMap<String, AppClientHTTPAdapter> 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 @@
* adapter which serves files from the installation, as opposed to
* files from the domain or files from a specific app.
*/
- Map<String,StaticContent> result = new HashMap<String,StaticContent>();
+ Map<String,StaticContent> result = new HashMap<>();
File gfClientJAR = gfClientJAR();
final String classPathExpr = getGFClientModuleClassPath(gfClientJAR);
@@ -277,39 +275,39 @@
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<String,DynamicContent> addDynamicSystemContent(final List<String> systemJARRelativeURIs,
- final String signingAlias) throws IOException {
- final Map<String,DynamicContent> result = new HashMap<String,DynamicContent>();
+
+ Map<String, DynamicContent> addDynamicSystemContent(final List<String> systemJARRelativeURIs,
+ final String signingAlias) throws IOException {
+ final Map<String,DynamicContent> 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 @@
}
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 @@
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<AppClientServerApplication> contributorsToAppLevelAdapter = contributingAppClients.get(appName);
if (contributorsToAppLevelAdapter == null) {
- contributorsToAppLevelAdapter = new HashSet<AppClientServerApplication>();
+ contributorsToAppLevelAdapter = new HashSet<>();
contributingAppClients.put(appName, contributorsToAppLevelAdapter);
}
contributorsToAppLevelAdapter.add(contributor);
@@ -572,13 +562,9 @@
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 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 53892b3..b7889f0 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 @@
private String signingAlias;
- final private Map<String,StaticContent> staticContent = new HashMap<String,StaticContent>();
- final private Map<String,DynamicContent> dynamicContent = new HashMap<String,DynamicContent>();
+ final private Map<String,StaticContent> staticContent = new HashMap<>();
+ final private Map<String,DynamicContent> dynamicContent = new HashMap<>();
private static final String JNLP_MIME_TYPE = "application/x-java-jnlp-file";
@@ -423,7 +423,7 @@
dch.addDeveloperContentFromPath(developerJNLPDoc);
- Set<Content> result = new HashSet<Content>(staticContent.values());
+ Set<Content> result = new HashSet<>(staticContent.values());
result.addAll(dynamicContent.values());
jwsAdapterManager.addContentForAppClient(
@@ -498,7 +498,7 @@
private void addSignedSystemContent(
) throws FileNotFoundException, IOException {
- final List<String> systemJARRelativeURIs = new ArrayList<String>();
+ final List<String> systemJARRelativeURIs = new ArrayList<>();
final Map<String,StaticContent> addedStaticContent =
jwsAdapterManager.addStaticSystemContent(
systemJARRelativeURIs,
@@ -663,17 +663,12 @@
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 @@
}
public static class VendorInfo {
- private String vendorStringFromDescriptor;
+ private final String vendorStringFromDescriptor;
private String vendor = "";
private String imageURIString = "";
private String splashImageURIString = "";
@@ -858,7 +853,7 @@
@Override
public UnprocessedChangeEvents changed(PropertyChangeEvent[] events) {
/* Record any events we tried to process but could not. */
- List<UnprocessedChangeEvent> unprocessedEvents = new ArrayList<UnprocessedChangeEvent>();
+ List<UnprocessedChangeEvent> 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 939cd7b..875ec8c 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 jdk.security.jarsigner.JarSigner;
-import jdk.security.jarsigner.JarSignerException;
+import org.jvnet.hk2.annotations.Service;
-import org.glassfish.appclient.server.core.jws.JavaWebStartInfo;
+import jdk.security.jarsigner.JarSigner;
+
+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 @@
/** 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
- */
- 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();
+ /**
+ * 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 {
+ 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<String,byte[]> additionalContent) throws Exception {
-
+ public long signJar(final File unsignedJar, final OutputStream signedJar, String alias, final Attributes attrs,
+ final Map<String, byte[]> additionalContent) throws IllegalStateException {
if (alias == null) {
alias = DEFAULT_ALIAS_VALUE;
}
@@ -140,48 +124,56 @@
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.
- *<p>
- *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.
+ * <p>
+ * 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 19c22c2..73d6990 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 @@
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 @@
this.signedFile = signedFile;
this.userProvidedAlias = userProvidedAlias;
this.jarSigner = jarSigner;
- this.relativeURI = URI.create(relativeURI);
this.appName = appName;
}
@@ -151,7 +148,15 @@
}
}
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 79d8cfe..bfbebc6 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
@@ -21,12 +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;
@@ -105,35 +107,25 @@
* 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<String,byte[]> addedContent = new HashMap<String,byte[]>();
+ final Map<String,byte[]> 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 (OutputStream dbgZos = 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 +148,8 @@
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 a9855f5..9309300 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.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/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 ec44fdf..0000000
--- 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.<Server>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 b929156..0000000
--- 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<GlassfishNamingManager> 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);
- }
- }
- }
-}
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 8e0aa43..955b1f0 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 @@
private static Pattern PROPERTY_PATTERN = Pattern.compile("\\$\\{\\{(.*?)}}|\\$\\{(.*?)}");
// configuration info
- private Map configMap = new HashMap();
- private Set<String> layersWithDefault = new HashSet<String>();
+ private final Map configMap = new HashMap();
+ private final Set<String> layersWithDefault = new HashSet<>();
private List<MessageSecurityConfig> msgSecConfigs = null;
private static final String ACC_XML = "glassfish-acc.xml.url";
@@ -90,10 +92,12 @@
}
+ @Override
public Map getConfigMap() {
return configMap;
}
+ @Override
public Set<String> getLayersWithDefault() {
return layersWithDefault;
}
@@ -218,23 +222,18 @@
return AuthMessagePolicy.getMessagePolicy(authSource, authRecipient);
}
+ @Override
public void initialize(Object config) throws IOException {
String sun_acc = System.getProperty(ACC_XML, "glassfish-acc.xml");
List<MessageSecurityConfig> 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();
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 8e4d4a8..513a901 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 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 @@
* {? = 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 @@
}
}
- 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");
diff --git a/appserver/tests/appserv-tests/config/properties.xml b/appserver/tests/appserv-tests/config/properties.xml
index 547ce79..fd0f492 100644
--- a/appserver/tests/appserv-tests/config/properties.xml
+++ b/appserver/tests/appserv-tests/config/properties.xml
@@ -171,7 +171,7 @@
<property name="RMIC" value="${env.S1AS_HOME}/jdk/bin/rmic.exe" />
<property name="TNAMESERV" value="${env.S1AS_HOME}/jdk/bin/tnameserv.exe" />
- <property name="WSCOMPILE" value="${env.S1AS_HOME}/bin/wscompile.bat" />
+ <property name="WSCOMPILE" value="${env.S1AS_HOME}/bin/wsgen.bat" />
<property name="WSGEN" value="${env.S1AS_HOME}/bin/wsgen.bat" />
<property name="WSIMPORT" value="${env.S1AS_HOME}/bin/wsimport.bat" />
<property name="pb.start.server" value="${env.S1AS_HOME}/pointbase/server/StartServer.bat" />
@@ -196,7 +196,7 @@
<property name="VERIFIER" value="${env.S1AS_HOME}/bin/verifier" />
<property name="RMIC" value="${env.S1AS_HOME}/jdk/bin/rmic" />
<property name="TNAMESERV" value="${env.S1AS_HOME}/jdk/bin/tnameserv" />
- <property name="WSCOMPILE" value="${env.S1AS_HOME}/bin/wscompile" />
+ <property name="WSCOMPILE" value="${env.S1AS_HOME}/bin/wsgen" />
<property name="WSGEN" value="${env.S1AS_HOME}/bin/wsgen" />
<property name="WSIMPORT" value="${env.S1AS_HOME}/bin/wsimport" />
<property name="pb.start.server" value="${env.S1AS_HOME}/pointbase/server/StartServer" />
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 ce8415b..0000000
--- a/appserver/tests/appserv-tests/devtests/admin/cli/nbproject/project.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.ant.freeform</type>
- <configuration>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
- <!-- Do not use Project Properties customizer when editing this file manually. -->
- <name>admin-devtests</name>
- <properties/>
- <folders>
- <source-folder>
- <label>C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java</label>
- <location>C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java</location>
- </source-folder>
- <source-folder>
- <label>C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java</label>
- <type>java</type>
- <location>C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java</location>
- </source-folder>
- <source-folder>
- <label>src</label>
- <type>java</type>
- <location>src</location>
- </source-folder>
- </folders>
- <ide-actions>
- <action name="build">
- <target>build</target>
- </action>
- <action name="clean">
- <target>clean</target>
- </action>
- <action name="run">
- <target>all</target>
- </action>
- <action name="test">
- <target>runtest</target>
- </action>
- <action name="rebuild">
- <target>clean</target>
- <target>build</target>
- </action>
- </ide-actions>
- <view>
- <items>
- <source-folder style="packages">
- <label>C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java</label>
- <location>C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java</location>
- </source-folder>
- <source-folder style="packages">
- <label>src</label>
- <location>src</location>
- </source-folder>
- <source-file>
- <location>build.xml</location>
- </source-file>
- </items>
- <context-menu>
- <ide-action name="build"/>
- <ide-action name="rebuild"/>
- <ide-action name="clean"/>
- <ide-action name="run"/>
- <ide-action name="test"/>
- </context-menu>
- </view>
- <subprojects/>
- </general-data>
- <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
- <compilation-unit>
- <package-root>C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java</package-root>
- <package-root>src</package-root>
- <classpath mode="compile">../../../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</classpath>
- <source-level>1.5</source-level>
- </compilation-unit>
- </java-data>
- </configuration>
-</project>
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 e0f75f7..6d9e55a 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.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 4e1e6fc..fc287c0 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/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 94cf55e..0000000
--- 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 c266aa3..0000000
--- 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);
- }
- }
-
-}
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 0f8adf8..0000000
--- a/appserver/tests/appserv-tests/devtests/cdi/smoke-tests/simple-wab-with-cdi/build.properties
+++ /dev/null
@@ -1,26 +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
-
--->
-
-
-<property name="module" value="cdi"/>
-<property name="appname" value="${module}-wab"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="contextroot" value="/test"/>
-<property name="beans.xml" value="descriptor/beans.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="bundle.descriptor" value="descriptor/MANIFEST.MF"/>
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 7ea274d..a5789ea 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 @@
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 e07dd2d..5cd1efb 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 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 @@
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 0b87827..4d24a51 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.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 90e71c6..fc287c0 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 5cb6dad..5d10394 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 @@
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 0709b15..48a87b3 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 @@
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 7de5b08..a59b299 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 @@
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 c45dd70..80524ce 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 @@
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 517b439..653cef5 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 @@
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 cb8ebb0..3b5e045 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 @@
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 4783e5a..296e9bc 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 @@
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 993b4bf..c2e35ab 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 @@
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 4eb1b81..3432535 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 @@
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 b1f2bdb..e88f546 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 @@
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 b1f2bdb..e88f546 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 @@
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 bd4ad5a..c58887f 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 @@
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 ed34754..5209d1c 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 @@
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 fd6c34d..adeceb8 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 @@
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 024c7bf..fcbeba4 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 @@
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 46a99ee..cdd58ed 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 @@
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 718af36..ae091cb 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 @@
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 718af36..ae091cb 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 @@
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 da59637..8b5c439 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 @@
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 7f706d5..b18c034 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 @@
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 27a3855..5ba32e7 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 @@
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 156f70b..91b964a 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"
>
<arg line="${db.driver}" />
+ <arg line="${http.port}" />
</java>
<antcall target="drop-table" />
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 aa938d9..eeadf56 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 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 882493d..2e682db 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 @@
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/deployment/annotation/README b/appserver/tests/appserv-tests/devtests/deployment/annotation/README
deleted file mode 100644
index aa903d8..0000000
--- 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/<your new directory>
-2. cp annotation/ejb/build.xml <your new directory>
-3. modify ant project name in build.xml and test name under junit
-4. create java files (ejbs, etc) for annotation testing in
- <your new directory>/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
- <your new directory>/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/<your new directory>
-2. cp annotation/webservice/build.xml <your new directory>
-3. modify ant project name in build.xml
-4. create java files (ejbs, etc) for annotation testing in
- <your new directory>/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:
- <test name ="<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 3fd6d56..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/build.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="AppClientAnnotationTest" default="all" basedir=".">
- &commonBuild;
-
- <property name="src" location="src"/>
-
- <target name="private-all">
- <antcall target="cleanXml"/>
- <antcall target="compile"/>
- <antcall target="test"/>
- </target>
-
- <target name="cleanXml">
- <delete dir="${basedir}/META-INF"/>
- </target>
-
- <target name="prepare">
- <mkdir dir="${build}"/>
- </target>
-
- <target name="compile" depends="init, prepare, compile.util">
- <javac srcdir="${src}" destdir="${build}" debug="on">
- <classpath>
- <path refid="gfv3.classpath"/>
- <pathelement location="${junit.jar}"/>
- <pathelement path="${testsRoot}/util/build"/>
- </classpath>
- </javac>
- </target>
-
- <target name="test" depends="compile">
- <mkdir dir="${annotation.report.dir}"/>
- <junit printsummary="yes" haltonerror="no" haltonfailure="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <test name="AppClientAnnotationTest"
- todir="${annotation.report.dir}"/>
- <jvmarg value="-Dcom.sun.aas.installRoot=${inst}"/>
- <jvmarg value="-DtestClasspath=${build}"/>
- <jvmarg value="-DworkDir=${basedir}"/>
- <classpath>
- <path refid="test.compile.classpath"/>
- <path refid="gfv3.classpath"/>
- <pathelement path="${testsRoot}/util/build"/>
- <pathelement path="${build}"/>
- <pathelement path="${junit.jar}"/>
- </classpath>
- </junit>
- </target>
-
-</project>
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 d9d9cdb..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/appclient/goldenfiles/application-client.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-
- 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
-
--->
-
-<application-client xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" metadata-complete="true" version="7" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/application-client_7.xsd" xmlns="http://xmlns.jcp.org/xml/ns/javaee">
- <ejb-ref>
- <ejb-ref-name>test.Client/sful1</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <remote>test.ejb.stateful.SFHello</remote>
- <injection-target>
- <injection-target-class>test.Client</injection-target-class>
- <injection-target-name>sful1</injection-target-name>
- </injection-target>
- </ejb-ref>
- <ejb-ref>
- <ejb-ref-name>ejb/sfhello</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <remote>test.ejb.stateful.SFHello</remote>
- <injection-target>
- <injection-target-class>test.Client</injection-target-class>
- <injection-target-name>sful2</injection-target-name>
- </injection-target>
- </ejb-ref>
-</application-client>
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 ebf2219..0000000
--- 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 73c84d2..0000000
--- 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 c50eaf2..0000000
--- 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 6fb8aa0..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/build.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../config/common.xml">
-]>
-
-<project name="ejb" default="all" basedir=".">
-
- &commonBuild;
-
- <target name="private-all">
- <delete dir="${annotation.report.dir}"/>
-
- <ant dir="ejb" target="private-all">
- <property name="build" value="${build}/ejb"/>
- </ant>
- <ant dir="appclient" target="private-all">
- <property name="build" value="${build}/appclient"/>
- </ant>
- <ant dir="web" target="private-all">
- <property name="build" value="${build}/web"/>
- </ant>
- <ant dir="inheritance" target="private-all">
- <property name="build" value="${build}/inheritance"/>
- </ant>
-
- </target>
-
-</project>
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 60df51f..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/build.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="EjbAnnotationTest" default="all" basedir=".">
- &commonBuild;
-
- <property name="src" location="src"/>
-
- <target name="private-all">
- <antcall target="cleanXml"/>
- <antcall target="compile"/>
- <antcall target="test"/>
- </target>
-
- <target name="cleanXml">
- <delete dir="${basedir}/META-INF"/>
- </target>
-
- <target name="prepare">
- <mkdir dir="${build}"/>
- </target>
-
- <target name="compile" depends="init, prepare, compile.util">
- <javac srcdir="${src}" destdir="${build}" debug="on">
- <classpath>
- <path refid="gfv3.classpath" />
- <pathelement location="${junit.jar}"/>
- <pathelement path="${testsRoot}/util/build"/>
- </classpath>
- </javac>
- </target>
-
- <target name="test" depends="compile">
- <mkdir dir="${annotation.report.dir}"/>
- <junit printsummary="yes" haltonerror="no" haltonfailure="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <test name="EjbAnnotationTest"
- todir="${annotation.report.dir}"/>
- <jvmarg value="-Dcom.sun.aas.installRoot=${inst}"/>
- <jvmarg value="-DtestClasspath=${build}"/>
- <jvmarg value="-DworkDir=${basedir}"/>
- <classpath>
- <path refid="test.compile.classpath"/>
- <path refid="gfv3.classpath"/>
- <pathelement path="${testsRoot}/util/build"/>
- <pathelement path="${build}"/>
- <pathelement path="${junit.jar}"/>
- </classpath>
- </junit>
- </target>
-
-</project>
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 b349c3c..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/ejb/goldenfiles/ejb-jar.xml
+++ /dev/null
@@ -1,312 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" metadata-complete="true" version="3.2" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd" xmlns="http://xmlns.jcp.org/xml/ns/javaee">
- <enterprise-beans>
- <session>
- <display-name>myStatefulTest1</display-name>
- <ejb-name>myStatefulTest1</ejb-name>
- <business-remote>test.ejb.stateful.SFHello</business-remote>
- <ejb-class>test.ejb.stateful.StatefulTest1</ejb-class>
- <session-type>Stateful</session-type>
- <concurrency-management-type>Container</concurrency-management-type>
- <transaction-type>Bean</transaction-type>
- <ejb-local-ref>
- <ejb-ref-name>test.ejb.stateful.StatefulTest1/slHello1</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local>test.ejb.stateless.SLHello</local>
- <ejb-link>myStatelessTest1</ejb-link>
- <injection-target>
- <injection-target-class>test.ejb.stateful.StatefulTest1</injection-target-class>
- <injection-target-name>slHello1</injection-target-name>
- </injection-target>
- </ejb-local-ref>
- <ejb-local-ref>
- <ejb-ref-name>test.ejb.stateful.StatefulTest1/slHello2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local>test.ejb.stateless.SLHello</local>
- <ejb-link>myStatelessTest1</ejb-link>
- <injection-target>
- <injection-target-class>test.ejb.stateful.StatefulTest1</injection-target-class>
- <injection-target-name>slHello2</injection-target-name>
- </injection-target>
- </ejb-local-ref>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- <passivation-capable>true</passivation-capable>
- </session>
- <session>
- <display-name>StatefulTest2</display-name>
- <ejb-name>StatefulTest2</ejb-name>
- <business-remote>test.ejb.stateful.SFHello</business-remote>
- <ejb-class>StatefulTest2</ejb-class>
- <session-type>Stateful</session-type>
- <concurrency-management-type>Container</concurrency-management-type>
- <transaction-type>Container</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- <passivation-capable>true</passivation-capable>
- </session>
- <session>
- <display-name>myStatelessTest1</display-name>
- <ejb-name>myStatelessTest1</ejb-name>
- <business-local>test.ejb.stateless.SLHello</business-local>
- <ejb-class>test.ejb.stateless.StatelessTest1</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <ejb-local-ref>
- <ejb-ref-name>test.ejb.stateless.InterceptorA/slHello</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local>test.ejb.stateless.SLHello</local>
- <ejb-link>myStatelessTest1</ejb-link>
- <injection-target>
- <injection-target-class>test.ejb.stateless.InterceptorA</injection-target-class>
- <injection-target-name>slHello</injection-target-name>
- </injection-target>
- </ejb-local-ref>
- <resource-ref>
- <res-ref-name>jdbc/myDS</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- <lookup-name>java:comp/DefaultDataSource</lookup-name>
- </resource-ref>
- <resource-env-ref>
- <resource-env-ref-name>test.ejb.stateless.InterceptorB/sessionCtx</resource-env-ref-name>
- <resource-env-ref-type>jakarta.ejb.SessionContext</resource-env-ref-type>
- <injection-target>
- <injection-target-class>test.ejb.stateless.InterceptorB</injection-target-class>
- <injection-target-name>sessionCtx</injection-target-name>
- </injection-target>
- </resource-env-ref>
- <security-identity>
- <run-as>
- <role-name>user</role-name>
- </run-as>
- </security-identity>
- </session>
- <session>
- <display-name>StatelessTest2</display-name>
- <ejb-name>StatelessTest2</ejb-name>
- <business-local>test.ejb.stateless.SLHello</business-local>
- <ejb-class>test.ejb.stateless.StatelessTest2</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
- <interceptors>
- <interceptor>
- <interceptor-class>test.ejb.stateless.InterceptorB</interceptor-class>
- <around-invoke>
- <class>test.ejb.stateless.InterceptorB</class>
- <method-name>aroundInvokeB</method-name>
- </around-invoke>
- <around-invoke>
- <class>test.ejb.stateless.InterceptorA</class>
- <method-name>aroundInvokeA</method-name>
- </around-invoke>
- <post-construct>
- <lifecycle-callback-class>test.ejb.stateless.InterceptorA</lifecycle-callback-class>
- <lifecycle-callback-method>postConstruct</lifecycle-callback-method>
- </post-construct>
- <pre-destroy>
- <lifecycle-callback-class>test.ejb.stateless.InterceptorB</lifecycle-callback-class>
- <lifecycle-callback-method>preDestroy</lifecycle-callback-method>
- </pre-destroy>
- </interceptor>
- </interceptors>
- <assembly-descriptor>
- <security-role>
- <role-name>j2ee</role-name>
- </security-role>
- <security-role>
- <role-name>staff</role-name>
- </security-role>
- <security-role>
- <role-name>user</role-name>
- </security-role>
- <method-permission>
- <role-name>staff</role-name>
- <method>
- <ejb-name>myStatelessTest1</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayGoodAfternoon</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <method>
- <ejb-name>myStatelessTest1</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayHello</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <role-name>j2ee</role-name>
- <method>
- <ejb-name>myStatelessTest1</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayHello</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <unchecked/>
- <method>
- <ejb-name>myStatelessTest1</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayGoodMorning</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <role-name>staff</role-name>
- <method>
- <ejb-name>StatelessTest2</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayHello</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <role-name>j2ee</role-name>
- <method>
- <ejb-name>StatelessTest2</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayHello</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <unchecked/>
- <method>
- <ejb-name>StatelessTest2</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayGoodMorning</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- </method-permission>
- <container-transaction>
- <description>Required</description>
- <method>
- <ejb-name>myStatelessTest1</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayGoodAfternoon</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>Required</description>
- <method>
- <ejb-name>myStatelessTest1</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayHello</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>RequiresNew</description>
- <method>
- <ejb-name>myStatelessTest1</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayGoodMorning</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>RequiresNew</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>Mandatory</description>
- <method>
- <ejb-name>StatelessTest2</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayGoodAfternoon</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>Mandatory</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>Mandatory</description>
- <method>
- <ejb-name>StatelessTest2</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayHello</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>Mandatory</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>RequiresNew</description>
- <method>
- <ejb-name>StatelessTest2</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayGoodMorning</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>RequiresNew</trans-attribute>
- </container-transaction>
- <interceptor-binding>
- <ejb-name>myStatelessTest1</ejb-name>
- <interceptor-order>
- <interceptor-class>test.ejb.stateless.InterceptorB</interceptor-class>
- </interceptor-order>
- </interceptor-binding>
- <exclude-list>
- <method>
- <ejb-name>StatelessTest2</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayGoodAfternoon</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- </exclude-list>
- </assembly-descriptor>
-</ejb-jar>
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 2ed4674..0000000
--- 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 85cb042..0000000
--- 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 c8bdc0a..0000000
--- 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 c50eaf2..0000000
--- 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 8a11bc7..0000000
--- 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 dcca8b2..0000000
--- 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 c870de7..0000000
--- 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 d4708a5..0000000
--- 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 79165d6..0000000
--- 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 436f082..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/build.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="InheritanceAnnotationTest" default="all" basedir=".">
- &commonBuild;
-
- <property name="src" location="src"/>
-
- <target name="private-all">
- <antcall target="cleanXml"/>
- <antcall target="compile"/>
- <antcall target="test"/>
- </target>
-
- <target name="cleanXml">
- <delete dir="${basedir}/META-INF"/>
- </target>
-
- <target name="prepare">
- <mkdir dir="${build}"/>
- </target>
-
- <target name="compile" depends="init, prepare, compile.util">
- <javac srcdir="${src}" destdir="${build}" debug="on">
- <classpath>
- <path refid="gfv3.classpath"/>
- <pathelement location="${junit.jar}"/>
- <pathelement path="${testsRoot}/util/build"/>
- </classpath>
- </javac>
- </target>
-
- <target name="test" depends="compile">
- <mkdir dir="${annotation.report.dir}"/>
- <junit printsummary="yes" haltonerror="no" haltonfailure="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <test name="InheritanceAnnotationTest"
- todir="${annotation.report.dir}"/>
- <jvmarg value="-Dcom.sun.aas.installRoot=${inst}"/>
- <jvmarg value="-DtestClasspath=${build}"/>
- <jvmarg value="-DworkDir=${basedir}"/>
- <classpath>
- <path refid="gfv3.classpath"/>
- <pathelement path="${testsRoot}/util/build"/>
- <pathelement path="${build}"/>
- <pathelement path="${junit.jar}"/>
- </classpath>
- </junit>
- </target>
-
-</project>
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 482ed70..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/inheritance/goldenfiles/ejb-jar.xml
+++ /dev/null
@@ -1,433 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" metadata-complete="true" version="3.2" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/ejb-jar_3_2.xsd" xmlns="http://xmlns.jcp.org/xml/ns/javaee">
- <enterprise-beans>
- <session>
- <display-name>StatefulTest2</display-name>
- <ejb-name>StatefulTest2</ejb-name>
- <business-remote>test.ejb.SFHello1</business-remote>
- <ejb-class>StatefulTest2</ejb-class>
- <session-type>Stateful</session-type>
- <concurrency-management-type>Container</concurrency-management-type>
- <transaction-type>Container</transaction-type>
- <ejb-local-ref>
- <ejb-ref-name>test.ejb.StatefulTest/mySfHello</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local>test.ejb.SFHello</local>
- <ejb-link>StatefulTest</ejb-link>
- <injection-target>
- <injection-target-class>test.ejb.StatefulTest</injection-target-class>
- <injection-target-name>mySfHello</injection-target-name>
- </injection-target>
- </ejb-local-ref>
- <resource-ref>
- <res-ref-name>myDataSource</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- <lookup-name>java:comp/DefaultDataSource</lookup-name>
- </resource-ref>
- <resource-env-ref>
- <description>testing</description>
- <resource-env-ref-name>test.ejb.StatefulTest/ejbContext</resource-env-ref-name>
- <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
- <injection-target>
- <injection-target-class>test.ejb.StatefulTest</injection-target-class>
- <injection-target-name>ejbContext</injection-target-name>
- </injection-target>
- </resource-env-ref>
- <resource-env-ref>
- <resource-env-ref-name>sfContext</resource-env-ref-name>
- <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
- <injection-target>
- <injection-target-class>StatefulTest2</injection-target-class>
- <injection-target-name>ejbContext</injection-target-name>
- </injection-target>
- </resource-env-ref>
- <resource-env-ref>
- <resource-env-ref-name>test.ejb.StatefulTest/ejbContext2</resource-env-ref-name>
- <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
- <injection-target>
- <injection-target-class>test.ejb.StatefulTest</injection-target-class>
- <injection-target-name>ejbContext2</injection-target-name>
- </injection-target>
- </resource-env-ref>
- <resource-env-ref>
- <resource-env-ref-name>sfContext2</resource-env-ref-name>
- <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
- <injection-target>
- <injection-target-class>StatefulTest2</injection-target-class>
- <injection-target-name>ejbContext2</injection-target-name>
- </injection-target>
- </resource-env-ref>
- <resource-env-ref>
- <resource-env-ref-name>test.ejb.StatefulTest/ejbContext3</resource-env-ref-name>
- <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
- <injection-target>
- <injection-target-class>test.ejb.StatefulTest</injection-target-class>
- <injection-target-name>ejbContext3</injection-target-name>
- </injection-target>
- </resource-env-ref>
- <security-identity>
- <run-as>
- <role-name>staff</role-name>
- </run-as>
- </security-identity>
- <passivation-capable>true</passivation-capable>
- </session>
- <session>
- <display-name>myStatefulTest</display-name>
- <ejb-name>myStatefulTest</ejb-name>
- <business-remote>test.ejb.SFHello1</business-remote>
- <ejb-class>test.ejb.StatefulTest1</ejb-class>
- <session-type>Stateful</session-type>
- <concurrency-management-type>Container</concurrency-management-type>
- <transaction-type>Container</transaction-type>
- <ejb-local-ref>
- <ejb-ref-name>test.ejb.StatefulTest1/sfHello</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local>test.ejb.SFHello</local>
- <ejb-link>StatefulTest</ejb-link>
- <injection-target>
- <injection-target-class>test.ejb.StatefulTest1</injection-target-class>
- <injection-target-name>sfHello</injection-target-name>
- </injection-target>
- </ejb-local-ref>
- <ejb-local-ref>
- <ejb-ref-name>test.ejb.StatefulTest/mySfHello</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local>test.ejb.SFHello</local>
- <ejb-link>StatefulTest</ejb-link>
- <injection-target>
- <injection-target-class>test.ejb.StatefulTest</injection-target-class>
- <injection-target-name>mySfHello</injection-target-name>
- </injection-target>
- </ejb-local-ref>
- <resource-ref>
- <res-ref-name>myDataSource</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- <lookup-name>java:comp/DefaultDataSource</lookup-name>
- </resource-ref>
- <resource-ref>
- <res-ref-name>myDataSource1</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- <lookup-name>java:comp/DefaultDataSource</lookup-name>
- </resource-ref>
- <resource-env-ref>
- <description>testing</description>
- <resource-env-ref-name>test.ejb.StatefulTest/ejbContext</resource-env-ref-name>
- <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
- <injection-target>
- <injection-target-class>test.ejb.StatefulTest</injection-target-class>
- <injection-target-name>ejbContext</injection-target-name>
- </injection-target>
- </resource-env-ref>
- <resource-env-ref>
- <resource-env-ref-name>sfEjbContext</resource-env-ref-name>
- <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
- <injection-target>
- <injection-target-class>test.ejb.StatefulTest1</injection-target-class>
- <injection-target-name>ejbContext</injection-target-name>
- </injection-target>
- </resource-env-ref>
- <resource-env-ref>
- <resource-env-ref-name>sfEjbContext2</resource-env-ref-name>
- <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
- <injection-target>
- <injection-target-class>test.ejb.StatefulTest1</injection-target-class>
- <injection-target-name>ejbContext2</injection-target-name>
- </injection-target>
- </resource-env-ref>
- <resource-env-ref>
- <resource-env-ref-name>sfEjbContext3</resource-env-ref-name>
- <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
- <injection-target>
- <injection-target-class>test.ejb.StatefulTest1</injection-target-class>
- <injection-target-name>ejbContext3</injection-target-name>
- </injection-target>
- </resource-env-ref>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- <passivation-capable>true</passivation-capable>
- </session>
- <session>
- <display-name>StatefulTest</display-name>
- <ejb-name>StatefulTest</ejb-name>
- <business-local>test.ejb.SFHello</business-local>
- <ejb-class>test.ejb.StatefulTest</ejb-class>
- <session-type>Stateful</session-type>
- <concurrency-management-type>Container</concurrency-management-type>
- <transaction-type>Container</transaction-type>
- <ejb-local-ref>
- <ejb-ref-name>test.ejb.StatefulTest/mySfHello</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local>test.ejb.SFHello</local>
- <ejb-link>StatefulTest</ejb-link>
- <injection-target>
- <injection-target-class>test.ejb.StatefulTest</injection-target-class>
- <injection-target-name>mySfHello</injection-target-name>
- </injection-target>
- </ejb-local-ref>
- <resource-ref>
- <res-ref-name>myDataSource</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- <lookup-name>java:comp/DefaultDataSource</lookup-name>
- </resource-ref>
- <resource-env-ref>
- <description>testing</description>
- <resource-env-ref-name>test.ejb.StatefulTest/ejbContext</resource-env-ref-name>
- <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
- <injection-target>
- <injection-target-class>test.ejb.StatefulTest</injection-target-class>
- <injection-target-name>ejbContext</injection-target-name>
- </injection-target>
- </resource-env-ref>
- <resource-env-ref>
- <resource-env-ref-name>test.ejb.StatefulTest/ejbContext2</resource-env-ref-name>
- <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
- <injection-target>
- <injection-target-class>test.ejb.StatefulTest</injection-target-class>
- <injection-target-name>ejbContext2</injection-target-name>
- </injection-target>
- </resource-env-ref>
- <resource-env-ref>
- <resource-env-ref-name>test.ejb.StatefulTest/ejbContext3</resource-env-ref-name>
- <resource-env-ref-type>jakarta.ejb.EJBContext</resource-env-ref-type>
- <injection-target>
- <injection-target-class>test.ejb.StatefulTest</injection-target-class>
- <injection-target-name>ejbContext3</injection-target-name>
- </injection-target>
- </resource-env-ref>
- <security-identity>
- <run-as>
- <role-name>guest</role-name>
- </run-as>
- </security-identity>
- <passivation-capable>true</passivation-capable>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <security-role>
- <role-name>staff</role-name>
- </security-role>
- <security-role>
- <role-name>member</role-name>
- </security-role>
- <security-role>
- <role-name>guest</role-name>
- </security-role>
- <method-permission>
- <unchecked/>
- <method>
- <ejb-name>StatefulTest2</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>sayGoodAfternoon</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <method>
- <ejb-name>StatefulTest2</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>sayGoodMorning</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <role-name>member</role-name>
- <method>
- <ejb-name>StatefulTest2</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>sayBye</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <unchecked/>
- <method>
- <ejb-name>myStatefulTest</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>sayGoodAfternoon</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <method>
- <ejb-name>myStatefulTest</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>sayGoodMorning</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <unchecked/>
- <method>
- <ejb-name>StatefulTest</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>*</method-name>
- </method>
- </method-permission>
- <container-transaction>
- <description>Required</description>
- <method>
- <ejb-name>StatefulTest2</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>sayGoodAfternoon</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>Mandatory</description>
- <method>
- <ejb-name>StatefulTest2</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>sayHello</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>Mandatory</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>Supports</description>
- <method>
- <ejb-name>StatefulTest2</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>sayBye</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>Supports</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>Supports</description>
- <method>
- <ejb-name>StatefulTest2</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>sayGoodMorning</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>Supports</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>Required</description>
- <method>
- <ejb-name>myStatefulTest</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>sayGoodAfternoon</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>Mandatory</description>
- <method>
- <ejb-name>myStatefulTest</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>sayHello</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>Mandatory</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>Supports</description>
- <method>
- <ejb-name>myStatefulTest</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>sayGoodMorning</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>Supports</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>Required</description>
- <method>
- <ejb-name>StatefulTest</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayGoodAfternoon</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>RequiresNew</description>
- <method>
- <ejb-name>StatefulTest</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayHello</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>RequiresNew</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>Required</description>
- <method>
- <ejb-name>StatefulTest</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayGoodNight</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>Supports</description>
- <method>
- <ejb-name>StatefulTest</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>sayGoodMorning</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>Supports</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
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 4ff866e..0000000
--- 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 d845a02..0000000
--- 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 0a515bc..0000000
--- 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 78c03f5..0000000
--- 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 8a30968..0000000
--- 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 0f804bd..0000000
--- 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 ff6f4fe..0000000
--- 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 <servlet-name> 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 <servlet-name> in web.xml.
-This is the limitation of the test as <servlet-name> 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 b957c4e..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/build.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="WebAnnotationTest" default="all" basedir=".">
- &commonBuild;
-
- <property name="src" location="src"/>
-
- <target name="private-all">
- <antcall target="cleanXml"/>
- <antcall target="compile"/>
- <antcall target="assemble"/>
- <antcall target="test"/>
- </target>
-
- <target name="cleanXml">
- <delete dir="${basedir}/META-INF"/>
- </target>
-
- <target name="prepare">
- <mkdir dir="${build}/_war/WEB-INF/classes"/>
- </target>
-
- <target name="compile" depends="init, prepare, compile.util">
- <javac srcdir="${src}" destdir="${build}/_war/WEB-INF/classes" debug="on">
- <classpath>
- <path refid="gfv3.classpath"/>
- <pathelement location="${inst}/lib/appserv-rt.jar"/>
- <pathelement location="${junit.jar}"/>
- <pathelement path="${testsRoot}/util/build"/>
- </classpath>
- </javac>
- </target>
-
- <target name="assemble" depends="init,prepare,compile">
- <move file="${build}/_war/WEB-INF/classes/WebAnnotationTest.class"
- todir="${build}" overwrite="true" failonerror="false"/>
- </target>
-
- <target name="test" depends="assemble">
- <mkdir dir="${annotation.report.dir}"/>
- <junit printsummary="yes" haltonerror="no" haltonfailure="no" fork="true">
- <formatter type="plain" usefile="false"/>
- <formatter type="xml"/>
- <test name="WebAnnotationTest"
- todir="${annotation.report.dir}"/>
- <jvmarg value="-Dcom.sun.aas.installRoot=${inst}"/>
- <jvmarg value="-DtestClasspath=${build}/_war"/>
- <jvmarg value="-DworkDir=${basedir}"/>
- <classpath>
- <path refid="test.compile.classpath"/>
- <path refid="gfv3.classpath"/>
- <pathelement path="${testsRoot}/util/build"/>
- <pathelement path="${build}"/>
- <pathelement path="${junit.jar}"/>
- </classpath>
- </junit>
- </target>
-
-</project>
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 11fb31c..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/annotation/web/goldenfiles/web.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-
- 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
-
--->
-
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" metadata-complete="true" version="3.1" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd" xmlns="http://xmlns.jcp.org/xml/ns/javaee">
- <servlet>
- <servlet-class>test.ServletTest</servlet-class>
- <load-on-startup>-1</load-on-startup>
- <enabled>true</enabled>
- <async-supported>false</async-supported>
- </servlet>
- <security-role>
- <role-name>staff</role-name>
- </security-role>
- <ejb-ref>
- <ejb-ref-name>test.ServletTest/sful1</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <remote>test.ejb.stateful.SFHello</remote>
- <injection-target>
- <injection-target-class>test.ServletTest</injection-target-class>
- <injection-target-name>sful1</injection-target-name>
- </injection-target>
- </ejb-ref>
- <ejb-ref>
- <ejb-ref-name>ejb/sfhello</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <remote>test.ejb.stateful.SFHello</remote>
- <injection-target>
- <injection-target-class>test.ServletTest</injection-target-class>
- <injection-target-name>sful2</injection-target-name>
- </injection-target>
- </ejb-ref>
- <post-construct>
- <lifecycle-callback-class>test.ServletTest</lifecycle-callback-class>
- <lifecycle-callback-method>preconstruct</lifecycle-callback-method>
- </post-construct>
- <pre-destroy>
- <lifecycle-callback-class>test.ServletTest</lifecycle-callback-class>
- <lifecycle-callback-method>predestroy</lifecycle-callback-method>
- </pre-destroy>
- <session-config/>
-</web-app>
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 c50eaf2..0000000
--- 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 c98feba..0000000
--- 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 09668d0..0000000
--- 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 951c018..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/build.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY autodeployUtil SYSTEM "./util/util.xml">
-<!ENTITY commonBuild SYSTEM "./../config/common.xml">
-]>
-
-<project name="autodeploy" default="all" basedir=".">
-
- &commonBuild;
-
- <property name="autodeploy.util.build" value="${build}/util"/>
- <property name="autodeploy.archive.name" value="servletonly.war"/>
- <property name="autodeploy.archive" value="../../build/war/servletonly/${autodeploy.archive.name}"/>
-
- &autodeployUtil;
-
- <target name="private-all">
-
- <!--
- Build the common tools used by autodeploy tests.
- -->
- <ant dir="util" target="private-all">
- <property name="build" value="${build}/util"/>
- </ant>
-
- <!--
- Build the servletonly.war file used by the autodeploy tests.
- -->
- <ant dir="../war/servletonly" target="assemble">
- <property name="build" value="${build}/war/servletonly"/>
- </ant>
-
- <ant dir="simple" target="private-all">
- <property name="build" value="${build}/simple"/>
- </ant>
-
- <ant dir="slowCopy" target="private-all">
- <property name="build" value="${build}/slowCopy"/>
- </ant>
-
- <!-- commented out because log search on Linux does not work as expected -->
- <!--
- <ant dir="withEJB" target="private-all">
- <property name="build" value="${build}/withEJB"/>
- </ant>
- -->
-
- </target>
-
-</project>
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 17cef4f..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/simple/build.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY autodeployUtil SYSTEM "./../util/util.xml">
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-<!--
- This makes sure that redeployment of an autodeployed app works. Specifically,
- it tests that the validations (governing app refcs in particular) pass as
- the autodeployed app is removed and then redeployed.
--->
-
-<project name="autodeploy-simple" default="all" basedir=".">
-
- &commonBuild;
- &autodeployUtil;
-
- <property name="testName" value="simpleautodeploy"/>
-
- <target name="prepare" depends="init">
- <property name="result.property.file" value="${build}/result.properties"/>
-<echo>in simple/build.xml and build is ${build}</echo>
- <mkdir dir="${build}" />
-
- </target>
-
- <target name="build" depends="prepare">
-
- <echo>Using previously-built ${autodeploy.archive}</echo>
- <!--
- Some earlier tests should have run already, so the app we use for autodeploy testing
- should already be in place in the build directory.
- -->
- </target>
-
-
-
- <target name="private-all" depends="build">
-
- <antcall target="declare-test">
- <param name="description" value="autodeploy/simple Test autodeploy, auto-redeploy, and autoundeploy"/>
- </antcall>
-
- <!--
- The next task discards any previous temporary file used to gather property settings that
- record the results of the autodeploy directory monitoring Java class.
- -->
- <delete file="${result.property.file}" quiet="true"/>
-
- <!--
- Do the auto-deployment.
- -->
- <antcall target="deploy.autodeploy">
- <param name="archive.name" value="${autodeploy.archive.name}"/>
- <param name="archive.file" value="${autodeploy.archive}"/>
- <param name="autodeploy.dir" value="${autodeploy.dir}"/>
- <param name="deployResultPropertyName" value="deployResult1"/>
- </antcall>
-
- <!--
- Redeploy the archive. This used to trigger an error because the
- app ref was not removed before the app was removed.
- -->
- <antcall target="deploy.autodeploy">
- <param name="archive.name" value="${autodeploy.archive.name}"/>
- <param name="archive.file" value="${autodeploy.archive}"/>
- <param name="autodeploy.dir" value="${autodeploy.dir}"/>
- <param name="deployResultPropertyName" value="deployResult2"/>
- </antcall>
-
- <!--
- Now undeploy the app.
- -->
- <antcall target="deploy.autoundeploy">
- <param name="archive.file" value="${autodeploy.archive}"/>
- <param name="archive.name" value="${autodeploy.archive.name}"/>
- <param name="autodeploy.dir" value="${autodeploy.dir}"/>
- <param name="undeployResultPropertyName" value="undeployResult"/>
- </antcall>
-
- <!--
- Make the result properties of the several substeps accessible now because we need them in
- the next several steps. The prefix attribute helps avoid possible collisions with other
- property names that might already be present.
- -->
- <property file="${result.property.file}" prefix="simple.autodeploy"/>
-
- <!--
- Decide whether the test was successful or not. Make sure that the deploy and
- undeploy results are good.
- -->
- <condition property="result" value="0">
- <and>
- <equals arg1="${simple.autodeploy.deployResult1}" arg2="0"/>
- <equals arg1="${simple.autodeploy.deployResult2}" arg2="0"/>
- <equals arg1="${simple.autodeploy.undeployResult}" arg2="0"/>
- </and>
- </condition>
-
- <!--
- If the property "result" was not set by the "condition" task just above then something
- went wrong and we set result to 1 now.
- -->
- <condition property="result" value="1">
- <not>
- <isset property="result"/>
- </not>
- </condition>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/output.log"/>
- </antcall>
-
- </target>
-
-</project>
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 b62226b..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/slowCopy/build.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY autodeployUtil SYSTEM "./../util/util.xml">
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-<!--
- Note that this currently assumes that the ear/earwithejb and ejb/statelesshello projects have run to build
- the ear used for this test.
-
- Also note that this test expects the 'grep' command to be present in the operating environment.
- This is fine on Solaris and Linux systems, and should be fine on Windows systems prepared
- according to the requirements for building the app server.
--->
-
-<project name="autodeploy-slowcopy" default="all" basedir=".">
-
- &commonBuild;
- &autodeployUtil;
-
- <property name="testName" value="slowcopy"/>
-
- <target name="prepare" depends="init">
- <property name="inputArchive" value="${autodeploy.archive}"/>
- <property name="outputArchive" value="${autodeploy.dir}/${autodeploy.archive.name}"/>
- <!--
- The next property setting represents a 4-second delay between
- writes to the autodeployed file (by the SlowCopy test class invoked
- below). This is based on the 2-second
- interval with which the autodeploy thread rechecks the files
- in the autodeploy directory. By using a setting significantly
- longer than the 2-second autodeploy period, we test two code paths in the
- autodeploy code.
-
- One code path suppresses a retry of the file
- if it has failed to open successfully as an archive previously
- and has grown in size since the last check of the file. The
- assumption in this case is that, since the file has grown since the
- last check, it might continue to grow and so we decide not to
- retry it at that moment.
-
- The other code path detects runs when the
- size has not changed since the last check. This set of logic
- then tries to open the file as an archive
- again. (Here, the assumption is that since the file did
- not grow since the previous check, it might be done growing and
- therefore it makes sense to try to open it again now).
- For most of the iterations, this code path finds that the archive
- still will not open correctly - because the slow copy is still
- in progress - and does not further work with the file in the
- current iteration but leaves the file in the map of files to be
- monitored.
-
- At last, when the copy completes, an iteration discovers that
- the file size has been stable since the last time through and
- the attempt to open the file as an archive succeeds. The file
- is then autodeployed normally.
- -->
- <property name="slowcopy.delay" value="4000"/>
-
- <property name="result.property.file" value="${build}/result.properties"/>
-
- <mkdir dir="${build}" />
- </target>
-
- <target name="build" depends="prepare">
-
- <echo>Using previously-built ${inputArchive}</echo>
- <!--
- Some earlier tests should have run already, so the app we use for autodeploy testing
- should already be in place in the build directory.
- -->
-
- </target>
-
- <target name="private-all" depends="build">
-
- <antcall target="declare-test">
- <param name="description" value="autodeploy/slow Test autodeploy with slowly-copied file"/>
- </antcall>
-
- <!--
- The next task discards any previous temporary file used to gather property settings that
- record the results of the autodeploy directory monitoring Java class.
- -->
- <delete file="${result.property.file}" quiet="true"/>
-
- <tstamp prefix="slowcopy">
- <format property="NOW" pattern="${dateFormat}"/>
- </tstamp>
-
- <!--
- Do the auto-deployment but use the special tool that copies slowly.
- -->
- <echo>Copying ${inputArchive} slowly to the autodeploy directory</echo>
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="autodeploy.slowtest.SlowCopy"
- resultproperty="slow.autodeploy.deployResult"
- output="${build}/1.output.log"
- >
- <arg value="timed"/>
- <arg value="${inputArchive}"/>
- <arg value="${outputArchive}"/>
- <arg value="${slowcopy.delay}"/>
-
- <classpath refid="autodeploy.compile.classpath"/>
-
- </javaWithResult>
-
- <antcall target="useMonitorToWaitForAutodeployCompletion">
- <param name="log.id" value="2"/>
- </antcall>
-
- <!--
- Now undeploy the app.
- -->
- <antcall target="deploy.autoundeploy">
- <param name="archive.file" value="${outputArchive}"/>
- <param name="archive.name" value="${autodeploy.archive.name}"/>
- <param name="autodeploy.dir" value="${autodeploy.dir}"/>
- <param name="undeployResultPropertyName" value="undeployResult"/>
- <param name="log.id" value="3"/>
- </antcall>
-
- <!--
- Make the result properties of the several substeps accessible now because we need them in
- the next several steps. The prefix attribute helps avoid possible collisions with other
- property names that might already be present.
- -->
- <property file="${result.property.file}" prefix="slow.autodeploy"/>
-
- <!--
- Decide whether the test was successful or not. Make sure that the deploy and
- undeploy results are good.
- -->
- <condition property="result" value="0">
- <and>
- <equals arg1="${slow.autodeploy.deployResult}" arg2="0"/>
- <equals arg1="${slow.autodeploy.undeployResult}" arg2="0"/>
- </and>
- </condition>
-
- <!--
- If the property "result" was not set by the "condition" task just above then something
- went wrong and we set result to 1 now.
- -->
- <condition property="result" value="1">
- <not>
- <isset property="result"/>
- </not>
- </condition>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/output.log"/>
- </antcall>
-
- </target>
-
- <target name="useMonitorToWaitForAutodeployCompletion">
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="autodeploy.test.AutoDeployMonitor"
- resultproperty="autodeployResult"
- output="${build}/${log.id}.output.log"
- >
- <jvmarg value="-Dmonitor.debug=true"/>
-
- <classpath refid="autodeploy.compile.classpath"/>
-
- <arg value="${autodeploy.archive.name}"/>
- <arg value="${autodeploy.dir}"/>
- <arg value="${dateFormat}"/>
- <arg value="${slowcopy.NOW}"/>
- </javaWithResult>
-
- <!--
- The result property name used in the next task is an argument to the called target.
- Note that the echo is a little oddly formatted. The </echo> is on a line by itself and left-justified so
- that the output to the file being written will reside on a line by itself. The
- left-justification is not really needed but the properties file looks a bit nicer
- if you open it in an editor. This is because the next line in the properties file being
- written is indented as far as the </echo> is indented here in the build.xml file.
- -->
- <echo file="${result.property.file}" append="true">${resultPropertyName}=${autodeployResult}
-</echo>
- </target>
-
-</project>
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 5320364..0000000
--- 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.
- *<p>
- *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 <archive-name> <autodeploy-directory> <SimpleDateFormat-pattern-for-timestamp> <timestamp-value>");
- }
-
- 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 99fe50e..0000000
--- 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
- *<ul>
- *<le>"timed" is a keyword
- *<le>existing-file is the existing archive to be copied
- *<le>target-file-spec is the file spec of the copy to be created
- *<le>delay-in-ms is the optional time delay (in ms) to wait between writes
- *</ul>
- *
- * @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 a857bf1..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/build.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY autodeployUtil SYSTEM "./util.xml">
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="autodeploy-util" default="all" basedir=".">
- &commonBuild;
- &autodeployUtil;
-
- <target name="prepare" depends="init">
- <mkdir dir="${build}" />
- </target>
-
- <target name="build" depends="compile">
-
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="."
- destdir="${build}"
- debug="on"
- failonerror="true">
- <classpath refid="autodeploy.compile.classpath"/>
- </javac>
- </target>
-
- <target name="private-all" depends="build">
- <echo>Autodeploy util common tools are ready</echo>
- </target>
-
-</project>
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 f528529..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/util/util.xml
+++ /dev/null
@@ -1,158 +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
-
--->
-
-<!--
- This file should be included by all autodeployment build.xml files and
- defines properties and tasks used by multiple auto-deploy tests.
--->
-
- <property name="dateFormat" value="yyyy-MM-dd-HH:mm:ss"/>
- <property name="autodeploy.dir" value="${env.S1AS_HOME}/domains/domain1/autodeploy"/>
- <property name="autodeploy.util.build" value="${testsRoot}/build/autodeploy/util"/>
-
- <path id="autodeploy.compile.classpath">
- <pathelement location="${inst}/lib/javaee.jar"/>
- <pathelement location="${java.home}/lib/tools.jar"/>
- <pathelement location="${env.S1AS_HOME}/modules/deployment-autodeploy.jar"/>
- <pathelement location="${autodeploy.util.build}"/>
- </path>
-
- <!--
- This target runs a Java class that watches the app server's autodeploy directory and detects
- when the app server has deployed or undeployed the app (or has reported a failure to do so) by observing
- when the marker files appear in the directory.
-
- The target records its results in a temporary properties file in the ${build} directory.
- This provides a simple way (relatively simple, at least) to use the same target more than once
- and store different result values in a way that can be retrieved and used from the main
- target. (This basically works around the behavior of ant in which a called target's property
- settings are NOT propagated out to the calling target. It also avoids the practice of creating
- a set of marker files that, by their presence or absence, convey success or failure of a substep.)
- -->
- <target name="runAutoDeployMonitor">
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="autodeploy.test.AutoDeployMonitor"
- resultproperty="autodeployResult"
- output="${build}/${log.id}.output.log"
- >
- <jvmarg value="-Dmonitor.debug=true"/>
-
- <classpath refid="autodeploy.compile.classpath"/>
-<!--
- <classpath>
- <path location="${inst}/lib/j2ee.jar"/>
- <path location="${build}"/>
- </classpath>
--->
- <arg line="${arg.list}"/>
- </javaWithResult>
-
- <!--
- The result property name used in the next task is an argument to the called target.
- Note that the echo is a little oddly formatted. The </echo> is on a line by itself and left-justified so
- that the output to the file being written will reside on a line by itself. The
- left-justification is not really needed but the properties file looks a bit nicer
- if you open it in an editor. This is because the next line in the properties file being
- written is indented as far as the </echo> is indented here in the build.xml file.
- -->
- <echo file="${result.property.file}" append="true">${resultPropertyName}=${autodeployResult}
-</echo>
-
- </target>
-
- <target name="deploy.autodeploy">
-
- <!--
- To monitor auto-deployment or auto-undeployment, we start by getting the current time.
- Then we copy the archive file into the autodeploy directory (for auto-deploy) or delete
- it (for auto-undeploy). All marker files created by the server during auto-deployment of
- the newly-copied archive file will have later timestamps than the timestamp just created.
- There could be earlier marker files for the same archive in the directory and the monitor
- wants to ignore those, which is why we get the current time and pass it to the monitor.
-
- The monitor will check for marker files for the copied archive file
- and whose last modification time are after the current timestamp, returning 0 if the
- auto-deployer creates a _deployed or _undeployed file, 1 if it creates a _deploy_failed
- or _undeploy_failed file, and -1 if it recognized no marker file.
- -->
- <tstamp prefix="deploy">
- <format property="NOW" pattern="${dateFormat}"/>
- </tstamp>
-
- <!-- Pause; some file systems record file rev date/time to 2-second precision -->
- <sleep seconds="2"/>
-
- <!--
- Trigger the auto-deploy.
- -->
- <copy file="${archive.file}" todir="${autodeploy.dir}" overwrite="true"/>
-
- <condition property="log.id" value="1">
- <not>
- <isset property="log.id"/>
- </not>
- </condition>
- <!--
- Use the monitor to detect when the auto-deploy has completed.
- -->
- <echo>Waiting for autodeployment to complete...</echo>
- <antcall target="runAutoDeployMonitor">
- <param name="arg.list" value="${archive.name} ${autodeploy.dir} ${dateFormat} ${deploy.NOW}"/>
- <param name="resultPropertyName" value="${deployResultPropertyName}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="deploy.autoundeploy">
-
- <!--
- This target works very much like the deploy.autodeploy target except that instead of
- copying the archive into the autodeploy directory it deletes the previously copied
- archive from that directory.
- -->
- <tstamp prefix="undeploy">
- <format property="NOW" pattern="${dateFormat}"/>
- </tstamp>
-
- <!-- Pause; some file systems record file rev date/time to 2-second resolution -->
- <sleep seconds="2"/>
-
- <!--
- Trigger auto-undeploy by deleting the file.
- -->
- <delete quiet="true">
- <fileset dir="${autodeploy.dir}" includes="${archive.name}"/>
- </delete>
-
- <condition property="log.id" value="2">
- <not>
- <isset property="log.id"/>
- </not>
- </condition>
-
- <echo>Waiting for autoundeployment to complete...</echo>
- <antcall target="runAutoDeployMonitor">
- <param name="arg.list" value="${archive.name} ${autodeploy.dir} ${dateFormat} ${undeploy.NOW}"/>
- <param name="resultPropertyName" value="${undeployResultPropertyName}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
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 c388ed6..0000000
--- 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.
- *<p>
- *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 <archive-name> <autodeploy-directory> <SimpleDateFormat-pattern-for-timestamp> <timestamp-value>");
- }
-
- 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 89d4236..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/autodeploy/withEJB/build.xml
+++ /dev/null
@@ -1,366 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<!--
- Note that this currently assumes that the ear/earwithejb and ejb/statelesshello projects have run to build
- the ear used for this test.
-
- Also note that this test expects the 'grep' command to be present in the operating environment.
- This is fine on Solaris and Linux systems, and should be fine on Windows systems prepared
- according to the requirements for building the app server.
--->
-
-<project name="autodeployWithEJB" default="all" basedir=".">
-
- &commonBuild;
-
- <property name="testName" value="withEJB"/>
- <property name="dateFormat" value="yyyy-MM-dd-HH:mm:ss.SSS"/>
- <property name="archivedir" value="${build}/archives"/>
-
- <!--
- The following property defines the exception text that appears in the server.log file if
- the bug is present.
- -->
- <property name="exceptionText" value="EJBClassLoader instance that has already been shutdown"/>
-
- <target name="prepare" depends="init">
- <property name="archiveName" value="earwithejb.ear"/>
- <property name="all.ear" value="${archivedir}/${archiveName}"/>
- <property name="server.log.file" value="${env.S1AS_HOME}/domains/domain1/logs/server.log"/>
- <property name="autodeploy.dir" value="${env.S1AS_HOME}/domains/domain1/autodeploy"/>
- <property name="result.property.file" value="${build}/result.properties"/>
-
-
- <mkdir dir="${build}" />
- <path id="test.compile.classpath">
- <pathelement location="${inst}/lib/j2ee.jar"/>
- <pathelement location="${java.home}/lib/tools.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/appserv-rt.jar"/>
- <pathelement location="${build}"/>
- </path>
- </target>
-
- <target name="build" depends="prepare">
-
- <echo>Building ear</echo>
- <!--
- The earlier tests should have run already, so the app we use for autodeploy testing
- should already be in place.
- -->
-
-<!--
- <ant dir="${testsRoot}/ejb/statelesshello" target="assemble">
- <property name="build" value="${testsRoot}/build/ejb/statelesshello"/>
- </ant>
- <ant dir="${testsRoot}/ear/earwithejb" target="assemble">
- <property name="build" value="${testsRoot}/build/ear/earwithejb"/>
- </ant>
--->
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="."
- destdir="${build}"
- debug="on"
- failonerror="true">
- <classpath refid="test.compile.classpath"/>
- </javac>
- </target>
-
- <!--
- This target runs a Java class that watches the app server's autodeploy directory and detects
- when the app server has deployed or undeployed the app (or has reported a failure to do so) by observing
- when the marker files appear in the directory.
-
- The target records its results in a temporary properties file in the ${build} directory.
- This provides a simple way (relatively simple, at least) to use the same target more than once
- and store different result values in a way that can be retrieved and used from the main
- target. (This basically works around the behavior of ant in which a called target's property
- settings are NOT propagated out to the calling target. It also avoids the practice of creating
- a set of marker files that, by their presence or absence, convey success or failure of a substep.)
- -->
- <target name="runAutoDeployMonitor">
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="autodeploy.test.AutoDeployMonitor"
- resultproperty="autodeployResult"
- output="${build}/${log.id}.output.log"
- >
- <jvmarg value="-Dmonitor.debug=true"/>
-
- <classpath>
- <path location="${inst}/lib/j2ee.jar"/>
- <path location="${build}"/>
- </classpath>
- <arg line="${arg.list}"/>
- </javaWithResult>
-
- <!--
- The result property name used in the next task is an argument to the called target.
- Note that the echo is a little oddly formatted. The </echo> is on a line by itself and left-justified so
- that the output to the file being written will reside on a line by itself. The
- left-justification is not really needed but the properties file looks a bit nicer
- if you open it in an editor. This is because the next line in the properties file being
- written is indented as far as the </echo> is indented here in the build.xml file.
- -->
- <echo file="${result.property.file}" append="true">${resultPropertyName}=${autodeployResult}
-</echo>
-
- </target>
-
- <target name="deploy.autodeploy">
-
- <!--
- To monitor auto-deployment or auto-undeployment, we start by getting the current time.
- Then we copy the archive file into the autodeploy directory (for auto-deploy) or delete
- it (for auto-undeploy). All marker files created by the server during auto-deployment of
- the newly-copied archive file will have later timestamps than the timestamp just created.
- There could be earlier marker files for the same archive in the directory and the monitor
- wants to ignore those, which is why we get the current time and pass it to the monitor.
-
- The monitor will check for marker files for the copied archive file
- and whose last modification time are after the current timestamp, returning 0 if the
- auto-deployer creates a _deployed or _undeployed file, 1 if it creates a _deploy_failed
- or _undeploy_failed file, and -1 if it recognized no marker file.
- -->
- <tstamp prefix="deploy">
- <format property="NOW" pattern="${dateFormat}"/>
- </tstamp>
-
- <!--
- Trigger the auto-deploy.
- -->
- <copy file="${archive.file}" todir="${autodeploy.dir}" overwrite="true"/>
-
- <!--
- Use the monitor to detect when the auto-deploy has completed.
- -->
- <echo>Waiting for autodeployment to complete...</echo>
- <antcall target="runAutoDeployMonitor">
- <param name="arg.list" value="${archiveName} ${autodeploy.dir} ${dateFormat} ${deploy.NOW}"/>
- <param name="resultPropertyName" value="${deployResultPropertyName}"/>
- <param name="log.id" value="1"/>
- </antcall>
- </target>
-
- <target name="deploy.autoundeploy">
-
- <!--
- This target works very much like the deploy.autodeploy target except that instead of
- copying the archive into the autodeploy directory it deletes the previously copied
- archive from that directory.
- -->
- <tstamp prefix="undeploy">
- <format property="NOW" pattern="${dateFormat}"/>
- </tstamp>
-
- <!--
- Trigger auto-undeploy by deleting the file.
- -->
- <delete quiet="true">
- <fileset dir="${autodeploy.dir}" includes="${archiveName}"/>
- </delete>
-
- <echo>Waiting for autoundeployment to complete...</echo>
- <antcall target="runAutoDeployMonitor">
- <param name="arg.list" value="${archiveName} ${autodeploy.dir} ${dateFormat} ${undeploy.NOW}"/>
- <param name="resultPropertyName" value="${undeployResultPropertyName}"/>
- <param name="log.id" value="2"/>
- </antcall>
- </target>
-
- <target name="searchForException">
- <!--
- See if the exception text appears in the server.log file. This step assumes the operating
- environment supports the grep command. This should be fine for Solaris and Linux systems
- and for Windows systems that support building the product.
-
- The output from the grep is saved into a property (grepOutput),then the property is written
- into a file. The file to be written (output.file) is also provided as an argument so this
- target can be called from different places and the results stored in different files for
- later comparison.
- -->
- <exec
- executable="grep"
- resultproperty="grepResult"
- outputproperty="grepOutput"
- >
- <arg value="${exceptionText}"/>
- <arg value="${server.log.file}"/>
- </exec>
-
- <!--
- If grep does not find the error string it displays Result: 1 which looks like a failure. The
- next couple of steps prepare and display a message that reassures someone looking at the log
- that Result: 1 is not a problem in this context.
- -->
- <condition property="statusMessage" value="The preceding Result: 1 message is expected; it means grep did not find the error string.">
- <equals arg1="${grepResult}" arg2="1"/>
- </condition>
-
- <property name="statusMessage" value=""/>
- <echo>${statusMessage}</echo>
-
- <echo file="${output.file}">${grepOutput}</echo>
- <echo file="${result.property.file}" append="true">${resultPropertyName}=${grepResult}
-</echo>
- </target>
-
- <target name="checkForRegression" if="fileMatchError">
- <echo>${fileMatchError}
-
-The string "${exceptionText}" was found, implying that the bug is present.
-</echo>
- </target>
-
- <target name="private-all" depends="compile">
-
- <antcall target="build"/>
-
- <antcall target="declare-test">
- <param name="description" value="autodeploy/loadertest Test autodeploy and context class loader"/>
- </antcall>
-
- <!--
- The next task discards any previous temporary file used to gather property settings that
- record the results of the autodeploy directory monitoring Java class.
- -->
- <delete file="${result.property.file}" quiet="true"/>
-
- <!--
- Do the auto-deployment.
- -->
- <antcall target="deploy.autodeploy">
- <param name="archive.file" value="${all.ear}"/>
- <param name="autodeploy.dir" value="${autodeploy.dir}"/>
- <param name="deployResultPropertyName" value="deployResult"/>
- </antcall>
-
- <!--
- Search the server's log file for occurrences of the exception we're interested in.
- We do this now, before undeploying, and capture the output in a file. Then we'll
- do the same thing after undeploying, capturing that output to s separate file. We
- hope the two output files will be the same, meaning that no new exceptions were
- thrown as a result of the undeploy. If the bug has resurfaced, then the second
- output file will contain an additional exception as compared to the first output file.
- -->
- <antcall target="searchForException">
- <param name="resultPropertyName" value="firstSearchResult"/>
- <param name="output.file" value="${build}/before2nddeploy.log"/>
- </antcall>
-
- <!--
- Now undeploy the app.
- -->
- <antcall target="deploy.autoundeploy">
- <param name="archive.file" value="${all.ear}"/>
- <param name="autodeploy.dir" value="${autodeploy.dir}"/>
- <param name="undeployResultPropertyName" value="undeployResult"/>
- </antcall>
-
- <!--
- Trigger another autodeployment. If the bug is present, this will trigger
- an exception message in the server's log file although the autodeployment
- will succeed.
- -->
-
- <antcall target="deploy.autodeploy">
- <param name="archive.file" value="${all.ear}"/>
- <param name="autodeploy.dir" value="${autodeploy.dir}"/>
- <param name="deployResultPropertyName" value="secondDeployResult"/>
- </antcall>
-
- <!--
- Search the file again looking for the error message that the bug would trigger.
- -->
- <antcall target="searchForException">
- <param name="resultPropertyName" value="secondSearchResult"/>
- <param name="output.file" value="${build}/after2nddeploy.log"/>
- </antcall>
-
- <!--
- Autoundeploy the app once more just to clean up.
- -->
- <antcall target="deploy.autoundeploy">
- <param name="archive.file" value="${all.ear}"/>
- <param name="autodeploy.dir" value="${autodeploy.dir}"/>
- <param name="undeployResultPropertyName" value="secondUndeployResult"/>
- </antcall>
-
- <!--
- Make the result properties of the several substeps accessible now because we need them in
- the next several steps. The prefix attribute helps avoid possible collisions with other
- property names that might already be present.
- -->
- <property file="${result.property.file}" prefix="autodeploy"/>
-
- <!--
- Compare the two grep output files. They will be the same if the test was successful, and
- the fileMatchError property will be set if the grep outputs do NOT match.
- -->
- <condition property="fileMatchError" value="An exception was recorded in the server.log file that indicates a regression of bug 5003242.">
- <not>
- <filesmatch file1="${build}/before2nddeploy.log" file2="${build}/after2nddeploy.log"/>
- </not>
- </condition>
-
- <!--
- Decide whether the test was successful or not. Make sure that the deploy and
- undeploy results are good and that the grep for the error string of the server.log
- file was the same before and after the second autodeployment. We don't really care
- if the second undeploy worked or not so we don't check its result property here.
- -->
- <condition property="result" value="0">
- <and>
- <equals arg1="${autodeploy.deployResult}" arg2="0"/>
- <equals arg1="${autodeploy.undeployResult}" arg2="0"/>
- <equals arg1="${autodeploy.secondDeployResult}" arg2="0"/>
- <not>
- <isset property="fileMatchError"/>
- </not>
- </and>
- </condition>
-
- <antcall target="checkForRegression"/>
-
- <!--
- If the property "result" was not set by the "condition" task just above then something
- went wrong and we set result to 1 now. Normally checkForRegression will set the value to 0 or 1.
- -->
- <condition property="result" value="1">
- <not>
- <isset property="result"/>
- </not>
- </condition>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/output.log"/>
- </antcall>
-
- </target>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/build.xml b/appserver/tests/appserv-tests/devtests/deployment/build.xml
index 76ddb5b..6381985 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/build.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/build.xml
@@ -22,69 +22,48 @@
]>
<project name="deployment" default="all" basedir=".">
+ &commonBuild;
- &commonBuild;
+ <target name="private-all">
+ <ant dir="war" target="private-all">
+ <property name="build" value="${build}/war" />
+ </ant>
+ <ant dir="ear" target="private-all">
+ <property name="build" value="${build}/ear" />
+ </ant>
+ <ant dir="dol" target="private-all">
+ <property name="build" value="${build}/dol" />
+ </ant>
+ <ant dir="ejb30" target="private-all">
+ <property name="build" value="${build}/ejb30" />
+ </ant>
+ <ant dir="ejb31" target="private-all">
+ <property name="build" value="${build}/ejb31" />
+ </ant>
+ <ant dir="descriptor_free_zone" target="private-all">
+ <property name="build" value="${build}/descriptor_free_zone" />
+ </ant>
+ <ant dir="directorydeploy" target="private-all">
+ <property name="build" value="${build}/directorydeploy" />
+ </ant>
+ <ant dir="versioning" target="private-all">
+ <property name="build" value="${build}/versioning" />
+ </ant>
+ <ant dir="osgi" target="private-all">
+ <property name="build" value="${build}/osgi" />
+ </ant>
+ <ant dir="webservices" target="private-all">
+ <property name="build" value="${build}/webservices" />
+ </ant>
+ <ant dir="javaee8" target="private-all">
+ <property name="build" value="${build}/javaee8" />
+ </ant>
+ </target>
-
- <target name="private-all">
- <ant dir="war" target="private-all">
- <property name="build" value="${build}/war"/>
- </ant>
- <ant dir="ejb" target="private-all">
- <property name="build" value="${build}/ejb"/>
- </ant>
- <ant dir="ear" target="private-all">
- <property name="build" value="${build}/ear"/>
- </ant>
- <ant dir="jsr88" target="private-all">
- <property name="build" value="${build}/jsr88"/>
- </ant>
- <ant dir="dol" target="private-all">
- <property name="build" value="${build}/dol"/>
- </ant>
-<!-- <ant dir="autodeploy" target="private-all">
- <property name="build" value="${build}/autodeploy"/>
- </ant> -->
- <ant dir="annotation" target="private-all">
- <property name="build" value="${build}/annotation"/>
- </ant>
- <ant dir="ejb30" target="private-all">
- <property name="build" value="${build}/ejb30"/>
- </ant>
-
- <ant dir="ejb31" target="private-all">
- <property name="build" value="${build}/ejb31"/>
- </ant>
-
- <ant dir="descriptor_free_zone" target="private-all">
- <property name="build" value="${build}/descriptor_free_zone"/>
- </ant>
- <ant dir="directorydeploy" target="private-all">
- <property name="build" value="${build}/directorydeploy"/>
- </ant>
- <ant dir="versioning" target="private-all">
- <property name="build" value="${build}/versioning"/>
- </ant>
- <ant dir="osgi" target="private-all">
- <property name="build" value="${build}/osgi"/>
- </ant>
- <!-- comment out till issue 12637 is fixed
- <ant dir="webservices" target="private-all">
- <property name="build" value="${build}/webservices"/>
- </ant>
- -->
- <ant dir="${testsRoot}/ear/earwithall2" target="depl-order">
- <property name="build" value="${build}/ear/earwithall2"/>
- </ant>
- <ant dir="javaee8" target="private-all">
- <property name="build" value="${build}/javaee8"/>
- </ant>
- </target>
-
- <target name="clobber" depends="clean">
- <delete file="${basedir}/tests-results.xml"/>
- <delete file="${basedir}/results.html"/>
- <delete file="${basedir}/client.log"/>
- <delete file="${annotation.report.dir}"/>
- </target>
+ <target name="clobber" depends="clean">
+ <delete file="${basedir}/tests-results.xml" />
+ <delete file="${basedir}/results.html" />
+ <delete file="${basedir}/client.log" />
+ <delete file="${annotation.report.dir}" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/config/common.xml b/appserver/tests/appserv-tests/devtests/deployment/config/common.xml
index 4044334..7920b96 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 @@
</path>
<path id="test.compile.classpath">
- <pathelement location="${inst}/lib/j2ee.jar"/>
+ <pathelement location="${inst}/lib/javaee.jar"/>
<pathelement location="${java.home}/lib/tools.jar"/>
</path>
@@ -705,34 +705,6 @@
</antcall>
</target>
-<!-- jsr88 deployer commands -->
-
-<!-- deploy user jsr88 -->
-<!-- @param ${arg.list} (required) -->
-<target name="common.deploy.jsr88" >
- <antcall target="common.run.jsr88">
- <param name="command" value="deploy"/>
- <param name="arg.list" value="true ${arg.list}"/>
- </antcall>
-</target>
-
-<!-- use InputStream signature to deploy -->
-<target name="common.deploy-stream.jsr88" >
- <antcall target="common.run.jsr88">
- <param name="command" value="deploy-stream"/>
- <param name="arg.list" value="true ${arg.list}"/>
- </antcall>
-</target>
-
-<!-- undeploy user jsr88 -->
-<!-- @param ${arg.list} (required) -->
-<target name="common.undeploy.jsr88" >
- <antcall target="common.run.jsr88">
- <param name="command" value="undeploy"/>
- <param name="arg.list" value="${arg.list}"/>
- </antcall>
-</target>
-
<target name="common.run.positive">
<antcall target="common.run">
<param name="test-details" value="${desc}"/>
@@ -784,62 +756,6 @@
</antcall>
</target>
-<!-- run jsr88 -->
-<!-- @param ${arg.list} (required) -->
-<!--
-<target name="common.run.jsr88" depends="init, compile.util">
--->
-<!-- to disable running jsr88 tests, set the property -Drun.jsr88=false -->
-<target name="common.run.jsr88" depends="init, compile.util" unless="run.jsr88" >
- <delete file="${testsRoot}/build/archives/DEPLOY_RESULT"/>
-
- <!--
- Due to differences in command line parsing on Windows and non-Windows systems we need
- to pass the possibly-empty admin.password differently.
- -->
- <condition property="admin.password.arg" value=""${admin.password}"" else="${admin.password}">
- <os family="windows"/>
- </condition>
-
- <echo message="JSR88Deployer ${command} ${jsr88.uri} ${admin.user} ${admin.password} ${arg.list}"/>
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="devtests.deployment.util.JSR88Deployer"
- resultproperty="deployActionResult">
- <arg value="${command}"/>
- <arg value="${jsr88.uri}"/>
- <arg value="${admin.user}"/>
- <arg value="${admin.password.arg}"/>
- <arg line="${arg.list}"/>
-<!-- <arg line="${command} ${jsr88.uri} ${admin.user} "" ${arg.list}"/> -->
- <classpath>
- <path refid="gfv3.classpath"/>
- <path location="${junit.jar}"/>
- <path location="${env.APS_HOME}/devtests/deployment/util/build"/>
- </classpath>
- <sysproperty key="com.sun.aas.installRoot" value="${inst}"/>
- <sysproperty key="deploymentTarget" value="${targetPlatform}"/>
- <sysproperty key="server" value="${appserver.instance.name}"/>
- <sysproperty key="java.library.path" value="${inst}/lib"/>
- <sysproperty key="com.sun.aas.configRoot" value="${inst}/config"/>
-<!--
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=9999"/>
--->
- </javaWithResult>
- <condition property="deployFailed">
- <or>
- <equals arg1="${deployActionResult}" arg2="-1"/>
- <equals arg1="${deployActionResult}" arg2="1"/>
- </or>
- </condition>
- <antcall target="deployActionFailed">
- <param name="indicator" value="${testsRoot}/build/archives/DEPLOY_RESULT"/>
- </antcall>
-</target>
-
<target name="deployActionFailed" if="deployFailed">
<touch file="${indicator}"/>
</target>
@@ -1242,13 +1158,13 @@
<target name="init.tools.unix" if="unix">
<property name="JAVA" value="${java.home}/bin/java"/>
<property name="ASADMIN" value="${s1as.home}/bin/asadmin"/>
- <property name="WSCOMPILE" value="${s1as.home}/bin/wscompile"/>
+ <property name="WSCOMPILE" value="${s1as.home}/bin/wsgen"/>
<property name="APPCLIENT" value="${s1as.home}/bin/appclient"/>
</target>
<target name="init.tools.windows" if="windows">
<property name="JAVA" value="${java.home}/bin/java.exe"/>
<property name="ASADMIN" value="${s1as.home}/bin/asadmin.bat"/>
- <property name="WSCOMPILE" value="${s1as.home}/bin/wscompile.bat"/>
+ <property name="WSCOMPILE" value="${s1as.home}/bin/wsgen.bat"/>
<property name="APPCLIENT" value="${s1as.home}/bin/appclient.bat"/>
</target>
@@ -1268,7 +1184,7 @@
<jvmarg value="-Djava.library.path=${inst}/lib"/>
<jvmarg value="-Dcom.sun.aas.configRoot=${inst}/config"/>
<classpath>
- <pathelement path="${build}:${inst}/lib/j2ee.jar:${inst}/lib/appserv-rt.jar:${inst}/lib/appserv-admin.jar:${inst}/lib/dom.jar:${inst}/lib/xalan.jar:${inst}/lib/xercesImpl.jar"/>
+ <pathelement path="${build}:${inst}/lib/javaee.jar:${inst}/lib/appserv-rt.jar"/>
</classpath>
<arg value="${deployablearchive}"/>
<arg value="${deploymentplan}"/>
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 aee49e9..f4f4685 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;
<target name="private-all">
- <ant dir="no_appxml" target="private-all">
- <property name="build" value="${build}/no_appxml"/>
- </ant>
<ant dir="dir_deploy" target="private-all">
<property name="build" value="${build}/dir_deploy"/>
</ant>
- <ant dir="no_appxml_2" target="private-all">
- <property name="build" value="${build}/no_appxml_2"/>
- </ant>
</target>
</project>
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 2593df7..0000000
--- 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 9d11451..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml/build.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
-]>
-
-<project name="NoAppXml" default="usage" basedir=".">
-
- &commonBuild;
-
- <property name="testName" value="NoAppXml"/>
-
- <target name="prepare" depends="init">
- <property name="util.jar" value="${build}/util.jar"/>
- <property name="ejb.jar" value="${build}/ejb.jar"/>
- <property name="portable.ear" value="${build}/${testName}.ear"/>
- <property name="appclient.jar" value="${build}/appclient.jar"/>
- <property name="deployplan.jar" value="${build}/${testName}-deployplan.jar"/>
- </target>
-
- <target name="compile" depends="prepare">
- <mkdir dir="${build}"/>
- <javac srcdir="."
- destdir="${build}"
- debug="on"
- failonerror="true">
- <classpath refid="gfv3.classpath"/>
- </javac>
- </target>
-
- <target name="assemble" depends="compile">
- <jar destfile="${util.jar}">
- <fileset dir="${build}"
- includes="com/sun/s1asdev/deployment/noappxml/util/**.class"/>
- </jar>
- <jar destfile="${ejb.jar}" manifest="ejb/MANIFEST.MF">
- <fileset dir="${build}"
- includes="com/sun/s1asdev/deployment/noappxml/ejb/**.class"/>
- </jar>
- <jar destfile="${portable.ear}">
- <fileset dir="${build}" includes="util.jar, ejb.jar"/>
- </jar>
- <jar destfile="${appclient.jar}" manifest="client/MANIFEST.MF">
- <fileset dir="${build}"
- includes="com/sun/s1asdev/deployment/noappxml/client/**.class,
- com/sun/s1asdev/deployment/noappxml/ejb/Sful.class,
- com/sun/s1asdev/deployment/noappxml/ejb/Sless.class"/>
- </jar>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="${portable.ear}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="${portable.ear}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="deploy-stream.jsr88" depends="prepare">
- <antcall target="common.deploy-stream.jsr88">
- <param name="arg.list" value="${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="${testName}-portable ${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy-stream.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy-stream"/>
- <param name="arg.list" value="${testName}-portable ${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="${testName}-portable"/>
- </antcall>
- </target>
-
- <target name="undeploy-stream.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="all"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="prepare,setOrbPort2">
- <exec executable="${APPCLIENT}"
- resultproperty="result"
- failonerror="false"
- output="${build}/${log.id}.output.log">
- <arg line="-targetserver ${appclient.targetservers} -client ${appclient.jar}"/>
- </exec>
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all" depends="private-all-pe-ee, private-all-ee"/>
-
- <!-- the following is run in both PE and EE environment -->
- <target name="private-all-pe-ee">
- <antcall target="assemble"/>
-
- <antcall target="declare-test">
- <param name="description" value="descriptor_free/ear/no_appxml Test asadmin deploy"/>
- </antcall>
- <antcall target="deploy.asadmin"/>
- <antcall target="runclient">
- <param name="log.id" value="1"/>
- </antcall>
-
- <antcall target="declare-test">
- <param name="description" value="descriptor_free/ear/no_appxml Test asadmin re-deploy"/>
- </antcall>
- <antcall target="redeploy.asadmin"/>
- <antcall target="runclient">
- <param name="log.id" value="2"/>
- </antcall>
- <antcall target="undeploy.asadmin"/>
- </target>
-
- <!-- the following is run only in EE environment -->
- <target name="private-all-ee" depends="prepare" if="EE">
- <echo message="Running tests specific to EE"/>
- </target>
-
- <target name="clobber" depends="clean">
- <delete dir="${build}"/>
- <delete file="client.log"/>
- <delete file="results.html"/>
- <delete file="tests-results.xml"/>
- </target>
-
- <target name="usage">
- <antcall target="all"/>
- </target>
-
-</project>
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 d648004..0000000
--- 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 cd5be56..0000000
--- 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 37e4280..0000000
--- 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 840e35e..0000000
--- 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 36a9bff..0000000
--- 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 844a124..0000000
--- 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 fbec4fb..0000000
--- 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 06b605b..0000000
--- 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 17f84d0..0000000
--- 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 d256a64..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/build.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
-]>
-
-<project name="NoAppXml" default="usage" basedir=".">
-
- &commonBuild;
-
- <property name="testName" value="NoAppXml2"/>
-
- <target name="prepare" depends="init">
- <property name="util.jar" value="${build}/lib/util.jar"/>
- <property name="ejb.jar" value="${build}/ejb/ejb.jar"/>
- <property name="web.war" value="${build}/web/web.war"/>
- <property name="portable.ear" value="${build}/${testName}.ear"/>
- <property name="appclient.jar" value="${build}/client/appclient.jar"/>
- <property name="deployplan.jar" value="${build}/${testName}-deployplan.jar"/>
- </target>
-
- <target name="compile" depends="prepare">
- <mkdir dir="${build}"/>
- <mkdir dir="${build}/lib"/>
- <mkdir dir="${build}/ejb"/>
- <mkdir dir="${build}/client"/>
- <mkdir dir="${build}/web"/>
- <javac srcdir="."
- destdir="${build}"
- debug="on"
- failonerror="true">
- <classpath refid="gfv3.classpath"/>
- </javac>
- </target>
-
- <target name="assemble" depends="compile">
- <jar destfile="${util.jar}">
- <fileset dir="${build}"
- includes="com/sun/s1asdev/deployment/noappxml/util/**.class"/>
- </jar>
- <jar destfile="${ejb.jar}" manifest="ejb/MANIFEST.MF">
- <fileset dir="${build}"
- includes="com/sun/s1asdev/deployment/noappxml/ejb/**.class"/>
- </jar>
- <war destfile="${web.war}" webxml="web/web.xml">
- <fileset dir="web"
- includes="**.html"/>
- </war>
- <jar destfile="${appclient.jar}" manifest="client/MANIFEST.MF">
- <fileset dir="${build}"
- includes="com/sun/s1asdev/deployment/noappxml/client/**.class,
- com/sun/s1asdev/deployment/noappxml/ejb/Sful.class,
- com/sun/s1asdev/deployment/noappxml/ejb/Sless.class"/>
- </jar>
- <jar destfile="${portable.ear}">
- <fileset dir="${build}" includes="lib/util.jar, ejb/ejb.jar, web/web.war, client/appclient.jar"/>
- </jar>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--retrieve . ${portable.ear}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="--retrieve . ${portable.ear}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="deploy-stream.jsr88" depends="prepare">
- <antcall target="common.deploy-stream.jsr88">
- <param name="arg.list" value="${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="${testName}-portable ${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy-stream.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy-stream"/>
- <param name="arg.list" value="${testName}-portable ${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="${testName}-portable"/>
- </antcall>
- </target>
-
- <target name="undeploy-stream.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="all"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="prepare,setOrbPort2,setHttpPort2">
- <exec executable="${APPCLIENT}"
- resultproperty="result"
- failonerror="false"
- output="${build}/${log.id}.output.log">
- <arg line="-targetserver ${appclient.targetservers} -client ${testName}Client.jar http://${http.host}:${depltest.port}/web"/>
- </exec>
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all" depends="private-all-pe-ee, private-all-ee"/>
-
- <!-- the following is run in both PE and EE environment -->
- <target name="private-all-pe-ee">
- <antcall target="assemble"/>
-
- <antcall target="declare-test">
- <param name="description" value="descriptor_free/ear/no_appxml_2 Test asadmin deploy"/>
- </antcall>
- <antcall target="deploy.asadmin"/>
- <antcall target="runclient">
- <param name="log.id" value="1"/>
- </antcall>
-
- <antcall target="declare-test">
- <param name="description" value="descriptor_free/ear/no_appxml_2 Test asadmin re-deploy"/>
- </antcall>
- <antcall target="redeploy.asadmin"/>
- <antcall target="runclient">
- <param name="log.id" value="2"/>
- </antcall>
- <antcall target="undeploy.asadmin"/>
- <delete file="${testName}Client.jar"/>
- </target>
-
- <!-- the following is run only in EE environment -->
- <target name="private-all-ee" depends="prepare" if="EE">
- <echo message="Running tests specific to EE"/>
- </target>
-
- <target name="clobber" depends="clean">
- <delete dir="${build}"/>
- <delete file="client.log"/>
- <delete file="results.html"/>
- <delete file="tests-results.xml"/>
- </target>
-
- <target name="usage">
- <antcall target="all"/>
- </target>
-
-</project>
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 2b1b624..0000000
--- 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 cd5be56..0000000
--- 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 452ecc3..0000000
--- 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 840e35e..0000000
--- 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 36a9bff..0000000
--- 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 844a124..0000000
--- 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 fbec4fb..0000000
--- 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 06b605b..0000000
--- 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 27361f8..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/web/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>
-<head>
-<!--
-
- 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
-
--->
-
-<title>HTML Only Test</title>
-</head>
-<body>
-<p>
-This is a simple HTML page used for HTML only deployment unit test
-</p>
-What else can be put ?
-</body>
-</html>
-
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 bc28b27..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/descriptor_free_zone/ear/no_appxml_2/web/web.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
- <display-name>dummy web xml</display-name>
-</web-app>
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 81160c9..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>EARwithWAROnly</display-name>
- <module>
- <web>
- <web-uri>appmgt-web.war</web-uri>
- <context-root>appmgt/war</context-root>
- </web>
- </module>
-</application>
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 cc6ce95..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/build.xml
+++ /dev/null
@@ -1,408 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="appMgtTestApp" default="usage" basedir=".">
-
- &commonBuild;
-
- <property name="testName" value="appmgt"/>
- <property name="webModuleName" value="appmgt-web.war"/>
- <property name="asadminCmdArg" value="${testName}/${webModuleName}"/>
- <property name="all.ear" value="${build}/archive/${testName}.ear"/>
- <property name="testCategory" value="ear/appmgt"/>
- <property name="urlToContact" value="${testName}/war"/>
-
- <property name="original.config.client.args" value="-param builtin=in-app -env builtin(java.lang.String)=in-app"/>
- <property name="customized.config.client.args" value="-env env1(java.lang.String)=env-val1 -param par1=par-val1"/>
-
- <target name="prepare" depends="init">
- <property name="all.war" value="${build}/${webModuleName}"/>
- <mkdir dir="${build}"/>
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="."
- destdir="${build}"
- debug="on"
- failonerror="true">
- <classpath refid="gfv3.classpath" />
- </javac>
- </target>
-
- <target name="assemble" depends="compile">
- <ant dir="../../war/appmgt" target="compile">
- <property name="build" value="${build}"/>
- </ant>
-
- <war destfile="${all.war}" webxml="web.xml">
- <classes dir="${build}"/>
- </war>
-
-
- <copy file="application.xml" todir="${build}/archive/META-INF"/>
- <copy file="${all.war}" todir="${build}/archive"/>
- <jar destfile="${all.ear}" basedir="${build}/archive"/>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="${all.ear}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="${all.ear}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="v3.redeploy.asadmin" depends="prepare">
- <antcall target="common.v3.redeploy.asadmin">
- <param name="arg.list"
- value="--name ${testName} ${all.ear}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="enable.asadmin">
- <antcall target="common.enable.asadmin">
- <param name="arg.list"
- value="${testName}"/>
- </antcall>
- </target>
-
- <target name="disable.asadmin">
- <antcall target="common.disable.asadmin">
- <param name="arg.list"
- value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.war} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="appmgt-portable ${portable.war} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="appmgt-portable"/>
- </antcall>
- </target>
-
- <target name="start.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="start"/>
- <param name="arg.list" value="appmgt-portable"/>
- </antcall>
- </target>
-
- <target name="stop.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="stop"/>
- <param name="arg.list" value="appmgt-portable"/>
- </antcall>
- </target>
-
- <target name="do.asadmin">
- <antcall target="common.run.asadmin">
- <param name="arg.list" value="${command} ${arg.list} ${asadminCmdArg}"/>
- </antcall>
- </target>
-
- <target name="run" depends="run.positive"/>
-
- <target name="run.positive" depends="setHttpPort">
- <antcall target="common.run.positive">
- <param name="link" value="${urlToContact}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="run.negative" depends="setHttpPort">
- <antcall target="common.run.negative">
- <param name="link" value="${urlToContact}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="init">
- <echo message="TestClient ${arg.list}"/>
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="appmgttest.TestClient"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
-
- <classpath>
- <path location="${inst}/lib/j2ee.jar"/>
- <path location="${build}"/>
- </classpath>
-
- <arg line="${arg.list}"/>
- </javaWithResult>
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all" depends="private-all-pe"/>
-
- <target name="private-all-pe" if="PE">
-
- <antcall target="assemble"/>
-
- <antcall target="deploy.asadmin"/>
-
- <antcall target="runTests"/>
-
- <antcall target="undeploy.asadmin"/>
-
- </target>
-
- <target name="runTests">
-
- <!--
- Note that the client asks the servlet to report all its
- env-entries and all context-params. Then the client uses the
- client command-line args to search for matching entries that the
- servlet returned. We expect positive results for env-entries or
- context-params defined EITHER in the web app OR in the customizations,
- unless of course the customizations request ignoreDescriptorItem in
- which case the corresponding descriptor item should not appear in
- the data the servlet sends to the client.
- -->
- <antcall target="check.original.config.with.no.customization">
- <param name="log.id" value="1"/>
- </antcall>
-
- <!--
- Now create a new env entry and context param via customization.
- -->
-
- <antcall target="do.asadmin">
- <param name="command" value="set-web-env-entry"/>
- <param name="arg.list" value="--name=env1 --type=java.lang.String --value=env-val1"/>
- </antcall>
-
- <antcall target="do.asadmin">
- <param name="command" value="set-web-context-param"/>
- <param name="arg.list" value="--name=par1 --value=par-val1"/>
- </antcall>
-
- <antcall target="disable.asadmin"/>
- <antcall target="enable.asadmin"/>
-
- <antcall target="check.original.config.with.additive.customization">
- <param name="log.id" value="2"/>
- </antcall>
-
- <!--
- Further customize by suppressing the original env-entry and
- context-param but leaving the added ones.
- -->
- <antcall target="do.asadmin">
- <param name="command" value="set-web-env-entry"/>
- <param name="arg.list" value="--name builtin --ignoreDescriptorItem=true"/>
- </antcall>
-
- <antcall target="do.asadmin">
- <param name="command" value="set-web-context-param"/>
- <param name="arg.list" value="--name=builtin --ignoreDescriptorItem=true"/>
- </antcall>
-
- <!--
- Restart the app so the config changes will have effect.
- -->
- <antcall target="disable.asadmin"/>
- <antcall target="enable.asadmin"/>
-
- <antcall target="check.added.customization.and.suppressed.original.config">
- <param name="log.id" value="3"/>
- </antcall>
-
- <!--
- Make sure the results are the same after a redeployment.
- -->
- <antcall target="v3.redeploy.asadmin"/>
-
- <antcall target="check.added.customization.and.suppressed.original.config">
- <param name="log.id" value="4"/>
- </antcall>
-
- <!--
- Redeploy using deploy force=true. The customizations should
- survive.
- -->
-
- <antcall target="redeploy.asadmin"/>
-
- <antcall target="check.added.customization.and.suppressed.original.config">
- <param name="log.id" value="5"/>
- </antcall>
-
- <!--
- Now unset the customizations and then make sure that the behavior
- is back to how it was immediately after the initial deployment.
- -->
-
- <antcall target="do.asadmin">
- <param name="command" value="unset-web-env-entry"/>
- <param name="arg.list" value="--name=env1"/>
- </antcall>
-
- <antcall target="do.asadmin">
- <param name="command" value="unset-web-env-entry"/>
- <param name="arg.list" value="--name builtin"/>
- </antcall>
-
- <antcall target="do.asadmin">
- <param name="command" value="unset-web-context-param"/>
- <param name="arg.list" value="--name=par1"/>
- </antcall>
-
- <antcall target="do.asadmin">
- <param name="command" value="unset-web-context-param"/>
- <param name="arg.list" value="--name=builtin"/>
- </antcall>
-
- <!-- Restart so the changes become effective. -->
- <antcall target="disable.asadmin"/>
- <antcall target="enable.asadmin"/>
-
- <antcall target="check.original.config.with.no.customization">
- <param name="log.id" value="6"/>
- </antcall>
-
- <!--
- The app is still deployed. Undeploy it then deploy it again.
- The customizations should have vanished.
- -->
-
- <antcall target="undeploy.asadmin"/>
-
- <antcall target="deploy.asadmin"/>
-
- <antcall target="check.original.config.with.no.customization">
- <param name="log.id" value="7"/>
- </antcall>
-
- </target>
-
- <!--
- Makes sure the app's configuration matches how it
- was when first deployed, before any customization.
- -->
- <target name="check.original.config.with.no.customization">
- <antcall target="run.positive">
- <param name="log.id" value="${log.id}.1"/>
- <param name="desc" value="${testCategory} Check app's original config [${log.id}.1]"/>
- <param name="extra.args" value="${original.config.client.args}"/>
- </antcall>
-
- <antcall target="run.negative">
- <param name="log.id" value="${log.id}.2"/>
- <param name="desc" value="${testCategory} Make sure a non-existent customization is absent [${log.id}.2]"/>
- <param name="extra.args" value="-env notThere(java.lang.String)=in-app"/>
- </antcall>
-
- <antcall target="run.negative">
- <param name="log.id" value="${log.id}.3"/>
- <param name="desc" value="${testCategory} Make sure a customization used during the test is absent when it should be [${log.id}.3]"/>
- <param name="extra.args" value="${customized.config.client.args}"/>
- </antcall>
- </target>
-
- <!--
- Make sure that the customizations are
- reflected with the app's original config.
- -->
- <target name="check.original.config.with.additive.customization">
- <antcall target="run.positive">
- <param name="log.id" value="${log.id}.1"/>
- <param name="desc" value="${testCategory} Check app's original config plus additive customization [${log.id}.1]"/>
- <param name="extra.args" value="${original.config.client.args} ${customized.config.client.args}"/>
- </antcall>
-
- </target>
-
- <target name="check.additive.customization">
- <antcall target="run.positive">
- <param name="log.id" value="${log.id}.1"/>
- <param name="desc" value="${testCategory} Check for added env and param customization [${log.id}.1]"/>
- <param name="extra.args" value="${customized.config.client.args}"/>
- </antcall>
- </target>
-
- <target name="check.added.customization.and.suppressed.original.config">
- <antcall target="check.additive.customization">
- <param name="log.id" value="${log.id}.1"/>
- </antcall>
- <antcall target="check.suppressed.original.config">
- <param name="log.id" value="${log.id}.2"/>
- </antcall>
- </target>
-
- <target name="check.suppressed.original.config">
- <antcall target="run.negative">
- <param name="log.id" value="${log.id}.1"/>
- <param name="desc" value="${testCategory} Check for env-entry in the web app's descr being (correctly) ignored [${log.id}.1]"/>
- <param name="extra.args" value="-env builtin(java.lang.String)=in-app"/>
- </antcall>
-
- <antcall target="run.negative">
- <param name="log.id" value="${log.id}.2"/>
- <param name="desc" value="${testCategory} Check for context-param in the web app's descr being (correctly) ignored [${log.id}.2]"/>
- <param name="extra.args" value="-param builtin=in-app"/>
- </antcall>
- </target>
-
- <target name="clobber" depends="clean">
- <delete file="${all.ear}"/>
- <delete dir="${build}"/>
- </target>
-
- <target name="usage">
- <antcall target="all"/>
- </target>
-</project>
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 a13ed51..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/appmgt/web.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <context-param>
- <description>This context-param was defined in the web app itself.</description>
- <param-name>builtin</param-name>
- <param-value>in-app</param-value>
- </context-param>
- <servlet>
- <servlet-name>TestServlet</servlet-name>
- <servlet-class>appmgttest.TestServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>TestServlet</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>
- 30
- </session-timeout>
- </session-config>
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
- <env-entry>
- <description>This env-entry was defined in the web app app itself.</description>
- <env-entry-name>builtin</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>in-app</env-entry-value>
- </env-entry>
- </web-app>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/ear/build.xml b/appserver/tests/appserv-tests/devtests/deployment/ear/build.xml
index cbf597a..2cce55a 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 @@
<project name="ear" default="all" basedir=".">
- &commonBuild;
+ &commonBuild;
- <target name="private-all">
- <ant dir="earwithwar" target="private-all">
- <property name="build" value="${build}/earwithwar"/>
- </ant>
- <ant dir="earwithejb" target="private-all">
- <property name="build" value="${build}/earwithejb"/>
- </ant>
- <!--ant dir="wstoejb" target="private-all">
- <property name="build" value="${build}/wstoejb"/>
- </ant>
- <ant dir="earwithall" target="private-all">
- <property name="build" value="${build}/earwithall"/>
- </ant-->
- <ant dir="earwithall2" target="private-all">
- <property name="build" value="${build}/earwithall2"/>
- </ant>
- <ant dir="uniquecr" target="private-all">
- <property name="build" value="${build}/uniquecr"/>
- </ant>
- <ant dir="libClassPath" target="private-all">
- <property name="build" value="${build}/libClassPath"/>
- </ant>
+ <target name="private-all">
+ <ant dir="libClassPath" target="private-all">
+ <property name="build" value="${build}/libClassPath" />
+ </ant>
- <ant dir="libclasspath2" target="private-all">
- <property name="build" value="${build}/libclasspath2"/>
- </ant>
- <ant dir="manifestClassPath" target="private-all">
- <property name="build" value="${build}/manifestClassPath"/>
- </ant>
-
- <ant dir="appmgt" target="private-all">
- <property name="build" value="${build}/appmgt"/>
- </ant>
- </target>
+ <ant dir="libclasspath2" target="private-all">
+ <property name="build" value="${build}/libclasspath2" />
+ </ant>
+ <ant dir="manifestClassPath" target="private-all">
+ <property name="build" value="${build}/manifestClassPath" />
+ </ant>
+ </target>
</project>
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 42328d5..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/application.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>EARwithEverything</display-name>
- <module>
- <web>
- <web-uri>sayhello.war</web-uri>
- <context-root>HelloService</context-root>
- </web>
- </module>
- <module>
- <ejb>statelesshello.jar</ejb>
- </module>
-</application>
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 e99995c..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/build.xml
+++ /dev/null
@@ -1,254 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="HelloServiceWS" default="all" basedir=".">
-
- &commonBuild;
-
- <property name="testName" value="SayHelloWS"/>
- <property name="archivedir" value="${build}/archives"/>
- <target name="prepare" depends="init">
- <property name="binary" value="${build}/WEB-INF/classes"/>
- <property name="wsdl" value="${build}/WEB-INF/wsdl"/>
- <mkdir dir="${binary}" />
- <mkdir dir="${wsdl}"/>
- <mkdir dir="${build}/ejb"/>
- <property name="portable.war" value="${archivedir}/sayhello-portable.war"/>
- <property name="portable.jar" value="${archivedir}/statelesshello-portable.jar"/>
- <property name="portable.ear" value="${archivedir}/sayhello-portable.ear"/>
- <property name="all.war" value="${archivedir}/sayhello.war"/>
- <property name="all.jar" value="${archivedir}/statelesshello.jar"/>
- <property name="all.ear" value="${archivedir}/sayhello.ear"/>
- <property name="deployplan.jar" value="${archivedir}/sayhello-deployplan.jar"/>
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="statelesshello" destdir="${build}/ejb">
- <classpath refid="gfv3.classpath"/>
- </javac>
- <javac srcdir="helloservice" destdir="${binary}">
- <classpath refid="gfv3.classpath"/>
- </javac>
- <echo message="invoking wscompile to generate wsdl file"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-define config-interface.xml -d ${binary} -nd ${wsdl} -classpath ${binary} -mapping ${build}/mapping.xml"/>
- </exec>
- </target>
-
- <target name="assemble" depends="compile">
- <copy file="web.xml" todir="${build}/WEB-INF"/>
- <copy file="webservices.xml" todir="${build}/WEB-INF"/>
- <jar destfile="${portable.war}" basedir="${build}"/>
- <copy file="sun-web.xml" todir="${build}/WEB-INF" failonerror="false"/>
- <jar destfile="${all.war}" basedir="${build}"/>
-
- <mkdir dir="${build}/ejb/META-INF"/>
- <copy file="ejb-jar.xml" todir="${build}/ejb/META-INF"/>
- <jar destfile="${portable.jar}" basedir="${build}/ejb"/>
- <copy file="sun-ejb-jar.xml" todir="${build}/ejb/META-INF" failonerror="false"/>
- <jar destfile="${all.jar}" basedir="${build}/ejb"/>
-
- <mkdir dir="${build}/plan"/>
- <copy file="sun-ejb-jar.xml" tofile="${build}/plan/statelesshello-portable.jar.sun-ejb-jar.xml"/>
- <copy file="sun-web.xml" tofile="${build}/plan/sayhello-portable.war.sun-web.xml"/>
- <jar destfile="${deployplan.jar}" basedir="${build}/plan"/>
-
- <mkdir dir="${build}/ear"/>
- <mkdir dir="${build}/ear/META-INF"/>
- <copy file="application.xml" todir="${build}/ear/META-INF"/>
- <copy file="${all.war}" todir="${build}/ear"/>
- <copy file="${all.jar}" todir="${build}/ear"/>
- <jar destfile="${all.ear}" basedir="${build}/ear"/>
- <delete file="${build}/ear/sayhello.war"/>
- <delete file="${build}/ear/statelesshello.jar"/>
- <delete file="${build}/ear/META-INF/application.xml"/>
- <copy file="portable-app.xml" tofile="${build}/ear/META-INF/application.xml"/>
- <copy file="${portable.war}" todir="${build}/ear"/>
- <copy file="${portable.jar}" todir="${build}/ear"/>
- <jar destfile="${portable.ear}" basedir="${build}/ear"/>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--name ${testName} ${all.ear}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- <echo message="Create client webservices artifacts"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-gen:client -keep -d ${binary} -classpath ${binary} config-interface.xml"/>
- </exec>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="--name ${testName} ${all.ear}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- <echo message="Create client webservices artifacts"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-gen:client -keep -d ${binary} -classpath ${binary} config-interface.xml"/>
- </exec>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="sayhello-portable ${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="sayhello-portable"/>
- </antcall>
- </target>
-
- <target name="start.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="start"/>
- <param name="arg.list" value="sayhello-portable"/>
- </antcall>
- </target>
-
- <target name="stop.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="stop"/>
- <param name="arg.list" value="sayhello-portable"/>
- </antcall>
- </target>
-
- <target name="deploy.autodeploy">
- </target>
-
- <target name="run" depends="run.positive"/>
-
- <target name="run.positive" depends="setHttpPort">
- <antcall target="common.run.positive">
- <param name="link" value="HelloService/HelloService"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="run.negative" depends="setHttpPort">
- <antcall target="common.run.negative">
- <param name="link" value="HelloService/HelloService"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="prepare">
- <javac srcdir="staticstubclient" destdir="${binary}"
- classpath="${inst}/lib/j2ee.jar:${inst}/lib/webservices-rt.jar:${inst}/lib/webservices-tools.jar"/>
-
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="staticstubclient.SayHelloClient"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
-
-
- <classpath>
- <path location="${inst}/lib/j2ee.jar"/>
- <path location="${inst}/lib/webservices-rt.jar"/>
- <path location="${inst}/lib/webservices-tools.jar"/>
- <path location="${binary}"/>
- </classpath>
-
- <arg line="${arg.list}"/>
- </javaWithResult>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all">
- <antcall target="assemble"/>
- <antcall target="deploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="1"/>
- <param name="desc" value="ear/earwithall Test asadmin deploy"/>
- </antcall>
-
- <antcall target="redeploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="2"/>
- <param name="desc" value="ear/earwithall Test asadmin redeploy"/>
- </antcall>
- <antcall target="undeploy.asadmin"/>
-
-<!--
- <antcall target="deploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="3"/>
- <param name="desc" value="ear/earwithall Test jsr88 deploy"/>
- </antcall>
--->
-
- <!--antcall target="stop.jsr88"/>
- <antcall target="run.negative">
- <param name="log.id" value="4"/>
- <param name="desc" value="ear/earwithall Test jsr88 stopped state"/>
- </antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="5"/>
- <param name="desc" value="ear/earwithall Test jsr88 started state"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.negative">
- <param name="log.id" value="6"/>
- <param name="desc" value="ear/earwithall Test jsr88 redeploy stop"/>
- </antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="7"/>
- <param name="desc" value="ear/earwithall Test jsr88 redeploy start"/>
- </antcall-->
-<!--
- <antcall target="undeploy.jsr88"/>
--->
-
- </target>
-</project>
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 894789a..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SayHelloService"
- targetNamespace="urn:DeploymentWebServiceTest"
- typeNamespace="urn:DeploymentWebServiceTest"
- packageName="helloservice">
- <interface name="helloservice.SayHello"/>
- </service>
-</configuration>
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 254e84f..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/ejb-jar.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>MyStatelesshelloEJB</ejb-name>
- <home>statelesshello.StatelesshelloHome</home>
- <remote>statelesshello.Statelesshello</remote>
- <ejb-class>statelesshello.StatelesshelloEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>MyStatelesshelloEJB</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>sayStatelesshello</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
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 d715c4f..0000000
--- 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 51bf9b4..0000000
--- 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 c6d7c89..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/portable-app.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>EARwithEverything</display-name>
- <module>
- <web>
- <web-uri>sayhello-portable.war</web-uri>
- <context-root>HelloService</context-root>
- </web>
- </module>
- <module>
- <ejb>statelesshello-portable.jar</ejb>
- </module>
-</application>
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 1b08767..0000000
--- 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 1c0363a..0000000
--- 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 1513c0b..0000000
--- 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 d65a7ea..0000000
--- 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 6e45b93..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/sun-ejb-jar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>MyStatelesshelloEJB</ejb-name>
- <jndi-name>ejb/MyStatelesshello</jndi-name>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 77052c4..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/sun-web.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <ejb-ref>
- <ejb-ref-name>ejb/MyStatelesshello</ejb-ref-name>
- <jndi-name>ejb/MyStatelesshello</jndi-name>
- </ejb-ref>
-</sun-web-app>
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 bc32ab0..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>HelloServiceWS</display-name>
- <servlet>
- <servlet-name>HelloService</servlet-name>
- <servlet-class>helloservice.SayHelloImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>HelloService</servlet-name>
- <url-pattern>/HelloService</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
- <ejb-ref>
- <ejb-ref-name>ejb/MyStatelesshello</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>statelesshello.StatelesshelloHome</home>
- <remote>statelesshello.Statelesshello</remote>
- <ejb-link>MyStatelesshelloEJB</ejb-link>
- </ejb-ref>
-</web-app>
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 e4ea4b1..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall/webservices.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>Very simple web services</description>
- <webservice-description>
- <webservice-description-name>A WebService Servlet that says Hello</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/SayHelloService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>SayHelloPort</port-component-name>
- <wsdl-port xmlns:tns="urn:DeploymentWebServiceTest">tns:SayHelloPort </wsdl-port>
- <service-endpoint-interface>helloservice.SayHello</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>HelloService</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 3f72699..0000000
--- 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 9c60aac..0000000
--- 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 9dea1a5..0000000
--- 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 ca151d2..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/application-client.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client xmlns="http://java.sun.com/xml/ns/j2ee" version="1.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <display-name>justclient</display-name>
- <ejb-ref>
- <ejb-ref-name>ejb/JustBean</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>justbean.JustBeanHome</home>
- <remote>justbean.JustBean</remote>
- <ejb-link>JustSessionBean</ejb-link>
- </ejb-ref>
-</application-client>
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 f31c63c..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/application.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application xmlns="http://java.sun.com/xml/ns/javaee"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="6" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee Http://java.sun.com/xml/ns/javaee/application_6.xsd">
- <application-name>foo</application-name>
- <description>Application description</description>
- <display-name>WebNBean</display-name>
- <module>
- <ejb>WebNBean.jar</ejb>
- </module>
- <!--
- <module>
- <java>app-client-ic.jar</java>
- </module>
- -->
- <module>
- <web>
- <web-uri>WebNBean.war</web-uri>
- <context-root>/webnbean</context-root>
- </web>
- </module>
-</application>
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 e96bb20..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/build.xml
+++ /dev/null
@@ -1,559 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="WebNBean" default="usage" basedir=".">
-
- &commonBuild;
-
- <property name="contextRoot" value="webnbean"/>
- <property name="testName" value="WebNBean"/>
- <property name="appName" value="foo"/>
-
- <target name="prepare" depends="init">
- <property name="portable.war" value="${build}/${testName}-portable.war"/>
- <property name="portable.jar" value="${build}/${testName}-portable.jar"/>
- <property name="portable.ear" value="${build}/${testName}-portable.ear"/>
- <property name="all.war" value="${build}/${testName}.war"/>
- <property name="A.war" value="${build}/${testName}A.war"/>
- <property name="B.war" value="${build}/${testName}B.war"/>
- <property name="C.war" value="${build}/${testName}C.war"/>
- <property name="all.jar" value="${build}/${testName}.jar"/>
- <property name="all.ear" value="${build}/${testName}.ear"/>
- <property name="deployplan.jar" value="${build}/${testName}-deployplan.jar"/>
- <property name="warName" value="${testName}_war"/>
- <property name="warNameA" value="${testName}A"/>
- <property name="warNameB" value="${testName}B"/>
- <property name="warNameC" value="${testName}C"/>
- <property name="ejbName" value="${testName}_ejb"/>
- <property name="testWar" value="${build}/${warName}.war"/>
- <property name="testEjb" value="${build}/${ejbName}.jar"/>
- </target>
-
- <target name="compile" depends="prepare">
- <mkdir dir="${build}"/>
- <javac srcdir="."
- destdir="${build}"
- debug="on"
- failonerror="true">
- <classpath refid="gfv3.classpath"/>
- </javac>
- </target>
-
- <target name="assemble" depends="compile">
- <!-- didn't deal with appclient yet -->
-
- <war destfile="${portable.war}" webxml="web.xml">
- <classes dir="${build}" excludes="justclient/**,justbean/JustSessionBean.class,**/*.*ar"/>
- </war>
- <war destfile="${all.war}" webxml="web.xml">
- <webinf file="glassfish-web.xml"/>
- <classes dir="${build}" excludes="justclient/**,justbean/JustSessionBean.class,**.*ar"/>
- </war>
- <war destfile="${A.war}" webxml="weba/web.xml">
- <webinf file="weba/glassfish-web.xml"/>
- <classes dir="${build}" excludes="justclient/**,justbean/JustSessionBean.class,**.*ar"/>
- </war>
- <war destfile="${B.war}" webxml="webb/web.xml">
- <webinf file="webb/glassfish-web.xml"/>
- <classes dir="${build}" excludes="justclient/**,justbean/JustSessionBean.class,**.*ar"/>
- </war>
- <war destfile="${C.war}" webxml="webc/web.xml">
- <webinf file="webc/glassfish-web.xml"/>
- <classes dir="${build}" excludes="justclient/**,justbean/JustSessionBean.class,**.*ar"/>
- </war>
-
- <jar destfile="${portable.jar}">
- <metainf file="ejb-jar.xml"/>
- <fileset dir="${build}" excludes="justclient/**,justweb/**,**.*ar"/>
- </jar>
- <jar destfile="${all.jar}">
- <metainf dir="${basedir}" includes="ejb-jar.xml,glassfish-ejb-jar.xml"/>
- <fileset dir="${build}" excludes="justclient/**,justweb/**,**.*ar"/>
- </jar>
-
- <ear destfile="${portable.ear}" appxml="portable.application.xml">
- <fileset dir="${build}" includes="**-portable.war,**-portable.jar"/>
- </ear>
- <ear destfile="${all.ear}" appxml="application.xml">
- <metainf file="glassfish-application.xml"/>
- <fileset dir="${build}" includes="${testName}.jar,${testName}.war"/>
- </ear>
-
- <copy file="${all.war}" tofile="${testWar}"/>
- <copy file="${all.jar}" tofile="${testEjb}"/>
-
- <copy file="glassfish-web.xml" tofile="${portable.war}.glassfish-web.xml"/>
- <copy file="glassfish-ejb-jar.xml" tofile="${portable.jar}.glassfish-ejb-jar.xml"/>
- <copy file="glassfish-application.xml" tofile="${build}/glassfish-application.xml"/>
- <jar destfile="${deployplan.jar}"
- basedir="${build}" includes="**.xml"/>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="${all.ear}"/>
- <param name="testName" value="${appName}"/>
- </antcall>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="${all.ear}"/>
- <param name="testName" value="${appName}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${appName}"/>
- <param name="testName" value="${appName}"/>
- </antcall>
- </target>
-
- <target name="deploy.asadmin.war" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--deploymentorder 102 ${testWar}"/>
- <param name="testName" value="${warName}"/>
- </antcall>
- </target>
-
- <target name="deploy.asadmin.war.a" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--deploymentorder 102 ${A.war}"/>
- <param name="testName" value="${warName}A"/>
- </antcall>
- </target>
-
- <target name="deploy.asadmin.war.b" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--deploymentorder 102 ${B.war}"/>
- <param name="testName" value="${warName}B"/>
- </antcall>
- </target>
-
- <target name="deploy.asadmin.war.c" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--deploymentorder 102 ${C.war}"/>
- <param name="testName" value="${warName}C"/>
- </antcall>
- </target>
-
- <target name="deploy.asadmin.ejb" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--deploymentorder 101 ${testEjb}"/>
- <param name="testName" value="${ejbName}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin.war" depends="prepare">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${warName}"/>
- <param name="testName" value="${warName}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin.war.a" depends="prepare">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${warNameA}"/>
- <param name="testName" value="${warName}A"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin.war.b" depends="prepare">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${warNameB}"/>
- <param name="testName" value="${warName}B"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin.war.c" depends="prepare">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${warNameC}"/>
- <param name="testName" value="${warName}C"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin.ejb" depends="prepare">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${ejbName}"/>
- <param name="testName" value="${ejbName}"/>
- </antcall>
- </target>
-
- <target name="enable.asadmin">
- <antcall target="common.enable.asadmin">
- <param name="arg.list"
- value="${appName}"/>
- <param name="testName" value="${appName}"/>
- </antcall>
- </target>
-
- <target name="disable.asadmin">
- <antcall target="common.disable.asadmin">
- <param name="arg.list"
- value="${appName}"/>
- <param name="testName" value="${appName}"/>
- </antcall>
- </target>
-
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="deploy-stream.jsr88" depends="prepare">
- <antcall target="common.deploy-stream.jsr88">
- <param name="arg.list" value="${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="${appName} ${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy-stream.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy-stream"/>
- <param name="arg.list" value="${appName} ${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="${appName}"/>
- </antcall>
- </target>
-
- <!-- as it's not easy to implement the undeploy-stream using the
- current JSR88 Deployer, let's just undeploy all -->
- <target name="undeploy-stream.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="all"/>
- </antcall>
- </target>
-
- <target name="start.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="start"/>
- <param name="arg.list" value="${appName}"/>
- </antcall>
- </target>
-
- <target name="stop.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="stop"/>
- <param name="arg.list" value="${appName}"/>
- </antcall>
- </target>
-
-
- <target name="deploy.autodeploy">
- </target>
-
- <target name="run" depends="run.positive"/>
-
- <target name="run.positive" depends="setHttpPort">
- <antcall target="common.run.positive">
- <param name="link" value="${contextRoot}/justweb"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="run.negative" depends="setHttpPort">
- <antcall target="common.run.negative">
- <param name="link" value="${contextRoot}/justweb"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="init">
- <echo message="TestClient ${arg.list}"/>
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="ear.earwithall2.TestClient"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
-
- <classpath>
- <path location="${inst}/lib/j2ee.jar"/>
- <path location="${build}"/>
- </classpath>
-
- <arg line="${arg.list}"/>
-
- </javaWithResult>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all" depends="private-all-pe-ee, private-all-ee"/>
-
- <!-- the following is run in both PE and EE environment -->
- <target name="private-all-pe-ee">
- <antcall target="assemble"/>
- <antcall target="deploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="1"/>
- <param name="desc" value="ear/earwithall2 Test asadmin deploy"/>
- </antcall>
-
- <antcall target="disable.asadmin"/>
- <antcall target="run.negative">
- <param name="desc" value="ear/earwithall2 Test asadmin disable"/>
- <param name="log.id" value="2"/>
- </antcall>
-
- <antcall target="enable.asadmin"/>
- <antcall target="run.positive">
- <param name="desc" value="ear/earwithall2 Test asadmin enable"/>
- <param name="log.id" value="3"/>
- </antcall>
-
- <antcall target="redeploy.asadmin"/>
- <antcall target="run.positive">
- <param name="desc" value="ear/earwithall2 Test asadmin redeploy"/>
- <param name="log.id" value="4"/>
- </antcall>
- <antcall target="undeploy.asadmin"/>
-
- <antcall target="deploy.jsr88"/>
- <antcall target="run.positive">
- <param name="desc" value="ear/earwithall2 Test jsr88 deploy"/>
- <param name="log.id" value="5"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="run.negative">
- <param name="desc" value="ear/earwithall2 Test jsr88 stopped state"/>
- <param name="log.id" value="6"/>
- </antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="run.positive">
- <param name="desc" value="ear/earwithall2 Test jsr88 started state"/>
- <param name="log.id" value="7"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.negative">
- <param name="desc" value="ear/earwithall2 Test jsr88 redeploy stop"/>
- <param name="log.id" value="8"/>
- </antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.positive">
- <param name="desc" value="ear/earwithall2 Test jsr88 redeploy start"/>
- <param name="log.id" value="9"/>
- </antcall>
- <antcall target="undeploy.jsr88"/>
- <antcall target="deploy-stream.jsr88"/>
- <antcall target="run.positive">
- <param name="desc" value="ear/earwithall2 Test jsr88 deploy using InputStream"/>
- <param name="log.id" value="10"/>
- </antcall>
- <antcall target="redeploy-stream.jsr88"/>
- <antcall target="run.positive">
- <param name="desc" value="ear/earwithall2 Test jsr88 redeploy using InputStream"/>
- <param name="log.id" value="11"/>
- </antcall>
- <antcall target="undeploy-stream.jsr88"/>
-
- </target>
-
- <target name="addInstanceRef" depends="prepare">
- <!-- create-app-ref to remote instance server -->
- <antcall target="common.run.asadmin">
- <param name="arg.list"
- value="create-application-ref --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target ${testServer} ${appName}"/>
- </antcall>
- </target>
-
- <target name="delInstanceRef" depends="prepare">
- <!-- delete-app-ref to remote instance server -->
- <antcall target="common.run.asadmin">
- <param name="arg.list"
- value="delete-application-ref --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target ${testServer} ${appName}"/>
- </antcall>
- </target>
-
- <target name="addClusterRefs" depends="prepare" if="doCluster">
- <!-- create-app-ref to cluster -->
- <antcall target="common.run.asadmin">
- <param name="arg.list"
- value="create-application-ref --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target ${testCluster} ${appName}"/>
- </antcall>
- </target>
-
- <target name="delClusterRefs" depends="prepare" if="doCluster">
- <!-- delete-app-ref to remote instance server -->
- <antcall target="common.run.asadmin">
- <param name="arg.list"
- value="delete-application-ref --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target ${testCluster} ${appName}"/>
- </antcall>
- </target>
-
- <!-- the following is run only in EE environment -->
- <target name="private-all-ee" depends="prepare" if="EE">
- <echo message="Running tests specific to EE"/>
-
- <!-- deployment to Domain -->
- <antcall target="common.run.asadmin">
- <param name="arg.list"
- value="deploy --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target domain ${all.ear}"/>
- </antcall>
-
- <antcall target="addInstanceRef"/>
- <antcall target="addClusterRefs"/>
- <antcall target="run.positive">
- <param name="log.id" value="10"/>
- <param name="desc" value="ear/earwithall2 Test create-application-ref"/>
- </antcall>
-
- <antcall target="delInstanceRef"/>
- <antcall target="delClusterRefs"/>
- <antcall target="run.negative">
- <param name="log.id" value="11"/>
- <param name="desc" value="ear/earwithall2 Test delete-application-ref"/>
- </antcall>
-
- <antcall target="addInstanceRef"/>
- <antcall target="addClusterRefs"/>
- <antcall target="common.run.asadmin">
- <param name="arg.list"
- value="deploy --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --force=true --target domain ${all.ear}"/>
- </antcall>
- <antcall target="run.positive">
- <param name="log.id" value="12"/>
- <param name="desc" value="ear/earwithall2 Test redeploy to domain"/>
- </antcall>
-
- <antcall target="common.run.asadmin">
- <param name="arg.list"
- value="disable --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target domain ${appName}"/>
- </antcall>
- <antcall target="run.negative">
- <param name="log.id" value="13"/>
- <param name="desc" value="ear/earwithall2 Test disable on domain"/>
- </antcall>
-
- <antcall target="common.run.asadmin">
- <param name="arg.list"
- value="enable --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target domain ${appName}"/>
- </antcall>
- <antcall target="run.positive">
- <param name="log.id" value="14"/>
- <param name="desc" value="ear/earwithall2 Test enable domain"/>
- </antcall>
-
- <!-- undeploy from Domain -->
- <antcall target="common.run.asadmin">
- <param name="arg.list"
- value="undeploy --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target domain ${appName}"/>
- </antcall>
- </target>
-
- <target name="clobber" depends="clean">
- <delete file="${portable.war}"/>
- <delete file="${portable.jar}"/>
- <delete file="${portable.ear}"/>
- <delete file="${all.war}"/>
- <delete file="${all.jar}"/>
- <delete file="${all.ear}"/>
- <delete file="${testWar}"/>
- <delete file="${testEjb}"/>
- <delete file="${deployplan.war}"/>
- <delete dir="${build}"/>
- </target>
-
- <target name="usage">
- <antcall target="all"/>
- </target>
-
- <target name="depl-order" depends="assemble" unless="EE">
- <echo message="depl-order"/>
- <antcall target="declare-test">
- <param name="description" value="test deployment order"/>
- </antcall>
- <antcall target="deploy.asadmin.war"/>
- <antcall target="deploy.asadmin.ejb"/>
- <antcall target="restart.server"/>
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="ear.earwithall2.TestDeplOrder"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
-
- <classpath>
- <path location="${inst}/lib/j2ee.jar"/>
- <path location="${build}"/>
- </classpath>
-
- <arg line="${env.S1AS_HOME}/domains/domain1/logs/server.log"/>
-
- </javaWithResult>
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- </antcall>
- <antcall target="undeploy.asadmin.war"/>
- <antcall target="undeploy.asadmin.ejb"/>
-
- <antcall target="deploy.asadmin.war.a"/>
- <antcall target="deploy.asadmin.war.c"/>
- <antcall target="deploy.asadmin.war.b"/>
- <antcall target="restart.server"/>
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="ear.earwithall2.TestDeplOrder2"
- output="${build}/${log.id}.output2.log"
- resultproperty="result">
-
- <classpath>
- <path location="${inst}/lib/j2ee.jar"/>
- <path location="${build}"/>
- </classpath>
-
- <arg line="${env.S1AS_HOME}/domains/domain1/logs/server.log"/>
-
- </javaWithResult>
- <antcall target="undeploy.asadmin.war.a"/>
- <antcall target="undeploy.asadmin.war.c"/>
- <antcall target="undeploy.asadmin.war.b"/>
- </target>
-</project>
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 fb0f874..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/ejb-jar.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee" version="2.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
-<display-name>justbean.jar</display-name>
-<enterprise-beans>
-<session>
-<ejb-name>JustSessionBean</ejb-name>
-<home>justbean.JustBeanHome</home>
-<remote>justbean.JustBean</remote>
-<ejb-class>justbean.JustSessionBean</ejb-class>
-<session-type>Stateless</session-type>
-<transaction-type>Bean</transaction-type>
-<security-identity>
-<use-caller-identity/>
-</security-identity>
-</session>
-</enterprise-beans>
-<assembly-descriptor>
-<method-permission>
-<unchecked/>
-<method>
-<ejb-name>JustSessionBean</ejb-name>
-<method-intf>Home</method-intf>
-<method-name>remove</method-name>
-<method-params>
-<method-param>java.lang.Object</method-param>
-</method-params>
-</method>
-<method>
-<ejb-name>JustSessionBean</ejb-name>
-<method-intf>Home</method-intf>
-<method-name>getHomeHandle</method-name>
-</method>
-<method>
-<ejb-name>JustSessionBean</ejb-name>
-<method-intf>Remote</method-intf>
-<method-name>isIdentical</method-name>
-<method-params>
-<method-param>jakarta.ejb.EJBObject</method-param>
-</method-params>
-</method>
-<method>
-<ejb-name>JustSessionBean</ejb-name>
-<method-intf>Home</method-intf>
-<method-name>create</method-name>
-</method>
-<method>
-<ejb-name>JustSessionBean</ejb-name>
-<method-intf>Home</method-intf>
-<method-name>remove</method-name>
-<method-params>
-<method-param>jakarta.ejb.Handle</method-param>
-</method-params>
-</method>
-<method>
-<ejb-name>JustSessionBean</ejb-name>
-<method-intf>Remote</method-intf>
-<method-name>log</method-name>
-<method-params>
-<method-param>java.lang.String</method-param>
-</method-params>
-</method>
-<method>
-<ejb-name>JustSessionBean</ejb-name>
-<method-intf>Remote</method-intf>
-<method-name>getHandle</method-name>
-</method>
-<method>
-<ejb-name>JustSessionBean</ejb-name>
-<method-intf>Remote</method-intf>
-<method-name>findAllMarbles</method-name>
-</method>
-<method>
-<ejb-name>JustSessionBean</ejb-name>
-<method-intf>Home</method-intf>
-<method-name>getEJBMetaData</method-name>
-</method>
-<method>
-<ejb-name>JustSessionBean</ejb-name>
-<method-intf>Remote</method-intf>
-<method-name>getPrimaryKey</method-name>
-</method>
-<method>
-<ejb-name>JustSessionBean</ejb-name>
-<method-intf>Remote</method-intf>
-<method-name>remove</method-name>
-</method>
-<method>
-<ejb-name>JustSessionBean</ejb-name>
-<method-intf>Remote</method-intf>
-<method-name>getEJBHome</method-name>
-</method>
-</method-permission>
-</assembly-descriptor>
-</ejb-jar>
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 1ae5934..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-application-client.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-application-client PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Java EE Application Client 6.0//EN" "http://glassfish.org/dtds/glassfish-application-client_6_0-1.dtd">
-<!--
-
- 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
-
--->
-
-<glassfish-application-client>
- <ejb-ref>
- <ejb-ref-name>ejb/JustBean</ejb-ref-name>
- <jndi-name>ejb/JustBean</jndi-name>
- </ejb-ref>
-</glassfish-application-client>
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 7fc8d8d..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-application.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-application PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Java EE Application 6.0//EN" "http://glassfish.org/dtds/glassfish-application_6_0-1.dtd">
-<!--
-
- 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
-
--->
-
-<glassfish-application>
- <pass-by-reference>false</pass-by-reference>
-</glassfish-application>
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 b1e3f94..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-ejb-jar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-ejb-jar PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 EJB 3.1//EN" "http://glassfish.org/dtds/glassfish-ejb-jar_3_1-1.dtd">
-<!--
-
- 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
-
--->
-
-<glassfish-ejb-jar>
- <enterprise-beans>
- <name>justbean.jar</name>
- <ejb>
- <ejb-name>JustSessionBean</ejb-name>
- <jndi-name>JustSessionBean</jndi-name>
- </ejb>
- </enterprise-beans>
-</glassfish-ejb-jar>
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 689f296..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/glassfish-web.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<!--
-
- 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
-
--->
-
-<glassfish-web-app>
- <context-root>/webnbean</context-root>
- <ejb-ref>
- <ejb-ref-name>ejb/JustBean</ejb-ref-name>
- <jndi-name>ejb/JustBean</jndi-name>
- </ejb-ref>
-</glassfish-web-app>
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 d00efe9..0000000
--- 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 3c97ab6..0000000
--- 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 713efbf..0000000
--- 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 34aa4f4..0000000
--- 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 66b10c6..0000000
--- 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 e0b7896..0000000
--- 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("<html>");
- out.println("<head>");
- out.println("<title>Just Web Test</title>");
- out.println("</head>");
- out.println("<body>");
- out.println("<p>");
- out.println("Check log information on the server side.");
- out.println("<br>");
- out.println("Isn't this a wonderful life?");
- out.println("</p>");
- out.println("</body>");
- out.println("</html>");
- }
-}
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 cfa0e97..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/portable.application.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application xmlns="http://java.sun.com/xml/ns/javaee"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="6" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee Http://java.sun.com/xml/ns/javaee/application_6.xsd">
- <application-name>foo</application-name>
- <description>Application description</description>
- <display-name>WebNBean-DisplayName</display-name>
- <module>
- <ejb>WebNBean-portable.jar</ejb>
- </module>
- <!--
- <module>
- <java>app-client-ic.jar</java>
- </module>
- -->
- <module>
- <web>
- <web-uri>WebNBean-portable.war</web-uri>
- <context-root>/webnbean</context-root>
- </web>
- </module>
-</application>
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 fc9209f..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/web.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>JustWeb</display-name>
- <servlet>
- <display-name>JustWebServlet</display-name>
- <servlet-name>JustWebServlet</servlet-name>
- <servlet-class>justweb.JustWebServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>JustWebServlet</servlet-name>
- <url-pattern>/justweb</url-pattern>
- </servlet-mapping>
- <ejb-ref>
- <ejb-ref-name>ejb/JustBean</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>justbean.JustBeanHome</home>
- <remote>justbean.JustBean</remote>
- <ejb-link>JustSessionBean</ejb-link>
- </ejb-ref>
-</web-app>
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 b7c1dff..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/weba/glassfish-web.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<!--
-
- 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
-
--->
-
-<glassfish-web-app>
- <context-root>/webnbeana</context-root>
- <ejb-ref>
- <ejb-ref-name>ejb/JustBean</ejb-ref-name>
- <jndi-name>ejb/JustBean</jndi-name>
- </ejb-ref>
-</glassfish-web-app>
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 61ac094..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/weba/web.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>JustWeb</display-name>
- <servlet>
- <display-name>JustWebServlet</display-name>
- <servlet-name>JustWebServlet</servlet-name>
- <servlet-class>justweb.JustWebServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>JustWebServlet</servlet-name>
- <url-pattern>/justweba</url-pattern>
- </servlet-mapping>
- <ejb-ref>
- <ejb-ref-name>ejb/JustBean</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>justbean.JustBeanHome</home>
- <remote>justbean.JustBean</remote>
- <ejb-link>JustSessionBean</ejb-link>
- </ejb-ref>
-</web-app>
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 1a482ad..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webb/glassfish-web.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<!--
-
- 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
-
--->
-
-<glassfish-web-app>
- <context-root>/webnbeanb</context-root>
- <ejb-ref>
- <ejb-ref-name>ejb/JustBean</ejb-ref-name>
- <jndi-name>ejb/JustBean</jndi-name>
- </ejb-ref>
-</glassfish-web-app>
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 39d612c..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webb/web.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>JustWeb</display-name>
- <servlet>
- <display-name>JustWebServlet</display-name>
- <servlet-name>JustWebServlet</servlet-name>
- <servlet-class>justweb.JustWebServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>JustWebServlet</servlet-name>
- <url-pattern>/justwebb</url-pattern>
- </servlet-mapping>
- <ejb-ref>
- <ejb-ref-name>ejb/JustBean</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>justbean.JustBeanHome</home>
- <remote>justbean.JustBean</remote>
- <ejb-link>JustSessionBean</ejb-link>
- </ejb-ref>
-</web-app>
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 e4edcff..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webc/glassfish-web.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<!--
-
- 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
-
--->
-
-<glassfish-web-app>
- <context-root>/webnbeanc</context-root>
- <ejb-ref>
- <ejb-ref-name>ejb/JustBean</ejb-ref-name>
- <jndi-name>ejb/JustBean</jndi-name>
- </ejb-ref>
-</glassfish-web-app>
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 b7b9e20..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithall2/webc/web.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>JustWeb</display-name>
- <servlet>
- <display-name>JustWebServlet</display-name>
- <servlet-name>JustWebServlet</servlet-name>
- <servlet-class>justweb.JustWebServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>JustWebServlet</servlet-name>
- <url-pattern>/justwebc</url-pattern>
- </servlet-mapping>
- <ejb-ref>
- <ejb-ref-name>ejb/JustBean</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>justbean.JustBeanHome</home>
- <remote>justbean.JustBean</remote>
- <ejb-link>JustSessionBean</ejb-link>
- </ejb-ref>
-</web-app>
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 9ddc3e9..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/alt-ejbjar.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>MyStatelesshello</ejb-name>
- <home>statelesshello.StatelesshelloHome</home>
- <remote>statelesshello.Statelesshello</remote>
- <ejb-class>statelesshello.StatelesshelloEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <env-entry>
- <env-entry-name>user</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>scott</env-entry-value>
- </env-entry>
- <env-entry>
- <env-entry-name>number</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>22.25</env-entry-value>
- </env-entry>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>MyStatelesshello</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>sayStatelesshello</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <method>
- <ejb-name>MyStatelesshello</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>getUserDefinedException</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <method>
- <ejb-name>MyStatelesshello</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>isStatelesshello</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
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 2991c8f..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/application.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>EARwithEJBOnly</display-name>
- <module>
- <ejb>earwithejb.jar</ejb>
- <alt-dd>alt-ejbjar.xml</alt-dd>
- </module>
-</application>
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 969e325..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/build.xml
+++ /dev/null
@@ -1,267 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="statelesshello" default="all" basedir=".">
-
- &commonBuild;
-
- <property name="testName" value="StatelessHelloEjb"/>
- <property name="archivedir" value="${build}/archives"/>
- <target name="prepare" depends="init">
- <mkdir dir="${build}" />
- <mkdir dir="${archivedir}" />
- <property name="portable.ear" value="${archivedir}/earwithejb-portable.ear"/>
- <property name="portable.jar" value="${archivedir}/earwithejb-portable.jar"/>
- <property name="all.ear" value="${archivedir}/earwithejb.ear"/>
- <property name="all.jar" value="${archivedir}/earwithejb.jar"/>
- <property name="deployplan.jar" value="${archivedir}/earwithejb-deployplan.jar"/>
- </target>
-
- <target name="assemble" depends="prepare">
- <jar destfile="${deployplan.jar}">
- <fileset dir="${basedir}" includes="sun-ejb-jar.xml"/>
- </jar>
-
- <mkdir dir="${build}/META-INF"/>
- <copy file="ejb-jar.xml" todir="${build}/META-INF"/>
- <jar destfile="${portable.jar}">
- <fileset dir="../../build/ejb/statelesshello"
- excludes="**/archives/**"/>
- <fileset dir="${build}"
- excludes="**/archives/**"/>
- </jar>
-
- <copy file="sun-ejb-jar.xml" todir="${build}/META-INF" failonerror="false"/>
- <jar destfile="${all.jar}">
- <fileset dir="../../build/ejb/statelesshello"/>
- <fileset dir="${build}"
- excludes="**/archives/**"/>
- </jar>
-
- <mkdir dir="${build}/META-INF"/>
- <copy file="portable-app.xml" tofile="${build}/META-INF/application.xml"/>
- <copy file="${portable.jar}" todir="${build}"/>
- <jar destfile="${portable.ear}" basedir="${build}" excludes="**ejb-jar.xml"/>
-
- <delete file="${build}/earwithejb-portable.jar"/>
- <delete file="${build}/META-INF/application.xml"/>
- <delete file="${build}/META-INF/sun-ejb-jar.xml"/>
- <delete file="${build}/META-INF/ejb-jar.xml"/>
- <delete file="${build}/earwithejb-portable.jar"/>
- <copy file="application.xml" todir="${build}/META-INF"/>
- <copy file="alt-ejbjar.xml" todir="${build}"/>
- <copy file="sun-alt-ejbjar.xml" todir="${build}" failonerror="false"/>
- <copy file="${all.jar}" todir="${build}"/>
- <jar destfile="${all.ear}" basedir="${build}" excludes="**/archives/**"/>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--retrieve ${archivedir} --name ${testName} ${all.ear}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="--retrieve ${archivedir} --name ${testName} ${all.ear}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="earwithejb-portable ${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="earwithejb-portable"/>
- </antcall>
- </target>
-
- <target name="start.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="start"/>
- <param name="arg.list" value="earwithejb-portable"/>
- </antcall>
- </target>
-
- <target name="stop.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="stop"/>
- <param name="arg.list" value="earwithejb-portable"/>
- </antcall>
- </target>
-
- <target name="deploy.autodeploy">
- </target>
-
- <target name="run" depends="run.positive"/>
-
- <target name="run.positive" depends="init,setOrbPort">
- <antcall target="declare-test">
- <param name="description" value="${description} (server)"/>
- </antcall>
- <antcall target="runclient">
- <param name="arg.list" value="true"/>
- <param name="log.id" value="${log.id}"/>
- <param name="tgtPort" value="${depltest.orbport}"/>
- </antcall>
- <antcall target="pingCluster">
- <param name="state" value="true"/>
- <param name="log.id" value="${log.id}"/>
- <param name="testDet" value="${description}"/>
- </antcall>
- </target>
-
- <target name="run.negative" depends="init,setOrbPort">
- <antcall target="declare-test">
- <param name="description" value="${description} (server)"/>
- </antcall>
- <antcall target="runclient">
- <param name="arg.list" value="false"/>
- <param name="log.id" value="${log.id}"/>
- <param name="tgtPort" value="${depltest.orbport}"/>
- </antcall>
- <antcall target="pingCluster">
- <param name="state" value="false"/>
- <param name="log.id" value="${log.id}"/>
- <param name="testDet" value="${description}"/>
- </antcall>
- </target>
-
- <target name="pingCluster" if="doCluster">
- <antcall target="declare-test">
- <param name="description" value="${testDet} (cluster-inst1)"/>
- </antcall>
- <antcall target="runclient">
- <param name="arg.list" value="${state}"/>
- <param name="log.id" value="${log.id}"/>
- <param name="tgtPort" value="${deploy.clusterinstance1.orbport}"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="init,setOrbPort">
- <javac srcdir="../../ejb/statelesshello/standaloneclient" destdir="${build}">
- <classpath>
- <path refid="gfv3.classpath"/>
- <path location="../../build/ejb/statelesshello"/>
- </classpath>
-
- </javac>
-
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="standaloneclient.HelloClient"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
-
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${tgtPort}"/>
-
- <classpath>
- <path location="${inst}/lib/j2ee.jar"/>
- <path location="${inst}/lib/appserv-rt.jar"/>
- <path location="${inst}/lib/appserv-admin.jar"/>
- <path location="${build}"/>
- <path location="${archivedir}/earwithejb.jar"/>
- </classpath>
-
- <arg line="${arg.list}"/>
- </javaWithResult>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all">
- <antcall target="assemble"/>
- <antcall target="deploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="1"/>
- <param name="description" value="ear/earwithejb Test asadmin deploy"/>
- </antcall>
-
- <antcall target="redeploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="2"/>
- <param name="description" value="ear/earwithejb Test asadmin redeploy"/>
- </antcall>
- <antcall target="undeploy.asadmin"/>
-
-<!--
- <antcall target="deploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="3"/>
- <param name="description" value="ear/earwithejb Test jsr88 deploy"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="run.negative">
- <param name="log.id" value="4"/>
- <param name="description" value="ear/earwithejb Test jsr88 stopped state"/>
- </antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="5"/>
- <param name="description" value="ear/earwithejb Test jsr88 started state"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.negative">
- <param name="log.id" value="6"/>
- <param name="description" value="ear/earwithejb Test jsr88 redeploy stop"/>
- </antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="7"/>
- <param name="description" value="ear/earwithejb Test jsr88 redeploy start"/>
- </antcall>
- <antcall target="undeploy.jsr88"/>
--->
- </target>
-</project>
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 9ddc3e9..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/ejb-jar.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>MyStatelesshello</ejb-name>
- <home>statelesshello.StatelesshelloHome</home>
- <remote>statelesshello.Statelesshello</remote>
- <ejb-class>statelesshello.StatelesshelloEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <env-entry>
- <env-entry-name>user</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>scott</env-entry-value>
- </env-entry>
- <env-entry>
- <env-entry-name>number</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>22.25</env-entry-value>
- </env-entry>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>MyStatelesshello</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>sayStatelesshello</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <method>
- <ejb-name>MyStatelesshello</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>getUserDefinedException</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <method>
- <ejb-name>MyStatelesshello</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>isStatelesshello</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
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 e80941d..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/portable-app.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>EARwithEJBOnly</display-name>
- <module>
- <ejb>earwithejb-portable.jar</ejb>
- </module>
-</application>
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 ece1511..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/sun-alt-ejbjar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <name>Ejb1</name>
- <ejb>
- <ejb-name>MyStatelesshello</ejb-name>
- <jndi-name>MyStatelesshello</jndi-name>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 ece1511..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithejb/sun-ejb-jar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <name>Ejb1</name>
- <ejb>
- <ejb-name>MyStatelesshello</ejb-name>
- <jndi-name>MyStatelesshello</jndi-name>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 1f1ce6c..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/altapplication.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>EARwithWAROnly</display-name>
- <module>
- <web>
- <web-uri>servletonly.war</web-uri>
- <context-root>altwar</context-root>
- </web>
- </module>
-</application>
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 52542fa..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>EARwithWAROnly</display-name>
- <module>
- <web>
- <web-uri>servletonly.war</web-uri>
- <context-root>war</context-root>
- </web>
- </module>
-</application>
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 25e3753..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/build.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="earwithwarApp" default="usage" basedir=".">
-
- &commonBuild;
-
- <property name="contextRoot" value="war"/>
- <property name="altContextRoot" value="altwar"/>
- <property name="testName" value="servletonly"/>
-
- <target name="prepare" depends="init">
- <mkdir dir="${build}"/>
- <mkdir dir="${build}/archive"/>
- <mkdir dir="${build}/archive/META-INF"/>
- <property name="portable.ear" value="${build}/${testName}-portable.ear"/>
- <property name="portable.war" value="${build}/${testName}-portable.war"/>
- <property name="all.war" value="${build}/${testName}.war"/>
- <property name="all.ear" value="${build}/${testName}.ear"/>
- <property name="deployplan.jar" value="${build}/${testName}-deployplan.jar"/>
- </target>
-
- <target name="assemble" depends="prepare">
- <ant dir="../../war/servletonly" target="compile">
- <property name="build" value="${build}/war"/>
- </ant>
- <war destfile="${portable.war}" webxml="../../war/servletonly/web.xml">
- <classes dir="${build}/war"/>
- </war>
- <jar destfile="${deployplan.jar}">
- <fileset dir="${basedir}" includes="sun-web.xml"/>
- </jar>
- <war destfile="${all.war}" webxml="../../war/servletonly/web.xml">
- <webinf dir="." includes="sun-web.xml"/>
- <classes dir="${build}/war"/>
- </war>
- <copy file="portable-app.xml" tofile="${build}/archive/META-INF/application.xml"/>
- <copy file="altapplication.xml" tofile="${build}/archive/altapplication.xml"/>
- <copy file="${portable.war}" todir="${build}/archive"/>
- <jar destfile="${portable.ear}" basedir="${build}/archive"/>
- <delete file="${build}/archive/${testName}-portable.war"/>
- <delete file="${build}/archive/META-INF/application.xml"/>
- <copy file="application.xml" todir="${build}/archive/META-INF"/>
- <copy file="${all.war}" todir="${build}/archive"/>
- <jar destfile="${all.ear}" basedir="${build}/archive"/>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="${all.ear}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.asadmin.altdd" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--altdd ${build}/archive/altapplication.xml ${all.ear}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="${all.ear}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="enable.asadmin">
- <antcall target="common.enable.asadmin">
- <param name="arg.list"
- value="${testName}"/>
- </antcall>
- </target>
-
- <target name="disable.asadmin">
- <antcall target="common.disable.asadmin">
- <param name="arg.list"
- value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="servletonly-portable ${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="servletonly-portable"/>
- </antcall>
- </target>
-
- <target name="start.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="start"/>
- <param name="arg.list" value="servletonly-portable"/>
- </antcall>
- </target>
-
- <target name="stop.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="stop"/>
- <param name="arg.list" value="servletonly-portable"/>
- </antcall>
- </target>
-
- <target name="deploy.autodeploy">
- </target>
-
- <target name="run" depends="run.positive"/>
-
- <target name="run.positive" depends="setHttpPort">
- <antcall target="common.run.positive">
- <param name="link" value="${contextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="run.positive.altdd" depends="setHttpPort">
- <antcall target="common.run.positive">
- <param name="link" value="${altContextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="run.negative" depends="setHttpPort">
- <antcall target="common.run.negative">
- <param name="link" value="${contextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="init">
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="servletonly.client.TestClient"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
-
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
-
- <classpath>
- <path location="${inst}/lib/j2ee.jar"/>
- <path location="${build}/war"/>
- <path location="../../build/war/servletonly"/>
- </classpath>
-
- <arg line="${arg.list}"/>
- </javaWithResult>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all">
- <antcall target="assemble"/>
- <antcall target="deploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="1"/>
- <param name="desc" value="ear/earwithwar Test asadmin deploy"/>
- </antcall>
-
- <antcall target="redeploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="2"/>
- <param name="desc" value="ear/earwithwar Test asadmin redeploy"/>
- </antcall>
-
- <antcall target="disable.asadmin"/>
- <antcall target="run.negative">
- <param name="log.id" value="3"/>
- <param name="desc" value="ear/earwithwar Test asadmin disable"/>
- </antcall>
-
- <antcall target="enable.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="4"/>
- <param name="desc" value="ear/earwithwar Test asadmin enable"/>
- </antcall>
-
- <antcall target="undeploy.asadmin"/>
-
- <antcall target="deploy.asadmin.altdd"/>
- <antcall target="run.positive.altdd">
- <param name="log.id" value="5"/>
- <param name="desc" value="ear/earwithwar Test asadmin deploy with altdd"/>
- </antcall>
-
- <antcall target="undeploy.asadmin"/>
-
- <antcall target="deploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="6"/>
- <param name="desc" value="ear/earwithwar Test jsr88 deploy"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="run.negative">
- <param name="desc" value="ear/earwithwar Test jsr88 stopped state"/>
- <param name="log.id" value="7"/>
- </antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="run.positive">
- <param name="desc" value="ear/earwithwar Test jsr88 started state"/>
- <param name="log.id" value="8"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.negative">
- <param name="desc" value="ear/earwithwar Test jsr88 redeploy stop"/>
- <param name="log.id" value="9"/>
- </antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.positive">
- <param name="desc" value="ear/earwithwar Test jsr88 redeploy start"/>
- <param name="log.id" value="10"/>
- </antcall>
- <antcall target="undeploy.jsr88"/>
- </target>
-
- <target name="clobber" depends="clean">
- <delete file="${portable.war}"/>
- <delete file="${all.war}"/>
- <delete file="${deployplan.war}"/>
- <delete dir="${build}"/>
- </target>
-
- <target name="usage">
- <antcall target="all"/>
- </target>
-</project>
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 248b34b..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/portable-app.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>EARwithWAROnly</display-name>
- <module>
- <web>
- <web-uri>servletonly-portable.war</web-uri>
- <context-root>war</context-root>
- </web>
- </module>
-</application>
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 5279cd2..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/earwithwar/sun-web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <context-root>war</context-root>
- <session-config>
- <session-manager/>
- </session-config>
- <class-loader delegate="true"/>
- <jsp-config/>
-</sun-web-app>
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 dc231d1..5286479 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 @@
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
<classpath>
- <path location="${inst}/lib/j2ee.jar"/>
+ <path location="${inst}/lib/javaee.jar"/>
<path location="${build}"/>
</classpath>
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 d29f788..6b53819 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 @@
<target name="compile" depends="prepare">
<javac srcdir="samples" destdir="${build}">
<classpath>
- <pathelement location="${inst}/lib/j2ee.jar"/>
+ <pathelement location="${inst}/lib/javaee.jar"/>
<pathelement location="${inst}/lib/appserv-rt.jar"/>
<pathelement location="${build}/WEB-INF/lib/library.jar"/>
</classpath>
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 ef4ae92..1c7fa3a 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 @@
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
<classpath>
- <path location="${inst}/lib/j2ee.jar"/>
+ <path location="${inst}/lib/javaee.jar"/>
<path location="${build}"/>
</classpath>
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 d29f788..6b53819 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 @@
<target name="compile" depends="prepare">
<javac srcdir="samples" destdir="${build}">
<classpath>
- <pathelement location="${inst}/lib/j2ee.jar"/>
+ <pathelement location="${inst}/lib/javaee.jar"/>
<pathelement location="${inst}/lib/appserv-rt.jar"/>
<pathelement location="${build}/WEB-INF/lib/library.jar"/>
</classpath>
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 52542fa..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>EARwithWAROnly</display-name>
- <module>
- <web>
- <web-uri>servletonly.war</web-uri>
- <context-root>war</context-root>
- </web>
- </module>
-</application>
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 51e28bf..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/build.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="uniquecrApp" default="usage" basedir=".">
-
- &commonBuild;
-
- <property name="contextRoot" value="war"/>
- <property name="testName" value="servletonly"/>
- <property name="testName2" value="servletonly2"/>
-
- <target name="prepare" depends="init">
- <mkdir dir="${build}"/>
- <mkdir dir="${build}/archive"/>
- <mkdir dir="${build}/archive/META-INF"/>
- <property name="portable.ear" value="${build}/${testName}-portable.ear"/>
- <property name="portable.war" value="${build}/${testName}-portable.war"/>
- <property name="all.war" value="${build}/${testName}.war"/>
- <property name="all.ear" value="${build}/${testName2}.ear"/>
- <property name="deployplan.jar" value="${build}/${testName}-deployplan.jar"/>
- </target>
-
- <target name="assemble" depends="prepare">
- <ant dir="../../war/servletonly" target="compile">
- <property name="build" value="${build}/war"/>
- </ant>
- <war destfile="${portable.war}" webxml="../../war/servletonly/web.xml">
- <classes dir="${build}/war"/>
- </war>
- <jar destfile="${deployplan.jar}">
- <fileset dir="${basedir}" includes="sun-web.xml"/>
- </jar>
- <war destfile="${all.war}" webxml="../../war/servletonly/web.xml">
- <webinf dir="." includes="sun-web.xml"/>
- <classes dir="${build}/war"/>
- </war>
- <copy file="portable-app.xml" tofile="${build}/archive/META-INF/application.xml"/>
- <copy file="${portable.war}" todir="${build}/archive"/>
- <jar destfile="${portable.ear}" basedir="${build}/archive"/>
- <delete file="${build}/archive/${testName}-portable.war"/>
- <delete file="${build}/archive/META-INF/application.xml"/>
- <copy file="application.xml" todir="${build}/archive/META-INF"/>
- <copy file="${all.war}" todir="${build}/archive"/>
- <jar destfile="${all.ear}" basedir="${build}/archive"/>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="${all.ear}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="run" depends="run.positive"/>
-
- <target name="run.positive" depends="setHttpPort">
- <antcall target="common.run.positive">
- <param name="link" value="${contextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="run.positive.2">
- <property name="test-details" value="${desc}"/>
- <property name="sub-url" value="${contextRoot}/${testName}"/>
- <property name="url" value="http://${http.host}:${http.port}/${sub-url}"/>
- <property name="state" value="true"/>
- <property name="log-file" value="${log.id}"/>
- <antcall target="declare-test">
- <param name="description" value="${test-details} (server)"/>
- </antcall>
- <antcall target="runclient">
- <param name="arg.list" value="${url} ${state}"/>
- <param name="log.id" value="${log-file}"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="init">
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="servletonly.client.TestClient"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
-
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
-
- <classpath>
- <path location="${inst}/lib/j2ee.jar"/>
- <path location="${build}/war"/>
- <path location="../../build/war/servletonly"/>
- </classpath>
-
- <arg line="${arg.list}"/>
- </javaWithResult>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="addClusterRefs" depends="prepare" if="doCluster">
- <!-- create-app-ref to cluster -->
- <antcall target="common.run.asadmin">
- <param name="arg.list"
- value="create-application-ref --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target ${testCluster} ${testName2}"/>
- </antcall>
- </target>
-
- <target name="delClusterRefs" depends="prepare" if="doCluster">
- <!-- delete-app-ref to remote instance server -->
- <antcall target="common.run.asadmin">
- <param name="arg.list"
- value="delete-application-ref --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target ${testCluster} ${testName2}"/>
- </antcall>
- </target>
-
- <!-- the following is run only in EE environment -->
- <target name="private-all-ee" depends="assemble" if="EE">
- <echo message="Running tests specific to EE"/>
-
- <!-- deploy ear to remote instance server/cluster -->
- <antcall target="common.run.asadmin">
- <param name="arg.list"
- value="deploy --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target ${testServer} ${all.ear}"/>
- </antcall>
- <antcall target="addClusterRefs"/>
-
- <antcall target="run.positive">
- <param name="log.id" value="1"/>
- <param name="desc" value="ear/uniquecr Test1 "/>
- </antcall>
-
- <!-- deploy war to DAS server instance -->
- <!-- this should succeed because it's different instance -->
- <antcall target="common.run.asadmin">
- <param name="arg.list"
- value="deploy --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target server ${all.war}"/>
- </antcall>
-
- <antcall target="run.positive.2">
- <param name="log.id" value="2"/>
- <param name="desc" value="ear/uniquecr Test2"/>
- </antcall>
-
- <!-- undeploy ear from remote server instance/cluster -->
- <antcall target="delClusterRefs"/>
- <antcall target="common.run.asadmin">
- <param name="arg.list"
- value="undeploy --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target ${testServer} ${testName2}"/>
- </antcall>
-
- <!-- undeploy war from DAS server instance-->
- <antcall target="common.run.asadmin">
- <param name="arg.list"
- value="undeploy --port ${admin.port} --user ${admin.user} --passwordfile ${passwordFile} --target server ${testName}"/>
- </antcall>
- </target>
-
- <target name="private-all" depends="private-all-ee"/>
-
- <target name="clobber" depends="clean">
- <delete file="${portable.war}"/>
- <delete file="${all.war}"/>
- <delete file="${deployplan.war}"/>
- <delete dir="${build}"/>
- </target>
-
- <target name="usage">
- <antcall target="all"/>
- </target>
-</project>
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 248b34b..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/portable-app.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>EARwithWAROnly</display-name>
- <module>
- <web>
- <web-uri>servletonly-portable.war</web-uri>
- <context-root>war</context-root>
- </web>
- </module>
-</application>
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 5279cd2..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/uniquecr/sun-web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <context-root>war</context-root>
- <session-config>
- <session-manager/>
- </session-config>
- <class-loader delegate="true"/>
- <jsp-config/>
-</sun-web-app>
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 bb305cb..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/application-client.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>application client for wstoejb application</description>
- <display-name>wstoejbClient</display-name>
- <service-ref>
- <description>web service ref</description>
- <service-ref-name>service/WstoEjbService</service-ref-name>
- <service-interface>wstoejb.WebServiceToEjb</service-interface>
- <wsdl-file>META-INF/wsdl/WebServiceToEjb.wsdl</wsdl-file>
- <jaxrpc-mapping-file>mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>wstoejb.WebServiceToEjbSEI</service-endpoint-interface>
- <port-component-link>WebServiceToEjbSEIPort</port-component-link>
- </port-component-ref>
- </service-ref>
-</application-client>
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 204b108..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/build.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
-]>
-
-<project name="wstoejb" default="all" basedir=".">
-
- &commonBuild;
- <property name="archivedir" value="${build}/archives"/>
-
- <target name="prepare" depends="init">
- <mkdir dir="${build}" />
- <mkdir dir="${archivedir}" />
- <copy file="WebServiceToEjb.wsdl" todir="${build}/META-INF/wsdl"/>
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-import -d ${build} -classpath ${build} -mapping ${build}/mapping.xml wscompile_config.xml"/>
- </exec>
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="wstoejb" destdir="${build}">
- <classpath refid="gfv3.classpath"/>
- </javac>
-
- </target>
-
- <target name="assemble" depends="compile,setHttpPort">
- <mkdir dir="${build}/META-INF"/>
- <copy file="application-client.xml" todir="${build}/META-INF"/>
- <jar destfile="${archivedir}/appclient-portable.jar" basedir="${build}">
- <manifest>
- <attribute name="main-class" value="wstoejb.Client"/>
- </manifest>
- </jar>
- <copy file="sun-application-client.xml" todir="${build}/META-INF" failonerror="false"/>
- <replace file="${build}/META-INF/sun-application-client.xml">
- <replacefilter token="HTTP_HOST" value="${http.host}" />
- <replacefilter token="HTTP_PORT" value="${depltest.port}"/>
- </replace>
- <jar destfile="${archivedir}/appclient.jar" basedir="${build}">
- <manifest>
- <attribute name="main-class" value="wstoejb.Client"/>
- </manifest>
- </jar>
- </target>
-
- <target name="private-all" depends="assemble"/>
-
-</project>
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 faf43de..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/sun-application-client.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/WstoEjbService</service-ref-name>
- <wsdl-override>http://HTTP_HOST:HTTP_PORT/wstoejb/wstoejb?WSDL</wsdl-override>
- </service-ref>
-</sun-application-client>
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 e781eb3..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/appclient/wscompile_config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="WebServiceToEjb.wsdl"
- packageName="wstoejb"/>
-</configuration>
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 5ba67b1..0000000
--- 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 39f5fe0..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/application.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>WebServiceToEjbApp</display-name>
- <module>
- <web>
- <web-uri>sayhello.war</web-uri>
- <context-root>wstoejb</context-root>
- </web>
- </module>
- <module>
- <java>appclient.jar</java>
- </module>
- <module>
- <ejb>wstoejb.jar</ejb>
- </module>
-</application>
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 5adcc74..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/build.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="wstoejb" default="all" basedir=".">
-
- &commonBuild;
-
-
- <property name="testName" value="wstoejb"/>
- <target name="prepare" depends="init">
- <property name="portable.ear" value="${build}/wstoejb-portable.ear"/>
- <property name="all.ear" value="${build}/wstoejb.ear"/>
- <property name="deployplan.jar" value="${build}/wstoejb-deployplan.jar"/>
- <mkdir dir="${build}"/>
- </target>
-
- <target name="build" depends="prepare">
- <mkdir dir="${build}/ear"/>
-
- <ant dir="ejb" target="private-all">
- <property name="build" value="${build}/ejb"/>
- </ant>
-
- <ant dir="war" target="private-all">
- <property name="build" value="${build}/war"/>
- </ant>
-
- <copy file="${build}/war/WEB-INF/wsdl/WebServiceToEjb.wsdl" todir="appclient"/>
- <ant dir="appclient" target="private-all">
- <property name="build" value="${build}/appclient"/>
- </ant>
-
- <delete file="appclient/WebServiceToEjb.wsdl"/>
- <mkdir dir="${build}/ear/META-INF"/>
- <copy file="application.xml" todir="${build}/ear/META-INF"/>
- <jar destfile="${all.ear}">
- <fileset dir="${build}/ear" excludes="appclient-portable.jar,sayhello-portable.war,wstoejb-portable.jar"/>
- </jar>
-
- <delete file="${build}/ear/META-INF/application.xml"/>
- <copy file="portable-app.xml" tofile="${build}/ear/META-INF/application.xml"/>
- <jar destfile="${portable.ear}">
- <fileset dir="${build}/ear" excludes="appclient.jar,sayhello.war,wstoejb.jar"/>
- </jar>
-
- <mkdir dir="${build}/plan"/>
- <copy file="war/sun-web.xml" tofile="${build}/plan/sayhello-portable.war.sun-web.xml"/>
- <copy file="ejb/sun-ejb-jar.xml" tofile="${build}/plan/wstoejb-portable.jar.sun-ejb-jar.xml"/>
- <copy file="${build}/appclient/META-INF/sun-application-client.xml" tofile="${build}/plan/appclient-portable.jar.sun-application-client.xml"/>
- <jar destfile="${deployplan.jar}" basedir="${build}/plan"/>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--name ${testName} --retrieve ${build} ${all.ear}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="--name ${testName} --retrieve ${build} ${all.ear}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="wstoejb-portable ${portable.ear} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="wstoejb-portable"/>
- </antcall>
- </target>
-
- <target name="start.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="start"/>
- <param name="arg.list" value="wstoejb-portable"/>
- </antcall>
- </target>
-
- <target name="stop.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="stop"/>
- <param name="arg.list" value="wstoejb-portable"/>
- </antcall>
- </target>
-
- <target name="deploy.autodeploy">
- </target>
-
- <target name="run" depends="run.positive"/>
-
- <target name="run.positive">
- <antcall target="runclient">
- <param name="arg.list" value="true"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="run.negative">
- <antcall target="runclient">
- <param name="arg.list" value="false"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="prepare">
- <exec executable="${APPCLIENT}" resultproperty="result" output="${build}/${log.id}.output.log">
- <arg line="-client ${build}/wstoejbClient.jar ${arg.list}"/>
- </exec>
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all" unless="EE">
- <antcall target="declare-test">
- <param name="description" value="ear/wstoejb Test asadmin deploy"/>
- </antcall>
- <antcall target="build"/>
- <antcall target="deploy.asadmin"/>
- <antcall target="run.positive"><param name="log.id" value="1"/></antcall>
-
- <antcall target="declare-test">
- <param name="description" value="ear/wstoejb Test asadmin redeploy"/>
- </antcall>
- <antcall target="deploy.asadmin"/>
- <antcall target="run.positive"><param name="log.id" value="2"/></antcall>
- <antcall target="undeploy.asadmin"/>
-
- <antcall target="declare-test">
- <param name="description" value="ear/wstoejb Test jsr88 deploy"/>
- </antcall>
- <antcall target="deploy.jsr88"/>
- <antcall target="run.positive"><param name="log.id" value="3"/></antcall>
-
- <antcall target="declare-test">
- <param name="description" value="ear/wstoejb Test jsr88 stopped state"/>
- </antcall>
- <antcall target="stop.jsr88"/>
- <antcall target="run.negative"><param name="log.id" value="4"/></antcall>
-
- <antcall target="declare-test">
- <param name="description" value="ear/wstoejb Test jsr88 started state"/>
- </antcall>
- <antcall target="start.jsr88"/>
- <antcall target="run.positive"><param name="log.id" value="5"/></antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="declare-test">
- <param name="description" value="ear/wstoejb Test jsr88 redeploy stop"/>
- </antcall>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.negative"><param name="log.id" value="6"/></antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="declare-test">
- <param name="description" value="ear/wstoejb Test jsr88 redeploy start"/>
- </antcall>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.positive"><param name="log.id" value="7"/></antcall>
- <antcall target="undeploy.jsr88"/>
- </target>
-</project>
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 535b9ca..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/build.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
-]>
-
-<project name="wstoejb" default="all" basedir=".">
-
- &commonBuild;
- <property name="archivedir" value="${build}/archives"/>
-
- <target name="prepare" depends="init">
- <mkdir dir="${build}" />
- <mkdir dir="${archivedir}" />
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="wstoejb" destdir="${build}">
- <classpath refid="gfv3.classpath"/>
- </javac>
-
- </target>
-
- <target name="assemble" depends="compile">
- <mkdir dir="${build}/META-INF"/>
- <copy file="ejb-jar.xml" todir="${build}/META-INF"/>
- <jar destfile="${archivedir}/wstoejb-portable.jar" basedir="${build}"/>
- <copy file="sun-ejb-jar.xml" todir="${build}/META-INF" failonerror="false"/>
- <jar destfile="${archivedir}/wstoejb.jar" basedir="${build}"/>
- </target>
-
- <target name="private-all" depends="assemble">
- </target>
-
-</project>
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 dabe645..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/ejb-jar.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>WsToEjbSessionBean</ejb-name>
- <home>wstoejb.StatefulSessionBeanHome</home>
- <remote>wstoejb.StatefulSessionBean</remote>
- <ejb-class>wstoejb.StatefulSessionBeanEJB</ejb-class>
- <session-type>Stateful</session-type>
- <transaction-type>Container</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
-</ejb-jar>
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 bfcb3c9..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/ejb/sun-ejb-jar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <name>Ejb1</name>
- <ejb>
- <ejb-name>WsToEjbSessionBean</ejb-name>
- <jndi-name>WsToEjbSessionBean</jndi-name>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 522216a..0000000
--- 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 39d3113..0000000
--- 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 d47f2cb..0000000
--- 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 f0bef43..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/portable-app.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>WebServiceToEjbApp</display-name>
- <module>
- <web>
- <web-uri>sayhello-portable.war</web-uri>
- <context-root>wstoejb</context-root>
- </web>
- </module>
- <module>
- <java>appclient-portable.jar</java>
- </module>
- <module>
- <ejb>wstoejb-portable.jar</ejb>
- </module>
-</application>
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 51a5339..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/build.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
- <!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
-]>
-
-<project name="WebServiceToEjb" default="all" basedir=".">
-
- &commonBuild;
- <property name="archivedir" value="${build}/archives"/>
-
- <target name="prepare" depends="init">
- <property name="binary" value="${build}/WEB-INF/classes"/>
- <property name="wsdl" value="${build}/WEB-INF/wsdl"/>
- <mkdir dir="${binary}" />
- <mkdir dir="${wsdl}"/>
- <mkdir dir="${archivedir}" />
- </target>
-
- <target name="compile" depends="prepare, import-dep">
- <javac srcdir="wstoejb" destdir="${binary}">
- <classpath>
- <path refid="gfv3.classpath"/>
- <path location="${build}/WEB-INF/lib/library.jar"/>
- </classpath>
- </javac>
- <echo message="invoking wscompile to generate wsdl file"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-define config-interface.xml -d ${binary} -nd ${wsdl} -classpath ${binary} -mapping ${build}/mapping.xml"/>
- </exec>
- </target>
-
- <target name="import-dep">
- <mkdir dir="${build}/WEB-INF/lib" />
- <mkdir dir="${build}/tmp/wstoejb" />
- <copy file="${build}/../ejb/wstoejb/StatefulSessionBean.class" todir="${build}/tmp/wstoejb"/>
- <copy file="${build}/../ejb/wstoejb/StatefulSessionBeanHome.class" todir="${build}/tmp/wstoejb"/>
- <jar destfile="${build}/WEB-INF/lib/library.jar" basedir="${build}/tmp"/>
- <delete dir="${build}/tmp"/>
- </target>
-
- <target name="assemble" depends="compile">
- <copy file="web.xml" todir="${build}/WEB-INF"/>
- <copy file="webservices.xml" todir="${build}/WEB-INF"/>
- <jar destfile="${archivedir}/sayhello-portable.war" basedir="${build}"/>
- <copy file="sun-web.xml" todir="${build}/WEB-INF" failonerror="false"/>
- <jar destfile="${archivedir}/sayhello.war" basedir="${build}"/>
- </target>
-
- <target name="private-all" depends="assemble"/>
-
-</project>
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 4db777f..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="WebServiceToEjb"
- targetNamespace="urn:DeploymentWebServiceTest"
- typeNamespace="urn:DeploymentWebServiceTest"
- packageName="wstoejb">
- <interface name="wstoejb.WebServiceToEjbSEI"/>
- </service>
-</configuration>
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 8e1d87c..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/sun-web.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <context-root>wstoejb</context-root>
-</sun-web-app>
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 0032f13..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>WebServiceToEjbWebApp</display-name>
- <servlet>
- <servlet-name>WebServiceToEjbServlet</servlet-name>
- <servlet-class>wstoejb.WebServiceToEjbServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>WebServiceToEjbServlet</servlet-name>
- <url-pattern>/wstoejb</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
- <ejb-ref>
- <ejb-ref-name>MyEjbReference</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>wstoejb.StatefulSessionBeanHome</home>
- <remote>wstoejb.StatefulSessionBean</remote>
- <ejb-link>WsToEjbSessionBean</ejb-link>
- </ejb-ref>
-</web-app>
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 3be9902..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ear/wstoejb/war/webservices.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>Very simple web services</description>
- <webservice-description>
- <webservice-description-name>A WebService Servlet that will invoke an ejb</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/WebServiceToEjb.wsdl</wsdl-file>
- <jaxrpc-mapping-file>mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>WebServiceToEjbSEIPort</port-component-name>
- <wsdl-port xmlns:tns="urn:DeploymentWebServiceTest">tns:WebServiceToEjbSEIPort</wsdl-port>
- <service-endpoint-interface>wstoejb.WebServiceToEjbSEI</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>WebServiceToEjbServlet</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 e79b531..0000000
--- 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 ba067e5..0000000
--- 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 0302fc5..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/build.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../config/common.xml">
-]>
-
-<project name="ejb" default="all" basedir=".">
-
- &commonBuild;
-
- <target name="private-all">
- <ant dir="statelesshello" target="private-all">
- <property name="build" value="${build}/statelesshello"/>
- </ant>
- <!--ant dir="webservice" target="private-all">
- <property name="build" value="${build}/webservice"/>
- </ant-->
- </target>
-</project>
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 ce61b3c..0000000
--- 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 516645a..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/build.xml
+++ /dev/null
@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="statelesshello" default="all" basedir=".">
-
- &commonBuild;
- <property name="archivedir" value="${build}/archives"/>
-
- <property name="testName" value="StatelessHelloEjb"/>
- <target name="prepare" depends="init">
- <property name="portable.jar" value="${archivedir}/statelesshelloejb-portable.jar"/>
- <property name="all.jar" value="${archivedir}/statelesshelloejb.jar"/>
- <property name="deployplan.jar" value="${archivedir}/statelesshelloejb-plan.jar"/>
- <mkdir dir="${build}" />
- <mkdir dir="${archivedir}" />
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="statelesshello" destdir="${build}">
- <classpath refid="gfv3.classpath"/>
- </javac>
- </target>
-
- <target name="assemble" depends="compile">
- <mkdir dir="${build}/META-INF"/>
- <copy file="ejb-jar.xml" todir="${build}/META-INF"/>
- <jar destfile="${portable.jar}" basedir="${build}" excludes="**/archives/**"/>
- <copy file="sun-ejb-jar.xml" todir="${build}/META-INF" failonerror="false"/>
- <jar destfile="${all.jar}" basedir="${build}" excludes="**/archives/**"/>
- <jar destfile="${deployplan.jar}">
- <fileset dir="${basedir}" includes="sun-ejb-jar.xml" excludes="**/archives/**"/>
- </jar>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--retrieve ${archivedir} --name ${testName} ${all.jar}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="--retrieve ${archivedir} --name ${testName} ${all.jar}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.jar} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="statelesshelloejb-portable ${portable.jar} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="statelesshelloejb-portable"/>
- </antcall>
- </target>
-
- <target name="start.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="start"/>
- <param name="arg.list" value="statelesshelloejb-portable"/>
- </antcall>
- </target>
-
- <target name="stop.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="stop"/>
- <param name="arg.list" value="statelesshelloejb-portable"/>
- </antcall>
- </target>
-
- <target name="deploy.autodeploy">
- </target>
-
- <target name="run" depends="run.positive"/>
-
- <target name="run.positive" depends="init,setOrbPort">
- <antcall target="declare-test">
- <param name="description" value="${description} (server)"/>
- </antcall>
- <antcall target="runclient">
- <param name="arg.list" value="true"/>
- <param name="log.id" value="${log.id}"/>
- <param name="tgtPort" value="${depltest.orbport}"/>
- </antcall>
- <antcall target="pingCluster">
- <param name="state" value="true"/>
- <param name="log.id" value="${log.id}"/>
- <param name="testDet" value="${description}"/>
- </antcall>
- </target>
-
- <target name="run.negative" depends="init,setOrbPort">
- <antcall target="declare-test">
- <param name="description" value="${description} (server)"/>
- </antcall>
- <antcall target="runclient">
- <param name="arg.list" value="false"/>
- <param name="log.id" value="${log.id}"/>
- <param name="tgtPort" value="${depltest.orbport}"/>
- </antcall>
- <antcall target="pingCluster">
- <param name="state" value="false"/>
- <param name="log.id" value="${log.id}"/>
- <param name="testDet" value="${description}"/>
- </antcall>
- </target>
-
- <target name="pingCluster" if="doCluster">
- <antcall target="declare-test">
- <param name="description" value="${testDet} (cluster-inst1)"/>
- </antcall>
- <antcall target="runclient">
- <param name="arg.list" value="${state}"/>
- <param name="log.id" value="${log.id}"/>
- <param name="tgtPort" value="${deploy.clusterinstance1.orbport}"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="init, setOrbPort">
- <javac srcdir="standaloneclient" destdir="${build}">
- <classpath refid="gfv3.classpath"/>
- </javac>
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="standaloneclient.HelloClient"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
-
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${tgtPort}"/>
-
- <classpath>
- <path refid="gfv3.classpath"/>
- <path location="${build}"/>
- <path location="${archivedir}/StatelessHelloEjbClient.jar"/>
- </classpath>
-
- <arg line="${arg.list}"/>
- </javaWithResult>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all">
- <antcall target="assemble"/>
- <antcall target="deploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="1"/>
- <param name="description" value="ejb/statelessejb Test asadmin deploy"/>
- </antcall>
-
- <antcall target="redeploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="2"/>
- <param name="description" value="ejb/statelessejb Test asadmin redeploy"/>
- </antcall>
- <antcall target="undeploy.asadmin"/>
-
- <antcall target="deploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="3"/>
- <param name="description" value="ejb/statelessejb Test jsr88 deploy"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="run.negative">
- <param name="log.id" value="4"/>
- <param name="description" value="ejb/statelessejb Test jsr88 stopped state"/>
- </antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="5"/>
- <param name="description" value="ejb/statelessejb Test jsr88 started state"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.negative">
- <param name="log.id" value="6"/>
- <param name="description" value="ejb/statelessejb Test jsr88 redeploy stop"/>
- </antcall>
-
- <antcall target="undeploy.jsr88"/>
- </target>
-</project>
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 9ddc3e9..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/ejb-jar.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>MyStatelesshello</ejb-name>
- <home>statelesshello.StatelesshelloHome</home>
- <remote>statelesshello.Statelesshello</remote>
- <ejb-class>statelesshello.StatelesshelloEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <env-entry>
- <env-entry-name>user</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>scott</env-entry-value>
- </env-entry>
- <env-entry>
- <env-entry-name>number</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>22.25</env-entry-value>
- </env-entry>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>MyStatelesshello</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>sayStatelesshello</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <method>
- <ejb-name>MyStatelesshello</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>getUserDefinedException</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <method>
- <ejb-name>MyStatelesshello</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>isStatelesshello</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
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 73dfb00..0000000
--- 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 ca7d5d5..0000000
--- 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 1d24e73..0000000
--- 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 c89fd37..0000000
--- 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 1513c0b..0000000
--- 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 ece1511..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/statelesshello/sun-ejb-jar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <name>Ejb1</name>
- <ejb>
- <ejb-name>MyStatelesshello</ejb-name>
- <jndi-name>MyStatelesshello</jndi-name>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 eaa7358..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/build.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="HelloServiceWS" default="all" basedir=".">
-
- &commonBuild;
- <property name="archivedir" value="${build}/archives"/>
-
- <property name="testName" value="SayHelloWS"/>
- <target name="prepare" depends="init">
- <property name="wsdl" value="${build}/META-INF/wsdl"/>
- <mkdir dir="${build}" />
- <mkdir dir="${wsdl}"/>
- <property name="portable.jar" value="${archivedir}/sayhello-portable.jar"/>
- <property name="all.jar" value="${archivedir}/sayhello.jar"/>
- <property name="deployplan.jar" value="${archivedir}/sayhello-deployplan.jar"/>
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="helloservice" destdir="${build}">
- <classpath refid="gfv3.classpath"/>
- </javac>
- <echo message="invoking wscompile to generate wsdl file"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-define config-interface.xml -d ${build} -nd ${wsdl} -classpath ${build} -mapping ${build}/mapping.xml"/>
- </exec>
- </target>
-
- <target name="assemble" depends="compile">
- <copy file="ejb-jar.xml" todir="${build}/META-INF"/>
- <copy file="webservices.xml" todir="${build}/META-INF"/>
- <jar destfile="${portable.jar}" basedir="${build}"/>
- <copy file="sun-ejb-jar.xml" todir="${build}/META-INF" failonerror="false"/>
- <jar destfile="${all.jar}" basedir="${build}"/>
- <jar destfile="${deployplan.jar}">
- <fileset dir="${basedir}" includes="sun-ejb-jar.xml"/>
- </jar>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--name ${testName} ${all.jar}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- <echo message="Create client webservices artifacts"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-gen:client -keep -d ${build} -classpath ${build} config-interface.xml"/>
- </exec>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="--name ${testName} ${all.jar}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- <echo message="Create client webservices artifacts"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-gen:client -keep -d ${build} -classpath ${build} config-interface.xml"/>
- </exec>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.jar} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="sayhello-portable ${portable.jar} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="sayhello-portable"/>
- </antcall>
- </target>
-
- <target name="start.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="start"/>
- <param name="arg.list" value="sayhello-portable"/>
- </antcall>
- </target>
-
- <target name="stop.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="stop"/>
- <param name="arg.list" value="sayhello-portable"/>
- </antcall>
- </target>
-
- <target name="deploy.autodeploy">
- </target>
-
- <target name="run" depends="run.positive"/>
-
- <target name="run.positive" depends="setHttpPort">
- <antcall target="common.run.positive">
- <param name="link" value="ejb/sayhello"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="run.negative" depends="setHttpPort">
- <antcall target="common.run.negative">
- <param name="link" value="ejb/sayhello"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="prepare">
- <javac srcdir="staticstubclient" destdir="${build}">
- <classpath>
- <path refid="gfv3.classpath"/>
- <pathelement location="${junit.jar}"/>
- </classpath>
- </javac>
-
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="staticstubclient.SayHelloClient"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
-
-
- <classpath>
- <path refid="gfv3.classpath"/>
- </classpath>
-
- <arg line="${arg.list}"/>
- </javaWithResult>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all" unless="EE">
- <antcall target="assemble"/>
- <antcall target="deploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="1"/>
- <param name="desc" value="ejb/webservice Test asadmin deploy"/>
- </antcall>
-
- <antcall target="deploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="2"/>
- <param name="desc" value="ejb/webservice Test asadmin redeploy"/>
- </antcall>
- <antcall target="undeploy.asadmin"/>
-
-<!--
- <antcall target="deploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="3"/>
- <param name="desc" value="ejb/webservice Test jsr88 deploy"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="run.negative">
- <param name="log.id" value="4"/>
- <param name="desc" value="ejb/webservice Test jsr88 stopped state"/>
- </antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="5"/>
- <param name="desc" value="ejb/webservice Test jsr88 started state"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.negative">
- <param name="log.id" value="6"/>
- <param name="desc" value="ejb/webservice Test jsr88 redeploy stop"/>
- </antcall>
--->
-
- <!--antcall target="start.jsr88"/>
- <param name="desc" value="ejb/webservice Test jsr88 stop-redeploy-start"/>
- <antcall target="run.positive"/>
-
- <param name="desc" value="ejb/webservice Test jsr88 redeploy start"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.positive"/-->
-<!--
- <antcall target="undeploy.jsr88"/>
--->
- </target>
-</project>
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 894789a..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SayHelloService"
- targetNamespace="urn:DeploymentWebServiceTest"
- typeNamespace="urn:DeploymentWebServiceTest"
- packageName="helloservice">
- <interface name="helloservice.SayHello"/>
- </service>
-</configuration>
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 dc779ed..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/ejb-jar.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
-
- <display-name>SayHelloJAR</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>SayHelloEJB</ejb-name>
- <service-endpoint>helloservice.SayHello</service-endpoint>
- <ejb-class>helloservice.SayHelloEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
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 5477ce5..0000000
--- 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 5f25a8a..0000000
--- 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 7e6b0e0..0000000
--- 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 a8005c8..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/sun-ejb-jar.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <name>SayHelloJAR</name>
- <ejb>
- <ejb-name>SayHelloEJB</ejb-name>
- <jndi-name>SayHelloEJB</jndi-name>
- <webservice-endpoint>
- <port-component-name>SayHelloPort</port-component-name>
- <endpoint-address-uri>ejb/sayhello</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 a84a554..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/ejb/webservice/webservices.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>A WebService EJB that says Hello</webservice-description-name>
- <wsdl-file>META-INF/wsdl/SayHelloService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>SayHelloPort</port-component-name>
- <wsdl-port xmlns:tns="urn:DeploymentWebServiceTest">tns:SayHelloPort </wsdl-port>
- <service-endpoint-interface>helloservice.SayHello</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>SayHelloEJB</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 76a2c05..0dd99cb 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 @@
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${depltest.orbport}"/>
<classpath>
- <path location="${inst}/lib/j2ee.jar"/>
+ <path location="${inst}/lib/javaee.jar"/>
<path location="${build}"/>
</classpath>
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 eac1fed..0000000
--- 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<reportedApps.length; i++) {
- String modId = reportedApps[i].getModuleID();
- log("Reported application name = " + modId);
- if(expectedApps.containsKey(modId))
- expectedApps.remove(modId);
- }
- if(expectedApps.size() != 0) {
- log("Not all expected applications have been reported");
- return(false);
- }
- log("All expected applications have been reported");
- return(true);
- }
-
- private boolean checkReportedApps(String[] args, Boolean state)
- throws Exception {
- log("Checking if application names reported are valid");
-
- HashMap set = new HashMap();
- set.put(args[4], "app");
- set.put(args[5], "app");
- set.put(args[6], "app");
-
- TargetModuleID[] apps = depl.getAllApplications(state);
- log("Total count = " + apps.length);
- return(checkIfAppsArePresent(apps, set));
- }
-
- private int testProgressObjectImplRace(String[] args) throws Exception {
- /*
- *This test works like testStartStop except that it uses only one application and sets the system
- *property to introduce a sleep into listener notification to test race conditions. See ProgressObjectImpl
- *for more details on the possible problem and how the test probes for it.
- */
- String appOfInterest = args[4];
- boolean appIsRunning = true;
-
- try {
- /*
- *The system property to control the test code in ProgressObjectImpl could have been set on the
- *command line that ran this test. If not, use the default value.
- */
- Integer sleepTime = Integer.getInteger(SLEEP_TIME_PROPERTY_NAME, SLEEP_TIME_DEFAULT);
- log("ProgressObjectImpl race test is using " + SLEEP_TIME_PROPERTY_NAME + " = " + sleepTime);
-
- /*
- *Stop the first application specified on the command line.
- */
- log("Stopping application " + appOfInterest);
- if (depl.stop(appOfInterest) == null) {
- log("Failed to stop " + appOfInterest);
- return -1;
- }
- log("Stop request completed");
-
- /*
- *Wait a while for the stop operation to complete and the events to be delivered.
- */
- try {
- Thread.currentThread().sleep(sleepTime.intValue());
- } catch (InterruptedException ie) {
- log("ProgressObjectImpl race test was interrupted during a sleep waiting for the app to stop.");
- return -1;
- }
-
- appIsRunning = false;
-
- /*
- *Now that the app is stopped, start it and pay attention to the events.
- */
- log("Starting application " + appOfInterest);
- depl.clearReceivedEvents();
- if (depl.start(appOfInterest, sleepTime.intValue() / 2 ) == null) {
- log("Failed to start " + appOfInterest);
- return -1;
- }
-
- appIsRunning = true;
-
- /*
- *Wait before retrieving the events to give the start operation time to complete.
- */
-
- try {
- Thread.currentThread().sleep(sleepTime.intValue());
- } catch (InterruptedException ie) {
- throw new RuntimeException("TestClient was interrupted waiting for start operation events to accumulate before retrieving them.", ie);
- }
-
- log("About to retrieve events");
- ProgressEvent receivedEvents[] = depl.getReceivedEvents();
-
- /*
- *We expect two events, one corresponding to the start operation entering the "running" state and
- *one for the operation completing. If the race condition has occurred, then we won't see both of
- *the events. We're going to look at the first one, expecting it to be the "running" event.
- */
- if (receivedEvents.length < 2) {
- log("ProgressObjectImpl race test expected two events (running and completed), but found " + receivedEvents.length + ".");
- if (receivedEvents.length == 1) {
- log("...and the event that was recorded was " + receivedEvents[0].getDeploymentStatus().getMessage());
- }
- return -1;
- }
-
- ProgressEvent event = receivedEvents[0];
- DeploymentStatus dStatus = event.getDeploymentStatus();
-
- if ( ! dStatus.isRunning()) {
- log("ProgressObjectImpl race test's first recorded event was not what was expected; expected running but found " + dStatus.getMessage());
- return -1;
- } else {
- log("ProgressObjectImpl race test completed normally.");
- return 0;
- }
-
- } finally {
- /*
- *Restart the application if it isn't running.
- */
- if ( ! appIsRunning) {
- log("Restarting application " + appOfInterest);
- if (depl.start(appOfInterest) == null) {
- log("Failed to restart application " + appOfInterest);
- return -1;
- }
- }
- }
- }
-
- private int testStartStop(String[] args) {
- try {
- log("Stopping all Applications");
- for(int i=4; i<7; i++) {
- if(depl.stop(args[i]) == null) {
- log("Failed to stop " + args[i]);
- return(-1);
- }
- }
- boolean ret = checkReportedApps(args, Boolean.FALSE);
- if(!ret)
- return(-1);
- log("Starting all Applications");
- for(int j=4; j<7; j++) {
- if (depl.start(args[j]) == null) {;
- log("Failed to start " + args[j]);
- return(-1);
- }
- }
- ret = checkReportedApps(args, Boolean.TRUE);
- if(!ret)
- return(-1);
- } catch(Exception e) {
- log("testStartStop recd exception : " + e.getMessage());
- return(-1);
- }
- return(0);
- }
-
- private int getModulesByType(String args[], ModuleType type, Boolean state) {
- log("Getting list of Applications with type = " + type.toString());
- log("Required running state = " + state);
- try {
- TargetModuleID[] apps = depl.getApplications(type, state);
- log("Total count = " + apps.length);
-
- HashMap set = new HashMap();
- set.put(args[4], "app");
-
- boolean ret = checkIfAppsArePresent(apps, set);
- if(!ret)
- return(-1);
- } catch(Exception e) {
- log("getModulesByType recd exception : " + e.getMessage());
- return(-1);
- }
- return(0);
- }
-
- private int testEmptyModule() {
- try {
- TargetModuleID[] apps = depl.getApplications(ModuleType.WAR, null);
- if(apps.length != 0) {
- log("# of WARs expected = 0");
- log("# of WARs reported = " + apps.length);
- return(-1);
- }
- apps = depl.getApplications(ModuleType.EJB, null);
- if(apps.length != 0) {
- log("# of EJB-JARs expected = 0");
- log("# of EJB-JARs reported = " + apps.length);
- return(-1);
- }
- apps = depl.getApplications(ModuleType.EAR, null);
- if(apps.length != 0) {
- log("# of EARs expected = 0");
- log("# of EARs reported = " + apps.length);
- return(-1);
- }
- } catch(Exception e) {
- log("testEmptyModule recd exception : " + e.getMessage());
- return(-1);
- }
- return(0);
- }
-
- public static void main(String[] args) {
- int exitVal = 0;
- TestClient client = new TestClient();
- try {
- int testCase = (new Integer(args[0])).intValue();
- client.initDeployer(args);
- switch(testCase) {
- case 1 :
- exitVal = client.getModulesByType(args,ModuleType.WAR,null);
- break;
- case 2 :
- exitVal = client.getModulesByType(args,ModuleType.EJB,null);
- break;
- case 3 :
- exitVal = client.getModulesByType(args,ModuleType.EAR,null);
- break;
- case 4 :
- exitVal = client.testStartStop(args);
- break;
- case 5 :
- exitVal = client.testEmptyModule();
- break;
- case 6 :
- exitVal = client.testProgressObjectImplRace(args);
- break;
- default:
- log("Wrong test number given !!!");
- exitVal = -1;
- break;
- }
- } catch (Exception e) {
- log("Caught Exception = " + e.getMessage());
- System.exit(-1);
- }
- System.exit(exitVal);
- }
-
- private static void log(String message) {
- System.out.println("[JSR88APITest]:: " + message);
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/TestJSR88Concurrency.java b/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/TestJSR88Concurrency.java
deleted file mode 100644
index c046f47..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/TestJSR88Concurrency.java
+++ /dev/null
@@ -1,408 +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
- */
-
-/*
- * TestJSR88Concurrency.java
- *
- * Created on September 19, 2006, 3:52 PM
- *
- */
-
-package devtests.deployment.jsr88.apitests;
-
-import com.sun.enterprise.deployapi.SunDeploymentFactory;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-import javax.enterprise.deploy.shared.ModuleType;
-import javax.enterprise.deploy.spi.DeploymentManager;
-import javax.enterprise.deploy.spi.Target;
-import javax.enterprise.deploy.spi.TargetModuleID;
-import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
-import javax.enterprise.deploy.spi.exceptions.TargetException;
-import javax.enterprise.deploy.spi.factories.DeploymentFactory;
-
-/**
- *Tests concurrent use of the same deployment connection to the back-end.
- *<p>
- *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.
- *<p>
- *arguments:
- * --host <host>
- * --port <port>
- * --username <username>
- * --password <password>
- * --operation <operation>[*<n>]
- * --startTime <testStartTime> (as H:mm:ss)
- * --delay <delayTime) (in ms)
- * --secure <true or false>
- *<p>
- *where <operation> 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
- *<p>
- *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.
- *<p>
- *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<String,String> 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 <operation[*n]> but none was found");
- }
- }
-
- private HashMap<String,String> initOptionsMap() {
- HashMap<String,String> result = new HashMap<String,String>();
- 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 <host> --port <port> --username <username> --password <password> --operation <operation>[*<n>] --startTime testStartTime (as H:mm:ss) --delay <delay-in-ms> --secure true/false");
- System.out.println(" where <operation> 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<TargetModuleID> result = new ArrayList<TargetModuleID>();
- 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 9502fb5..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/apitests/build.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="apitests" default="private-all" basedir=".">
-
- <property file="./../../../../config.properties"/>
-
- &commonBuild;
- <property name="archivedir" value="${build}/archives"/>
-
- <path id="jsr88api.test.classpath">
- <pathelement location="${inst}/lib/j2ee.jar"/>
- <pathelement location="${inst}/jdk/lib/tools.jar"/>
- <pathelement location="${env.APS_HOME}/devtests/deployment/util/build"/>
- </path>
-
- <path id="jsr88api.concurrency.test.classpath">
- <pathelement location="${inst}/lib/javaee.jar"/>
- <pathelement location="${inst}/lib/appserv-admin.jar"/>
- <pathelement location="${inst}/lib/appserv-deployment-client.jar"/>
- <pathelement location="${env.APS_HOME}/devtests/deployment/util/build"/>
- </path>
-
- <target name="deployApps">
- <delete dir="${testsRoot}/build/war/servletonly"/>
- <delete dir="${testsRoot}/build/ejb/statelesshello"/>
- <delete dir="${testsRoot}/build/ear/wstoejb"/>
- <ant dir="../../war/servletonly" target="assemble">
- <property name="build" value="${testsRoot}/build/war/servletonly"/>
- </ant>
- <ant dir="../../ejb/statelesshello" target="assemble">
- <property name="build" value="${testsRoot}/build/ejb/statelesshello"/>
- </ant>
- <ant dir="../../ear/wstoejb" target="build">
- <property name="build" value="${testsRoot}/build/ear/wstoejb"/>
- </ant>
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="${testsRoot}/build/war/servletonly/servletonly.war"/>
- <param name="testName" value="servletonly"/>
- </antcall>
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--retrieve ${archivedir} --name StatelessHelloEjb ${archivedir}/statelesshelloejb.jar"/>
- <param name="testName" value="StatelessHelloEjb"/>
- </antcall>
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--name wstoejb --retrieve ${testsRoot}/build/ear/wstoejb ${testsRoot}/build/ear/wstoejb/wstoejb.ear"/>
- <param name="testName" value="wstoejb"/>
- </antcall>
- </target>
-
- <target name="undeployApps">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="wstoejb"/>
- <param name="testName" value="wstoejb"/>
- </antcall>
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="StatelessHelloEjb"/>
- <param name="testName" value="StatelessHelloEjb"/>
- </antcall>
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="servletonly"/>
- <param name="testName" value="servletonly"/>
- </antcall>
- </target>
-
- <target name="compile" depends="init, compile.util">
- <mkdir dir="${build}"/>
- <javac srcdir="."
- destdir="${build}"
- debug="on"
- failonerror="true"
- excludes="**/ProgressObjectImpl.java">
- <classpath refid="jsr88api.test.classpath"/>
- <classpath refid="jsr88api.concurrency.test.classpath"/>
- </javac>
- </target>
-
- <target name="runclient" depends="compile">
- <echo message="TestClient ${arg.list}"/>
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="devtests.deployment.jsr88.apitests.TestClient"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
- <classpath>
- <path location="${build}"/>
- <path location="${inst}/lib/j2ee.jar"/>
- <path location="${inst}/lib/appserv-rt.jar"/>
- <path location="${inst}/lib/appserv-admin.jar"/>
- <path location="${inst}/lib/appserv-ext.jar"/>
- <path location="${env.APS_HOME}/devtests/deployment/util/build"/>
- <path location="${inst}/jdk/lib/tools.jar"/>
- </classpath>
- <sysproperty key="com.sun.aas.installRoot" value="${inst}"/>
- <sysproperty key="server" value="${appserver.instance.name}"/>
- <sysproperty key="java.library.path" value="${inst}/lib"/>
- <sysproperty key="com.sun.aas.configRoot" value="${inst}/config"/>
-
- <arg line="${arg.list}" />
- </javaWithResult>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="runConcurrencyClient" depends="compile">
- <echo message="ConcurrencyClient ${arg.list}"/>
- <java
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="devtests.deployment.jsr88.apitests.TestJSR88Concurrency"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
- <classpath>
- <path location="${build}"/>
- <path location="${inst}/lib/javaee.jar"/>
- <path location="${inst}/lib/appserv-admin.jar"/>
- <path location="${inst}/lib/appserv-deployment-client.jar"/>
- <!-- <path location="${env.APS_HOME}/devtests/deployment/util/build"/> -->
- </classpath>
-<!--
- <sysproperty key="com.sun.aas.installRoot" value="${inst}"/>
- <sysproperty key="server" value="${appserver.instance.name}"/>
- <sysproperty key="java.library.path" value="${inst}/lib"/>
- <sysproperty key="com.sun.aas.configRoot" value="${inst}/config"/>
--->
- <arg line="${arg.list}" />
- </java>
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all" depends="init,compile.util">
-
- <antcall target="deployApps" />
-
- <antcall target="declare-test">
- <param name="description" value="jsr88/apitests Test getAvailableModules API for all WARs"/>
- </antcall>
- <antcall target="runclient">
- <param name="arg.list" value="1 ${jsr88.uri} ${admin.user} ${admin.password} servletonly"/>
- <param name="log.id" value="1"/>
- </antcall>
-
- <antcall target="declare-test">
- <param name="description" value="jsr88/apitests Test getAvailableModules API for all EJB-JARs"/>
- </antcall>
- <antcall target="runclient">
- <param name="arg.list" value="2 ${jsr88.uri} ${admin.user} ${admin.password} StatelessHelloEjb"/>
- <param name="log.id" value="2"/>
- </antcall>
-
- <antcall target="declare-test">
- <param name="description" value="jsr88/apitests Test getAvailableModules API for all EARs"/>
- </antcall>
- <antcall target="runclient">
- <param name="arg.list" value="3 ${jsr88.uri} ${admin.user} ${admin.password} wstoejb"/>
- <param name="log.id" value="3"/>
- </antcall>
-
- <antcall target="declare-test">
- <param name="description" value="jsr88/apitests Test getRunningModules/getNonRunningModules API"/>
- </antcall>
- <antcall target="runclient">
- <param name="arg.list" value="4 ${jsr88.uri} ${admin.user} ${admin.password} servletonly StatelessHelloEjb wstoejb"/>
- <param name="log.id" value="4"/>
- </antcall>
-
-<!-- <antcall target="runConcurrencyTest"/>
--->
-
- <antcall target="undeployApps" />
- </target>
-
- <target name="runConcurrencyTest" depends="init">
- <antcall target="declare-test">
- <param name="description" value="jsr88/apitests Test JSR-88 concurrent usage"/>
- </antcall>
- <antcall target="runConcurrencyClient">
- <param name="arg.list" value="--host ${admin.host} --port ${admin.port} --secure ${s1as.secure} --username ${admin.user} --passwordfile ${passwordFile} --operation loopGetTargets*2"/>
- <param name="log.id" value="5"/>
- </antcall>
- </target>
-</project>
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 5debba1..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../config/common.xml">
-]>
-
-<project name="jsr88" default="all" basedir=".">
-
- &commonBuild;
-
- <target name="private-all">
- <ant dir="war" target="private-all">
- <property name="build" value="${build}/war"/>
- </ant>
- <!--
- <ant dir="misc" target="private-all">
- <property name="build" value="${build}/misc"/>
- </ant>
- <ant dir="apitests" target="private-all">
- <property name="build" value="${build}/apitests"/>
- </ant>
- -->
- </target>
-</project>
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 07d012a..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/build.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="deploymentmanager" default="all" basedir=".">
-
- &commonBuild;
- <property name="archivedir" value="${build}/archives"/>
-
- <target name="private-all">
- <ant dir="distribute" target="private-all">
- <property name="build" value="${build}/distribute"/>
- </ant>
- <ant dir="getXModules" target="private-all">
- <property name="build" value="${build}/getXModules"/>
- </ant>
- </target>
-
-</project>
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 0409ec2..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
-]>
-
-<project name="distribute" default="all" basedir=".">
-
- &commonBuild;
-
- <target name="private-all">
- <ant dir="childtargetmoduleid" target="private-all">
- <property name="build" value="${build}"/>
- </ant>
- <ant dir="getweburl" target="private-all">
- <property name="build" value="${build}"/>
- </ant>
- <ant dir="clientconfiguration" target="private-all">
- <property name="build" value="${build}"/>
- </ant>
-
- </target>
-
-</project>
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 028de29..0000000
--- 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<moduleIDs.length;i++) {
- TargetModuleID parent = moduleIDs[i];
- Target target = parent.getTarget();
- log("Deployed on " + target.getName() + " with module ID " + parent.getModuleID());
-
- // now look at all the children
- TargetModuleID[] children = parent.getChildTargetModuleID();
- if (children==null) {
- log("ERROR : App from " + path + " has " + app.getBundleDescriptors().size() +
- " modules but I didn't get any children TagetModuleID");
- return false;
- }
-
- // size is consistent ?
- if (children.length!=app.getBundleDescriptors().size()) {
- log("ERROR : App from " + path + " has " + app.getBundleDescriptors().size() +
- " modules but I got only " + children.length +
- " children TagetModuleID");
- return false;
- } else {
- log("Expected " + app.getBundleDescriptors().size() +
- " children TargetModuleIDs and got " + children.length);
- }
-
- for (int j=0;j<children.length;j++) {
- TargetModuleID aChild = children[j];
- log("Processing " + aChild.getModuleID());
-
- String childModuleID = aChild.getModuleID();
- String[] splitted = childModuleID.split("#");
- if (splitted.length!=2) {
- log("Unknown sub module id " + childModuleID);
- return false;
- }
-
- // check that parent TargeTModuleID is correct
- if (aChild.getParentTargetModuleID().equals(parent)) {
- log("Child's parent TargetModuleID is correctly set");
- } else {
- log("Child's parent TargetModuleID is incorrect");
- return false;
- }
-
- String first = splitted[0];
- if (first.equals(parent.getModuleID())) {
- log("Correct parent module id for child " + childModuleID);
- } else {
- log("Incorrect parent module id for child " + childModuleID);
- }
-
- // look for the right module descriptor..
- ModuleDescriptor md = app.getModuleDescriptorByUri(splitted[1]);
- if (md==null) {
- log("Cannot find module descriptor for " + childModuleID);
- return false;
- } else {
- log("Found module descriptor for " + childModuleID);
- }
- }
- }
- }
- // if we are here, it's good !
- return true;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/childtargetmoduleid/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/childtargetmoduleid/build.xml
deleted file mode 100644
index 2e6cb52..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/childtargetmoduleid/build.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
-]>
-
-<project name="deploytargetmoduleid" default="all" basedir=".">
-
- &commonBuild;
- <property name="archivedir" value="${build}/archives"/>
-
- <target name="compile">
- <mkdir dir="${build}" />
- <javac srcdir="." destdir="${env.APS_HOME}/devtests/deployment/util/build"
- classpath="${inst}/lib/j2ee.jar:${inst}/lib/appserv-rt.jar:../../../../util/build"
- />
- </target>
-
- <target name="build-ear" unless="earfile.built">
- <echo message="file ${build}/save/wstoejb.ear is present : ${earfile.built}"/>
- <ant dir="../../../ear/wstoejb" target="assemble"/>
- <mkdir dir="${build}/../save"/>
- <copy file="${archivedir}/wstoejb.ear" todir="${build}/../save"/>
- <copy file="${archivedir}/plan.jar" todir="${build}/../save"/>
- </target>
-
- <target name="private-all" depends="compile">
- <antcall target="declare-test">
- <param name="description" value="jsr88/distribute/ChildTargetModuleID test TargetModuleID and its children returned from deployment"/>
- </antcall>
- <available property="earfile.built" file="${archivedir}/wstoejb.ear"/>
- <antcall target="build-ear"/>
- <antcall target="specialized.run.jsr88">
- <param name="deployer.class" value="devtests.deployment.jsr88.targetmoduleid.deploytargetmoduleid.DeployTargetModuleIDTester"/>
- <param name="command" value="deploy"/>
- <param name="arg.list" value="true ${build}/../save/wstoejb.ear ${build}/../save/plan.jar"/>
- </antcall>
- <antcall target="processResult">
- <param name="result" value="0"/>
- </antcall>
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="wstoejb"/>
- </antcall>
- </target>
-
-</project>
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 b23c3fe..0000000
--- 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<moduleIDs.length;i++) {
- TargetModuleID parent = moduleIDs[i];
- Target target = parent.getTarget();
- log("Deployed on " + target.getName() + " with module ID " + parent.getModuleID());
-
- // now look at all the children
- TargetModuleID[] children = parent.getChildTargetModuleID();
- if (children==null) {
- log("ERROR : App from " + path + " has " + app.getBundleDescriptors().size() +
- " modules but I didn't get any children TagetModuleID");
- return false;
- }
-
- for (int j=0;j<children.length;j++) {
- TargetModuleID aChild = children[j];
- log("Processing " + aChild.getModuleID());
-
- String childModuleID = aChild.getModuleID();
- String[] splitted = childModuleID.split("#");
- if (splitted.length!=2) {
- log("Unknown sub module id " + childModuleID);
- return false;
- }
-
- // look for the right module descriptor..
- ModuleDescriptor md = app.getModuleDescriptorByUri(splitted[1]);
- if (md==null) {
- log("Cannot find module descriptor for " + childModuleID);
- return false;
- } else {
- log("Found module descriptor for " + childModuleID);
- }
- if (md.getModuleType().equals(ModuleType.CAR)) {
- // this is an appcliemt, let's execute it
- ClientConfiguration cc = po.getClientConfiguration(aChild);
- cc.execute();
- }
- }
- }
- }
- // if we are here, it's good !
- return true;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/clientconfiguration/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/clientconfiguration/build.xml
deleted file mode 100644
index bc51c41..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/clientconfiguration/build.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
-]>
-
-<project name="getweburl" default="all" basedir=".">
-
- &commonBuild;
- <property name="archivedir" value="${build}/archives"/>
-
- <target name="compile">
- <mkdir dir="${build}" />
- <javac srcdir="." destdir="${env.APS_HOME}/devtests/deployment/util/build"
- classpath="${inst}/lib/j2ee.jar:${inst}/lib/appserv-rt.jar:../../../../util/build"
- />
- </target>
-
- <target name="build-ear" unless="earfile.built">
- <echo message="file ${build}/save/wstoejb.ear is present : ${earfile.built}"/>
- <ant dir="../../../ear/wstoejb" target="assemble"/>
- <mkdir dir="${build}/../save"/>
- <copy file="${archivedir}/wstoejb.ear" todir="${build}/../save"/>
- <copy file="${archivedir}/plan.jar" todir="${build}/../save"/>
- </target>
-
- <target name="private-all" depends="compile">
- <antcall target="declare-test">
- <param name="description" value="jsr88/deploymentmanager/distribute/clientconfiguration test getClientConfiguraton API"/>
- </antcall>
- <available property="earfile.built" file="${build}/../save/wstoejb.ear"/>
- <antcall target="build-ear"/>
- <antcall target="specialized.run.jsr88">
- <param name="deployer.class" value="jsr88.deploymentmanager.distribute.clientconfiguration.ClientConfigurationTester"/>
- <param name="command" value="deploy"/>
- <param name="arg.list" value="true ${build}/../save//wstoejb.ear ${build}/../save/plan.jar"/>
- </antcall>
- <antcall target="processResult">
- <param name="result" value="0"/>
- </antcall>
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="wstoejb"/>
- </antcall>
- </target>
-
-</project>
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 9697fe2..0000000
--- 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<moduleIDs.length;i++) {
- TargetModuleID parent = moduleIDs[i];
- Target target = parent.getTarget();
- log("Deployed on " + target.getName() + " with module ID " + parent.getModuleID());
-
- // now look at all the children
- TargetModuleID[] children = parent.getChildTargetModuleID();
- if (children==null) {
- log("ERROR : App from " + path + " has " + app.getBundleDescriptors().size() +
- " modules but I didn't get any children TagetModuleID");
- return false;
- }
-
- for (int j=0;j<children.length;j++) {
- TargetModuleID aChild = children[j];
- log("Processing " + aChild.getModuleID());
-
- String childModuleID = aChild.getModuleID();
- String[] splitted = childModuleID.split("#");
- if (splitted.length!=2) {
- log("Unknown sub module id " + childModuleID);
- return false;
- }
-
- // look for the right module descriptor..
- ModuleDescriptor md = app.getModuleDescriptorByUri(splitted[1]);
- if (md==null) {
- log("Cannot find module descriptor for " + childModuleID);
- return false;
- } else {
- log("Found module descriptor for " + childModuleID);
- }
- if (md.getModuleType().equals(ModuleType.WAR)) {
- if (aChild.getWebURL()==null) {
- log("Error : web module " + splitted[1] + " TargetModuleID.GetWebURI() returned null");
- return false;
- } else {
- log("Web module " + splitted[1] + " available at " + aChild.getWebURL());
- }
- }
- }
- }
- }
- // if we are here, it's good !
- return true;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/getweburl/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/getweburl/build.xml
deleted file mode 100644
index f260790..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/distribute/getweburl/build.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
-]>
-
-<project name="getweburl" default="all" basedir=".">
-
- &commonBuild;
- <property name="archivedir" value="${build}/archives"/>
-
- <target name="compile">
- <mkdir dir="${build}" />
- <javac srcdir="." destdir="${env.APS_HOME}/devtests/deployment/util/build"
- classpath="${inst}/lib/j2ee.jar:${inst}/lib/appserv-rt.jar:../../../../util/build"
- />
- </target>
-
- <target name="build-ear" unless="earfile.built">
- <echo message="file ${build}/save/wstoejb.ear is present : ${earfile.built}"/>
- <ant dir="../../../ear/wstoejb" target="assemble"/>
- <mkdir dir="${build}/../save"/>
- <copy file="${archivedir}/wstoejb.ear" todir="${build}/../save"/>
- <copy file="${archivedir}/plan.jar" todir="${build}/../save"/>
- </target>
-
- <target name="private-all" depends="compile">
- <antcall target="declare-test">
- <param name="description" value="jsr88/targetmoduleid/DeployGetWebUrlTester test GetWebURL returned from deployment"/>
- </antcall>
- <available property="earfile.built" file="${build}/../save/wstoejb.ear"/>
- <antcall target="build-ear"/>
- <antcall target="specialized.run.jsr88">
- <param name="deployer.class" value="devtests.deployment.jsr88.targetmoduleid.deploygetweburl.DeployGetWebUrlTester"/>
- <param name="command" value="deploy"/>
- <param name="arg.list" value="true ${build}/../save//wstoejb.ear ${build}/../save/plan.jar"/>
- </antcall>
- <antcall target="processResult">
- <param name="result" value="0"/>
- </antcall>
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="wstoejb"/>
- </antcall>
- </target>
-
-</project>
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 7d0f7d1..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/build.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
-]>
-
-<project name="getXModules" default="all" basedir=".">
-
- &commonBuild;
-
- <target name="private-all">
- <ant dir="childtmid" target="private-all">
- <property name="build" value="${build}"/>
- </ant>
- </target>
-
-</project>
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 5952256..0000000
--- 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<moduleIDs.length;i++) {
- TargetModuleID aTargetModuleID = moduleIDs[i];
-
- // should be part of the non running
- TargetModuleID[] targetModuleIDs = findApplication(aTargetModuleID.getModuleID(),
- modType, Boolean.FALSE);
- check(path, app, targetModuleIDs);
-
- // should be part of the available apps
- targetModuleIDs = findApplication(aTargetModuleID.getModuleID(),
- modType, null);
- check(path, app, targetModuleIDs);
-
- // now we start it..
- start(aTargetModuleID.getModuleID());
-
- // should be part of the running
- targetModuleIDs = findApplication(aTargetModuleID.getModuleID(),
- modType, Boolean.TRUE);
- check(path, app, targetModuleIDs);
-
- // should be part of the available apps
- targetModuleIDs = findApplication(aTargetModuleID.getModuleID(),
- modType, null);
- check(path, app, targetModuleIDs);
-
- }
- return true;
-
- }
-
- private boolean check(String path, Application app, TargetModuleID[] moduleIDs) {
-
- 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<moduleIDs.length;i++) {
- TargetModuleID parent = moduleIDs[i];
- Target target = parent.getTarget();
- log("Deployed on " + target.getName() + " with module ID " + parent.getModuleID());
-
- // now look at all the children
- TargetModuleID[] children = parent.getChildTargetModuleID();
- if (children==null) {
- log("ERROR : App from " + path + " has " + app.getBundleDescriptors().size() +
- " modules but I didn't get any children TagetModuleID");
- return false;
- }
-
- // size is consistent ?
- if (children.length!=app.getBundleDescriptors().size()) {
- log("ERROR : App from " + path + " has " + app.getBundleDescriptors().size() +
- " modules but I got only " + children.length +
- " children TagetModuleID");
- return false;
- } else {
- log("Expected " + app.getBundleDescriptors().size() +
- " children TargetModuleIDs and got " + children.length);
- }
-
- for (int j=0;j<children.length;j++) {
- TargetModuleID aChild = children[j];
- log("Processing " + aChild.getModuleID());
-
- String childModuleID = aChild.getModuleID();
- String[] splitted = childModuleID.split("#");
- if (splitted.length!=2) {
- log("Unknown sub module id " + childModuleID);
- return false;
- }
-
- // check that parent TargeTModuleID is correct
- if (aChild.getParentTargetModuleID().equals(parent)) {
- log("Child's parent TargetModuleID is correctly set");
- } else {
- log("Child's parent TargetModuleID is incorrect");
- return false;
- }
-
- String first = splitted[0];
- if (first.equals(parent.getModuleID())) {
- log("Correct parent module id for child " + childModuleID);
- } else {
- log("Incorrect parent module id for child " + childModuleID);
- }
-
- // look for the right module descriptor..
- ModuleDescriptor md = app.getModuleDescriptorByUri(splitted[1]);
- if (md==null) {
- log("Cannot find module descriptor for " + childModuleID);
- //return false;
- } else {
- log("Found module descriptor for " + childModuleID);
- }
- if (md.getModuleType().equals(ModuleType.WAR)) {
- log("Web module deployed at : " + aChild.getWebURL());
- }
- }
- }
- }
- // if we are here, it's good !
- return true;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/childtmid/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/childtmid/build.xml
deleted file mode 100644
index cefc68e..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/deploymentmanager/getXModules/childtmid/build.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../../../config/common.xml">
-]>
-
-<project name="deploytargetmoduleid" default="all" basedir=".">
-
- &commonBuild;
- <property name="archivedir" value="${build}/archives"/>
-
- <target name="compile" depends="init">
- <mkdir dir="${build}" />
- <javac srcdir="." destdir="${env.APS_HOME}/devtests/deployment/util/build"
- classpath="${inst}/lib/j2ee.jar:${inst}/lib/appserv-rt.jar:../../../../util/build"
- />
- </target>
-
- <target name="build-ear" unless="earfile.built">
- <echo message="file ${build}/save/wstoejb.ear is present : ${earfile.built}"/>
- <ant dir="../../../ear/wstoejb" target="assemble"/>
- <mkdir dir="${build}/../save"/>
- <copy file="${archivedir}/wstoejb.ear" todir="${build}/../save"/>
- <copy file="${archivedir}/plan.jar" todir="${build}/../save"/>
- </target>
-
- <target name="private-all" depends="compile">
- <antcall target="declare-test">
- <param name="description" value="jsr88/distribute/ChildTargetModuleID test TargetModuleID and its children returned from deployment"/>
- </antcall>
- <available property="earfile.built" file="${archivedir}/wstoejb.ear"/>
- <antcall target="build-ear"/>
- <antcall target="specialized.run.jsr88">
- <param name="deployer.class" value="jsr88.deploymentmanager.getXModules.childtmid.ChildTargetModuleIDTester"/>
- <param name="command" value="deploy"/>
- <param name="arg.list" value="true ${build}/../save/wstoejb.ear ${build}/../save/plan.jar"/>
- </antcall>
- <antcall target="processResult">
- <param name="result" value="0"/>
- </antcall>
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="wstoejb"/>
- </antcall>
- </target>
-
-</project>
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 c3afeb1..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/ear/build.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="ear" default="all" basedir=".">
-
- &commonBuild;
-
- <target name="private-all">
- <ant dir="wstoejb" target="private-all">
- <property name="build" value="${build}/wstoejb"/>
- </ant>
- </target>
-
-</project>
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 9467f3d..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/META-INF/application-client.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.4" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <display-name>appclienttest</display-name>
-</application-client>
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 f201635..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/META-INF/sun-application-client.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/softwaree/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application-client/>
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 3f49164..0000000
--- 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.
- *<p>
- *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 f29ddc6..0000000
--- 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 20178cf..0000000
--- 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.
- *<p>
- *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 294d430..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/build.xml
+++ /dev/null
@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="miscellaneousTestForJSR88" default="usage" basedir=".">
-
- &commonBuild;
-
- <property name="appClientName" value="appclienttest"/>
- <property name="appClientJarFile" value="${build}/${appClientName}.jar"/>
- <property name="appClientModuleName" value="testAppClient"/>
-
- <property name="webServicesWorkaroundCheckWarFile" value="exampleFromJ2EETutorial/cb/provided-wars/jaxrpc-coffee-distributor.war"/>
-
- <path id="jsr88.exec.classpath">
- <path refid="gfv3.classpath"/>
- <pathelement location="${env.APS_HOME}/devtests/deployment/util/build"/>
- <pathelement location="${inst}/jdk/lib/tools.jar"/>
- </path>
-
- <target name="prepare" depends="init">
- <mkdir dir="${build}"/>
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="."
- destdir="${build}"
- includes="*.java"
- debug="on"
- failonerror="true">
- <classpath>
- <path refid="gfv3.classpath"/>
- <path refid="test.compile.classpath"/>
- <pathelement location="../../util/build"/> <!-- need this to find the JSR88Deployer -->
- </classpath>
- </javac>
- </target>
-
-<!--
- Run all the tests.
--->
- <target name="run" depends="compile,assemble">
- <antcall target="runTestProgressObjectImpl"/>
- <antcall target="runGetModulesTest"/>
- <antcall target="runOpenJarWorkaroundTest"/>
- </target>
-
- <!--
- The test for the ProgressObjectImpl class is a very simple Java class with
- a few methods. No archives or deployments or undeployments are needed.
- The test run should throw no exceptions if the code functions correctly.
- -->
- <target name="runTestProgressObjectImpl">
- <antcall target="declare-test">
- <param name="description" value="jsr88/misc - Test ProgressObjectImpl class (for correct management of listener list to avoid concurrent update errors)"/>
- </antcall>
-
- <javaWithResult classname="TestProgressObjectImpl"
- fork="true"
- failonerror="false"
- output="${build}/TestProgressObjectImpl.log"
- dir="${build}"
- resultProperty="result"
- >
- <classpath>
- <path refid="jsr88.exec.classpath"/>
- <pathelement path="${build}"/>
- </classpath>
- </javaWithResult>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/TestProgressObjectImpl.log"/>
- </antcall>
- </target>
-
-
-
- <target name="assemble" depends="compile">
- <antcall target="buildAppClientJar"/>
- </target>
-
- <target name="buildAppClientJar">
- <!--
- Create the application-client.xml file.
- -->
- <jar
- destfile="${appClientJarFile}">
- <fileset dir="${basedir}" includes="**/application-client.xml **/sun-application-client.xml"/>
- </jar>
- </target>
-
- <!--
- To test the ability to get information about the modules through JSR88, first deploy an app client
- (which exposed a bug), then use JSR88 to retrieve information about app client components, then undeploy
- the app client.
- -->
- <target name="runGetModulesTest" depends="assemble">
- <antcall target="declare-test">
- <param name="description" value="jsr88/misc - Test ApplicationsConfigMBean class (for correct handling of app client object-type and enabled)"/>
- </antcall>
-
- <!--
- Deploy an app client so we can test the bug fix.
- -->
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--name ${appClientModuleName} ${appClientJarFile}"/>
- </antcall>
-
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="SimpleJSR88Client"
- resultproperty="result"
- >
- <sysproperty key="jsr88client.user" value="${admin.user}"/>
- <sysproperty key="jsr88client.password" value="${admin.password}"/>
- <sysproperty key="jsr88client.host" value="${admin.host}"/>
- <sysproperty key="jsr88client.port" value="${admin.port}"/>
- <sysproperty key="com.sun.aas.installRoot" value="${inst}"/>
-
- <classpath>
- <pathelement location="${inst}/lib/j2ee.jar"/>
- <pathelement location="${build}"/>
- <path refid="jsr88.exec.classpath"/>
- </classpath>
-
- <!--
- The first command line argument to SimpleJSR88Client is the function to be performed.
- -->
- <arg line="getAvailableAppClientModules"/>
-
- </javaWithResult>
-
- <!--
- Undeploy the app client that we just deployed.
- -->
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${appClientModuleName}"/>
- </antcall>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/GetModulesTest.log"/>
- </antcall>
- </target>
-
- <!--
- This test checks on a workaround that avoids a bug in J2SE that opens a jar file but never closes it.
- This happens during web services compilation during deployment (in some cases) and the open jar file
- prevents the app server from completely undeploying the app. A later attempt to deploy the app
- again fails because of the open jar file. The administrator must shut down and restart the app
- server to clear the open jar and permit the later deployment to succeed.
-
- Deployment has worked around this problem, and this test makes sure the workaround continues to work.
- -->
- <target name="runOpenJarWorkaroundTest" depends="init">
- <antcall target="declare-test">
- <param name="description" value="jsr88/misc - Test workaround of J2SE bug that leaves a jar file open during deployment"/>
- </antcall>
-
- <!--
- Run the test program that deploys, undeploys, and deploys again.
- -->
- <javaWithResult
- fork="true"
- failonerror="false"
- output="${build}/TestOpenJarFileWorkaround.log"
- jvm="${JAVA}"
- classname="TestOpenJarFileWorkaround"
- resultproperty="result"
- >
- <sysproperty key="jsr88client.user" value="${admin.user}"/>
- <sysproperty key="jsr88client.password" value="${admin.password}"/>
- <sysproperty key="jsr88client.host" value="${admin.host}"/>
- <sysproperty key="jsr88client.port" value="${admin.port}"/>
- <sysproperty key="com.sun.aas.installRoot" value="${inst}"/>
-
- <classpath>
- <pathelement location="${inst}/lib/j2ee.jar"/>
- <pathelement location="${build}"/>
- <pathelement location="../../util/build"/> <!-- need this to find the JSR88Deployer -->
- <path refid="jsr88.exec.classpath"/>
- </classpath>
-
- <!--
- The command line arguments are host, port, user, password, and the war to deploy.
- -->
- <arg line="${admin.host} ${admin.port} ${admin.user} ${admin.password} ${webServicesWorkaroundCheckWarFile}"/>
-
- </javaWithResult>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/TestOpenJarFileWorkaround.log"/>
- </antcall>
-
- </target>
-
- <target name="private-all">
- <antcall target="run"/>
- </target>
-
- <target name="clobber" depends="clean">
- <delete dir="${build}"/>
- </target>
-
- <target name="usage">
- <antcall target="all"/>
- </target>
-
-</project>
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 10a09b4..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/common/build.xml
+++ /dev/null
@@ -1,53 +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
-
--->
-
-<project name="Coffee Break, common" default="build" basedir=".">
- <target name="init">
- <tstamp/>
- </target>
-
- <property name="build" value="build" />
- <property name="src" value="src" />
-
- <target name="prepare" depends="init"
- description="Create build directories.">
- <mkdir dir="${build}" />
- </target>
-
- <!-- Executable Targets -->
-
- <target name="compile" depends="prepare"
- description="Compile .java files." >
- <javac
- srcdir="${src}"
- destdir="${build}"
- includes="**/*.java"
- />
- </target>
-
- <target name="build" depends="compile"
- description="Compiles source.">
- </target>
-
- <target name="clean"
- description="Removes the build directory.">
- <delete dir="${build}" />
- </target>
-
-</project>
-
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 f0587dd..0000000
--- 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 c2c912a..0000000
--- 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 0ab383d..0000000
--- 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 f042d52..0000000
--- 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 a267359..0000000
--- 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 17f887e..0000000
--- 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 4e03601..0000000
--- 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 b4124e1..0000000
--- 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 cdec3a7..0000000
--- 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 de381cf..0000000
--- 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 8599a87..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.properties
+++ /dev/null
@@ -1,55 +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
-
--->
-
-
-# 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 3cfefa9..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/build.xml
+++ /dev/null
@@ -1,289 +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
-
--->
-
-<project name="Coffee Break Supplier, JAX-RPC" default="build-service" basedir=".">
-
- <property file="../../common/build.properties"/>
- <property file="build.properties"/>
-
-<!-- ========================== CLASSPATHS ============================= -->
-
- <path id="run.classpath">
- <fileset dir="${dist}">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${j2ee.home}/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${j2ee.home}/lib/endorsed">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <path id="compile.classpath">
- <pathelement location="${build}/server"/>
- <pathelement location="${common}"/>
- <fileset dir="${j2ee.home}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <!-- ========================== PREPARE ============================= -->
-
- <target name="prepare"
- description="Creates the build and dist directories" >
- <echo message="Creating the required directories...." />
- <mkdir dir="${build}/client" />
- <mkdir dir="${build}/server" />
- <mkdir dir="${build}/registry" />
- <mkdir dir="${dist}" />
- </target>
-
- <target name="init">
- <tstamp/>
- </target>
-
-
- <!-- ========================== WSCOMPILE ============================= -->
-
- <target name="set-wscompile" >
- <condition property="wscompile" value="${wscompile.dir}/wscompile.bat">
- <os family="windows"/>
- </condition>
- <condition property="wscompile" value="${wscompile.dir}/wscompile">
- <not>
- <os family="windows"/>
- </not>
- </condition>
- </target>
-
- <target name="run-wscompile" depends="prepare,set-wscompile"
- description="Runs wscompile">
- <echo message="Running wscompile:"/>
- <echo message=" ${wscompile} ${param1}"/>
- <exec executable="${wscompile}">
- <arg line="${param1}"/>
- </exec>
- </target>
-
- <target name="generate-wsdl"
- description="Runs wscompile to generate the WSDL file">
- <antcall target="run-wscompile">
- <param name="param1" value="-define -mapping ${build}/server/${mapping.file} -d ${build}/server -nd ${build}/server -classpath ${build}/server ${config.interface.file}"/>
- </antcall>
- </target>
-
- <target name="generate-stubs"
- description="Runs wscompile to generate the client stub classes">
- <antcall target="run-wscompile">
- <param name="param1" value="-gen:client -d ${build}/client -classpath ${build}/client ${config.wsdl.file}"/>
- </antcall>
- </target>
-
-<!-- ========================== COMPILE ============================= -->
-
- <target name="compile-common" depends="prepare"
- description="Compiles the common beans">
- <echo message="Compiling the common bean source code...."/>
- <ant antfile="../common/build.xml"
- dir="../common"
- target="build">
- </ant>
- </target>
-
- <target name="compile-service" depends="prepare"
- description="Compiles the server-side source code">
- <echo message="Compiling the server-side source code...."/>
- <javac
- srcdir="${server.src}"
- destdir="${build}/server"
- classpath="${common}:dist/${registry.jar}"
- includes="*.java"
- />
- <copy todir="${build}/server/${package.path}">
- <fileset dir="src/server/${package.path}">
- <include name="*.properties"/>
- </fileset>
- </copy>
- </target>
-
- <target name="compile-registry" depends="prepare"
- description="Compiles the registry source code" >
- <echo message="Compiling the registry source code...."/>
- <javac srcdir="${registry.src}" destdir="${build}/registry">
- <include name="**/*.java" />
- <classpath refid="compile.classpath"/>
- </javac>
- <javac
- srcdir="../common/src"
- destdir="${build}/registry"
- includes="**/URLHelper.java"
- >
- <classpath refid="compile.classpath" />
- <classpath path="${common}" />
- </javac>
- <copy file="../common/src/${package.path}/CoffeeBreak.properties"
- todir="${build}/registry/${package.path}" />
- </target>
-
- <target name="compile-client" depends="prepare"
- description="Compiles the client-side source code" >
- <echo message="Compiling the client source code...."/>
- <javac srcdir="${client.src}" destdir="${build}/client">
- <include name="**/*.java" />
- <classpath refid="compile.classpath"/>
- </javac>
- </target>
-
- <!-- ========================== COPY & REMOVE ===================== -->
-
- <target name="copy-common-service"
- description="Copies common class files to build/service
- because multiple classpaths for a wscompile command run
- within ant do not work.">
- <echo message="Copying common classes...."/>
- <copy todir="${build}/server/${package.path}">
- <fileset dir="../common/build/${package.path}" />
- </copy>
- </target>
-
- <target name="copy-common-client"
- description="Copies common class files to build/client
- but doesn't copy beans because they are created w. generate-stubs.">
- <echo message="Copying common classes...."/>
- <copy file="../common/build/${package.path}/DateHelper.class"
- todir="${build}/client/${package.path}"/>
- </target>
-
-
-<!-- ========================== PACKAGE ============================= -->
-
-
- <target name="package-client"
- description="Builds the JAR file that contains the client ">
- <echo message="Building the client JAR file...."/>
- <delete file="${dist}/${client.jar}" />
- <jar jarfile="${dist}/${client.jar}" >
- <fileset dir="${build}/client" />
- </jar>
- </target>
-
- <target name="package-registry"
- description="Builds the JAR file that contains the registry routines">
- <echo message="Building the registry JAR file...."/>
- <copy file="${registry.src}/CoffeeRegistry.properties" todir="${build}/registry/${package.path}" />
- <delete file="${dist}/${registry.jar}" />
- <jar jarfile="${dist}/${registry.jar}" >
- <fileset dir="${build}/registry" />
- </jar>
- </target>
-
-
-<!-- ========================== RUN ============================= -->
-
- <target name="run-test-order"
- description="Runs TestOrderCaller">
- <antcall target="run-test-client">
- <param name="client.class" value="com.sun.cb.TestOrderCaller"/>
- </antcall>
- </target>
-
- <target name="run-test-price"
- description="Runs TestPriceFetcher">
- <antcall target="run-test-client">
- <param name="client.class" value="com.sun.cb.TestPriceFetcher"/>
- </antcall>
- </target>
-
- <target name="run-test-client"
- description="Runs a test JAX-RPC client.">
- <java
- fork="on"
- classpath="dist/${client.jar}"
- classname="${client.class}" >
- <arg value="${endpoint-address}" />
- <classpath refid="run.classpath" />
- </java>
- </target>
-
- <target name="run-registry-publish"
- description="Publishes an organization in the registry server. Note: You must start the registry server before executing this task." >
- <echo message="Running OrgPublisher." />
- <echo message="Note: Remember to start the registry server before running this program." />
- <java classname="com.sun.cb.OrgPublisher"
- fork="yes"
- classpath="dist/${registry.jar}" >
- <classpath refid="run.classpath" />
- <sysproperty key="useSOAP" value="false"/>
- </java>
- </target>
-
- <target name="run-registry-remove"
- description="Removes an organization from the registry. Note: You must start the registry server before executing this task." >
- <echo message="Running OrgRemover." />
- <echo message="Note: Remember to start the registry server before running this program." />
- <java classname="com.sun.cb.OrgRemover"
- fork="yes"
- classpath="dist/${registry.jar}:${foo}" >
- <classpath refid="run.classpath" />
- <sysproperty key="useSOAP" value="false"/>
- </java>
- </target>
-
-<!-- ========================== BUILD ============================= -->
-
-
-
- <target name="build-service"
- depends="compile-service,copy-common-service,generate-wsdl"
- description="Executes the targets needed to build the service.">
- </target>
-
- <target name="build-client"
- depends="generate-stubs,copy-common-client,compile-client,package-client"
- description="Executes the targets needed to build the client files.">
- </target>
-
- <target name="build-registry"
- depends="compile-registry,package-registry"
- description="Executes the targets needed to build the registry JAR.">
- </target>
-
-
-<!-- ========================== UTIL ============================= -->
-
-
- <target name="clean"
- description="Removes the build and dist directory">
- <delete dir="${build}" />
- <delete dir="dist" />
- </target>
-
- <target name="listprops" depends="set-wscompile"
- description="Displays values of some of the properties of this build file">
- <echo message="j2ee.home: ${j2ee.home}" />
- <echo message="foo: ${foo}" />
- <echo message="war.file: ${war.file}" />
- <echo message="client.jar: ${client.jar}" />
- <echo message="registry.jar: ${registry.jar}" />
- <echo message="wscompile: ${wscompile}" />
- <echo message="endpoint-address: ${endpoint-address}" />
- </target>
-
-
-</project>
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 69d19c4..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/client-start-wsdl.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl location="http://localhost:8080/jaxrpc-coffee-supplier/jaxrpc?WSDL"
- packageName="com.sun.cb"/>
-</configuration>
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 90b0b4e..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/server-start-wsdl.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl location="build/Supplier.wsdl"
- packageName="com.sun.cb"/>
-</configuration>
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 3c3d693..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/conf/start-interface.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="Supplier"
- targetNamespace="urn:Foo"
- typeNamespace="urn:Foo"
- packageName="com.sun.cb">
- <interface name="com.sun.cb.SupplierIF"/>
- <typeMappingRegistry>
- <additionalTypes>
- <class name="com.sun.cb.PriceItemBean"/>
- <class name="com.sun.cb.LineItemBean"/>
- </additionalTypes>
- </typeMappingRegistry>
- </service>
-</configuration>
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 3c3d693..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-interface.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="Supplier"
- targetNamespace="urn:Foo"
- typeNamespace="urn:Foo"
- packageName="com.sun.cb">
- <interface name="com.sun.cb.SupplierIF"/>
- <typeMappingRegistry>
- <additionalTypes>
- <class name="com.sun.cb.PriceItemBean"/>
- <class name="com.sun.cb.LineItemBean"/>
- </additionalTypes>
- </typeMappingRegistry>
- </service>
-</configuration>
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 69d19c4..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/jaxrpc/config-wsdl.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl location="http://localhost:8080/jaxrpc-coffee-supplier/jaxrpc?WSDL"
- packageName="com.sun.cb"/>
-</configuration>
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 a624df5..0000000
--- 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 7fc7113..0000000
--- 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 f565d08..0000000
--- 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 d523f54..0000000
--- 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 ffb5e08..0000000
--- 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 122a0f8..0000000
--- 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 c53e045..0000000
--- 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 1024fd1..0000000
--- 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 fbd8771..0000000
--- 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 6bfcbe9..0000000
--- 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 252cbed..0000000
--- 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 f58ac8d..0000000
--- 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 ac265b5..0000000
--- 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 f380edc..0000000
--- 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 3150fbe..0000000
--- 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 6c32fdc..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/provided-wars/cbserver.war
+++ /dev/null
Binary files differ
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 bf62d3c..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/provided-wars/jaxrpc-coffee-distributor.war
+++ /dev/null
Binary files differ
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/provided-wars/saaj-coffee-supplier.war b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/provided-wars/saaj-coffee-supplier.war
deleted file mode 100644
index 279cc3d..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/provided-wars/saaj-coffee-supplier.war
+++ /dev/null
Binary files differ
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.properties b/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.properties
deleted file mode 100644
index e7025be..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.properties
+++ /dev/null
@@ -1,26 +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
-
--->
-
-
-# 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 e91daa8..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/build.xml
+++ /dev/null
@@ -1,123 +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
-
--->
-
-<!DOCTYPE project [
- <!ENTITY targets SYSTEM "../../common/targets.xml">
-]>
-
-<project name="SAAJ Tutorial, Coffee Break" default="build" basedir=".">
- <target name="init">
- <tstamp/>
- </target>
-
- <property file="../../common/build.properties"/>
- <property file="build.properties"/>
-
- &targets;
-
- <path id="run.classpath">
- <fileset dir="${j2ee.home}/lib">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${j2ee.home}/lib/endorsed">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <target name="prepare"
- description="Creates the build and dist directories" >
- <echo message="Creating the required directories...." />
- <mkdir dir="${build}/client" />
- <mkdir dir="${build}/server" />
- <mkdir dir="dist" />
- </target>
-
- <target name="compile-server" depends="prepare"
- description="Compiles the server-side source code">
- <echo message="Compiling the server-side source code...."/>
- <javac
- srcdir="${src}"
- destdir="${build}/server"
- includes="**/PriceListServlet.java, **/ConfirmationServlet.java">
- <classpath refid="classpath" />
- <classpath path="${common}" />
- </javac>
- </target>
-
- <target name="compile-client"
- description="Compiles the client source code" >
- <echo message="Compiling the client source code...."/>
- <javac
- srcdir="${src}"
- destdir="${build}/client"
- includes="**/OrderRequest.java, **/PriceListRequest.java, **/Test*.java">
- <classpath refid="classpath" />
- <classpath path="${common}" />
- </javac>
- <javac
- srcdir="../common/src"
- destdir="${build}/client"
- includes="**/URLHelper.java"
- >
- <classpath refid="classpath" />
- <classpath path="${common}" />
- </javac>
- <copy file="../common/src/com/sun/cb/CoffeeBreak.properties"
- todir="${build}/client/com/sun/cb" />
- </target>
-
- <target name="package-client" depends="compile-client"
- description="Builds the JAR file that contains the SAAJ client routines">
- <echo message="Building the ${client-jar} file...."/>
- <delete file="dist/${client-jar}" />
- <jar jarfile="dist/${client-jar}" >
- <fileset dir="${build}/client" >
- <exclude name="**/*Test*" />
- </fileset>
- </jar>
- </target>
-
- <target name="run-test-order">
- <antcall target="run-test-client">
- <param name="client-class" value="com.sun.cb.TestOrderRequest"/>
- </antcall>
- </target>
-
- <target name="run-test-price">
- <antcall target="run-test-client">
- <param name="client-class" value="com.sun.cb.TestPriceListRequest"/>
- </antcall>
- </target>
-
- <target name="run-test-client"
- description="Runs a test client">
- <echo message="Running the ${client-class} program:" />
- <echo message=" " />
- <java
- fork="on"
- classname="${client-class}">
- <classpath refid="run.classpath" />
- <classpath path="${build}/client" />
- </java>
- </target>
-
- <target name="build" depends="compile-server, package-client"
- description="Executes the targets needed to build this example.">
- </target>
-
-</project>
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 511ab56..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/coffee-order.dtd
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<!ELEMENT coffee-order (orderID, customer, address, line-item+, total)>
-
-<!ELEMENT orderID (#PCDATA)>
-
-<!ELEMENT customer (last-name, first-name, phone-number,
- email-address)>
-<!ELEMENT last-name (#PCDATA)>
-<!ELEMENT first-name (#PCDATA)>
-<!ELEMENT phone-number (#PCDATA)>
-<!ELEMENT email-address (#PCDATA)>
-
-<!ELEMENT address (street, city, state, zip)>
-<!ELEMENT street (#PCDATA)>
-<!ELEMENT city (#PCDATA)>
-<!ELEMENT state (#PCDATA)>
-<!ELEMENT zip (#PCDATA)>
-
-<!ELEMENT line-item (coffee-name, pounds, price)>
-<!ELEMENT coffee-name (#PCDATA)>
-<!ELEMENT pounds (#PCDATA)>
-<!ELEMENT price (#PCDATA)>
-
-<!ELEMENT total (#PCDATA)>
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 d2aa353..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/coffee-order.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<!DOCTYPE coffee-order
- PUBLIC "-//Sun Microsystems, Inc.//DTD Coffee Order//EN"
- "http://java.sun.com/webservices/dtds/coffee-order.dtd">
-
-<coffee-order>
- <orderID>
- "1234"
- </orderID>
-
- <customer>
- <last-name>
- "Pental"
- </last-name>
- <first-name>
- "Ragni"
- </first-name>
- </customer>
-
- <address>
- <street>
- "9876 Central Way"
- </street>
- <city>
- "Rainbow"
- </city>
- <state>
- "CA"
- </state>
- <zip>
- "99999"
- </zip>
- <phone-number>
- "908 873-6789"
- </phone-number>
- <email-address>
- "ragnip@aol.com"
- </email-address>
- </address>
-
- <line-item>
- <coffee-name>
- "arabica"
- </coffee-name>
- <pounds>
- "2"
- </pounds>
- <price>
- "10.95"
- </price>
- </line-item>
-
- <total>
- "10.95"
- </total>
-
-</coffee-order>
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 544c9af..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/confirm.dtd
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<!ELEMENT confirmation (orderID, ship-date)>
-
-<!ELEMENT orderID (#PCDATA)>
-
-<!ELEMENT ship-date (#PCDATA)>
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 b802692..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/confirm.xml
+++ /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
-
--->
-
-<!DOCTYPE confirm
- PUBLIC "-//Sun Microsystems, Inc.//DTD confirmation//EN"
- "http://java.sun.com/webservices/dtds/confirm.dtd">
-
-<confirmation>
- <orderID>
- "1234"
- </orderID>
-
- <ship-date>
- "01-01-2001"
- </ship-date>
-</confirmation>
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 507604a..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/price-list.dtd
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<!ELEMENT price-list (coffee+)>
-
-<!ELEMENT coffee (coffee-name, price)>
-
-<!ELEMENT coffee-name (#PCDATA)>
-<!ELEMENT price (#PCDATA)>
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 ca2f4f0..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/price-list.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE price-list
-<!--
-
- 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
-
--->
-
- PUBLIC "-//Sun Microsystems, Inc.//DTD priceList//EN"
- "http://java.sun.com/webservices/dtds/price-list.dtd">
-
-<price-list
- <coffee>
- <coffee-name> Arabica </coffee-name>
- <price> 4.50 </price>
- </coffee>
-
- <coffee>
- <coffee-name> HouseBlend </coffee-name>
- <price> 5.00 </price>
- </coffee>
-
- <coffee>
- <coffee-name> Espresso </coffee-name>
- <price> 5.00 </price>
- </coffee>
-
- <coffee>
- <coffee-name> Dorada </coffee-name>
- <price> 6.00 </price>
- </coffee>
-
-</price-list>
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 c64645e..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/request-prices.dtd
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<!ELEMENT request-prices (request)>
-
-<!ELEMENT request (#PCDATA)>
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 f6c4568..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/saaj/dtds/request-prices.xml
+++ /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
-
--->
-
-<!DOCTYPE request-prices
- PUBLIC "-//Sun Microsystems, Inc.//DTD priceRequest//EN"
- "http://java.sun.com/webservices/dtds/request-prices.dtd">
-
-<request-prices>
- <request>
- "Send current price list."
- </request>
-</request-prices>
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 6c66272..0000000
--- 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 66c37d3..0000000
--- 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 8febd35..0000000
--- 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 adc2842..0000000
--- 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 760be0e..0000000
--- 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 5ef7036..0000000
--- 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 d50416d..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.properties
+++ /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
-
--->
-
-
-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 e791930..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/build.xml
+++ /dev/null
@@ -1,79 +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
-
--->
-
-<!DOCTYPE project [
- <!ENTITY targets SYSTEM "../../common/targets.xml">
-]>
-
-<project name="Coffee Break Server" default="build" basedir=".">
- <target name="init">
- <tstamp/>
- </target>
-
- <property file="../../common/build.properties"/>
- <property file="build.properties"/>
-
- &targets;
-
- <target name="prepare" depends="init"
- description="Create build directories.">
- <mkdir dir="${build}" />
- </target>
-
- <target name="build" depends="prepare"
- description="Compile CB server Java files and copy DD and static files." >
- <javac
- srcdir="${src}"
- destdir="${build}">
- <include name="**/*.java" />
- <classpath refid="classpath" />
- <classpath path="${common}:../jaxrpc/dist/jaxrpc-client.jar:../saaj/dist/saaj-client.jar" />
- </javac>
- <javac
- srcdir="../common/src"
- destdir="${build}"
- includes="**/URLHelper.java"
- >
- <classpath refid="classpath" />
- <classpath path="${common}" />
- </javac>
- <copy file="../common/src/com/sun/cb/CoffeeBreak.properties"
- todir="${build}/com/sun/cb" />
- <copy todir="${build}">
- <fileset dir="web">
- <include name="**/*.html" />
- <include name="**/*.jsp" />
- <include name="**/*.jspf" />
- <include name="**/*.gif" />
- <include name="**/*.xml" />
- <include name="**/*.tld" />
- <include name="**/*.jpg" />
- </fileset>
- </copy>
- </target>
-
- <target name="run-query" depends="build"
- description="Run JAXRQueryByName." >
- <java classname="com.sun.cb.JAXRQueryByName" fork="yes">
- <arg line="${query-string}" />
- <classpath refid="classpath" />
- <classpath path="${build}" />
- </java>
- </target>
-
-</project>
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 69a3240..0000000
--- 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 7fb4747..0000000
--- 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 177f44b..0000000
--- 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=<value> 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=<value> 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 a951549..0000000
--- 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 de66dcd..0000000
--- 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 4818935..0000000
--- 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 f0e3f35..0000000
--- 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 417c438..0000000
--- 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("<html><body bgcolor=\"#ffffff\">" +
- "Reloaded price list." + "</html></body>");
- }
-}
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 2f71ed7..0000000
--- 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 3fe7513..0000000
--- 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 c48f7e6..0000000
--- 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.<br>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 084e088..0000000
--- 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.<br>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 d339c00..0000000
--- 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 b276a2a..0000000
--- 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 46d681e..0000000
--- 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 c2c9b04..0000000
--- 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 e35cc5c..0000000
--- 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 86815cc..0000000
--- 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 185d2d7..0000000
--- 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 50c8d78..0000000
--- 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
-
---%>
-
-<body bgcolor="#FFFFFF">
-<center>
-<table>
-<tr>
-<td><img src="coffeebean.jpg"></td>
-<td><h1><font size="+3" color="black" face="sans">Coffee Break</font></h1></td>
-<td><img src="coffeebean.jpg"></td>
-</tr>
-</table>
-</center>
-
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 7e993a3..0000000
--- 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
-
---%>
-
-<body bgcolor="#FFFFFF">
-<center>
-<table>
-<tr>
-<td><img src="coffeebean.jpg"></td>
-<td><h1><font size="+3" color="black" face="sans">Coffee Break</font></h1></td>
-<td><img src="coffeebean.jpg"></td>
-</tr>
-</table>
-</center>
-
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 0709cee..0000000
--- 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
-
---%>
-
-<c:remove var="cart" scope="session"/>
-<center>
-<table cellpadding=4 cellspacing=2 border=0>
-<tr>
-<td align=center colspan=3><fmt:message key="OrderConfirmed"/></td>
-</tr>
-<tr>
-<td colspan=3> </td>
-</tr>
-<tr bgcolor="#CC9999">
-<td rowspan=2 align=center><b><fmt:message key="ShipDate"/></b>
-<td colspan=2 align=center><b><fmt:message key="Items"/></b>
-</tr>
-<tr bgcolor="#CC9999">
-<td><b><fmt:message key="Coffee"/></b></td>
-<td><b><fmt:message key="Pounds"/></b></td>
-</tr>
-<c:forEach var="oc" items="${requestScope.checkoutFormBean.orderConfirmations.items}" >
- <tr bgcolor="#CC9999">
- <td rowspan=${fn:length(oc.orderBean.lineItems)} align=center><fmt:formatDate value="${oc.confirmationBean.shippingDate.time}" type="date" dateStyle="full" /></td>
- <c:forEach var="item" items="${oc.orderBean.lineItems}" >
- <td bgcolor="#CC9999">${item.coffeeName}</td>
- <td bgcolor="#CC9999" align=right>${item.pounds}</td>
- </tr>
- </c:forEach>
-</c:forEach>
-<tr>
-<td colspan=3> </td>
-</tr>
-<tr>
-<td align=center colspan=3><a href="${pageContext.request.contextPath}/orderForm"><fmt:message key="ContinueShopping"/></a>
-<tr>
-<td colspan=3> </td>
-</tr>
-</table>
-</center>
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 b6c3029..0000000
--- 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
-
---%>
-
-<c:remove var="cart" scope="session"/>
-<center>
-<table cellpadding=4 cellspacing=2 border=0>
-<tr>
-<td align=center colspan=3><fmt:message key="OrderConfirmed"/></td>
-</tr>
-<tr>
-<td colspan=3> </td>
-</tr>
-<tr bgcolor="#CC9999">
-<td rowspan=2 align=center><b><fmt:message key="ShipDate"/></b>
-<td colspan=2 align=center><b><fmt:message key="Items"/></b>
-</tr>
-<tr bgcolor="#CC9999">
-<td><b><fmt:message key="Coffee"/></b></td>
-<td><b><fmt:message key="Pounds"/></b></td>
-</tr>
-<c:forEach var="oc" items="${requestScope.checkoutFormBean.orderConfirmations.items}" >
- <tr bgcolor="#CC9999">
- <td rowspan=${fn:length(oc.orderBean.lineItems)} align=center><fmt:formatDate value="${oc.confirmationBean.shippingDate.time}" type="date" dateStyle="full" /></td>
- <c:forEach var="item" items="${oc.orderBean.lineItems}" >
- <td bgcolor="#CC9999">${item.coffeeName}</td>
- <td bgcolor="#CC9999" align=right>${item.pounds}</td>
- </tr>
- </c:forEach>
-</c:forEach>
-<tr>
-<td colspan=3> </td>
-</tr>
-<tr>
-<td align=center colspan=3><a href="${pageContext.request.contextPath}/orderForm"><fmt:message key="ContinueShopping"/></a>
-<tr>
-<td colspan=3> </td>
-</tr>
-</table>
-</center>
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 e594785..0000000
--- 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
-
---%>
-
-<form action="${pageContext.request.contextPath}/checkoutAck" method=post>
-<center>
-<table cellpadding=4 cellspacing=2 border=0>
-<tr>
-<td colspan=2>
-<p><fmt:message key="YourOrder"/> \$${sessionScope.cart.total}. <fmt:message key="CheckoutInstructions"/></td>
-</tr>
-<tr>
-<td colspan=2> </td>
-</tr>
-
-<tr bgcolor="#CC9999">
-<td align="center" colspan=2><font size=5><b><fmt:message key="CheckoutForm"/><b></font></td>
-</tr>
-
-<tr bgcolor="#CC9999">
-<td valign=top>
-<B><fmt:message key="FirstName"/></B>
-<br>
-<input type="text" name="firstName" value="${requestScope.checkoutFormBean.firstName}" size=15 maxlength=20>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.firstName}</font>
-</td>
-<td valign=top>
-<B><fmt:message key="LastName"/></B>
-<br>
-<input type="text" name="lastName" value="${requestScope.checkoutFormBean.lastName}" size=15 maxlength=20>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.lastName}</font>
-</td>
-</tr>
-
-<tr bgcolor="#CC9999">
-<td valign=top>
-<B><fmt:message key="EMail"/></B>
-<br>
-<input type="text" name="email" value="${requestScope.checkoutFormBean.email}" size=25 maxlength=125>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.email}</font>
-</td>
-<td valign=top>
-<B><fmt:message key="PhoneNumber"/></B>
-<br>
-<input type="text" name="areaCode" value="${requestScope.checkoutFormBean.areaCode}" size=3 maxlength=3>
-<input type="text" name="phoneNumber" value="${requestScope.checkoutFormBean.phoneNumber}" size=8 maxlength=8>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.phoneNumber}</font>
-</td>
-</tr>
-
-
-<tr bgcolor="#CC9999">
-<td valign=top>
-<B><fmt:message key="Street"/></B>
-<br>
-<input type="text" name="street" size=25 value="${requestScope.checkoutFormBean.street}" maxlength=25>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.street}</font>
-</td>
-<td valign=top>
-<B><fmt:message key="City"/></B>
-<br>
-<input type="text" name="city" size=25 value="${requestScope.checkoutFormBean.city}" maxlength=25>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.city}</font>
-</td>
-<br>
-</tr>
-
-<tr bgcolor="#CC9999">
-<td valign=top>
-<B><fmt:message key="State"/></B>
-<br>
-<input type="text" name="state" size=2 value="${requestScope.checkoutFormBean.state}" maxlength=2>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.state}</font>
-</td>
-<td valign=top>
-<B><fmt:message key="Zip"/></B>
-<br>
-<input type="text" name="zip" value="${requestScope.checkoutFormBean.zip}" size=5 maxlength=5>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.zip}</font>
-</td>
-<br>
-</tr>
-
-
-<tr bgcolor="#CC9999">
-<td valign=top>
-<B><fmt:message key="CCOption"/></B>
-<br>
- <select name=CCOption>
- <option value=0 <c:if test="${CCOption == 0}"> selected</c:if> >VISA</option>
- <option value=1 <c:if test="${CCOption == 1}"> selected</c:if> >MasterCard</option>
- <option value=2 <c:if test="${CCOption == 2}"> selected</c:if> >American Express</option>
- </select>
-</td>
-<td valign=top>
-<B><fmt:message key="CCNumber"/></B>
-<br>
-<input type="text" name="CCNumber" value="${requestScope.checkoutFormBean.CCNumber}" size=16 maxlength=16>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.CCNumber}</font>
-</td>
-<br>
-</tr>
-
-
-<tr bgcolor="#CC9999">
-<td colspan="2" align=center>
-<input type="submit" value="<fmt:message key='Submit'/>"> <input type="reset" value="<fmt:message key='Reset'/>">
-</td>
-</tr>
-
-</table>
-</center>
-</form>
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 82e9b3f..0000000
--- 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
-
---%>
-
-
-<form action="${pageContext.request.contextPath}/checkoutAck" method=post>
-<center>
-<table cellpadding=4 cellspacing=2 border=0>
-<tr>
-<td colspan=2>
-<p><fmt:message key="YourOrder"/> \$${sessionScope.cart.total}. <fmt:message key="CheckoutInstructions"/></td>
-</tr>
-<tr>
-<td colspan=2> </td>
-</tr>
-
-<tr bgcolor="#CC9999">
-<td align="center" colspan=2><font size=5><b><fmt:message key="CheckoutForm"/><b></font></td>
-</tr>
-
-<tr bgcolor="#CC9999">
-<td valign=top>
-<B><fmt:message key="FirstName"/></B>
-<br>
-<input type="text" name="firstName" value="${requestScope.checkoutFormBean.firstName}" size=15 maxlength=20>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.firstName}</font>
-</td>
-<td valign=top>
-<B><fmt:message key="LastName"/></B>
-<br>
-<input type="text" name="lastName" value="${requestScope.checkoutFormBean.lastName}" size=15 maxlength=20>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.lastName}</font>
-</td>
-</tr>
-
-<tr bgcolor="#CC9999">
-<td valign=top>
-<B><fmt:message key="EMail"/></B>
-<br>
-<input type="text" name="email" value="${requestScope.checkoutFormBean.email}" size=25 maxlength=125>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.email}</font>
-</td>
-<td valign=top>
-<B><fmt:message key="PhoneNumber"/></B>
-<br>
-<input type="text" name="areaCode" value="${requestScope.checkoutFormBean.areaCode}" size=3 maxlength=3>
-<input type="text" name="phoneNumber" value="${requestScope.checkoutFormBean.phoneNumber}" size=8 maxlength=8>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.phoneNumber}</font>
-</td>
-</tr>
-
-
-<tr bgcolor="#CC9999">
-<td valign=top>
-<B><fmt:message key="Street"/></B>
-<br>
-<input type="text" name="street" size=25 value="${requestScope.checkoutFormBean.street}" maxlength=25>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.street}</font>
-</td>
-<td valign=top>
-<B><fmt:message key="City"/></B>
-<br>
-<input type="text" name="city" size=25 value="${requestScope.checkoutFormBean.city}" maxlength=25>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.city}</font>
-</td>
-<br>
-</tr>
-
-<tr bgcolor="#CC9999">
-<td valign=top>
-<B><fmt:message key="State"/></B>
-<br>
-<input type="text" name="state" size=2 value="${requestScope.checkoutFormBean.state}" maxlength=2>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.state}</font>
-</td>
-<td valign=top>
-<B><fmt:message key="Zip"/></B>
-<br>
-<input type="text" name="zip" value="${requestScope.checkoutFormBean.zip}" size=5 maxlength=5>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.zip}</font>
-</td>
-<br>
-</tr>
-
-
-<tr bgcolor="#CC9999">
-<td valign=top>
-<B><fmt:message key="CCOption"/></B>
-<br>
- <select name=CCOption>
- <option value=0 <c:if test="${CCOption == 0}"> selected</c:if> >VISA</option>
- <option value=1 <c:if test="${CCOption == 1}"> selected</c:if> >MasterCard</option>
- <option value=2 <c:if test="${CCOption == 2}"> selected</c:if> >American Express</option>
- </select>
-</td>
-<td valign=top>
-<B><fmt:message key="CCNumber"/></B>
-<br>
-<input type="text" name="CCNumber" value="${requestScope.checkoutFormBean.CCNumber}" size=16 maxlength=16>
-<br><font size=2 color=black>${requestScope.checkoutFormBean.errors.CCNumber}</font>
-</td>
-<br>
-</tr>
-
-
-<tr bgcolor="#CC9999">
-<td colspan="2" align=center>
-<input type="submit" value="<fmt:message key='Submit'/>"> <input type="reset" value="<fmt:message key='Reset'/>">
-</td>
-</tr>
-
-</table>
-</center>
-</form>
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 1b9cdb9..0000000
--- 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" %>
-<html>
-<head>
-<title><fmt:message key="ServerError"/></title>
-</head>
-<body bgcolor="white">
-<h3>
-<fmt:message key="ServerError"/>
-</h3>
-<p>
-${pageContext.errorData.throwable}
-<c:choose>
- <c:when test="${!empty pageContext.errorData.throwable.cause}">
- : ${pageContext.errorData.throwable.cause}
- </c:when>
- <c:when test="${!empty pageContext.errorData.throwable.rootCause}">
- : ${pageContext.errorData.throwable.rootCause}
- </c:when>
-</c:choose>
-</body>
-</html>
-
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 fa63fdf..0000000
--- 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" %>
-<html>
-<head>
-<title><fmt:message key="ServerError"/></title>
-</head>
-<body bgcolor="white">
-<h3>
-<fmt:message key="ServerError"/>
-</h3>
-<p>
-${pageContext.errorData.throwable}
-<c:choose>
- <c:when test="${!empty pageContext.errorData.throwable.cause}">
- : ${pageContext.errorData.throwable.cause}
- </c:when>
- <c:when test="${!empty pageContext.errorData.throwable.rootCause}">
- : ${pageContext.errorData.throwable.rootCause}
- </c:when>
-</c:choose>
-</body>
-</html>
-
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 bb4fe8a..0000000
--- 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
-
---%>
-
-<form action="${pageContext.request.contextPath}/orderForm" method=post>
-<center>
-
-<table cellpadding=4 cellspacing=2 border=0>
-
-<tr>
-<td colspan=4><fmt:message key="OrderInstructions"/></td>
-</tr>
-
-<tr>
-<td colspan=4>
- </td>
-</tr>
-
-<tr bgcolor="#CC9999">
-<td align="center" colspan=4><font size=5><b><fmt:message key="OrderForm"/><b></font></td>
-</tr>
-
-<tr bgcolor="#CC9999">
-<td align=center><B><fmt:message key="Coffee"/></B></td>
-<td align=center><B><fmt:message key="Price"/></B></td>
-<td align=center><B><fmt:message key="Quantity"/></B></td>
-<td align=center><B><fmt:message key="Total"/></B></td>
-</tr>
-
-<c:forEach var="sci" items="${sessionScope.cart.items}" >
-<tr bgcolor="#CC9999">
-<td>${sci.item.coffeeName}</td>
-<td align=right>\$${sci.item.retailPricePerPound}</td>
-<td align=center><input type="text" name="${sci.item.coffeeName}_pounds" value="${sci.pounds}" size="3" maxlength="3"></td>
-<td align=right>\$${sci.price}</td>
-</tr>
-</c:forEach>
-
-<tr>
-<td> </td>
-<td>
-<a href="${pageContext.request.contextPath}/checkoutForm?firstName=Coffee&lastName=Lover&email=jane@home&areaCode=123&phoneNumber=456-7890&street=99&city=Somewhere&state=CA&zip=95050&CCNumber=1234-2345-5678&CCOption=0"><fmt:message key='Checkout'/></a>
-</td>
-<td><input type="submit" value="<fmt:message key='Update'/>"></td>
-<td align=right>\$${sessionScope.cart.total}</td>
-<td> </td>
-</tr>
-
-<tr>
-<td colspan=5>${requestScope.orderError}</td>
-</tr>
-
-
-</table>
-</center>
-</form>
-
-
-
-
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 421e70a..0000000
--- 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
-
---%>
-<form action="${pageContext.request.contextPath}/orderForm" method=post>
-<center>
-
-<table cellpadding=4 cellspacing=2 border=0>
-
-<tr>
-<td colspan=4><fmt:message key="OrderInstructions"/></td>
-</tr>
-
-<tr>
-<td colspan=4>
- </td>
-</tr>
-
-<tr bgcolor="#CC9999">
-<td align="center" colspan=4><font size=5><b><fmt:message key="OrderForm"/><b></font></td>
-</tr>
-
-<tr bgcolor="#CC9999">
-<td align=center><B><fmt:message key="Coffee"/></B></td>
-<td align=center><B><fmt:message key="Price"/></B></td>
-<td align=center><B><fmt:message key="Quantity"/></B></td>
-<td align=center><B><fmt:message key="Total"/></B></td>
-</tr>
-
-<c:forEach var="sci" items="${sessionScope.cart.items}" >
-<tr bgcolor="#CC9999">
-<td>${sci.item.coffeeName}</td>
-<td align=right>\$${sci.item.retailPricePerPound}</td>
-<td align=center><input type="text" name="${sci.item.coffeeName}_pounds" value="${sci.pounds}" size="3" maxlength="3"></td>
-<td align=right>\$${sci.price}</td>
-</tr>
-</c:forEach>
-
-<tr>
-<td> </td>
-<td>
-<a href="${pageContext.request.contextPath}/checkoutForm?firstName=Coffee&lastName=Lover&email=jane@home&areaCode=123&phoneNumber=456-7890&street=99&city=Somewhere&state=CA&zip=95050&CCNumber=1234-2345-5678&CCOption=0"><fmt:message key='Checkout'/></a>
-</td>
-<td><input type="submit" value="<fmt:message key='Update'/>"></td>
-<td align=right>\$${sessionScope.cart.total}</td>
-<td> </td>
-</tr>
-
-<tr>
-<td colspan=5>${requestScope.orderError}</td>
-</tr>
-
-
-</table>
-</center>
-</form>
-
-
-
-
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 7de63ff..0000000
--- 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
-
---%>
-
-<body bgcolor="#FFFFFF">
-<center>
-<table>
-<tr>
-<td><img src="template/coffeebean.jpg"></td>
-<td><h1><font size="+3" color="black" face="sans">Coffee Break</font></h1></td>
-<td><img src="template/coffeebean.jpg" alt="Coffee Bean"></td>
-</tr>
-</table>
-</center>
-
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 7e993a3..0000000
--- 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
-
---%>
-
-<body bgcolor="#FFFFFF">
-<center>
-<table>
-<tr>
-<td><img src="coffeebean.jpg"></td>
-<td><h1><font size="+3" color="black" face="sans">Coffee Break</font></h1></td>
-<td><img src="coffeebean.jpg"></td>
-</tr>
-</table>
-</center>
-
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 6696f2e..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/template/coffeebean.jpg
+++ /dev/null
Binary files differ
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 04adaec..0000000
--- 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" %>
-<h3>
-<fmt:message key="ServerError"/>
-</h3>
-<p>
-${pageContext.errorData.throwable}
-<c:choose>
- <c:when test="${!empty pageContext.errorData.throwable.cause}">
- : ${pageContext.errorData.throwable.cause}
- </c:when>
- <c:when test="${!empty pageContext.errorData.throwable.rootCause}">
- : ${pageContext.errorData.throwable.rootCause}
- </c:when>
-</c:choose>
-
-
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 16b721c..0000000
--- 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 4cdf970..0000000
--- 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" %>
-
-<tt:definition name="coffeebreak" screen="${requestScope['jakarta.servlet.forward.servlet_path']}">
- <tt:screen screenId="/orderForm">
- <tt:parameter name="title" value="Coffee Break" direct="true"/>
- <tt:parameter name="banner" value="/template/banner.jsp" direct="false"/>
- <tt:parameter name="body" value="/orderForm.jsp" direct="false"/>
- </tt:screen>
- <tt:screen screenId="/checkoutForm">
- <tt:parameter name="title" direct="true">
- <jsp:attribute name="value" >
- <fmt:message key="TitleCheckoutForm"/>
- </jsp:attribute>
- </tt:parameter>
- <tt:parameter name="banner" value="/template/banner.jsp" direct="false"/>
- <tt:parameter name="body" value="/checkoutForm.jsp" direct="false"/>
- </tt:screen>
- <tt:screen screenId="/checkoutAck">
- <tt:parameter name="title" direct="true">
- <jsp:attribute name="value" >
- <fmt:message key="TitleCheckoutAck"/>
- </jsp:attribute>
- </tt:parameter>
- <tt:parameter name="banner" value="/template/banner.jsp" direct="false"/>
- <tt:parameter name="body" value="/checkoutAck.jsp" direct="false"/>
- </tt:screen>
-</tt:definition>
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 81b638c..0000000
--- 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" %>
-
-<tt:definition name="coffeebreak" screen="${requestScope['jakarta.servlet.forward.servlet_path']}">
- <tt:screen screenId="/orderForm">
- <tt:parameter name="title" value="Coffee Break" direct="true"/>
- <tt:parameter name="banner" value="/banner.jsp" direct="false"/>
- <tt:parameter name="body" value="/orderForm.jsp" direct="false"/>
- </tt:screen>
- <tt:screen screenId="/checkoutForm">
- <tt:parameter name="title" direct="true">
- <jsp:attribute name="value" >
- <fmt:message key="TitleCheckoutForm"/>
- </jsp:attribute>
- </tt:parameter>
- <tt:parameter name="banner" value="/banner.jsp" direct="false"/>
- <tt:parameter name="body" value="/checkoutForm.jsp" direct="false"/>
- </tt:screen>
- <tt:screen screenId="/checkoutAck">
- <tt:parameter name="title" direct="true">
- <jsp:attribute name="value" >
- <fmt:message key="TitleCheckoutAck"/>
- </jsp:attribute>
- </tt:parameter>
- <tt:parameter name="banner" value="/banner.jsp" direct="false"/>
- <tt:parameter name="body" value="/checkoutAck.jsp" direct="false"/>
- </tt:screen>
-</tt:definition>
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 9fe1eda..0000000
--- 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" %>
-<html>
-<head>
-<title>
- <tt:insert definition="coffeebreak" parameter="title"/>
-</title>
-</head>
- <tt:insert definition="coffeebreak" parameter="banner"/>
- <tt:insert definition="coffeebreak" parameter="body"/>
-</body>
-</html>
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 7e1c101..0000000
--- 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" %>
-<html>
-<head>
-<title>
- <tt:insert definition="coffeebreak" parameter="title"/>
-</title>
-</head>
- <tt:insert definition="coffeebreak" parameter="banner"/>
- <tt:insert definition="coffeebreak" parameter="body"/>
-</body>
-</html>
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 9665e08..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/cb/server/web/tutorial-template.tld
+++ /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
-
--->
-
-<taglib xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee web-jsptaglibrary_2_0.xsd"
- version="2.0">
- <description>A tag library exercising SimpleTag handlers.</description>
- <tlib-version>1.0</tlib-version>
- <short-name>SimpleTagLibrary</short-name>
- <uri>/SimpleTagLibrary</uri>
- <tag>
- <name>definition</name>
- <tag-class>template.DefinitionTag</tag-class>
- <body-content>scriptless</body-content>
- <attribute>
- <name>name</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>screen</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
- <tag>
- <name>screen</name>
- <tag-class>template.ScreenTag</tag-class>
- <body-content>scriptless</body-content>
- <attribute>
- <name>screenId</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
- <tag>
- <name>parameter</name>
- <tag-class>template.ParameterTag</tag-class>
- <body-content>scriptless</body-content>
- <attribute>
- <name>name</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>value</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>direct</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
- <tag>
- <name>insert</name>
- <tag-class>template.InsertTag</tag-class>
- <body-content>scriptless</body-content>
- <attribute>
- <name>definition</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- <attribute>
- <name>parameter</name>
- <required>true</required>
- <rtexprvalue>true</rtexprvalue>
- </attribute>
- </tag>
-</taglib>
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 6ddb470..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/build.properties
+++ /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
-
--->
-
-
-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 1def8de..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/misc/exampleFromJ2EETutorial/common/targets.xml
+++ /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
-
--->
-
- <path id="classpath">
- <fileset dir="${j2ee.home}/lib">
- <include name="j2ee.jar"/>
- </fileset>
- </path>
-
- <target name="clean" >
- <delete dir="${build}" />
- <delete dir="${dist}" />
- </target>
-
- <path id="db.classpath">
- <fileset dir="${db.root}/lib">
- <include name="*.jar"/>
- </fileset>
- </path>
-
- <target name="create-db_common" depends="init"
- description="Create database tables and populate database." >
- <java classname="com.pointbase.tools.toolsCommander" fork="yes" >
- <jvmarg line="${db.jvmargs}" />
- <arg line="${db.driver} ${db.url} ${sql.script} ${db.user} ${db.pwd}" />
- <classpath refid="db.classpath" />
- </java>
- </target>
-
- <target name="admin_command_common">
- <echo message="Doing admin task ${admin.command}"/>
- <sun-appserv-admin
- command="${admin.command}"
- user="${admin.user}"
- password="${admin.password}"
- host="${admin.host}"
- port="${admin.port}"
- sunonehome="${j2ee.home}" />
- </target>
-
- <target name="create-jdbc-resource_common">
- <antcall target="admin_command_common">
- <param name="admin.command"
- value="create-jdbc-resource
- --connectionpoolid ${conpool.name} ${jdbc.resource.name}" />
- </antcall>
- </target>
-
- <target name="delete-jdbc-resource_common">
- <antcall target="admin_command_common">
- <param name="admin.command"
- value="delete-jdbc-resource ${jdbc.resource.name}" />
- </antcall>
- </target>
-
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 f5b4f93..0000000
--- 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<targetModuleIDs.length;i++) {
- dumpModulesIDs(prefix, targetModuleIDs[i]);
- }
- }
-
- private void dumpModulesIDs(String prefix, TargetModuleID targetModuleID) {
- System.out.println(prefix + targetModuleID);
- TargetModuleID[] subs = targetModuleID.getChildTargetModuleID();
- if (subs!=null) {
- for (int i=0;i<subs.length;i++) {
- System.out.println(" Child " + i + "\n" + subs[i]);
- }
- }
- }
-
- public void handleProgressEvent(javax.enterprise.deploy.spi.status.ProgressEvent progressEvent) {
- DeploymentStatus ds = progressEvent.getDeploymentStatus();
- System.out.println("Received Progress Event state " + ds.getState() + " msg = " + ds.getMessage());
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/jsr88/tester/build.xml b/appserver/tests/appserv-tests/devtests/deployment/jsr88/tester/build.xml
deleted file mode 100644
index 1ec69b2..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/tester/build.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="wstoejb" default="all" basedir=".">
-
- &commonBuild;
-
- <target name="prepare" depends="init">
- <mkdir dir="${build}" />
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="." destdir="${build}">
- <classpath>
- <pathelement path="${inst}/lib/j2ee.jar"/>
- <pathelement path="${inst}/lib/appserv-rt.jar"/>
- </classpath>
- </javac>
- </target>
-
-</project>
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 4fcbfbb..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/build.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="ear" default="all" basedir=".">
-
- &commonBuild;
-
- <target name="private-all">
- <ant dir="simple" target="private-all">
- <property name="build" value="${build}/simple"/>
- </ant>
- </target>
-
-</project>
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 fc2140b..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/Simple_Page.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<!--
-
- 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
-
--->
-
- <meta http-equiv="content-type"
- content="text/html; charset=ISO-8859-1">
- <title>Simple Page</title>
-</head>
-<body>
-<div style="text-align: center;">This is a very simple HTML page !<br>
-<br>
-<div style="text-align: left;"><br>
-<address>jerome.dochez@sun.com<br>
-</address>
-</div>
-</div>
-</body>
-</html>
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 45aef9e..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/build.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
-]>
-
-<project name="ear" default="all" basedir=".">
-
- &commonBuild;
- <property name="archivedir" value="${build}/archives"/>
-
- <target name="build-deployment-plan">
- <mkdir dir="${build}/plan"/>
- <copy file="sun-web.xml" tofile="${build}/plan/sun-web.xml"/>
- <jar destfile="${archivedir}/plan.jar" basedir="${build}/plan"/>
- </target>
-
- <target name="build-portable">
- <war destfile="${archivedir}/simple.war" webxml="web.xml">
- <fileset file="Simple_Page.html"/>
- </war>
- </target>
-
- <target name="undeploy">
- <antcall target="common.run.jsr88">
- <param name="command" value="undeploy"/>
- <param name="arg.list" value="simple"/>
- </antcall>
- </target>
-
- <target name="deploy-test" depends="setHttpPort">
- <mkdir dir="${archivedir}"/>
- <antcall target="declare-test">
- <param name="description" value="jsr88/war/simple deploy test"/>
- </antcall>
- <antcall target="build-portable"/>
- <antcall target="build-deployment-plan"/>
- <antcall target="common.run.jsr88">
- <param name="command" value="deploy"/>
- <param name="arg.list" value="true ${archivedir}/simple.war ${archivedir}/plan.jar"/>
- </antcall>
- <echo message="getting http://${http.host}:${depltest.port}/simple/Simple_Page.html"/>
- <condition property="success">
- <http url="http://${http.host}:${depltest.port}/simple/Simple_Page.html"/>
- </condition>
- <antcall target="testSuccess"><param name="log.id" value="1"/></antcall>
- <antcall target="testFailure"><param name="log.id" value="2"/></antcall>
- <!--
- <antcall target="undeploy"/>
- -->
- </target>
-
- <target name="redeploy-test" depends="setHttpPort">
- <antcall target="declare-test">
- <param name="description" value="jsr88/war/simple redeploy test"/>
- </antcall>
- <!--
- <antcall target="build-portable"/>
- <antcall target="build-deployment-plan"/>
- <antcall target="common.run.jsr88">
- <param name="command" value="deploy"/>
- <param name="arg.list" value="true ${archivedir}/simple.war ${archivedir}/plan.jar"/>
- </antcall>
- -->
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="simple ${archivedir}/simple.war ${archivedir}/plan.jar"/>
- </antcall>
-
- <echo message="getting http://${http.host}:${depltest.port}/simple/Simple_Page.html"/>
- <condition property="success">
- <http url="http://${http.host}:${depltest.port}/simple/Simple_Page.html"/>
- </condition>
- <antcall target="testSuccess"><param name="log.id" value="3"/></antcall>
- <antcall target="testFailure"><param name="log.id" value="4"/></antcall>
- <antcall target="undeploy"/>
- </target>
-
-
- <target name="private-all">
- <antcall target="deploy-test"/>
- <antcall target="redeploy-test"/>
- </target>
-
- <target name="testSuccess" if="success">
- <antcall target="processResult">
- <param name="result" value="0"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
- <target name="testFailure" unless="success">
- <antcall target="processResult">
- <param name="result" value="-1"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-</project>
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 30fcd26..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/sun-web.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <context-root>simple</context-root>
-</sun-web-app>
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 18b7c2f..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/jsr88/war/simple/web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>Simplistic Web Application</display-name>
- <welcome-file-list>
- <welcome-file>simple_page.html</welcome-file>
- </welcome-file-list>
-</web-app>
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 48657d5..5775746 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 @@
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
<classpath>
- <path location="${inst}/lib/j2ee.jar"/>
+ <path location="${inst}/lib/javaee.jar"/>
<path location="${build}"/>
</classpath>
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 d7a1793..0000000
--- 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<allTargets.length; i++) {
- if(allTargets[i].getName().equals("server")) {
- continue;
- }
- filteredTargets.add(allTargets[i]);
- }
- targets = (Target[])(filteredTargets.toArray(new Target[filteredTargets.size()]));
- } else {
- targets = allTargets;
- }
-
- for(int i=0; i<targets.length; i++) {
- log("DBG : Target " + 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<targetModuleIDs.length;i++) {
- dumpModulesIDs(prefix, targetModuleIDs[i]);
- }
- }
-
- protected void dumpModulesIDs(String prefix, TargetModuleID targetModuleID) {
- log(prefix + targetModuleID);
- TargetModuleID[] subs = targetModuleID.getChildTargetModuleID();
- if (subs!=null) {
- for (int i=0;i<subs.length;i++) {
- log(" Child " + i + " = " + subs[i]);
- }
- }
- }
-
- public TargetModuleID[] getApplications(ModuleType moduleType, Boolean running)
- throws Exception {
- TargetModuleID[] modules = null;
- if (running==null) {
- modules = dm.getAvailableModules(moduleType, targets);
- } else if (running.booleanValue()) {
- modules = dm.getRunningModules(moduleType, targets);
- } else {
- modules = dm.getNonRunningModules(moduleType, targets);
- }
-
- return modules;
- }
-
- public TargetModuleID[] getAllApplications(Boolean running)
- throws Exception {
- //log("222. getAllApplications, running = " + running);
- TargetModuleID[] ears = getApplications(ModuleType.EAR, running);
- TargetModuleID[] wars = getApplications(ModuleType.WAR, running);
- TargetModuleID[] cars = getApplications(ModuleType.CAR, running);
- TargetModuleID[] ejbs = getApplications(ModuleType.EJB, running);
- TargetModuleID[] rars = getApplications(ModuleType.RAR, running);
-
- List list = new ArrayList();
- for (int i = 0; i < ears.length; i++) { list.add(ears[i]); }
- for (int i = 0; i < wars.length; i++) { list.add(wars[i]); }
- for (int i = 0; i < cars.length; i++) { list.add(cars[i]); }
- for (int i = 0; i < ejbs.length; i++) { list.add(ejbs[i]); }
- for (int i = 0; i < rars.length; i++) { list.add(rars[i]); }
-
- TargetModuleID[] results = new TargetModuleID[list.size()];
- for (int i = 0; i < list.size(); i++) {
- results[i] = (TargetModuleID) list.get(i);
- }
- return results;
- }
-
- protected TargetModuleID[] findApplication(String moduleID, ModuleType moduleType, Boolean running)
- throws Exception {
- /*
- *The DeploymentFacility requires that start, stop, redeploy, and undeploy requests
- *operate on the same set of targets that the original deployment did. As written currently, this test
- *class always deploys to all available targets so the other functions should also
- *apply to all available targets.
- */
- TargetModuleID[] list = getApplications(moduleType, running);
- return filterTargetModuleIDsByModule(list, moduleID);
- }
-
- protected TargetModuleID[] findApplication(String moduleID, Boolean running)
- throws Exception {
- //log("111 trying to get everything, moduleid = " + moduleID + "; boolean = " + running);
- TargetModuleID[] list = getAllApplications(running);
- return filterTargetModuleIDsByModule(list, moduleID);
- }
-
- /**
- *Filter an array of TargetModuleID, keeping only those that match the specified module ID.
- *@param tmids the array of TargetModuleID to be filtered
- *@param moduleID the name of the module of interest
- *@return new TargetModuleID array, containing only the elements from the original array that match the module ID
- */
- protected TargetModuleID[] filterTargetModuleIDsByModule(TargetModuleID [] tmids, String moduleID) {
- List tmidsToUse = new ArrayList();
- /*
- *Add to the vector of TMIDs each TMID from getApplications that also matches the
- *module ID.
- */
- for (int i = 0; i < tmids.length; i++) {
- if (moduleID.equals(tmids[i].getModuleID())) {
- tmidsToUse.add(tmids[i]);
- }
- }
- return (TargetModuleID [])(tmidsToUse.toArray(new TargetModuleID[tmidsToUse.size()]));
- }
-
- public void listApplications(ModuleType moduleType, Boolean running)
- throws Exception {
- TargetModuleID[] modules = getApplications(moduleType, running);
- if (modules == null) {
- } else {
- for (int i = 0; i < modules.length; i++) {
- if (running==null) {
- dumpModulesIDs(" AVAILABLE ", modules[i]);
- } else if (running.booleanValue()) {
- dumpModulesIDs(" RUNNING ", modules[i]);
- } else {
- dumpModulesIDs(" NOT RUNNING ", modules[i]);
- }
- }
- }
- }
-
- private void invokeAppClient(ProgressObject po, TargetModuleID targetModuleID) {
- TargetModuleID[] subs = targetModuleID.getChildTargetModuleID();
- if (subs==null) {
- return;
- }
- for (int i=0;i<subs.length;i++) {
- if (subs[i].getModuleID().indexOf("client")!=-1) {
- log(" App Client child " + subs[i]);
- ClientConfiguration cc = po.getClientConfiguration(subs[i]);
- try {
- cc.execute();
- } catch(Throwable t) {
- t.printStackTrace();
- }
- }
- }
- }
-
-
- public static void main(String[] args) {
-
- int finalExitValue = 0;
-
- if (args.length == 0 || "help".equals(args[0])) {
- usage();
- System.exit(1);
- }
- if (args.length < 5) {
- usage();
- System.exit(1);
- }
-
- JSR88Deployer deployer = new JSR88Deployer(args[1], args[2], args[3]);
- if ("deploy".equals(args[0]) || "deploy-stream".equals(args[0])) {
- if (args.length < 6) {
- usage();
- System.exit(1);
- }
- boolean useStream = "deploy-stream".equals(args[0]);
- 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);
- }
- 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("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 <JSR88.URI> <admin-user> <admin-password> [command-parameters]");
- System.out.println(" where command is one of [deploy<-stream> | redeploy<-stream> | undeploy | start | stop | list]");
- System.out.println(" where <JSR88.URI> is: deployer:Sun:AppServer::${admin.host}:${admin.port} for PE");
- System.out.println(" where <JSR88.URI> is: deployer:Sun:AppServer::${admin.host}:${admin.port}:https for EE");
- System.out.println(" where command-parameters are as follows");
- System.out.println(" deploy: <startByDefault> <archiveFile> [<deploymentFile>]");
- System.out.println(" deploy-stream: <startByDefault> <archiveFile> [<deploymentFile>]");
- System.out.println(" deploy-stream-withtype: <startByDefault> <archiveFile> <moduleType> [<deploymentFile>]");
- System.out.println(" redeploy: <moduleID> <archiveFile> [<deploymentFile>]");
- System.out.println(" redeploy-stream: <moduleID> <archiveFile> [<deploymentFile>]");
- 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 826e568..0000000
--- 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<String> componentClassNames = new HashSet<String>();
-
- 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 a656f57..0000000
--- 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 <i>set</i>, 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 712feef..0000000
--- 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 6977f39..0000000
--- 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 b565fed..0000000
--- 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<String> 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.<SJSASFactory>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<Class> 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 69cee32..0000000
--- 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 8c4d18f..6fbadf4 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 @@
<antcall target="undeploy.version">
<param name="versionExpression" value="${identifier.2}"/>
</antcall>
-
- <!-- deploys by using the 1st jsr88 api -->
- <antcall target="deploy.version.jsr88">
- <param name="versionExpression" value="${identifier.1}"/>
- <param name="xmlVersionIdentifier" value="${identifier.1}"/>
- </antcall>
-
- <!-- test that the deployed version running is ${identifier.1} -->
- <antcall target="test.registred">
- <param name="versionExpression" value="${identifier.1}"/>
- <param name="description" value="xml.version(3) deploy jsr88"/>
- </antcall>
-
- <!-- deploys by using the 1st jsr88 api (file mode)-->
- <antcall target="deploy.version.jsr88">
- <param name="versionExpression" value="${identifier.4}"/>
- <param name="xmlVersionIdentifier" value="${identifier.4}"/>
- </antcall>
-
- <!-- test that the deployed version running is ${identifier.4} -->
- <antcall target="test.registred">
- <param name="versionExpression" value="${identifier.4}"/>
- <param name="description" value="xml.version(4) deploy jsr88"/>
- </antcall>
-
- <!-- redeploys by using the 1st jsr88 api (File mode) -->
- <antcall target="redeploy.version.jsr88">
- <param name="versionExpression" value="${identifier.4}"/>
- <param name="xmlVersionIdentifier" value="${identifier.4}"/>
- </antcall>
-
- <!-- test that the deployed version running is ${identifier.4} -->
- <antcall target="test.registred">
- <param name="versionExpression" value="${identifier.4}"/>
- <param name="description" value="xml.version(5) redeploy jsr88"/>
- </antcall>
-
- <antcall target="autodeploy.scenario">
- <param name="description" value="xml.version(6) autodeploy"/>
- </antcall>
-
- <!-- deploys by using the 2nd jsr88 api (InputStream mode) -->
- <antcall target="deploy.version-stream.jsr88">
- <param name="versionExpression" value="${identifier.3}"/>
- <param name="xmlVersionIdentifier" value="${identifier.3}"/>
- </antcall>
-
- <!-- test that the deployed version running is ${identifier.3} -->
- <antcall target="test.registred">
- <param name="versionExpression" value="${identifier.3}"/>
- <param name="description" value="xml.version(7) deploy-stream jsr88"/>
- </antcall>
-
- <!-- redeploys by using the 2nd jsr88 api (InputStream mode) -->
- <antcall target="redeploy.version-stream.jsr88">
- <param name="versionExpression" value="${identifier.3}"/>
- <param name="xmlVersionIdentifier" value="${identifier.2}"/>
- </antcall>
-
- <!-- test that the deployed version running is ${identifier.3} -->
- <antcall target="test.registred">
- <param name="versionExpression" value="${identifier.3}"/>
- <param name="description" value="xml.version(8) deploy-stream jsr88"/>
- </antcall>
</target>
<!--
diff --git a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-appclient/META-INF/glassfish-application-client.xml b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-appclient/META-INF/glassfish-application-client.xml
index 27f3d2e..b49a6be 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-appclient/META-INF/glassfish-application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/simple-versioned-appclient/META-INF/glassfish-application-client.xml
@@ -19,5 +19,5 @@
-->
<glassfish-application-client>
- <version-identifier>RC-1.0.0</version-identifier>
+ <version-identifier></version-identifier>
</glassfish-application-client>
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 255df93..5fc9642 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 @@
-->
<glassfish-application>
- <version-identifier>RC-1.0.0</version-identifier>
+ <version-identifier>ALPHA-1.0.0</version-identifier>
</glassfish-application>
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 b943699..54e558c 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.
-->
- <property name="testPackage" value="versionedAppClient"/>
- <property name="gfDDFile" value="glassfish-application.xml"/>
- <property name="gfDDDir" value="META-INF"/>
+ <property name="testPackage" value="versionedAppClient"/>
+ <property name="gfDDFile" value="glassfish-application.xml"/>
+ <property name="gfDDDir" value="META-INF"/>
- <loadproperties srcFile="../build.properties"/>
+ <loadproperties srcFile="../build.properties"/>
- <!-- link: the context root of the servlet -->
- <property name="link" value="/${untaggedName}"/>
- <!-- untaggedName: the name of the application, its the version's prefix -->
- <property name="untaggedName" value="simple-versioned-ear"/>
- <!-- packaging: the file archive's extention -->
- <property name="packaging" value="ear"/>
+ <!-- link: the context root of the servlet -->
+ <property name="link" value="/${untaggedName}"/>
+ <!-- untaggedName: the name of the application, its the version's prefix -->
+ <property name="untaggedName" value="simple-versioned-ear"/>
+ <!-- packaging: the file archive's extention -->
+ <property name="packaging" value="ear"/>
- <!-- the module embedded in the EAR archive -->
- <property name="moduleUntaggedName" value="simple-versioned-servlet"/>
- <property name="modulePackaging" value="war"/>
- <property name="moduleBuildDir" value="../${moduleUntaggedName}"/>
+ <!-- the module embedded in the EAR archive -->
+ <property name="moduleUntaggedName" value="simple-versioned-servlet"/>
+ <property name="modulePackaging" value="war"/>
+ <property name="moduleBuildDir" value="../${moduleUntaggedName}"/>
- <target name="process.servletName" depends="process.versionExpression">
- <condition property="servletAppName" value="${moduleUntaggedName}:${versionExpression}" else="${moduleUntaggedName}">
- <not><equals arg1="${versionExpression}" arg2=""/></not>
- </condition>
- </target>
+ <target name="process.servletName" depends="process.versionExpression">
+ <condition property="servletAppName" value="${moduleUntaggedName}:${versionExpression}" else="${moduleUntaggedName}">
+ <not>
+ <equals arg1="${versionExpression}" arg2=""/>
+ </not>
+ </condition>
+ </target>
- <target name="prepare" depends="init">
- <mkdir dir="${build}"/>
- </target>
+ <target name="prepare" depends="init">
+ <mkdir dir="${build}"/>
+ </target>
- <!-- assemble: package the ear archive -->
- <target name="assemble" depends="prepare,process.servletName">
- <property name="moduleUntaggedArchive" value="${build}/${moduleUntaggedName}.${modulePackaging}"/>
- <delete file="${moduleUntaggedArchive}" failonerror="false"/>
- <ant dir="${moduleBuildDir}" target="create.version" inheritAll="false">
- <property name="versionExpression" value="${versionExpression}"/>
- <property name="xmlVersionIdentifier" value=""/>
- </ant>
- <move file="${build}/${servletAppName}.${modulePackaging}" tofile="${moduleUntaggedArchive}" failonerror="false"/>
- <property name="xmlFile" value="${gfDDDir}/${gfDDFile}"/>
- <antcall target="generate.xml.identifier"/>
- <jar destfile="${archiveFile}">
- <fileset dir="." includes="META-INF/*.xml"/>
- <fileset dir="${build}" includes="${moduleUntaggedName}.${modulePackaging}"/>
- </jar>
- <delete file="${moduleUntaggedArchive}" failonerror="false"/>
- </target>
+ <!-- assemble: package the ear archive -->
+ <target name="assemble" depends="prepare,process.servletName">
+ <property name="moduleUntaggedArchive" value="${build}/${moduleUntaggedName}.${modulePackaging}"/>
+ <delete file="${moduleUntaggedArchive}" failonerror="false"/>
+ <ant dir="${moduleBuildDir}" target="create.version" inheritAll="false">
+ <property name="versionExpression" value="${versionExpression}"/>
+ <property name="xmlVersionIdentifier" value=""/>
+ </ant>
+ <move file="${build}/${servletAppName}.${modulePackaging}" tofile="${moduleUntaggedArchive}" failonerror="false"/>
+ <property name="xmlFile" value="${gfDDDir}/${gfDDFile}"/>
+ <antcall target="generate.xml.identifier"/>
+ <jar destfile="${archiveFile}">
+ <fileset dir="." includes="META-INF/*.xml" />
+ <fileset dir="${build}" includes="${moduleUntaggedName}.${modulePackaging}" />
+ </jar>
+ <delete file="${moduleUntaggedArchive}" failonerror="false"/>
+ </target>
-<!--
- Currently, only the scenarios processing test.registred and test.notregistred
- are supported.
--->
- <target name="main-all">
- <antcall target="xml.version.information"/>
- <antcall target="clean.scenario"/>
- </target>
+ <!-- Currently, only the scenarios processing test.registred and test.notregistred are supported. -->
+ <target name="main-all">
+ <antcall target="xml.version.information"/>
+ <antcall target="clean.scenario"/>
+ </target>
</project>
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 cef074d..2cd578f 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 @@
-->
<glassfish-ejb-jar>
- <version-identifier>RC-1.0.0</version-identifier>
+ <version-identifier>ALPHA-1.0.0</version-identifier>
</glassfish-ejb-jar>
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 77c0513..7488e71 100644
--- a/appserver/tests/appserv-tests/devtests/deployment/versioning/versioning-common.xml
+++ b/appserver/tests/appserv-tests/devtests/deployment/versioning/versioning-common.xml
@@ -106,42 +106,6 @@
</target>
<!--
- Deploys the given version with JSR88 API that use a File
- @param ${versionExpression} (optional)
- @param ${xmlVersionIdentifier} (optional)
--->
-<target name="deploy.version.jsr88" depends="prepare.version.jsr88,common.deploy.jsr88"/>
-
-<!--
- Deploys the given version with the JSR88 API that use an Inputstream.
- @param ${versionExpression} (optional)
- @param ${xmlVersionIdentifier} (optional)
--->
-<target name="deploy.version-stream.jsr88" depends="prepare.version.jsr88,common.deploy-stream.jsr88"/>
-
-<!--
- Redeploys the given version with JSR88 API that use a File
- @param ${versionExpression} (optional)
--->
-<target name="redeploy.version.jsr88" depends="prepare.version.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="true ${arg.list}"/>
- </antcall>
-</target>
-
-<!--
- Redeploys the given version with the JSR88 API that use a Inputstream.
- @param ${versionExpression} (optional)
--->
-<target name="redeploy.version-stream.jsr88" depends="prepare.version.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy-stream"/>
- <param name="arg.list" value="true ${arg.list}"/>
- </antcall>
-</target>
-
-<!--
Deploys the given version with autodeploy directory, available only in PE mode
@param ${versionExpression} (optional)
@param ${xmlVersionIdentifier} (optional)
@@ -416,9 +380,6 @@
<property name="arg.list" value="get-client-stubs --appname=${appName} ${stubsPath}"/>
<property name="desc" value="${description}"/>
</target>
-<target name="prepare.version.jsr88" depends="process.appname,create.version">
- <property name="arg.list" value="${build}/${appName}.${packaging}"/>
-</target>
<target name="prepare.appclient.preparator">
<property name="classname" value="${preparatorClassName}"/>
<property name="outputLog" value="${build}/getJwsClientStubs.log"/>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/EnvEntryInfo.java b/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/EnvEntryInfo.java
deleted file mode 100644
index 85a34dc..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/EnvEntryInfo.java
+++ /dev/null
@@ -1,117 +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 appmgttest;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-public class EnvEntryInfo {
-
- /** env pattern is name(class)=value//desc */
- private static final String BRIEF_PATTERN_STRING = "([^\\(]*)\\(([^\\)]*)\\)=(.*?)";
- private static final String FULL_PATTERN_STRING = BRIEF_PATTERN_STRING + "//(.*)";
-
- private static final Pattern BRIEF_PATTERN = Pattern.compile(BRIEF_PATTERN_STRING);
- private static final Pattern FULL_PATTERN = Pattern.compile(FULL_PATTERN_STRING);
-
- private final String name;
- private final String className;
- private final String value;
- private final String desc;
-
- public EnvEntryInfo(final String name, final String cl, final String value, final String desc) {
- super();
- this.name = name;
- this.className = cl;
- this.value = value;
- this.desc = desc;
- }
-
- public EnvEntryInfo(final String name, final String cl, final String value) {
- this(name, cl, value, null);
- }
-
- public static EnvEntryInfo parseFull(final String expr) throws ClassNotFoundException {
- return parse(expr, FULL_PATTERN);
- }
-
- public static EnvEntryInfo parseBrief(final String expr) throws ClassNotFoundException {
- return parse(expr, BRIEF_PATTERN);
- }
-
-
-
- private static EnvEntryInfo parse(final String expr, final Pattern p) throws ClassNotFoundException {
- Matcher m = p.matcher(expr);
- EnvEntryInfo result = null;
- if (m.matches()) {
- result = new EnvEntryInfo(m.group(1), m.group(2),
- m.group(3), m.groupCount() > 3 ? m.group(4) : null);
- }
- return result;
- }
-
- public String name() {
- return name;
- }
-
- @Override
- public String toString() {
- return String.format("%1$s(%2$s)=%3$s//\"%4$s\"", name, className, value, desc);
- }
-
- public String toStringBrief() {
- return String.format("%1$s(%2$s)=%3$s", name, className, value);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final EnvEntryInfo other = (EnvEntryInfo) obj;
- if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
- return false;
- }
- if (this.className != other.className && (this.className == null || !this.className.equals(other.className))) {
- return false;
- }
- if ((this.value == null) ? (other.value != null) : !this.value.equals(other.value)) {
- return false;
- }
- if ((this.desc == null) ? (other.desc != null) : !this.desc.equals(other.desc)) {
- return false;
- }
- return true;
- }
-
- @Override
- public int hashCode() {
- int hash = 3;
- hash = 67 * hash + (this.name != null ? this.name.hashCode() : 0);
- hash = 67 * hash + (this.className != null ? this.className.hashCode() : 0);
- hash = 67 * hash + (this.value != null ? this.value.hashCode() : 0);
- hash = 67 * hash + (this.desc != null ? this.desc.hashCode() : 0);
- return hash;
- }
-
-
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/ParamInfo.java b/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/ParamInfo.java
deleted file mode 100644
index 8ab5cb7..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/ParamInfo.java
+++ /dev/null
@@ -1,114 +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 appmgttest;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- *
- * @author tjquinn
- */
-public class ParamInfo {
-
- /** env pattern is name(class)=value//desc */
- private static final String BRIEF_PATTERN_STRING = "([^=]*)=(.*?)";
- private static final String FULL_PATTERN_STRING = BRIEF_PATTERN_STRING + "//(.*)";
-
- private static final Pattern BRIEF_PATTERN = Pattern.compile(BRIEF_PATTERN_STRING);
- private static final Pattern FULL_PATTERN = Pattern.compile(FULL_PATTERN_STRING);
-
- private final String name;
- private final String value;
- private final String desc;
-
- public ParamInfo(final String name, final String value, final String desc) {
- super();
- this.name = name;
- this.value = value;
- this.desc = desc;
- }
-
- public ParamInfo(final String name, final String value) {
- this(name, value, null);
- }
-
- public static ParamInfo parseFull(final String expr) throws ClassNotFoundException {
- return parse(expr, FULL_PATTERN);
- }
-
- public static ParamInfo parseBrief(final String expr) throws ClassNotFoundException {
- return parse(expr, BRIEF_PATTERN);
- }
-
-
-
- private static ParamInfo parse(final String expr, final Pattern p) throws ClassNotFoundException {
- Matcher m = p.matcher(expr);
- ParamInfo result = null;
- if (m.matches()) {
- result = new ParamInfo(m.group(1),
- m.group(2), m.groupCount() > 2 ? m.group(3) : null);
- }
- return result;
- }
-
- public String name() {
- return name;
- }
-
- @Override
- public String toString() {
- return String.format("%1s$=%2$s//\"%3$s\"", name, value, desc);
- }
-
- public String toStringBrief() {
- return String.format("%1$s=%2$s", name, value);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (obj == null) {
- return false;
- }
- if (getClass() != obj.getClass()) {
- return false;
- }
- final ParamInfo other = (ParamInfo) obj;
- if ((this.name == null) ? (other.name != null) : !this.name.equals(other.name)) {
- return false;
- }
- if ((this.value == null) ? (other.value != null) : !this.value.equals(other.value)) {
- return false;
- }
- if ((this.desc == null) ? (other.desc != null) : !this.desc.equals(other.desc)) {
- return false;
- }
- return true;
- }
-
- @Override
- public int hashCode() {
- int hash = 3;
- hash = 97 * hash + (this.name != null ? this.name.hashCode() : 0);
- hash = 97 * hash + (this.value != null ? this.value.hashCode() : 0);
- hash = 97 * hash + (this.desc != null ? this.desc.hashCode() : 0);
- return hash;
- }
-
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/TestClient.java b/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/TestClient.java
deleted file mode 100644
index 81cc56a..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/TestClient.java
+++ /dev/null
@@ -1,180 +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 appmgttest;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * Command-line args should be:
- * URL to use in accessing the servlet
- * expect positive result (true or false)
- * one or more of the two following formats:
- * -env name(class)=value//"desc"
- * -param name=value//"desc"
- *
- * @author tjquinn
- */
-public class TestClient {
-
- /**
- * @param args the command line arguments
- */
- public static void main(String[] args) {
- try {
- new TestClient().run(args);
- } catch (Exception e) {
- e.printStackTrace();
- System.exit(1);
- }
- }
-
- private void run(String[] args) {
-
- String url = args[0];
- boolean testPositive = (Boolean.valueOf(args[1])).booleanValue();
- try {
- log("Test: devtests/deployment/war/appmgt");
- final Map<String,EnvEntryInfo> envs = new HashMap<String,EnvEntryInfo>();
- final Map<String,ParamInfo> params = new HashMap<String,ParamInfo>();
- int code = invokeServlet(url, envs, params);
-
- /*
- * We always expect the servlet to respond.
- */
- report(code, true);
-
- boolean entireTestPassed = true;
-
- String nextTestType = null;
- for (int i = 2; i < args.length; i++) {
- final String arg = args[i];
- if (arg.startsWith("-")) {
- nextTestType = arg;
- } else {
- if (nextTestType.equals("-env")) {
- EnvEntryInfo target = EnvEntryInfo.parseBrief(arg);
- EnvEntryInfo match = envs.get(target.name());
- entireTestPassed &= reportCheck(target, match, "env-entry", target.name());
- } else if (nextTestType.equals("-param")) {
- ParamInfo target = ParamInfo.parseBrief(arg);
- ParamInfo match = params.get(target.name());
- entireTestPassed &= reportCheck(target, match, "context-param", target.name());
- }
- }
- }
- if (entireTestPassed == testPositive) {
- pass();
- } else {
- fail();
- }
-
- } catch (IOException ex) {
- if (testPositive) {
- ex.printStackTrace();
- fail();
- } else {
- log("Caught EXPECTED IOException: " + ex);
- pass();
- }
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
- }
-
- private boolean reportCheck(Object target, Object match, final String testType, final String targetName) {
- boolean result;
- if (match == null) {
- System.err.println("No matching " + testType + " for target name " + targetName);
- result = false;
- } else if ( ! match.equals(target)) {
- System.err.println("Target " + target.toString() + " != match " + match.toString());
- result = false;
- } else {
- result = true;
- }
- return result;
- }
-
- private int invokeServlet(final String url, final Map<String,EnvEntryInfo> envs,
- final Map<String,ParamInfo> params) throws Exception {
- log("Invoking URL = " + url);
- URL u = new URL(url);
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- if (code == 200) {
- BufferedReader br = new BufferedReader(new InputStreamReader(c1.getInputStream()));
- String line;
- System.out.println("From servlet:");
- while ((line = br.readLine()) != null) {
- System.out.println(" " + line);
- if (line.startsWith("-env")) {
- final EnvEntryInfo env = EnvEntryInfo.parseBrief(line.substring("-env".length() + 1));
- envs.put(env.name(), env);
- } else if (line.startsWith("-param")) {
- final ParamInfo param = ParamInfo.parseBrief(line.substring("-param".length() + 1));
- params.put(param.name(), param);
- } else {
- System.err.println("Unrecognized response line from servlet - continuing:");
- System.err.println(">>" + line);
- }
- }
-
- System.out.println("servlet done");
- br.close();
- }
- 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);
- }
- } else {
- if(code != 200) { //expect return code !200
- log("Correct return code: " + code);
- } 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/appmgt");
- System.exit(0);
- }
-
- private void fail() {
- log("FAILED: devtests/deployment/war/appmgt");
- System.exit(1);
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/TestServlet.java b/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/TestServlet.java
deleted file mode 100644
index 790011e..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/appmgttest/TestServlet.java
+++ /dev/null
@@ -1,119 +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 appmgttest;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Enumeration;
-import javax.naming.Binding;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingEnumeration;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-/**
- *
- * @author tjquinn
- */
-public class TestServlet extends HttpServlet {
-
- /**
- * Processes requests for both HTTP <code>GET</code> and <code>POST</code> 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/plain;charset=UTF-8");
- PrintWriter out = response.getWriter();
- try {
- /*
- * Write the env-entry information.
- */
- Context ctx = new InitialContext();
- for (NamingEnumeration<Binding> e = ctx.listBindings("java:comp/env"); e.hasMore(); ) {
- Binding b = e.next();// java:comp/env/xxx
- final String name = b.getName().substring("java:comp/env/".length());
- final String cl = b.getClassName();
- final Object o = b.getObject();
- EnvEntryInfo env = new EnvEntryInfo(name, cl, o.toString());
- out.println("-env " + env.toStringBrief());
- }
-
- /*
- * Write the context-param info.
- */
- final ServletContext servletContext = getServletContext();
- for (Enumeration<String> names = servletContext.getInitParameterNames(); names.hasMoreElements();) {
- final String name = names.nextElement();
- final String value = servletContext.getInitParameter(name);
- final ParamInfo param = new ParamInfo(name, value);
- out.println("-param " + param.toStringBrief());
- }
-
- out.flush();
-
- } catch (Exception e) {
- e.printStackTrace(out);
- } finally {
- out.close();
- }
- }
-
- // <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
- * Handles the HTTP <code>GET</code> 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 <code>POST</code> 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 "Retrieves current env-entry and context-param settings";
- }// </editor-fold>
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/build.xml
deleted file mode 100644
index c23982f..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/build.xml
+++ /dev/null
@@ -1,405 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="appMgtTestApp" default="usage" basedir=".">
-
- &commonBuild;
-
- <property name="contextRoot" value="war"/>
- <property name="testName" value="appmgt"/>
-
- <property name="original.config.client.args" value="-param builtin=in-app -env builtin(java.lang.String)=in-app"/>
- <property name="customized.config.client.args" value="-env env1(java.lang.String)=env-val1 -param par1=par-val1"/>
-
- <target name="prepare" depends="init">
- <property name="portable.war" value="${build}/${testName}-portable.war"/>
- <property name="all.war" value="${build}/${testName}.war"/>
- <property name="deployplan.jar" value="${build}/${testName}-deployplan.jar"/>
- <mkdir dir="${build}"/>
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="."
- destdir="${build}"
- debug="on"
- failonerror="true">
- <classpath refid="gfv3.classpath" />
- </javac>
- </target>
-
- <target name="assemble" depends="compile">
- <war destfile="${portable.war}" webxml="web.xml">
- <classes dir="${build}"/>
- </war>
- <jar destfile="${deployplan.jar}">
- <fileset dir="${basedir}" includes="sun-web.xml"/>
- </jar>
-
- <war destfile="${all.war}" webxml="web.xml">
- <webinf dir="." includes="sun-web.xml"/>
- <classes dir="${build}"/>
- </war>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="${all.war}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="${all.war}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="v3.redeploy.asadmin" depends="prepare">
- <antcall target="common.v3.redeploy.asadmin">
- <param name="arg.list"
- value="--name ${testName} ${all.war}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="enable.asadmin">
- <antcall target="common.enable.asadmin">
- <param name="arg.list"
- value="${testName}"/>
- </antcall>
- </target>
-
- <target name="disable.asadmin">
- <antcall target="common.disable.asadmin">
- <param name="arg.list"
- value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.war} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="appmgt-portable ${portable.war} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="appmgt-portable"/>
- </antcall>
- </target>
-
- <target name="start.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="start"/>
- <param name="arg.list" value="appmgt-portable"/>
- </antcall>
- </target>
-
- <target name="stop.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="stop"/>
- <param name="arg.list" value="appmgt-portable"/>
- </antcall>
- </target>
-
- <target name="do.asadmin">
- <antcall target="common.run.asadmin">
- <param name="arg.list" value="${command} ${arg.list} ${testName}"/>
- </antcall>
- </target>
-
- <target name="run" depends="run.positive"/>
-
- <target name="run.positive" depends="setHttpPort">
- <antcall target="common.run.positive">
- <param name="link" value="${contextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="run.negative" depends="setHttpPort">
- <antcall target="common.run.negative">
- <param name="link" value="${contextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="init">
- <echo message="TestClient ${arg.list}"/>
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="appmgttest.TestClient"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
-
- <classpath>
- <path location="${inst}/lib/j2ee.jar"/>
- <path location="${build}"/>
- </classpath>
-
- <arg line="${arg.list}"/>
- </javaWithResult>
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all" depends="private-all-pe"/>
-
- <target name="private-all-pe" if="PE">
-
- <antcall target="assemble"/>
-
- <antcall target="deploy.asadmin"/>
-
- <!--
- Note that the client asks the servlet to report all its
- env-entries and all context-params. Then the client uses the
- client command-line args to search for matching entries that the
- servlet returned. We expect positive results for env-entries or
- context-params defined EITHER in the web app OR in the customizations,
- unless of course the customizations request ignoreDescriptorItem in
- which case the corresponding descriptor item should not appear in
- the data the servlet sends to the client.
- -->
- <antcall target="check.original.config.with.no.customization">
- <param name="log.id" value="1"/>
- </antcall>
-
- <!--
- Now create a new env entry and context param via customization.
- -->
-
- <antcall target="do.asadmin">
- <param name="command" value="set-web-env-entry"/>
- <param name="arg.list" value="--name=env1 --type=java.lang.String --value=env-val1"/>
- </antcall>
-
- <antcall target="do.asadmin">
- <param name="command" value="set-web-context-param"/>
- <param name="arg.list" value="--name=par1 --value=par-val1"/>
- </antcall>
-
- <antcall target="disable.asadmin"/>
- <antcall target="enable.asadmin"/>
-
- <antcall target="check.original.config.with.additive.customization">
- <param name="log.id" value="2"/>
- </antcall>
-
- <!--
- Further customize by suppressing the original env-entry and
- context-param but leaving the added ones.
- -->
- <antcall target="do.asadmin">
- <param name="command" value="set-web-env-entry"/>
- <param name="arg.list" value="--name builtin --ignoreDescriptorItem=true"/>
- </antcall>
-
- <antcall target="do.asadmin">
- <param name="command" value="set-web-context-param"/>
- <param name="arg.list" value="--name=builtin --ignoreDescriptorItem=true"/>
- </antcall>
-
- <!--
- Restart the app so the config changes will have effect.
- -->
- <antcall target="disable.asadmin"/>
- <antcall target="enable.asadmin"/>
-
- <antcall target="check.added.customization.and.suppressed.original.config">
- <param name="log.id" value="3"/>
- </antcall>
-
- <!--
- Make sure the results are the same after a redeployment.
- -->
- <antcall target="v3.redeploy.asadmin"/>
-
- <antcall target="check.added.customization.and.suppressed.original.config">
- <param name="log.id" value="4"/>
- </antcall>
-
- <!--
- Redeploy using deploy force=true. The customizations should
- survive.
- -->
-
- <antcall target="redeploy.asadmin"/>
-
- <antcall target="check.added.customization.and.suppressed.original.config">
- <param name="log.id" value="5"/>
- </antcall>
-
- <!--
- Now unset the customizations and then make sure that the behavior
- is back to how it was immediately after the initial deployment.
- -->
-
- <antcall target="do.asadmin">
- <param name="command" value="unset-web-env-entry"/>
- <param name="arg.list" value="--name=env1"/>
- </antcall>
-
- <antcall target="do.asadmin">
- <param name="command" value="unset-web-env-entry"/>
- <param name="arg.list" value="--name builtin"/>
- </antcall>
-
- <antcall target="do.asadmin">
- <param name="command" value="unset-web-context-param"/>
- <param name="arg.list" value="--name=par1"/>
- </antcall>
-
- <antcall target="do.asadmin">
- <param name="command" value="unset-web-context-param"/>
- <param name="arg.list" value="--name=builtin"/>
- </antcall>
-
- <!-- Restart so the changes become effective. -->
- <antcall target="disable.asadmin"/>
- <antcall target="enable.asadmin"/>
-
- <antcall target="check.original.config.with.no.customization">
- <param name="log.id" value="6"/>
- </antcall>
-
- <!--
- The app is still deployed. Undeploy it then deploy it again.
- The customizations should have vanished.
- -->
-
- <antcall target="undeploy.asadmin"/>
-
- <antcall target="deploy.asadmin"/>
-
- <antcall target="check.original.config.with.no.customization">
- <param name="log.id" value="7"/>
- </antcall>
-
-
- <!-- undeploy for the last time. We're done. -->
- <antcall target="undeploy.asadmin"/>
-
-
- </target>
-
- <!--
- Makes sure the app's configuration matches how it
- was when first deployed, before any customization.
- -->
- <target name="check.original.config.with.no.customization">
- <antcall target="run.positive">
- <param name="log.id" value="${log.id}.1"/>
- <param name="desc" value="war/appmgt Check app's original config [${log.id}.1]"/>
- <param name="extra.args" value="${original.config.client.args}"/>
- </antcall>
-
- <antcall target="run.negative">
- <param name="log.id" value="${log.id}.2"/>
- <param name="desc" value="war/appmgt Make sure a non-existent customization is absent [${log.id}.2]"/>
- <param name="extra.args" value="-env notThere(java.lang.String)=in-app"/>
- </antcall>
-
- <antcall target="run.negative">
- <param name="log.id" value="${log.id}.3"/>
- <param name="desc" value="war/appmgt Make sure a customization used during the test is absent when it should be [${log.id}.3]"/>
- <param name="extra.args" value="${customized.config.client.args}"/>
- </antcall>
- </target>
-
- <!--
- Make sure that the customizations are
- reflected with the app's original config.
- -->
-
- <target name="check.original.config.with.additive.customization">
- <antcall target="run.positive">
- <param name="log.id" value="${log.id}.1"/>
- <param name="desc" value="war/appmgt Check app's original config plus additive customization [${log.id}.1]"/>
- <param name="extra.args" value="${original.config.client.args} ${customized.config.client.args}"/>
- </antcall>
-
- </target>
-
- <target name="check.additive.customization">
- <antcall target="run.positive">
- <param name="log.id" value="${log.id}.1"/>
- <param name="desc" value="war/appmgt Check for added env and param customization [${log.id}.1]"/>
- <param name="extra.args" value="${customized.config.client.args}"/>
- </antcall>
- </target>
-
- <target name="check.added.customization.and.suppressed.original.config">
- <antcall target="check.additive.customization">
- <param name="log.id" value="${log.id}.1"/>
- </antcall>
- <antcall target="check.suppressed.original.config">
- <param name="log.id" value="${log.id}.2"/>
- </antcall>
- </target>
-
- <target name="check.suppressed.original.config">
- <antcall target="run.negative">
- <param name="log.id" value="${log.id}.1"/>
- <param name="desc" value="war/appmgt Check for env-entry in the web app's descr being (correctly) ignored [${log.id}.1]"/>
- <param name="extra.args" value="-env builtin(java.lang.String)=in-app"/>
- </antcall>
-
- <antcall target="run.negative">
- <param name="log.id" value="${log.id}.2"/>
- <param name="desc" value="war/appmgt Check for context-param in the web app's descr being (correctly) ignored [${log.id}.2]"/>
- <param name="extra.args" value="-param builtin=in-app"/>
- </antcall>
- </target>
-
- <target name="clobber" depends="clean">
- <delete file="${portable.war}"/>
- <delete file="${all.war}"/>
- <delete file="${deployplan.war}"/>
- <delete dir="${build}"/>
- </target>
-
- <target name="usage">
- <antcall target="all"/>
- </target>
-</project>
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 a7268e3..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/nbproject/project.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.ant.freeform</type>
- <configuration>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
- <name>appMgtTestApp</name>
- </general-data>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/2">
- <!-- Do not use Project Properties customizer when editing this file manually. -->
- <name>appMgtTestApp</name>
- <properties/>
- <folders>
- <source-folder>
- <label>appmgt</label>
- <location>.</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- <source-folder>
- <label>appmgt</label>
- <type>doc_root</type>
- <location>.</location>
- </source-folder>
- <source-folder>
- <label>appmgt</label>
- <type>web_inf</type>
- <location>.</location>
- </source-folder>
- <source-folder>
- <label>appmgt</label>
- <type>java</type>
- <location>.</location>
- <encoding>UTF-8</encoding>
- </source-folder>
- <build-folder>
- <location>../../build</location>
- </build-folder>
- </folders>
- <ide-actions>
- <action name="build">
- <target>compile</target>
- </action>
- <action name="clean">
- <target>clean</target>
- </action>
- <action name="run">
- <target>temprun</target>
- </action>
- <action name="test">
- <target>declare-test</target>
- </action>
- <action name="redeploy">
- <target>deploy.asadmin</target>
- </action>
- <action name="rebuild">
- <target>clean</target>
- <target>compile</target>
- </action>
- </ide-actions>
- <export>
- <type>folder</type>
- <location>../../build</location>
- <build-target>compile</build-target>
- </export>
- <view>
- <items>
- <source-folder style="tree">
- <label>Web Pages</label>
- <location>.</location>
- </source-folder>
- <source-folder style="tree">
- <label>WEB-INF Content</label>
- <location>.</location>
- </source-folder>
- <source-folder style="packages">
- <label>appmgt</label>
- <location>.</location>
- </source-folder>
- <source-file>
- <location>build.xml</location>
- </source-file>
- </items>
- <context-menu>
- <ide-action name="build"/>
- <ide-action name="rebuild"/>
- <ide-action name="clean"/>
- <ide-action name="run"/>
- <ide-action name="redeploy"/>
- <ide-action name="test"/>
- </context-menu>
- </view>
- <subprojects/>
- </general-data>
- <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
- <compilation-unit>
- <package-root>.</package-root>
- <classpath mode="compile">../../build</classpath>
- <built-to>../../build</built-to>
- <source-level>1.5</source-level>
- </compilation-unit>
- </java-data>
- <web-data xmlns="http://www.netbeans.org/ns/freeform-project-web/2">
- <web-module>
- <doc-root>.</doc-root>
- <classpath/>
- <context-path>/war/appmgt</context-path>
- <j2ee-spec-level>1.5</j2ee-spec-level>
- <web-inf>.</web-inf>
- </web-module>
- </web-data>
- </configuration>
-</project>
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 6fc6e96..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/sun-web.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-web-app error-url="">
- <context-root>/war/appmgt</context-root>
- <class-loader delegate="true"/>
- <jsp-config>
- <property name="keepgenerated" value="true">
- <description>Keep a copy of the generated servlet class' java code.</description>
- </property>
- </jsp-config>
-</sun-web-app>
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 a13ed51..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/appmgt/web.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <context-param>
- <description>This context-param was defined in the web app itself.</description>
- <param-name>builtin</param-name>
- <param-value>in-app</param-value>
- </context-param>
- <servlet>
- <servlet-name>TestServlet</servlet-name>
- <servlet-class>appmgttest.TestServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>TestServlet</servlet-name>
- <url-pattern>/*</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>
- 30
- </session-timeout>
- </session-config>
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
- <env-entry>
- <description>This env-entry was defined in the web app app itself.</description>
- <env-entry-name>builtin</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>in-app</env-entry-value>
- </env-entry>
- </web-app>
diff --git a/appserver/tests/appserv-tests/devtests/deployment/war/build.xml b/appserver/tests/appserv-tests/devtests/deployment/war/build.xml
index 7fdda32..97c39b0 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;
<target name="private-all">
- <!--ant dir="webservices" target="private-all">
- <property name="build" value="${build}/webservices"/>
- </ant-->
- <ant dir="servletonly" target="private-all">
- <property name="build" value="${build}/servletonly"/>
- </ant>
- <ant dir="jsponly" target="private-all">
- <property name="build" value="${build}/jsponly"/>
- </ant>
- <ant dir="htmlonly" target="private-all">
- <property name="build" value="${build}/htmlonly"/>
- </ant>
- <ant dir="webinflib" target="private-all">
- <property name="build" value="${build}/webinflib"/>
- </ant>
<ant dir="deploydir" target="private-all">
<property name="build" value="${build}/deploydir"/>
</ant>
- <ant dir="nojarexpansion" target="private-all">
- <property name="build" value="${build}/nojarexpansion"/>
- </ant>
- <ant dir="appmgt" target="private-all">
- <property name="build" value="${build}/appmgt"/>
+ <ant dir="virtualserver" target="private-all">
+ <property name="build" value="${build}/virtualserver"/>
</ant>
</target>
</project>
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 f5d5667..f64f004 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 @@
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
<classpath>
- <path location="${inst}/lib/j2ee.jar"/>
+ <path location="${inst}/lib/javaee.jar"/>
<path location="${build}/${testName}/WEB-INF/classes"/>
</classpath>
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 431c3fd..0000000
--- 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 250f821..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/build.xml
+++ /dev/null
@@ -1,238 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="htmlonlyApp" default="usage" basedir=".">
-
- &commonBuild;
-
- <property name="contextRoot" value="war"/>
- <property name="testName" value="htmlonly"/>
-
- <target name="prepare" depends="init">
- <property name="portable.war" value="${build}/${testName}-portable.war"/>
- <property name="all.war" value="${build}/${testName}.war"/>
- <property name="deployplan.jar" value="${build}/${testName}-deployplan.jar"/>
- <mkdir dir="${build}"/>
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="."
- destdir="${build}"
- debug="on"
- failonerror="true">
- <classpath refid="test.compile.classpath"/>
- </javac>
- </target>
-
- <target name="assemble" depends="prepare">
- <war destfile="${portable.war}" webxml="web.xml">
- <fileset dir="." includes="*.html"/>
- </war>
- <jar destfile="${deployplan.jar}">
- <fileset dir="${basedir}" includes="sun-web.xml"/>
- </jar>
- <war destfile="${all.war}" webxml="web.xml">
- <webinf dir="." includes="sun-web.xml"/>
- <fileset dir="." includes="*.html"/>
- </war>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="${all.war}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="${all.war}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="enable.asadmin">
- <antcall target="common.enable.asadmin">
- <param name="arg.list"
- value="${testName}"/>
- </antcall>
- </target>
-
- <target name="disable.asadmin">
- <antcall target="common.disable.asadmin">
- <param name="arg.list"
- value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.war} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="htmlonly-portable ${portable.war} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="htmlonly-portable"/>
- </antcall>
- </target>
-
- <target name="start.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="start"/>
- <param name="arg.list" value="htmlonly-portable"/>
- </antcall>
- </target>
-
- <target name="stop.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="stop"/>
- <param name="arg.list" value="htmlonly-portable"/>
- </antcall>
- </target>
-
- <target name="deploy.autodeploy">
- </target>
-
- <target name="run" depends="run.positive"/>
-
- <target name="run.positive" depends="setHttpPort">
- <antcall target="common.run.positive">
- <param name="link" value="${contextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="run.negative" depends="setHttpPort">
- <antcall target="common.run.negative">
- <param name="link" value="${contextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="compile">
- <echo message="TestClient ${arg.list}"/>
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="htmlonly.client.TestClient"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
-
- <classpath>
- <path location="${inst}/lib/j2ee.jar"/>
- <path location="${build}"/>
- </classpath>
-
- <arg line="${arg.list}"/>
- </javaWithResult>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all">
- <antcall target="assemble"/>
-
- <antcall target="deploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="1"/>
- <param name="desc" value="war/htmlonly Test asadmin deploy"/>
- </antcall>
-
- <antcall target="redeploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="2"/>
- <param name="desc" value="war/htmlonly Test asadmin redeploy"/>
- </antcall>
-
- <antcall target="disable.asadmin"/>
- <antcall target="run.negative">
- <param name="log.id" value="3"/>
- <param name="desc" value="war/htmlonly Test asadmin disable"/>
- </antcall>
-
- <antcall target="enable.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="4"/>
- <param name="desc" value="war/htmlonly Test asadmin enable"/>
- </antcall>
- <antcall target="undeploy.asadmin"/>
-
- <antcall target="deploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="5"/>
- <param name="desc" value="war/htmlonly Test jsr88 deploy"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="run.negative">
- <param name="log.id" value="6"/>
- <param name="desc" value="war/htmlonly Test jsr88 stopped state"/>
- </antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="7"/>
- <param name="desc" value="war/htmlonly Test jsr88 started state"/>
- </antcall>
-
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="8"/>
- <param name="desc" value="war/htmlonly Test jsr88 redeploy"/>
- </antcall>
-
- <antcall target="undeploy.jsr88"/>
- </target>
-
- <target name="clobber" depends="clean">
- <delete file="${portable.war}"/>
- <delete file="${all.war}"/>
- <delete file="${deployplan.war}"/>
- <delete dir="${build}"/>
- </target>
-
- <target name="usage">
- <antcall target="all"/>
- </target>
-</project>
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 27361f8..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<html>
-<head>
-<!--
-
- 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
-
--->
-
-<title>HTML Only Test</title>
-</head>
-<body>
-<p>
-This is a simple HTML page used for HTML only deployment unit test
-</p>
-What else can be put ?
-</body>
-</html>
-
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 af121f2..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/sun-web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <context-root>war/htmlonly</context-root>
- <session-config>
- <session-manager/>
- </session-config>
- <class-loader delegate="true"/>
- <jsp-config/>
-</sun-web-app>
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 7633c90..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/htmlonly/web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>htmlonly</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- </welcome-file-list>
-</web-app>
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 1cf017b..0000000
--- 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 d0769a0..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/build.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="jsponlyApp" default="usage" basedir=".">
-
- &commonBuild;
- <property name="contextRoot" value="war"/>
- <property name="testName" value="jsponly"/>
-
- <target name="prepare" depends="init">
- <property name="portable.war" value="${build}/${testName}-portable.war"/>
- <property name="all.war" value="${build}/${testName}.war"/>
- <property name="deployplan.jar" value="${build}/${testName}-deployplan.jar"/>
- <mkdir dir="${build}"/>
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="."
- destdir="${build}"
- debug="on"
- failonerror="true">
- <classpath refid="test.compile.classpath"/>
- </javac>
- </target>
-
- <target name="assemble" depends="prepare">
- <war destfile="${portable.war}" webxml="web.xml">
- <fileset dir="." includes="*.jsp"/>
- </war>
- <jar destfile="${deployplan.jar}">
- <fileset dir="${basedir}" includes="glassfish-web.xml"/>
- </jar>
- <war destfile="${all.war}" webxml="web.xml">
- <webinf dir="." includes="glassfish-web.xml"/>
- <fileset dir="." includes="*.jsp"/>
- </war>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="${all.war}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="${all.war}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.war} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="jsponly-portable ${portable.war} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="jsponly-portable"/>
- </antcall>
- </target>
-
- <target name="start.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="start"/>
- <param name="arg.list" value="jsponly-portable"/>
- </antcall>
- </target>
-
- <target name="stop.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="stop"/>
- <param name="arg.list" value="jsponly-portable"/>
- </antcall>
- </target>
-
- <target name="deploy.autodeploy">
- </target>
-
- <target name="run" depends="run.positive"/>
-
- <target name="run.positive" depends="setHttpPort">
- <antcall target="common.run.positive">
- <param name="link" value="${contextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="run.negative" depends="setHttpPort">
- <antcall target="common.run.negative">
- <param name="link" value="${contextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="compile">
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="jsponly.client.TestClient"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
-
- <classpath>
- <path refid="gfv3.classpath"/>
- <path location="${build}"/>
- </classpath>
-
- <arg line="${arg.list}"/>
- </javaWithResult>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all">
- <antcall target="assemble"/>
- <antcall target="deploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="1"/>
- <param name="desc" value="war/jsponly Test asadmin deploy"/>
- </antcall>
-
- <antcall target="redeploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="2"/>
- <param name="desc" value="war/jsponly Test asadmin redeploy"/>
- </antcall>
- <antcall target="undeploy.asadmin"/>
-
- <antcall target="deploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="3"/>
- <param name="desc" value="war/jsponly Test jsr88 deploy"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="run.negative">
- <param name="log.id" value="4"/>
- <param name="desc" value="war/jsponly Test jsr88 stopped state"/>
- </antcall>
-
-
- <antcall target="start.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="5"/>
- <param name="desc" value="war/jsponly Test jsr88 started state"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.negative">
- <param name="log.id" value="6"/>
- <param name="desc" value="war/jsponly Test jsr88 redeploy stop"/>
- </antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="7"/>
- <param name="desc" value="war/jsponly Test jsr88 redeploy start"/>
- </antcall>
-
- <antcall target="undeploy.jsr88"/>
- </target>
-
- <target name="clobber" depends="clean">
- <delete file="${portable.war}"/>
- <delete file="${all.war}"/>
- <delete file="${deployplan.war}"/>
- <delete dir="${build}"/>
- </target>
-
- <target name="usage">
- <antcall target="all"/>
- </target>
-</project>
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 20c1506..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/glassfish-web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<!--
-
- 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
-
--->
-
-<glassfish-web-app>
- <context-root>war/jsponly</context-root>
- <session-config>
- <session-manager/>
- </session-config>
- <class-loader delegate="true"/>
- <jsp-config/>
-</glassfish-web-app>
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 e78f2d8..0000000
--- 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
-
---%>
-
-<table cellpadding="10" width="100%">
- <tr bgcolor="#333333">
- <td align="right">
- <font face="sans-serif" color="#FFFFFF" size="+2">
- JSP Only test header
- </font>
- </td>
- </tr>
-</table>
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 f87cc49..0000000
--- 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
-
---%>
-
-<html>
-<head>
-<title>JSP Only Test</title>
-</head>
-<body>
-<%@ include file="header.jsp" %>
-<p>
-This is a simple JSP page with one simple include used for JSP only deployment unit test
-</p>
-What else can be put ?
-</body>
-</html>
-
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 963fd1c..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/jsponly/web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>jsponly</display-name>
- <welcome-file-list>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
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 80f4e67..0000000
--- 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 589e9be..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/TestProp.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project name="changeme" default="all" basedir=".">
- <target name="all">
- <antcall target="ensure.no.file">
- <param name="file" value="/tim"/>
- </antcall>
-
- <antcall target="ensure.no.file">
- <param name="file" value="/tim/jjjj"/>
- </antcall>
- </target>
-
- <target name="ensure.no.file">
- <available file="${file}" property="result" value="1"/>
- <condition property="result" value="0">
- <not>
- <isset property="result"/>
- </not>
- </condition>
- <echo>Result for file ${file}: ${result}</echo>
- </target>
-</project>
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 b721e97..0000000
--- 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("<html>");
- out.println("<head>");
- out.println("<title>TestServlet</title>");
- out.println("</head>");
- out.println("<body>");
- out.println("<p>");
- out.println("Dummy Lib returned a String");
- out.println("</p>");
- out.println("Value is [" + d.getDummyString() + "]");
- out.println("</body>");
- out.println("</html>");
- 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 9437645..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/build.xml
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="nojarexpansion" default="usage" basedir=".">
-
- &commonBuild;
-
- <property name="contextRoot" value="war"/>
- <property name="testName" value="nojarexpansion"/>
- <property name="file.to.check" value="${inst}/domains/domain1/applications/j2ee-modules/${testName}/dummypkg"/>
- <property name="file.to.check.jsr88" value="${inst}/domains/domain1/applications/j2ee-modules/${testName}-portable/dummypkg"/>
-
- <target name="prepare" depends="init">
- <property name="portable.war" value="${build}/${testName}-portable.war"/>
- <property name="all.war" value="${build}/${testName}.war"/>
- <property name="deployplan.jar" value="${build}/${testName}-deployplan.jar"/>
- <mkdir dir="${build}"/>
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="dummylib"
- destdir="${build}"
- debug="on"
- failonerror="true">
- </javac>
- <jar jarfile="${build}/dummy.jar" basedir="${build}"/>
- <javac srcdir="."
- destdir="${build}"
- debug="on"
- failonerror="true">
- <classpath>
- <path refid="gfv3.classpath"/>
- <path location="${inst}/jdk/lib/tools.jar"/>
- <path location="${dummy.jar}"/>
- </classpath >
- </javac>
- </target>
-
- <target name="assemble" depends="compile">
- <war destfile="${portable.war}" webxml="web.xml">
- <lib dir="${build}">
- <include name="dummy.jar" />
- </lib>
- <classes dir="${build}">
- <exclude name="dummy.jar" />
- <exclude name="**/dummypkg/*" />
- <exclude name="**/client/*" />
- </classes>
- </war>
- <jar destfile="${deployplan.jar}">
- <fileset dir="${basedir}" includes="sun-web.xml"/>
- </jar>
- <war destfile="${all.war}" webxml="web.xml">
- <webinf dir="." includes="sun-web.xml"/>
- <lib dir="${build}">
- <include name="dummy.jar" />
- </lib>
- <classes dir="${build}">
- <exclude name="dummy.jar" />
- <exclude name="**/dummypkg/*" />
- <exclude name="**/client/*" />
- </classes>
- </war>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="${all.war}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="${all.war}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.war} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="${testName}-portable ${portable.war} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="${testName}-portable"/>
- </antcall>
- </target>
-
- <target name="start.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="start"/>
- <param name="arg.list" value="${testName}-portable"/>
- </antcall>
- </target>
-
- <target name="stop.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="stop"/>
- <param name="arg.list" value="${testName}-portable"/>
- </antcall>
- </target>
-
- <target name="deploy.autodeploy">
- </target>
-
- <target name="run" depends="run.positive"/>
-
- <target name="run.positive" depends="setHttpPort">
- <antcall target="common.run.positive">
- <param name="link" value="${contextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="run.negative" depends="setHttpPort">
- <antcall target="common.run.negative">
- <param name="link" value="${contextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="init">
- <echo message="TestClient ${arg.list}"/>
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="webinflib.client.TestClient"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
-
- <classpath>
- <path refid="gfv3.classpath"/>
- <path location="${build}"/>
- </classpath>
-
- <arg line="${arg.list}"/>
- </javaWithResult>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="ensure.no.file" depends="init">
- <antcall target="declare-test">
- <param name="description" value="${desc}"/>
- </antcall>
- <echo>In ensure.no.file
-Current setting of result is ${result}.
-File to check is ${file.to.check}</echo>
- <available file="${file.to.check}" property="result" value="1"/>
- <echo>After available check, result is now ${result}</echo>
- <condition property="result" value="0">
- <not>
- <isset property="result"/>
- </not>
- </condition>
- <echo>After final check of results, value is now ${result}</echo>
- <antcall target="processResult">
- </antcall>
- </target>
-
-
- <target name="private-all">
- <antcall target="assemble"/>
- <antcall target="deploy.asadmin"/>
-
- <antcall target="run.positive">
- <param name="log.id" value="1"/>
- <param name="desc" value="war/nojarexpansion Test asadmin deploy"/>
- </antcall>
- <antcall target="ensure.no.file">
- <param name="log.id" value="2"/>
- <param name="desc" value="war/nojarexpansion Test verify jar was not expanded after deploy"/>
- </antcall>
-
- <antcall target="redeploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="2"/>
- <param name="desc" value="war/nojarexpansion Test asadmin redeploy"/>
- </antcall>
- <antcall target="ensure.no.file">
- <param name="log.id" value="2"/>
- <param name="desc" value="war/nojarexpansion Test verify jar was not expanded after redeploy"/>
- </antcall>
-
- <antcall target="undeploy.asadmin"/>
-
- <antcall target="deploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="3"/>
- <param name="desc" value="war/nojarexpansionTest jsr88 deploy"/>
- </antcall>
- <antcall target="ensure.no.file">
- <param name="file.to.check" value="${file.to.check.jsr88}"/>
- <param name="log.id" value="2"/>
- <param name="desc" value="war/nojarexpansion Test verify jar was not expanded after jsr88 deploy"/>
- </antcall>
-
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="6"/>
- <param name="desc" value="war/nojarexpansion Test jsr88 redeploy"/>
- </antcall>
- <antcall target="ensure.no.file">
- <param name="file.to.check" value="${file.to.check.jsr88}"/>
- <param name="log.id" value="2"/>
- <param name="desc" value="war/nojarexpansion Test verify jar was not expanded after jsr88 redeploy"/>
- </antcall>
-
- <antcall target="undeploy.jsr88"/>
- </target>
-
- <target name="clobber" depends="clean">
- <delete file="${portable.war}"/>
- <delete file="${all.war}"/>
- <delete file="${deployplan.war}"/>
- <delete dir="${build}"/>
- </target>
-
- <target name="usage">
- <antcall target="all"/>
- </target>
-
- <target name="xx" depends="init">
- <antcall target="ensure.no.file">
- <param name="file" value="${file.to.check}"/>
- </antcall>
- </target>
-</project>
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 1a39a4b..0000000
--- 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 5279cd2..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/sun-web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <context-root>war</context-root>
- <session-config>
- <session-manager/>
- </session-config>
- <class-loader delegate="true"/>
- <jsp-config/>
-</sun-web-app>
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 4c74258..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/nojarexpansion/web.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>nojarexpansion</display-name>
- <servlet>
- <servlet-name>TestServlet</servlet-name>
- <servlet-class>webinflib.TestServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>TestServlet</servlet-name>
- <url-pattern>/nojarexpansion</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
-</web-app>
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 0c9104b..0000000
--- 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 1b01187..0000000
--- 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 8f9e224..0000000
--- 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 e70e0ec..0000000
--- 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("<html>");
- out.println("<head>");
- out.println("<title>TestServlet</title>");
- out.println("</head>");
- out.println("<body>");
- out.println("<p>");
- out.println("So what is your lucky number?");
- out.println("</p>");
- out.println("Mine is [" + value + "]");
- out.println("<p>");
- out.println("changeableValue=" + changeableValue);
- out.println("</body>");
- out.println("</html>");
- 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 e7bd03f..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/alt-glassfish-web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<!--
-
- 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
-
--->
-
-<glassfish-web-app>
- <context-root>altwar</context-root>
- <session-config>
- <session-manager/>
- </session-config>
- <class-loader delegate="true"/>
- <jsp-config/>
-</glassfish-web-app>
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 4d74acf..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/build.xml
+++ /dev/null
@@ -1,404 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="servletonlyApp" default="usage" basedir=".">
-
- &commonBuild;
-
- <property name="contextRoot" value="war"/>
- <property name="altContextRoot" value="altwar"/>
- <property name="testName" value="servletonly"/>
- <property name="initial.changeable.value" value="first"/>
- <property name="second.changeable.value" value="second"/>
-
- <target name="prepare" depends="init">
- <property name="portable.war" value="${build}/${testName}-portable.war"/>
- <property name="all.war" value="${build}/${testName}.war"/>
- <property name="deployplan.jar" value="${build}/${testName}-deployplan.jar"/>
- <mkdir dir="${build}"/>
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="."
- destdir="${build}"
- debug="on"
- failonerror="true">
- <classpath refid="gfv3.classpath" />
- </javac>
- </target>
-
- <target name="generate-changeable-class" depends="prepare">
- <echo file="${basedir}/ChangeableClass.java">
-package servletonly;
-public class ChangeableClass {
- public static String changeableValue() {
- return "${expectedChangeableValue}";
- }
-}
- </echo>
- </target>
-
- <target name="assemble" depends="compile">
- <war destfile="${portable.war}" webxml="web.xml">
- <classes dir="${build}"/>
- </war>
- <jar destfile="${deployplan.jar}">
- <fileset dir="${basedir}" includes="glassfish-web.xml,sun-web.xml"/>
- </jar>
-
- <!--
- The manifest in the next task specifies a Main-Class. It is not used except
- to make sure the app client sniffer does not claim the web
- module simply because it has a Main-Class setting.
- -->
- <war destfile="${all.war}" webxml="web.xml" manifest="META-INF/MANIFEST.MF">
- <webinf dir="." includes="glassfish-web.xml, sun-web.xml"/>
- <classes dir="${build}" excludes="**-portable.war, **-deployplan.jar"/>
- </war>
- <copy file="alt-glassfish-web.xml" tofile="${build}/archive/alt-glassfish-web.xml"/>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="${all.war}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.asadmin.altdd" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--runtimealtdd ${build}/archive/alt-glassfish-web.xml ${all.war}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="${all.war}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="v3.redeploy.asadmin" depends="prepare">
- <antcall target="common.v3.redeploy.asadmin">
- <param name="arg.list"
- value="--name ${testName} ${all.war}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="enable.asadmin">
- <antcall target="common.enable.asadmin">
- <param name="arg.list"
- value="${testName}"/>
- </antcall>
- </target>
-
- <target name="disable.asadmin">
- <antcall target="common.disable.asadmin">
- <param name="arg.list"
- value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.war} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="servletonly-portable ${portable.war} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="servletonly-portable"/>
- </antcall>
- </target>
-
- <target name="start.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="start"/>
- <param name="arg.list" value="servletonly-portable"/>
- </antcall>
- </target>
-
- <target name="stop.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="stop"/>
- <param name="arg.list" value="servletonly-portable"/>
- </antcall>
- </target>
-
- <target name="run" depends="run.positive"/>
-
- <target name="run.positive" depends="setHttpPort">
- <property name="extra.args" value=""/>
- <antcall target="common.run.positive">
- <param name="link" value="${contextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- <param name="extra.args" value="${extra.args}"/>
- </antcall>
- </target>
-
- <target name="run.positive.altdd" depends="setHttpPort">
- <property name="extra.args" value=""/>
- <antcall target="common.run.positive">
- <param name="link" value="${altContextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- <param name="extra.args" value="${extra.args}"/>
- </antcall>
- </target>
-
- <target name="run.negative" depends="setHttpPort">
- <property name="extra.args" value=""/>
- <antcall target="common.run.negative">
- <param name="link" value="${contextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- <param name="extra.args" value="${extra.args}"/>
- </antcall>
- </target>
-
-
- <target name="runclient" depends="init">
- <property name="extra.args" value=""/>
- <echo message="TestClient ${arg.list}"/>
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="servletonly.client.TestClient"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
-
- <classpath>
- <path location="${inst}/lib/j2ee.jar"/>
- <path location="${build}"/>
- </classpath>
-
- <arg line="${arg.list}"/>
- </javaWithResult>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all">
- <antcall target="generate-changeable-class">
- <param name="expectedChangeableValue" value="${initial.changeable.value}"/>
- </antcall>
- <antcall target="assemble"/>
- <antcall target="deploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="1.1"/>
- <param name="desc" value="war/servletonly Test asadmin deploy"/>
- <param name="extra.args" value="${initial.changeable.value}"/>
- </antcall>
-
- <antcall target="test-reload"/>
-
- <antcall target="redeploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="2"/>
- <param name="desc" value="war/servletonly Test asadmin redeploy"/>
- </antcall>
-
- <antcall target="v3.redeploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="3"/>
- <param name="desc" value="war/servletonly Test v3 asadmin redeploy"/>
- </antcall>
-
- <antcall target="disable.asadmin"/>
- <antcall target="run.negative">
- <param name="log.id" value="4"/>
- <param name="desc" value="war/servletonly Test asadmin disable"/>
- </antcall>
-
- <antcall target="enable.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="5"/>
- <param name="desc" value="war/servletonly Test asadmin enable"/>
- </antcall>
-
- <antcall target="common.dotted.disable.ref.asadmin">
- <param name="testName" value="${testName}"/>
- </antcall>
- <antcall target="run.negative">
- <param name="log.id" value="6"/>
- <param name="desc" value="war/servletonly Test asadmin dotted disable ref"/>
- </antcall>
- <antcall target="common.dotted.enable.ref.asadmin">
- <param name="testName" value="${testName}"/>
- </antcall>
- <antcall target="run.positive">
- <param name="log.id" value="7"/>
- <param name="desc" value="war/servletonly Test asadmin dotted enableref "/>
- </antcall>
- <antcall target="common.dotted.disable.application.asadmin">
- <param name="testName" value="${testName}"/>
- </antcall>
- <antcall target="run.negative">
- <param name="log.id" value="8"/>
- <param name="desc" value="war/servletonly Test asadmin dotted disable application"/>
- </antcall>
- <antcall target="common.dotted.enable.application.asadmin">
- <param name="testName" value="${testName}"/>
- </antcall>
- <antcall target="run.positive">
- <param name="log.id" value="9"/>
- <param name="desc" value="war/servletonly Test asadmin dotted enable application"/>
- </antcall>
- <antcall target="common.dotted.disable.application.asadmin">
- <param name="testName" value="${testName}"/>
- </antcall>
- <antcall target="common.dotted.disable.ref.asadmin">
- <param name="testName" value="${testName}"/>
- </antcall>
- <antcall target="run.negative">
- <param name="log.id" value="10"/>
- <param name="desc" value="war/servletonly Test asadmin dotted disable ref and application"/>
- </antcall>
- <antcall target="common.dotted.enable.application.asadmin">
- <param name="testName" value="${testName}"/>
- </antcall>
- <antcall target="run.negative">
- <param name="log.id" value="11"/>
- <param name="desc" value="war/servletonly Test asadmin dotted disable ref and enable application"/>
- </antcall>
- <antcall target="common.dotted.disable.application.asadmin">
- <param name="testName" value="${testName}"/>
- </antcall>
- <antcall target="common.dotted.enable.ref.asadmin">
- <param name="testName" value="${testName}"/>
- </antcall>
- <antcall target="run.negative">
- <param name="log.id" value="12"/>
- <param name="desc" value="war/servletonly Test asadmin dotted disable application and enable ref"/>
- </antcall>
- <antcall target="common.dotted.enable.application.asadmin">
- <param name="testName" value="${testName}"/>
- </antcall>
- <antcall target="run.positive">
- <param name="log.id" value="13"/>
- <param name="desc" value="war/servletonly Test asadmin dotted enable application and enable ref"/>
- </antcall>
- <antcall target="undeploy.asadmin"/>
-
- <antcall target="deploy.asadmin.altdd"/>
- <antcall target="run.positive.altdd">
- <param name="log.id" value="14"/>
- <param name="desc" value="war/servletonly Test asadmin deploy with runtime altdd"/>
- </antcall>
- <antcall target="undeploy.asadmin"/>
-
- <antcall target="deploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="15"/>
- <param name="desc" value="war/servletonly Test jsr88 deploy"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="run.negative">
- <param name="log.id" value="16"/>
- <param name="desc" value="war/servletonly Test jsr88 stopped state"/>
- </antcall>
- <antcall target="start.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="17"/>
- <param name="desc" value="war/servletonly Test jsr88 started state"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.negative">
- <param name="log.id" value="18"/>
- <param name="desc" value="war/servletonly Test jsr88 redeploy stop"/>
- </antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="19"/>
- <param name="desc" value="war/servletonly Test jsr88 redeploy start"/>
- </antcall>
-
- <antcall target="undeploy.jsr88"/>
- </target>
-
- <target name="test-reload" depends="test-reload-PE"/>
-
- <!-- test .reload feature -->
-
- <target name="test-reload-PE" if="PE">
- <antcall target="generate-changeable-class">
- <param name="expectedChangeableValue" value="${second.changeable.value}"/>
- </antcall>
-
- <antcall target="compile"/>
-
- <copy file="${build}/servletonly/ChangeableClass.class"
- overwrite="true"
- todir="${s1as.home}/domains/domain1/applications/${testName}/WEB-INF/classes/servletonly"/>
-
- <!-- Make sure the .reload file will have a later timestamp. -->
- <sleep seconds="2"/>
-
- <touch file="${s1as.home}/domains/domain1/applications/${testName}/.reload"/>
-
- <!-- Give the server time to see the .reload file and to redeploy the app. -->
- <sleep seconds="5"/>
-
- <antcall target="run.positive">
- <param name="log.id" value="1.2"/>
- <param name="desc" value="war/servletonly Test .reload"/>
- <param name="extra.args" value="${second.changeable.value}"/>
- </antcall>
-
- </target>
-
- <target name="clobber" depends="clean">
- <delete file="${portable.war}"/>
- <delete file="${all.war}"/>
- <delete file="${deployplan.war}"/>
- <delete dir="${build}"/>
- </target>
-
- <target name="usage">
- <antcall target="all"/>
- </target>
-</project>
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 8a41263..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/glassfish-web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<!--
-
- 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
-
--->
-
-<glassfish-web-app>
- <context-root>war</context-root>
- <session-config>
- <session-manager/>
- </session-config>
- <class-loader delegate="true"/>
- <jsp-config/>
-</glassfish-web-app>
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 b2d9e51..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/sun-web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <context-root>foo</context-root>
- <session-config>
- <session-manager/>
- </session-config>
- <class-loader delegate="true"/>
- <jsp-config/>
-</sun-web-app>
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 6af6b4d..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/servletonly/web.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>servletonly</display-name>
- <servlet>
- <servlet-name>TestServlet</servlet-name>
- <servlet-class>servletonly.TestServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>TestServlet</servlet-name>
- <url-pattern>/servletonly</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
- <env-entry>
- <env-entry-name>name</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>LuckyNumber</env-entry-value>
- </env-entry>
- <env-entry>
- <env-entry-name>value</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>888</env-entry-value>
- </env-entry>
-</web-app>
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 6aee563..60bc48a 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 @@
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
<classpath>
- <path location="${inst}/lib/j2ee.jar"/>
+ <path location="${inst}/lib/javaee.jar"/>
<path location="${build}"/>
</classpath>
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 d816e77..0000000
--- 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 b721e97..0000000
--- 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("<html>");
- out.println("<head>");
- out.println("<title>TestServlet</title>");
- out.println("</head>");
- out.println("<body>");
- out.println("<p>");
- out.println("Dummy Lib returned a String");
- out.println("</p>");
- out.println("Value is [" + d.getDummyString() + "]");
- out.println("</body>");
- out.println("</html>");
- 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 5084285..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/build.xml
+++ /dev/null
@@ -1,235 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="webinflib" default="usage" basedir=".">
-
- &commonBuild;
-
- <property name="contextRoot" value="war"/>
- <property name="testName" value="webinflib"/>
-
- <target name="prepare" depends="init">
- <property name="portable.war" value="${build}/${testName}-portable.war"/>
- <property name="all.war" value="${build}/${testName}.war"/>
- <property name="deployplan.jar" value="${build}/${testName}-deployplan.jar"/>
- <mkdir dir="${build}"/>
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="dummylib"
- destdir="${build}"
- debug="on"
- failonerror="true">
- </javac>
- <jar jarfile="${build}/dummy.jar" basedir="${build}"/>
- <javac srcdir="."
- destdir="${build}"
- debug="on"
- failonerror="true">
- <classpath >
- <path refid="gfv3.classpath"/>
- <path location="${inst}/jdk/lib/tools.jar"/>
- <path location="${dummy.jar}"/>
- </classpath >
- </javac>
- </target>
-
- <target name="assemble" depends="compile">
- <war destfile="${portable.war}" webxml="web.xml">
- <lib dir="${build}">
- <include name="dummy.jar" />
- </lib>
- <classes dir="${build}">
- <exclude name="dummy.jar" />
- <exclude name="**/dummypkg/*" />
- <exclude name="**/client/*" />
- </classes>
- </war>
- <jar destfile="${deployplan.jar}">
- <fileset dir="${basedir}" includes="sun-web.xml"/>
- </jar>
- <war destfile="${all.war}" webxml="web.xml">
- <webinf dir="." includes="sun-web.xml"/>
- <lib dir="${build}">
- <include name="dummy.jar" />
- </lib>
- <classes dir="${build}">
- <exclude name="dummy.jar" />
- <exclude name="**/dummypkg/*" />
- <exclude name="**/client/*" />
- </classes>
- </war>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="${all.war}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="${all.war}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.war} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="webinflib-portable ${portable.war} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="webinflib-portable"/>
- </antcall>
- </target>
-
- <target name="start.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="start"/>
- <param name="arg.list" value="webinflib-portable"/>
- </antcall>
- </target>
-
- <target name="stop.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="stop"/>
- <param name="arg.list" value="webinflib-portable"/>
- </antcall>
- </target>
-
- <target name="deploy.autodeploy">
- </target>
-
- <target name="run" depends="run.positive"/>
-
- <target name="run.positive" depends="setHttpPort">
- <antcall target="common.run.positive">
- <param name="link" value="${contextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="run.negative" depends="setHttpPort">
- <antcall target="common.run.negative">
- <param name="link" value="${contextRoot}/${testName}"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="init">
- <echo message="TestClient ${arg.list}"/>
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="webinflib.client.TestClient"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${http.host}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
-
- <classpath>
- <path location="${inst}/lib/j2ee.jar"/>
- <path location="${build}"/>
- </classpath>
-
- <arg line="${arg.list}"/>
- </javaWithResult>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all">
- <antcall target="assemble"/>
- <antcall target="deploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="1"/>
- <param name="desc" value="war/webinflib Test asadmin deploy"/>
- </antcall>
-
- <antcall target="redeploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="2"/>
- <param name="desc" value="war/webinflib Test asadmin redeploy"/>
- </antcall>
- <antcall target="undeploy.asadmin"/>
-
- <antcall target="deploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="3"/>
- <param name="desc" value="war/webinflib Test jsr88 deploy"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="run.negative">
- <param name="desc" value="war/webinflib Test jsr88 stopped state"/>
- <param name="log.id" value="4"/>
- </antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="5"/>
- <param name="desc" value="war/webinflib Test jsr88 started state"/>
- </antcall>
-
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="6"/>
- <param name="desc" value="war/webinflib Test jsr88 redeploy"/>
- </antcall>
-
- <antcall target="undeploy.jsr88"/>
- </target>
-
- <target name="clobber" depends="clean">
- <delete file="${portable.war}"/>
- <delete file="${all.war}"/>
- <delete file="${deployplan.war}"/>
- <delete dir="${build}"/>
- </target>
-
- <target name="usage">
- <antcall target="all"/>
- </target>
-</project>
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 1a39a4b..0000000
--- 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 5279cd2..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/sun-web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <context-root>war</context-root>
- <session-config>
- <session-manager/>
- </session-config>
- <class-loader delegate="true"/>
- <jsp-config/>
-</sun-web-app>
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 241168f..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webinflib/web.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>webinflib</display-name>
- <servlet>
- <servlet-name>TestServlet</servlet-name>
- <servlet-class>webinflib.TestServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>TestServlet</servlet-name>
- <url-pattern>/webinflib</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
-</web-app>
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 fab18eb..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/build.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../config/common.xml">
-]>
-
-<project name="webservices" default="all" basedir=".">
-
- &commonBuild;
-
- <target name="private-all">
- <ant dir="helloservice" target="private-all">
- <property name="build" value="${build}/helloservice"/>
- </ant>
- </target>
-
-</project>
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 f688edf..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/build.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
- <!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
-]>
-
-<project name="HelloServiceWS" default="all" basedir=".">
-
- &commonBuild;
- <property name="archivedir" value="${build}/archives"/>
-
- <property name="testName" value="SayHelloWS"/>
- <target name="prepare" depends="init">
- <property name="binary" value="${build}/WEB-INF/classes"/>
- <property name="wsdl" value="${build}/WEB-INF/wsdl"/>
- <mkdir dir="${binary}" />
- <mkdir dir="${wsdl}"/>
- <property name="portable.war" value="${archivedir}/sayhello-portable.war"/>
- <property name="all.war" value="${archivedir}/sayhello.war"/>
- <property name="deployplan.jar" value="${archivedir}/sayhello-deployplan.jar"/>
- </target>
-
- <target name="compile" depends="prepare">
- <javac srcdir="helloservice" destdir="${binary}"
- classpath="${inst}/lib/j2ee.jar"/>
- <echo message="invoking wscompile to generate wsdl file"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-define config-interface.xml -d ${binary} -nd ${wsdl} -classpath ${binary} -mapping ${build}/mapping.xml"/>
- </exec>
- </target>
-
- <target name="assemble" depends="compile">
- <copy file="web.xml" todir="${build}/WEB-INF"/>
- <copy file="webservices.xml" todir="${build}/WEB-INF"/>
- <jar destfile="${portable.war}" basedir="${build}"/>
- <copy file="sun-web.xml" todir="${build}/WEB-INF" failonerror="false"/>
- <jar destfile="${all.war}" basedir="${build}"/>
- <jar destfile="${deployplan.jar}">
- <fileset dir="${basedir}" includes="sun-web.xml"/>
- </jar>
- </target>
-
- <target name="deploy.asadmin" depends="prepare">
- <antcall target="common.deploy.asadmin">
- <param name="arg.list" value="--name ${testName} ${all.war}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- <echo message="Create client webservices artifacts"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-gen:client -keep -d ${binary} -classpath ${binary} config-interface.xml"/>
- </exec>
- </target>
-
- <target name="redeploy.asadmin" depends="prepare">
- <antcall target="common.redeploy.asadmin">
- <param name="arg.list" value="--name ${testName} ${all.war}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- <echo message="Create client webservices artifacts"/>
- <exec executable="${WSCOMPILE}">
- <arg line="-gen:client -keep -d ${binary} -classpath ${binary} config-interface.xml"/>
- </exec>
- </target>
-
- <target name="undeploy.asadmin">
- <antcall target="common.undeploy.asadmin">
- <param name="arg.list" value="${testName}"/>
- <param name="testName" value="${testName}"/>
- </antcall>
- </target>
-
- <target name="deploy.jsr88" depends="prepare">
- <antcall target="common.deploy.jsr88">
- <param name="arg.list" value="${portable.war} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="redeploy.jsr88" depends="prepare">
- <antcall target="common.run.jsr88">
- <param name="command" value="redeploy"/>
- <param name="arg.list" value="sayhello-portable ${portable.war} ${deployplan.jar}"/>
- </antcall>
- </target>
-
- <target name="undeploy.jsr88">
- <antcall target="common.undeploy.jsr88">
- <param name="arg.list" value="sayhello-portable"/>
- </antcall>
- </target>
-
- <target name="start.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="start"/>
- <param name="arg.list" value="sayhello-portable"/>
- </antcall>
- </target>
-
- <target name="stop.jsr88">
- <antcall target="common.run.jsr88">
- <param name="command" value="stop"/>
- <param name="arg.list" value="sayhello-portable"/>
- </antcall>
- </target>
-
- <target name="deploy.autodeploy">
- </target>
-
- <target name="run" depends="run.positive"/>
-
- <target name="run.positive" depends="setHttpPort">
- <antcall target="common.run.positive">
- <param name="link" value="HelloService/HelloService"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="run.negative" depends="setHttpPort">
- <antcall target="common.run.negative">
- <param name="link" value="HelloService/HelloService"/>
- <param name="log.id" value="${log.id}"/>
- </antcall>
- </target>
-
- <target name="runclient" depends="prepare">
- <javac srcdir="staticstubclient" destdir="${binary}"
- classpath="${inst}/lib/j2ee.jar:${inst}/lib/webservices-rt.jar:${inst}/lib/webservices-tools.jar"/>
-
- <javaWithResult
- fork="true"
- failonerror="false"
- jvm="${JAVA}"
- classname="staticstubclient.SayHelloClient"
- output="${build}/${log.id}.output.log"
- resultproperty="result">
-
-
- <classpath>
- <path location="${inst}/lib/j2ee.jar"/>
- <path location="${inst}/lib/webservices-rt.jar"/>
- <path location="${inst}/lib/webservices-tools.jar"/>
- <path location="${binary}"/>
- </classpath>
-
- <arg line="${arg.list}"/>
- </javaWithResult>
-
- <antcall target="processResult">
- <param name="result" value="${result}"/>
- <param name="log" value="${build}/${log.id}.output.log"/>
- </antcall>
- </target>
-
- <target name="private-all">
- <antcall target="assemble"/>
- <antcall target="deploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="1"/>
- <param name="desc" value="war/webservice Test asadmin deploy"/>
- </antcall>
-
- <antcall target="redeploy.asadmin"/>
- <antcall target="run.positive">
- <param name="log.id" value="2"/>
- <param name="desc" value="war/webservice Test asadmin redeploy"/>
- </antcall>
- <antcall target="undeploy.asadmin"/>
-
- <antcall target="deploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="3"/>
- <param name="desc" value="war/webservice Test jsr88 deploy"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="run.negative">
- <param name="log.id" value="4"/>
- <param name="desc" value="war/webservice Test jsr88 stopped state"/>
- </antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="5"/>
- <param name="desc" value="war/webservice Test jsr88 started state"/>
- </antcall>
-
- <antcall target="stop.jsr88"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.negative">
- <param name="log.id" value="6"/>
- <param name="desc" value="war/webservice Test jsr88 redeploy stop"/>
- </antcall>
-
- <antcall target="start.jsr88"/>
- <antcall target="redeploy.jsr88"/>
- <antcall target="run.positive">
- <param name="log.id" value="7"/>
- <param name="desc" value="war/webservice Test jsr88 redeploy start"/>
- </antcall>
- <antcall target="undeploy.jsr88"/>
- </target>
-
-</project>
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 894789a..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SayHelloService"
- targetNamespace="urn:DeploymentWebServiceTest"
- typeNamespace="urn:DeploymentWebServiceTest"
- packageName="helloservice">
- <interface name="helloservice.SayHello"/>
- </service>
-</configuration>
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 d715c4f..0000000
--- 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 59ac4c8..0000000
--- 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 d65a7ea..0000000
--- 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 0fa56a9..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/sun-web.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <context-root>HelloService</context-root>
-</sun-web-app>
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 2d64676..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/web.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>HelloServiceWS</display-name>
- <servlet>
- <servlet-name>HelloService</servlet-name>
- <servlet-class>helloservice.SayHelloImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>HelloService</servlet-name>
- <url-pattern>/HelloService</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
-</web-app>
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 e4ea4b1..0000000
--- a/appserver/tests/appserv-tests/devtests/deployment/war/webservices/helloservice/webservices.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>Very simple web services</description>
- <webservice-description>
- <webservice-description-name>A WebService Servlet that says Hello</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/SayHelloService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>SayHelloPort</port-component-name>
- <wsdl-port xmlns:tns="urn:DeploymentWebServiceTest">tns:SayHelloPort </wsdl-port>
- <service-endpoint-interface>helloservice.SayHello</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>HelloService</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 a37975d..db84100 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 @@
-->
-<property environment="env"/>
-<property file="${env.APS_HOME}/config.properties"/>
+<property environment="env" />
+<property file="${env.APS_HOME}/config.properties" />
<target name="test-all" depends="clean">
- <basename file="${src-name}" property="server" suffix=".java"/>
- <dirname file="${src-name}" property="directory"/>
- <echo message="Starting Test ${directory}"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${src-name}" property="server" suffix=".java" />
+ <dirname file="${src-name}" property="directory" />
+ <echo message="Starting Test ${directory}" />
+ <basename file="${directory}" property="pkg-name" />
<antcall target="deploy">
- <param name="pkg-name" value="${pkg-name}"/>
+ <param name="pkg-name" value="${pkg-name}" />
</antcall>
<condition property="deploy_succeeded">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
+ <available
+ file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed" />
</condition>
<condition property="deploy_failed">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployFailed"/>
+ <available
+ file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployFailed" />
</condition>
- <fail message="Deployment failed" if="deploy_failed"/>
- <antcall target="run"/>
- <echo message="Removing jar bundle ${server}.jar from autodeploy directory"/>
- <antcall target="undeploy"/>
- <antcall target="report"/>
+ <fail message="Deployment failed" if="deploy_failed" />
+ <antcall target="run" />
+ <echo message="Removing jar bundle ${server}.jar from autodeploy directory" />
+ <antcall target="undeploy" />
+ <antcall target="report" />
</target>
<target name="clean">
- <echo message="Clean from ${ant.file}"/>
- <delete dir="${env.APS_HOME}/build/module/classes"/>
- <delete dir="${env.APS_HOME}/build/module/archive"/>
- <mkdir dir="${env.APS_HOME}/build/module/classes"/>
- <mkdir dir="${env.APS_HOME}/build/module/archive"/>
+ <echo message="Clean from ${ant.file}" />
+ <delete dir="${env.APS_HOME}/build/module/classes" />
+ <delete dir="${env.APS_HOME}/build/module/archive" />
+ <mkdir dir="${env.APS_HOME}/build/module/classes" />
+ <mkdir dir="${env.APS_HOME}/build/module/archive" />
</target>
- <path id="classpath">
-
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="*.jar"/>
-
- </fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
-
- </fileset>
- <fileset dir="${env.APS_HOME}/lib">
- <include name="reporter.jar"/>
- </fileset>
-
-
- </path>
+<path id="classpath">
+ <fileset dir="${env.S1AS_HOME}/modules">
+ <include name="*.jar" />
+ </fileset>
+ <fileset dir="${env.APS_HOME}/lib">
+ <include name="reporter.jar" />
+ </fileset>
+</path>
<target name="test-compile">
- <echo message="Compiling into ${pkg-name}/${server}.class"/>
+ <echo message="Compiling into ${pkg-name}/${server}.class" />
<javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
- includes="${pkg-name}/*.java">
- <classpath refid="classpath"/>
-</javac>
+ includes="${pkg-name}/*.java"
+ >
+ <classpath refid="classpath" />
+ </javac>
</target>
<target name="compile-client">
<javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
- includes="${client-src-name}">
- <classpath refid="classpath"/>
+ includes="${client-src-name}"
+ >
+ <classpath refid="classpath" />
</javac>
</target>
<target name="build">
- <basename file="${src-name}" property="server" suffix=".java"/>
- <dirname file="${src-name}" property="directory"/>
- <basename file="${directory}" property="pkg-name"/>
- <antcall target="test-compile"/>
- <echo message="Building with package ${pkg-name}"/>
+ <basename file="${src-name}" property="server" suffix=".java" />
+ <dirname file="${src-name}" property="directory" />
+ <basename file="${directory}" property="pkg-name" />
+ <antcall target="test-compile" />
+ <echo message="Building with package ${pkg-name}" />
<jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar"
- basedir="${env.APS_HOME}/build/module/classes"
- includes="${pkg-name}/**">
- <metainf dir="${pkg-name}"
- includes="*.xml **/*.wsdl **/*.xsd"/>
+ basedir="${env.APS_HOME}/build/module/classes" includes="${pkg-name}/**"
+ >
+ <metainf dir="${pkg-name}" includes="*.xml **/*.wsdl **/*.xsd" />
</jar>
</target>
<target name="deploy">
- <antcall target="build"/>
- <basename file="${src-name}" property="server" suffix=".java"/>
+ <antcall target="build" />
+ <basename file="${src-name}" property="server" suffix=".java" />
<waitfor maxwait="100" maxwaitunit="second">
- <or>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployFailed"/>
- </or>
+ <or>
+ <available
+ file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed" />
+ <available
+ file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployFailed" />
+ </or>
</waitfor>
</target>
<target name="undeploy">
- <basename file="${src-name}" property="server" suffix=".java"/>
+ <basename file="${src-name}" property="server" suffix=".java" />
<antcall target="autoundeploy-file">
- <param name="filename" value="${server}.jar"/>
+ <param name="filename" value="${server}.jar" />
</antcall>
<condition property="undeploy_succeeded">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_undeployed"/>
+ <available
+ file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_undeployed" />
</condition>
<condition property="undeploy_failed">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_undeployFailed"/>
+ <available
+ file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_undeployFailed" />
</condition>
- <fail if="undeploy_failed" message="undeployment failed"/>
+ <fail if="undeploy_failed" message="undeployment failed" />
</target>
<target name="autoundeploy-file">
- <delete file="${env.S1AS_HOME}/domains/domain1/autodeploy/${filename}"/>
+ <delete file="${env.S1AS_HOME}/domains/domain1/autodeploy/${filename}" />
<waitfor maxwait="100" maxwaitunit="second">
- <or>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${filename}_undeployed"/>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${filename}_undeployFailed"/>
- </or>
+ <or>
+ <available
+ file="${env.S1AS_HOME}/domains/domain1/autodeploy/${filename}_undeployed" />
+ <available
+ file="${env.S1AS_HOME}/domains/domain1/autodeploy/${filename}_undeployFailed" />
+ </or>
</waitfor>
</target>
<target name="report" depends="internal-report-success, internal-report-failure">
- <delete file="${env.S1AS_HOME}/domains/domain1/autodeploy/${class-name}_*"/>
+ <delete file="${env.S1AS_HOME}/domains/domain1/autodeploy/${class-name}_*" />
</target>
<target name="run">
- <basename file="${src-name}" property="server" suffix=".java"/>
+ <basename file="${src-name}" property="server" suffix=".java" />
<condition property="deploy_succeeded">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
+ <available
+ file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed" />
</condition>
<condition property="deploy_failed">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployFailed"/>
+ <available
+ file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployFailed" />
</condition>
- <antcall target="prepare-client"/>
- <antcall target="internal-run"/>
+ <antcall target="prepare-client" />
+ <antcall target="internal-run" />
</target>
<target name="wsdl-import">
<antcall target="configurable-wsdl-import">
- <param name="host-name" value="${http.host}"/>
- <param name="host-port" value="${http.port}"/>
- <param name="protocol" value="http"/>
+ <param name="host-name" value="${http.host}" />
+ <param name="host-port" value="${http.port}" />
+ <param name="protocol" value="http" />
</antcall>
</target>
<target name="configurable-wsdl-import">
- <echo message="wsimporting ${protocol}://${host-name}:${host-port}/${server}Service/${port}?WSDL; special args are ${wsimport-special-args}"/>
- <exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-keep -d ${env.APS_HOME}/build/module/classes ${protocol}://${host-name}:${host-port}/${server}Service/${port}?WSDL"/>
+ <tstamp>
+ <format property="TIMESTAMP" pattern="yyyy-MM-dd'T'HH:mm:ss.SSSZ" />
+ </tstamp>
+ <echo>Current time (ISO): ${TIMESTAMP}</echo>
+ <echo message="wsimporting ${protocol}://${host-name}:${host-port}/${server}Service/${port}?WSDL; special args are ${wsimport-special-args}" />
+ <exec executable="${env.S1AS_HOME}/bin/wsimport" failonerror="true">
+ <arg line="-keep -d ${env.APS_HOME}/build/module/classes ${protocol}://${host-name}:${host-port}/${server}Service/${port}?WSDL" />
</exec>
</target>
<target name="prepare-client">
- <!--basename file="${server}" property="port" suffix="EJB"/-->
- <basename file="${server}" property="port"/>
+ <!--basename file="${server}" property="port" suffix="EJB"/ -->
+ <basename file="${server}" property="port" />
<antcall target="wsdl-import">
- <param name="server" value="${server}"/>
- <param name="port" value="${port}"/>
+ <param name="server" value="${server}" />
+ <param name="port" value="${port}" />
</antcall>
- <antcall target="compile-client"/>
- <antcall target="unjar-client-utils"/>
+ <antcall target="compile-client" />
+ <antcall target="unjar-client-utils" />
</target>
<target name="unjar-client-utils">
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes"/>
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes" />
</target>
<target name="internal-run" if="deploy_succeeded">
- <basename file="${client-src-name}" property="client" suffix=".java"/>
- <dirname file="${client-src-name}" property="client-directory"/>
- <basename file="${client-directory}" property="client-pkg-name"/>
- <property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
- <echo message="Running appclient with ${client-pkg-name}.${client} ${app-client-parameters} ${app-client-extra-parameters}"/>
- <exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
- <arg line="${client-pkg-name}.${client} ${app-client-parameters} ${app-client-extra-parameters}"/>
+ <basename file="${client-src-name}" property="client" suffix=".java" />
+ <dirname file="${client-src-name}" property="client-directory" />
+ <basename file="${client-directory}" property="client-pkg-name" />
+ <property name="client-class-name" value="${client-pkg-name}/${client}.class" />
+ <echo message="Running appclient with ${client-pkg-name}.${client} ${app-client-parameters} ${app-client-extra-parameters}" />
+ <exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes" failonerror="true">
+ <arg line="${client-pkg-name}.${client} ${app-client-parameters} ${app-client-extra-parameters}" />
</exec>
</target>
<target name="internal-report-success" if="undeploy_succeeded">
- <antcall target="report-success"/>
+ <antcall target="report-success" />
</target>
<target name="internal-report-failure" if="undeploy_failed, deploy_failed">
- <antcall target="report-failure"/>
+ <antcall target="report-failure" />
</target>
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 c0bbafc..0dda222 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;
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 c37d861..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/ant-deploy.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project default="-deploy-ant" basedir=".">
- <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
- <property file="${deploy.ant.properties.file}" />
- <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
- <available file="${deploy.ant.resource.dir}" property="has.setup"/>
- <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
- </target>
-
- <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
- <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
- <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
- <!-- The doctype triggers resolution which can fail -->
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
- <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
- </replace>
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
- <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
- </replace>
- <xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
- <delete file="${temp.sun.web}"/>
- <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
- <property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
- </target>
- <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
- <property name="deploy.context.root.argument" value=""/>
- </target>
- <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
- <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
- <mkdir dir="${gfv3.resources.dir}"/>
- <mkdir dir="${gfv3.resources.dir}/META-INF"/>
- <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
- <copy todir="${gfv3.resources.dir}/META-INF">
- <fileset dir="${deploy.ant.resource.dir}"/>
- </copy>
- <jar destfile="${deploy.ant.archive}" update="true">
- <fileset dir="${gfv3.resources.dir}"/>
- </jar>
- <delete dir="${gfv3.resources.dir}"/>
- </target>
- <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
- <antcall target="-deploy-without-pw"/>
- <antcall target="-deploy-with-pw"/>
- </target>
-
- <target name="-deploy-without-pw" unless="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-deploy-with-pw" if="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
- <antcall target="-undeploy-without-pw"/>
- <antcall target="-undeploy-with-pw"/>
- </target>
-
- <target name="-undeploy-without-pw" unless="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-with-pw" if="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
-</project>
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 8a63173..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/build-impl.xml
+++ /dev/null
@@ -1,979 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!--
- *** GENERATED FROM project.xml - DO NOT EDIT ***
- *** EDIT ../build.xml INSTEAD ***
-
- For the purpose of easier reading the script
- is divided into following sections:
- - initialization
- - compilation
- - dist
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - cleanup
-
- -->
-<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="SFSBDriver-impl">
- <import file="ant-deploy.xml"/>
- <fail message="Please build using Ant 1.7.1 or higher.">
- <condition>
- <not>
- <antversion atleast="1.7.1"/>
- </not>
- </condition>
- </fail>
- <target depends="dist,javadoc" description="Build whole project." name="default"/>
- <!--
- INITIALIZATION SECTION
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init" name="-init-private">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target depends="-pre-init,-init-private" name="-init-user">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user" name="-init-project">
- <property file="nbproject/project.properties"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="javac.compilerargs" value=""/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <condition property="no.dist.ear.dir">
- <not>
- <isset property="dist.ear.dir"/>
- </not>
- </condition>
- <property name="build.web.excludes" value="${build.classes.excludes}"/>
- <condition property="do.compile.jsps">
- <istrue value="${compile.jsps}"/>
- </condition>
- <condition property="do.debug.server">
- <or>
- <not>
- <isset property="debug.server"/>
- </not>
- <istrue value="${debug.server}"/>
- <and>
- <not>
- <istrue value="${debug.server}"/>
- </not>
- <not>
- <istrue value="${debug.client}"/>
- </not>
- </and>
- </or>
- </condition>
- <condition property="do.debug.client">
- <istrue value="${debug.client}"/>
- </condition>
- <condition property="do.display.browser">
- <istrue value="${display.browser}"/>
- </condition>
- <condition property="do.display.browser.debug">
- <and>
- <isset property="do.display.browser"/>
- <not>
- <isset property="do.debug.client"/>
- </not>
- </and>
- </condition>
- <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
- <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
- <condition property="do.war.package.with.custom.manifest">
- <isset property="has.custom.manifest"/>
- </condition>
- <condition property="do.war.package.without.custom.manifest">
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- </condition>
- <condition property="do.tmp.war.package.with.custom.manifest">
- <and>
- <isset property="has.custom.manifest"/>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package.without.custom.manifest">
- <and>
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package">
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </condition>
- <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
- <condition else="" property="application.args.param" value="${application.args}">
- <and>
- <isset property="application.args"/>
- <not>
- <equals arg1="${application.args}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <property name="source.encoding" value="${file.encoding}"/>
- <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
- <and>
- <isset property="javadoc.encoding"/>
- <not>
- <equals arg1="${javadoc.encoding}" arg2=""/>
- </not>
- </and>
- </condition>
- <property name="javadoc.encoding.used" value="${source.encoding}"/>
- <property name="includes" value="**"/>
- <property name="excludes" value=""/>
- <property name="runmain.jvmargs" value=""/>
- <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
- <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
- <length length="0" string="${endorsed.classpath}" when="greater"/>
- </condition>
- </target>
- <target depends="init" name="-init-cos" unless="deploy.on.save">
- <condition property="deploy.on.save" value="true">
- <istrue value="${j2ee.deploy.on.save}"/>
- </condition>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="build.web.dir">Must set build.web.dir</fail>
- <fail unless="build.generated.dir">Must set build.generated.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.war">Must set dist.war</fail>
- <condition property="missing.j2ee.server.home">
- <and>
- <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
- <not>
- <isset property="j2ee.server.home"/>
- </not>
- </and>
- </condition>
- <fail if="missing.j2ee.server.home">
-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>
- </fail>
- <fail unless="j2ee.platform.classpath">
-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)
- </fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <mkdir dir="@{apgeneratedsrcdir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <compilerarg value="-processorpath"/>
- <compilerarg path="@{processorpath}:${empty.dir}"/>
- <compilerarg line="${ap.processors.internal}"/>
- <compilerarg value="-s"/>
- <compilerarg path="@{apgeneratedsrcdir}"/>
- <compilerarg line="${ap.proc.none.internal}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
- <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </depend>
- </sequential>
- </macrodef>
- <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${build.classes.dir}" name="destdir"/>
- <sequential>
- <fail unless="javac.includes">Must set javac.includes</fail>
- <pathconvert pathsep="," property="javac.includes.binary">
- <path>
- <filelist dir="@{destdir}" files="${javac.includes}"/>
- </path>
- <globmapper from="*.java" to="*.class"/>
- </pathconvert>
- <delete>
- <files includes="${javac.includes.binary}"/>
- </delete>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="**" name="testincludes"/>
- <sequential>
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}" name="classpath"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjsdebug">
- <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${client.url}" name="webUrl"/>
- <sequential>
- <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="name"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${build.classes.dir}" name="dir"/>
- <sequential>
- <nbjpdareload>
- <fileset dir="@{dir}" includes="${fix.classes}">
- <include name="${fix.includes}*.class"/>
- </fileset>
- </nbjpdareload>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
- <sequential>
- <nbjpdaappreloaded/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
- <os family="windows"/>
- </condition>
- <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
- <isset property="debug.transport"/>
- </condition>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${application.args.param}" name="args"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <arg line="@{args}"/>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-taskdefs">
- <fail unless="libs.CopyLibs.classpath">
-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
- </fail>
- <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
- </target>
- <target name="-init-ap-cmdline-properties">
- <property name="annotation.processing.enabled" value="true"/>
- <property name="annotation.processing.processors.list" value=""/>
- <property name="annotation.processing.run.all.processors" value="true"/>
- <property name="javac.processorpath" value="${javac.classpath}"/>
- <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
- <condition property="ap.supported.internal" value="true">
- <not>
- <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
- </not>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
- <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
- <isfalse value="${annotation.processing.run.all.processors}"/>
- </condition>
- <condition else="" property="ap.proc.none.internal" value="-proc:none">
- <isfalse value="${annotation.processing.enabled}"/>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
- <property name="ap.cmd.line.internal" value=""/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
- <!--
- COMPILATION SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
- <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
- <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
- <target depends="init,deps-jar" name="-pre-pre-compile">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-copy-webdir">
- <copy todir="${build.web.dir}">
- <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
- </copy>
- <copy todir="${build.web.dir}/WEB-INF">
- <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
- </copy>
- </target>
- <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources" name="-do-compile">
- <webproject2:javac destdir="${build.classes.dir}" gensrcdir="${build.generated.sources.dir}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target if="has.custom.manifest" name="-copy-manifest">
- <mkdir dir="${build.meta.inf.dir}"/>
- <copy todir="${build.meta.inf.dir}">
- <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
- </copy>
- </target>
- <target if="has.persistence.xml" name="-copy-persistence-xml">
- <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
- <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
- <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
- <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
- </target>
- <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
- <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-jspc.files"/>
- <arg path="${jsp.includes}"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
- <customize>
- <patternset includes="${javac.jsp.includes}"/>
- </customize>
- </webproject2:javac>
- </target>
- <target name="compile-single-jsp">
- <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
- <antcall target="-do-compile-single-jsp"/>
- </target>
- <!--
- DIST BUILDING SECTION
- -->
- <target name="-pre-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
- <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
- <mkdir dir="${build.web.dir}/META-INF"/>
- <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
- </target>
- <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
- <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
- <delete dir="${build.web.dir}/WEB-INF/lib"/>
- </target>
- <target depends="init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
- <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target name="-post-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
- <target depends="init,-clean-webinf-lib,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
- <!--
- EXECUTION SECTION
- -->
- <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
- <target name="-pre-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-post-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-pre-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
- </target>
- <target name="-post-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
- </target>
- <target name="-run-deploy-am">
- <!-- Task to deploy to the Access Manager runtime. -->
- </target>
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
- <nbjpdaappreloaded/>
- </target>
- <target if="netbeans.home" name="-run-deploy-nb">
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
- </target>
- <target name="-init-deploy-ant" unless="netbeans.home">
- <property name="deploy.ant.archive" value="${dist.war}"/>
- <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
- <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
- <property name="deploy.ant.enabled" value="true"/>
- </target>
- <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
- <target if="netbeans.home" name="-run-undeploy-nb">
- <fail message="Undeploy is not supported from within the IDE"/>
- </target>
- <target depends="init,-pre-dist,dist,-post-dist" name="verify">
- <nbverify file="${dist.war}"/>
- </target>
- <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
- <target if="do.display.browser" name="-init-display-browser">
- <condition property="do.display.browser.nb">
- <isset property="netbeans.home"/>
- </condition>
- <condition property="do.display.browser.cl">
- <isset property="deploy.ant.enabled"/>
- </condition>
- </target>
- <target if="do.display.browser.nb" name="-display-browser-nb">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.display.browser.cl" name="-get-browser" unless="browser">
- <condition property="browser" value="rundll32">
- <os family="windows"/>
- </condition>
- <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
- <os family="windows"/>
- </condition>
- <condition property="browser" value="/usr/bin/open">
- <os family="mac"/>
- </condition>
- <property environment="env"/>
- <condition property="browser" value="${env.BROWSER}">
- <isset property="env.BROWSER"/>
- </condition>
- <condition property="browser" value="/usr/bin/firefox">
- <available file="/usr/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/local/firefox/firefox">
- <available file="/usr/local/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/usr/bin/mozilla">
- <available file="/usr/bin/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/local/mozilla/mozilla">
- <available file="/usr/local/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
- <available file="/usr/sfw/lib/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/firefox">
- <available file="/opt/csw/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
- <available file="/usr/sfw/lib/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/mozilla">
- <available file="/opt/csw/bin/mozilla"/>
- </condition>
- </target>
- <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
- <fail unless="browser">
- Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
- </fail>
- <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
- <echo>Launching ${browse.url}</echo>
- <exec executable="${browser}" spawn="true">
- <arg line="${browser.args} ${browse.url}"/>
- </exec>
- </target>
- <target depends="init,-init-cos,compile-single" name="run-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" name="run-test-with-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
- </target>
- <!--
- DEBUGGING SECTION
- -->
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
- <nbstartserver debugmode="true"/>
- <antcall target="connect-debugger"/>
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
- <antcall target="debug-display-browser"/>
- <antcall target="connect-client-debugger"/>
- </target>
- <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
- <classpath>
- <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <sourcepath>
- <path path="${web.docbase.dir}"/>
- </sourcepath>
- </nbjpdaconnect>
- </target>
- <target if="do.display.browser.debug" name="debug-display-browser">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.debug.client" name="connect-client-debugger">
- <webproject1:nbjsdebugstart webUrl="${client.url}"/>
- </target>
- <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
- <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
- </target>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger">
- <webproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}"/>
- </target>
- <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
- <target depends="init" name="-pre-debug-fix">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
- <webproject1:nbjpdareload/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
- <!--
- JAVADOC SECTION
- -->
- <target depends="init" if="have.sources" name="javadoc-build">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
- <classpath>
- <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="**/*.java"/>
- </fileset>
- </javadoc>
- </target>
- <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
- <!--
-
- JUNIT COMPILATION SECTION
- -->
- <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
- <mkdir dir="${build.test.classes.dir}"/>
- <property name="j2ee.platform.embeddableejb.classpath" value=""/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
- <!--
-
- JUNIT EXECUTION SECTION
- -->
- <target depends="init" if="have.tests" name="-pre-test-run">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
- <webproject2:junit testincludes="**/*Test.java"/>
- </target>
- <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init" if="have.tests" name="test-report"/>
- <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
- <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
- <target depends="init" if="have.tests" name="-pre-test-run-single">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <webproject2:junit excludes="" includes="${test.includes}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
- <!--
-
- JUNIT DEBUGGING SECTION
- -->
- <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
- <delete file="${test.report.file}"/>
- <!-- must exist, otherwise the XML formatter would fail -->
- <mkdir dir="${build.test.results.dir}"/>
- <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
- <customize>
- <arg value="showoutput=true"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
- </customize>
- </webproject1:debug>
- </target>
- <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
- </target>
- <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
- <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
- <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
- <!--
-
- CLEANUP SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
- <target depends="init" name="do-clean">
- <condition property="build.dir.to.clean" value="${build.web.dir}">
- <isset property="dist.ear.dir"/>
- </condition>
- <property name="build.dir.to.clean" value="${build.web.dir}"/>
- <delete includeEmptyDirs="true" quiet="true">
- <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
- </delete>
- <delete dir="${build.dir}"/>
- <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target depends="do-clean" if="status.clean-failed" name="check-clean">
- <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
- <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
- </target>
- <target depends="init" if="netbeans.home" name="undeploy-clean">
- <nbundeploy failOnError="false" startServer="false"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
- <target depends="clean" description="Clean build products." name="clean-ear"/>
-</project>
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 5683af2..0000000
--- 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 3fa2c6c..0000000
--- 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 bc91159..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/private/private.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>
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 56b3eb5..0000000
--- 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 a2c6f67..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/asynctest/SFSBDriver/nbproject/project.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.web.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/web-project/3">
- <name>SFSBDriver</name>
- <minimum-ant-version>1.6.5</minimum-ant-version>
- <web-module-libraries/>
- <web-module-additional-libraries/>
- <source-roots>
- <root id="src.dir" name="Source Packages"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir" name="Test Packages"/>
- </test-roots>
- </data>
- </configuration>
-</project>
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 c37d861..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project default="-deploy-ant" basedir=".">
- <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
- <property file="${deploy.ant.properties.file}" />
- <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
- <available file="${deploy.ant.resource.dir}" property="has.setup"/>
- <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
- </target>
-
- <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
- <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
- <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
- <!-- The doctype triggers resolution which can fail -->
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
- <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
- </replace>
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
- <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
- </replace>
- <xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
- <delete file="${temp.sun.web}"/>
- <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
- <property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
- </target>
- <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
- <property name="deploy.context.root.argument" value=""/>
- </target>
- <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
- <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
- <mkdir dir="${gfv3.resources.dir}"/>
- <mkdir dir="${gfv3.resources.dir}/META-INF"/>
- <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
- <copy todir="${gfv3.resources.dir}/META-INF">
- <fileset dir="${deploy.ant.resource.dir}"/>
- </copy>
- <jar destfile="${deploy.ant.archive}" update="true">
- <fileset dir="${gfv3.resources.dir}"/>
- </jar>
- <delete dir="${gfv3.resources.dir}"/>
- </target>
- <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
- <antcall target="-deploy-without-pw"/>
- <antcall target="-deploy-with-pw"/>
- </target>
-
- <target name="-deploy-without-pw" unless="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-deploy-with-pw" if="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
- <antcall target="-undeploy-without-pw"/>
- <antcall target="-undeploy-with-pw"/>
- </target>
-
- <target name="-undeploy-without-pw" unless="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-with-pw" if="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
-</project>
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 8a63173..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml
+++ /dev/null
@@ -1,979 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!--
- *** GENERATED FROM project.xml - DO NOT EDIT ***
- *** EDIT ../build.xml INSTEAD ***
-
- For the purpose of easier reading the script
- is divided into following sections:
- - initialization
- - compilation
- - dist
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - cleanup
-
- -->
-<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="SFSBDriver-impl">
- <import file="ant-deploy.xml"/>
- <fail message="Please build using Ant 1.7.1 or higher.">
- <condition>
- <not>
- <antversion atleast="1.7.1"/>
- </not>
- </condition>
- </fail>
- <target depends="dist,javadoc" description="Build whole project." name="default"/>
- <!--
- INITIALIZATION SECTION
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init" name="-init-private">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target depends="-pre-init,-init-private" name="-init-user">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user" name="-init-project">
- <property file="nbproject/project.properties"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="javac.compilerargs" value=""/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <condition property="no.dist.ear.dir">
- <not>
- <isset property="dist.ear.dir"/>
- </not>
- </condition>
- <property name="build.web.excludes" value="${build.classes.excludes}"/>
- <condition property="do.compile.jsps">
- <istrue value="${compile.jsps}"/>
- </condition>
- <condition property="do.debug.server">
- <or>
- <not>
- <isset property="debug.server"/>
- </not>
- <istrue value="${debug.server}"/>
- <and>
- <not>
- <istrue value="${debug.server}"/>
- </not>
- <not>
- <istrue value="${debug.client}"/>
- </not>
- </and>
- </or>
- </condition>
- <condition property="do.debug.client">
- <istrue value="${debug.client}"/>
- </condition>
- <condition property="do.display.browser">
- <istrue value="${display.browser}"/>
- </condition>
- <condition property="do.display.browser.debug">
- <and>
- <isset property="do.display.browser"/>
- <not>
- <isset property="do.debug.client"/>
- </not>
- </and>
- </condition>
- <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
- <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
- <condition property="do.war.package.with.custom.manifest">
- <isset property="has.custom.manifest"/>
- </condition>
- <condition property="do.war.package.without.custom.manifest">
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- </condition>
- <condition property="do.tmp.war.package.with.custom.manifest">
- <and>
- <isset property="has.custom.manifest"/>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package.without.custom.manifest">
- <and>
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package">
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </condition>
- <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
- <condition else="" property="application.args.param" value="${application.args}">
- <and>
- <isset property="application.args"/>
- <not>
- <equals arg1="${application.args}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <property name="source.encoding" value="${file.encoding}"/>
- <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
- <and>
- <isset property="javadoc.encoding"/>
- <not>
- <equals arg1="${javadoc.encoding}" arg2=""/>
- </not>
- </and>
- </condition>
- <property name="javadoc.encoding.used" value="${source.encoding}"/>
- <property name="includes" value="**"/>
- <property name="excludes" value=""/>
- <property name="runmain.jvmargs" value=""/>
- <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
- <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
- <length length="0" string="${endorsed.classpath}" when="greater"/>
- </condition>
- </target>
- <target depends="init" name="-init-cos" unless="deploy.on.save">
- <condition property="deploy.on.save" value="true">
- <istrue value="${j2ee.deploy.on.save}"/>
- </condition>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="build.web.dir">Must set build.web.dir</fail>
- <fail unless="build.generated.dir">Must set build.generated.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.war">Must set dist.war</fail>
- <condition property="missing.j2ee.server.home">
- <and>
- <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
- <not>
- <isset property="j2ee.server.home"/>
- </not>
- </and>
- </condition>
- <fail if="missing.j2ee.server.home">
-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>
- </fail>
- <fail unless="j2ee.platform.classpath">
-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)
- </fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <mkdir dir="@{apgeneratedsrcdir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <compilerarg value="-processorpath"/>
- <compilerarg path="@{processorpath}:${empty.dir}"/>
- <compilerarg line="${ap.processors.internal}"/>
- <compilerarg value="-s"/>
- <compilerarg path="@{apgeneratedsrcdir}"/>
- <compilerarg line="${ap.proc.none.internal}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
- <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </depend>
- </sequential>
- </macrodef>
- <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${build.classes.dir}" name="destdir"/>
- <sequential>
- <fail unless="javac.includes">Must set javac.includes</fail>
- <pathconvert pathsep="," property="javac.includes.binary">
- <path>
- <filelist dir="@{destdir}" files="${javac.includes}"/>
- </path>
- <globmapper from="*.java" to="*.class"/>
- </pathconvert>
- <delete>
- <files includes="${javac.includes.binary}"/>
- </delete>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="**" name="testincludes"/>
- <sequential>
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}" name="classpath"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjsdebug">
- <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${client.url}" name="webUrl"/>
- <sequential>
- <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="name"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${build.classes.dir}" name="dir"/>
- <sequential>
- <nbjpdareload>
- <fileset dir="@{dir}" includes="${fix.classes}">
- <include name="${fix.includes}*.class"/>
- </fileset>
- </nbjpdareload>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
- <sequential>
- <nbjpdaappreloaded/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
- <os family="windows"/>
- </condition>
- <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
- <isset property="debug.transport"/>
- </condition>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${application.args.param}" name="args"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <arg line="@{args}"/>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-taskdefs">
- <fail unless="libs.CopyLibs.classpath">
-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
- </fail>
- <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
- </target>
- <target name="-init-ap-cmdline-properties">
- <property name="annotation.processing.enabled" value="true"/>
- <property name="annotation.processing.processors.list" value=""/>
- <property name="annotation.processing.run.all.processors" value="true"/>
- <property name="javac.processorpath" value="${javac.classpath}"/>
- <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
- <condition property="ap.supported.internal" value="true">
- <not>
- <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
- </not>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
- <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
- <isfalse value="${annotation.processing.run.all.processors}"/>
- </condition>
- <condition else="" property="ap.proc.none.internal" value="-proc:none">
- <isfalse value="${annotation.processing.enabled}"/>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
- <property name="ap.cmd.line.internal" value=""/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
- <!--
- COMPILATION SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
- <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
- <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
- <target depends="init,deps-jar" name="-pre-pre-compile">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-copy-webdir">
- <copy todir="${build.web.dir}">
- <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
- </copy>
- <copy todir="${build.web.dir}/WEB-INF">
- <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
- </copy>
- </target>
- <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources" name="-do-compile">
- <webproject2:javac destdir="${build.classes.dir}" gensrcdir="${build.generated.sources.dir}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target if="has.custom.manifest" name="-copy-manifest">
- <mkdir dir="${build.meta.inf.dir}"/>
- <copy todir="${build.meta.inf.dir}">
- <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
- </copy>
- </target>
- <target if="has.persistence.xml" name="-copy-persistence-xml">
- <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
- <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
- <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
- <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
- </target>
- <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
- <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-jspc.files"/>
- <arg path="${jsp.includes}"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
- <customize>
- <patternset includes="${javac.jsp.includes}"/>
- </customize>
- </webproject2:javac>
- </target>
- <target name="compile-single-jsp">
- <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
- <antcall target="-do-compile-single-jsp"/>
- </target>
- <!--
- DIST BUILDING SECTION
- -->
- <target name="-pre-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
- <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
- <mkdir dir="${build.web.dir}/META-INF"/>
- <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
- </target>
- <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
- <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
- <delete dir="${build.web.dir}/WEB-INF/lib"/>
- </target>
- <target depends="init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
- <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target name="-post-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
- <target depends="init,-clean-webinf-lib,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
- <!--
- EXECUTION SECTION
- -->
- <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
- <target name="-pre-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-post-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-pre-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
- </target>
- <target name="-post-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
- </target>
- <target name="-run-deploy-am">
- <!-- Task to deploy to the Access Manager runtime. -->
- </target>
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
- <nbjpdaappreloaded/>
- </target>
- <target if="netbeans.home" name="-run-deploy-nb">
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
- </target>
- <target name="-init-deploy-ant" unless="netbeans.home">
- <property name="deploy.ant.archive" value="${dist.war}"/>
- <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
- <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
- <property name="deploy.ant.enabled" value="true"/>
- </target>
- <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
- <target if="netbeans.home" name="-run-undeploy-nb">
- <fail message="Undeploy is not supported from within the IDE"/>
- </target>
- <target depends="init,-pre-dist,dist,-post-dist" name="verify">
- <nbverify file="${dist.war}"/>
- </target>
- <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
- <target if="do.display.browser" name="-init-display-browser">
- <condition property="do.display.browser.nb">
- <isset property="netbeans.home"/>
- </condition>
- <condition property="do.display.browser.cl">
- <isset property="deploy.ant.enabled"/>
- </condition>
- </target>
- <target if="do.display.browser.nb" name="-display-browser-nb">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.display.browser.cl" name="-get-browser" unless="browser">
- <condition property="browser" value="rundll32">
- <os family="windows"/>
- </condition>
- <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
- <os family="windows"/>
- </condition>
- <condition property="browser" value="/usr/bin/open">
- <os family="mac"/>
- </condition>
- <property environment="env"/>
- <condition property="browser" value="${env.BROWSER}">
- <isset property="env.BROWSER"/>
- </condition>
- <condition property="browser" value="/usr/bin/firefox">
- <available file="/usr/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/local/firefox/firefox">
- <available file="/usr/local/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/usr/bin/mozilla">
- <available file="/usr/bin/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/local/mozilla/mozilla">
- <available file="/usr/local/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
- <available file="/usr/sfw/lib/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/firefox">
- <available file="/opt/csw/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
- <available file="/usr/sfw/lib/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/mozilla">
- <available file="/opt/csw/bin/mozilla"/>
- </condition>
- </target>
- <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
- <fail unless="browser">
- Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
- </fail>
- <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
- <echo>Launching ${browse.url}</echo>
- <exec executable="${browser}" spawn="true">
- <arg line="${browser.args} ${browse.url}"/>
- </exec>
- </target>
- <target depends="init,-init-cos,compile-single" name="run-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" name="run-test-with-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
- </target>
- <!--
- DEBUGGING SECTION
- -->
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
- <nbstartserver debugmode="true"/>
- <antcall target="connect-debugger"/>
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
- <antcall target="debug-display-browser"/>
- <antcall target="connect-client-debugger"/>
- </target>
- <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
- <classpath>
- <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <sourcepath>
- <path path="${web.docbase.dir}"/>
- </sourcepath>
- </nbjpdaconnect>
- </target>
- <target if="do.display.browser.debug" name="debug-display-browser">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.debug.client" name="connect-client-debugger">
- <webproject1:nbjsdebugstart webUrl="${client.url}"/>
- </target>
- <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
- <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
- </target>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger">
- <webproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}"/>
- </target>
- <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
- <target depends="init" name="-pre-debug-fix">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
- <webproject1:nbjpdareload/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
- <!--
- JAVADOC SECTION
- -->
- <target depends="init" if="have.sources" name="javadoc-build">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
- <classpath>
- <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="**/*.java"/>
- </fileset>
- </javadoc>
- </target>
- <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
- <!--
-
- JUNIT COMPILATION SECTION
- -->
- <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
- <mkdir dir="${build.test.classes.dir}"/>
- <property name="j2ee.platform.embeddableejb.classpath" value=""/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
- <!--
-
- JUNIT EXECUTION SECTION
- -->
- <target depends="init" if="have.tests" name="-pre-test-run">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
- <webproject2:junit testincludes="**/*Test.java"/>
- </target>
- <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init" if="have.tests" name="test-report"/>
- <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
- <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
- <target depends="init" if="have.tests" name="-pre-test-run-single">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <webproject2:junit excludes="" includes="${test.includes}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
- <!--
-
- JUNIT DEBUGGING SECTION
- -->
- <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
- <delete file="${test.report.file}"/>
- <!-- must exist, otherwise the XML formatter would fail -->
- <mkdir dir="${build.test.results.dir}"/>
- <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
- <customize>
- <arg value="showoutput=true"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
- </customize>
- </webproject1:debug>
- </target>
- <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
- </target>
- <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
- <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
- <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
- <!--
-
- CLEANUP SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
- <target depends="init" name="do-clean">
- <condition property="build.dir.to.clean" value="${build.web.dir}">
- <isset property="dist.ear.dir"/>
- </condition>
- <property name="build.dir.to.clean" value="${build.web.dir}"/>
- <delete includeEmptyDirs="true" quiet="true">
- <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
- </delete>
- <delete dir="${build.dir}"/>
- <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target depends="do-clean" if="status.clean-failed" name="check-clean">
- <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
- <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
- </target>
- <target depends="init" if="netbeans.home" name="undeploy-clean">
- <nbundeploy failOnError="false" startServer="false"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
- <target depends="clean" description="Clean build products." name="clean-ear"/>
-</project>
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 5683af2..0000000
--- 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 04bacf7..0000000
--- 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 bc91159..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>
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 a11b91c..0000000
--- 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 a2c6f67..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/ha-web/SFSBDriver/nbproject/project.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.web.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/web-project/3">
- <name>SFSBDriver</name>
- <minimum-ant-version>1.6.5</minimum-ant-version>
- <web-module-libraries/>
- <web-module-additional-libraries/>
- <source-roots>
- <root id="src.dir" name="Source Packages"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir" name="Test Packages"/>
- </test-roots>
- </data>
- </configuration>
-</project>
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 c37d861..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/ant-deploy.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project default="-deploy-ant" basedir=".">
- <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
- <property file="${deploy.ant.properties.file}" />
- <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
- <available file="${deploy.ant.resource.dir}" property="has.setup"/>
- <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
- </target>
-
- <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
- <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
- <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
- <!-- The doctype triggers resolution which can fail -->
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
- <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
- </replace>
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
- <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
- </replace>
- <xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
- <delete file="${temp.sun.web}"/>
- <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
- <property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
- </target>
- <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
- <property name="deploy.context.root.argument" value=""/>
- </target>
- <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
- <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
- <mkdir dir="${gfv3.resources.dir}"/>
- <mkdir dir="${gfv3.resources.dir}/META-INF"/>
- <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
- <copy todir="${gfv3.resources.dir}/META-INF">
- <fileset dir="${deploy.ant.resource.dir}"/>
- </copy>
- <jar destfile="${deploy.ant.archive}" update="true">
- <fileset dir="${gfv3.resources.dir}"/>
- </jar>
- <delete dir="${gfv3.resources.dir}"/>
- </target>
- <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
- <antcall target="-deploy-without-pw"/>
- <antcall target="-deploy-with-pw"/>
- </target>
-
- <target name="-deploy-without-pw" unless="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-deploy-with-pw" if="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
- <antcall target="-undeploy-without-pw"/>
- <antcall target="-undeploy-with-pw"/>
- </target>
-
- <target name="-undeploy-without-pw" unless="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-with-pw" if="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
-</project>
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 8a63173..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/build-impl.xml
+++ /dev/null
@@ -1,979 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!--
- *** GENERATED FROM project.xml - DO NOT EDIT ***
- *** EDIT ../build.xml INSTEAD ***
-
- For the purpose of easier reading the script
- is divided into following sections:
- - initialization
- - compilation
- - dist
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - cleanup
-
- -->
-<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="SFSBDriver-impl">
- <import file="ant-deploy.xml"/>
- <fail message="Please build using Ant 1.7.1 or higher.">
- <condition>
- <not>
- <antversion atleast="1.7.1"/>
- </not>
- </condition>
- </fail>
- <target depends="dist,javadoc" description="Build whole project." name="default"/>
- <!--
- INITIALIZATION SECTION
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init" name="-init-private">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target depends="-pre-init,-init-private" name="-init-user">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user" name="-init-project">
- <property file="nbproject/project.properties"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="javac.compilerargs" value=""/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <condition property="no.dist.ear.dir">
- <not>
- <isset property="dist.ear.dir"/>
- </not>
- </condition>
- <property name="build.web.excludes" value="${build.classes.excludes}"/>
- <condition property="do.compile.jsps">
- <istrue value="${compile.jsps}"/>
- </condition>
- <condition property="do.debug.server">
- <or>
- <not>
- <isset property="debug.server"/>
- </not>
- <istrue value="${debug.server}"/>
- <and>
- <not>
- <istrue value="${debug.server}"/>
- </not>
- <not>
- <istrue value="${debug.client}"/>
- </not>
- </and>
- </or>
- </condition>
- <condition property="do.debug.client">
- <istrue value="${debug.client}"/>
- </condition>
- <condition property="do.display.browser">
- <istrue value="${display.browser}"/>
- </condition>
- <condition property="do.display.browser.debug">
- <and>
- <isset property="do.display.browser"/>
- <not>
- <isset property="do.debug.client"/>
- </not>
- </and>
- </condition>
- <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
- <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
- <condition property="do.war.package.with.custom.manifest">
- <isset property="has.custom.manifest"/>
- </condition>
- <condition property="do.war.package.without.custom.manifest">
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- </condition>
- <condition property="do.tmp.war.package.with.custom.manifest">
- <and>
- <isset property="has.custom.manifest"/>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package.without.custom.manifest">
- <and>
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package">
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </condition>
- <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
- <condition else="" property="application.args.param" value="${application.args}">
- <and>
- <isset property="application.args"/>
- <not>
- <equals arg1="${application.args}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <property name="source.encoding" value="${file.encoding}"/>
- <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
- <and>
- <isset property="javadoc.encoding"/>
- <not>
- <equals arg1="${javadoc.encoding}" arg2=""/>
- </not>
- </and>
- </condition>
- <property name="javadoc.encoding.used" value="${source.encoding}"/>
- <property name="includes" value="**"/>
- <property name="excludes" value=""/>
- <property name="runmain.jvmargs" value=""/>
- <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
- <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
- <length length="0" string="${endorsed.classpath}" when="greater"/>
- </condition>
- </target>
- <target depends="init" name="-init-cos" unless="deploy.on.save">
- <condition property="deploy.on.save" value="true">
- <istrue value="${j2ee.deploy.on.save}"/>
- </condition>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="build.web.dir">Must set build.web.dir</fail>
- <fail unless="build.generated.dir">Must set build.generated.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.war">Must set dist.war</fail>
- <condition property="missing.j2ee.server.home">
- <and>
- <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
- <not>
- <isset property="j2ee.server.home"/>
- </not>
- </and>
- </condition>
- <fail if="missing.j2ee.server.home">
-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>
- </fail>
- <fail unless="j2ee.platform.classpath">
-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)
- </fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <mkdir dir="@{apgeneratedsrcdir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <compilerarg value="-processorpath"/>
- <compilerarg path="@{processorpath}:${empty.dir}"/>
- <compilerarg line="${ap.processors.internal}"/>
- <compilerarg value="-s"/>
- <compilerarg path="@{apgeneratedsrcdir}"/>
- <compilerarg line="${ap.proc.none.internal}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
- <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </depend>
- </sequential>
- </macrodef>
- <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${build.classes.dir}" name="destdir"/>
- <sequential>
- <fail unless="javac.includes">Must set javac.includes</fail>
- <pathconvert pathsep="," property="javac.includes.binary">
- <path>
- <filelist dir="@{destdir}" files="${javac.includes}"/>
- </path>
- <globmapper from="*.java" to="*.class"/>
- </pathconvert>
- <delete>
- <files includes="${javac.includes.binary}"/>
- </delete>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="**" name="testincludes"/>
- <sequential>
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}" name="classpath"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjsdebug">
- <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${client.url}" name="webUrl"/>
- <sequential>
- <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="name"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${build.classes.dir}" name="dir"/>
- <sequential>
- <nbjpdareload>
- <fileset dir="@{dir}" includes="${fix.classes}">
- <include name="${fix.includes}*.class"/>
- </fileset>
- </nbjpdareload>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
- <sequential>
- <nbjpdaappreloaded/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
- <os family="windows"/>
- </condition>
- <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
- <isset property="debug.transport"/>
- </condition>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${application.args.param}" name="args"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <arg line="@{args}"/>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-taskdefs">
- <fail unless="libs.CopyLibs.classpath">
-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
- </fail>
- <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
- </target>
- <target name="-init-ap-cmdline-properties">
- <property name="annotation.processing.enabled" value="true"/>
- <property name="annotation.processing.processors.list" value=""/>
- <property name="annotation.processing.run.all.processors" value="true"/>
- <property name="javac.processorpath" value="${javac.classpath}"/>
- <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
- <condition property="ap.supported.internal" value="true">
- <not>
- <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
- </not>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
- <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
- <isfalse value="${annotation.processing.run.all.processors}"/>
- </condition>
- <condition else="" property="ap.proc.none.internal" value="-proc:none">
- <isfalse value="${annotation.processing.enabled}"/>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
- <property name="ap.cmd.line.internal" value=""/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
- <!--
- COMPILATION SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
- <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
- <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
- <target depends="init,deps-jar" name="-pre-pre-compile">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-copy-webdir">
- <copy todir="${build.web.dir}">
- <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
- </copy>
- <copy todir="${build.web.dir}/WEB-INF">
- <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
- </copy>
- </target>
- <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources" name="-do-compile">
- <webproject2:javac destdir="${build.classes.dir}" gensrcdir="${build.generated.sources.dir}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target if="has.custom.manifest" name="-copy-manifest">
- <mkdir dir="${build.meta.inf.dir}"/>
- <copy todir="${build.meta.inf.dir}">
- <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
- </copy>
- </target>
- <target if="has.persistence.xml" name="-copy-persistence-xml">
- <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
- <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
- <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
- <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
- </target>
- <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
- <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-jspc.files"/>
- <arg path="${jsp.includes}"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
- <customize>
- <patternset includes="${javac.jsp.includes}"/>
- </customize>
- </webproject2:javac>
- </target>
- <target name="compile-single-jsp">
- <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
- <antcall target="-do-compile-single-jsp"/>
- </target>
- <!--
- DIST BUILDING SECTION
- -->
- <target name="-pre-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
- <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
- <mkdir dir="${build.web.dir}/META-INF"/>
- <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
- </target>
- <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
- <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
- <delete dir="${build.web.dir}/WEB-INF/lib"/>
- </target>
- <target depends="init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
- <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target name="-post-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
- <target depends="init,-clean-webinf-lib,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
- <!--
- EXECUTION SECTION
- -->
- <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
- <target name="-pre-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-post-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-pre-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
- </target>
- <target name="-post-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
- </target>
- <target name="-run-deploy-am">
- <!-- Task to deploy to the Access Manager runtime. -->
- </target>
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
- <nbjpdaappreloaded/>
- </target>
- <target if="netbeans.home" name="-run-deploy-nb">
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
- </target>
- <target name="-init-deploy-ant" unless="netbeans.home">
- <property name="deploy.ant.archive" value="${dist.war}"/>
- <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
- <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
- <property name="deploy.ant.enabled" value="true"/>
- </target>
- <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
- <target if="netbeans.home" name="-run-undeploy-nb">
- <fail message="Undeploy is not supported from within the IDE"/>
- </target>
- <target depends="init,-pre-dist,dist,-post-dist" name="verify">
- <nbverify file="${dist.war}"/>
- </target>
- <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
- <target if="do.display.browser" name="-init-display-browser">
- <condition property="do.display.browser.nb">
- <isset property="netbeans.home"/>
- </condition>
- <condition property="do.display.browser.cl">
- <isset property="deploy.ant.enabled"/>
- </condition>
- </target>
- <target if="do.display.browser.nb" name="-display-browser-nb">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.display.browser.cl" name="-get-browser" unless="browser">
- <condition property="browser" value="rundll32">
- <os family="windows"/>
- </condition>
- <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
- <os family="windows"/>
- </condition>
- <condition property="browser" value="/usr/bin/open">
- <os family="mac"/>
- </condition>
- <property environment="env"/>
- <condition property="browser" value="${env.BROWSER}">
- <isset property="env.BROWSER"/>
- </condition>
- <condition property="browser" value="/usr/bin/firefox">
- <available file="/usr/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/local/firefox/firefox">
- <available file="/usr/local/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/usr/bin/mozilla">
- <available file="/usr/bin/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/local/mozilla/mozilla">
- <available file="/usr/local/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
- <available file="/usr/sfw/lib/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/firefox">
- <available file="/opt/csw/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
- <available file="/usr/sfw/lib/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/mozilla">
- <available file="/opt/csw/bin/mozilla"/>
- </condition>
- </target>
- <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
- <fail unless="browser">
- Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
- </fail>
- <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
- <echo>Launching ${browse.url}</echo>
- <exec executable="${browser}" spawn="true">
- <arg line="${browser.args} ${browse.url}"/>
- </exec>
- </target>
- <target depends="init,-init-cos,compile-single" name="run-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" name="run-test-with-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
- </target>
- <!--
- DEBUGGING SECTION
- -->
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
- <nbstartserver debugmode="true"/>
- <antcall target="connect-debugger"/>
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
- <antcall target="debug-display-browser"/>
- <antcall target="connect-client-debugger"/>
- </target>
- <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
- <classpath>
- <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <sourcepath>
- <path path="${web.docbase.dir}"/>
- </sourcepath>
- </nbjpdaconnect>
- </target>
- <target if="do.display.browser.debug" name="debug-display-browser">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.debug.client" name="connect-client-debugger">
- <webproject1:nbjsdebugstart webUrl="${client.url}"/>
- </target>
- <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
- <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
- </target>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger">
- <webproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}"/>
- </target>
- <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
- <target depends="init" name="-pre-debug-fix">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
- <webproject1:nbjpdareload/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
- <!--
- JAVADOC SECTION
- -->
- <target depends="init" if="have.sources" name="javadoc-build">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
- <classpath>
- <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="**/*.java"/>
- </fileset>
- </javadoc>
- </target>
- <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
- <!--
-
- JUNIT COMPILATION SECTION
- -->
- <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
- <mkdir dir="${build.test.classes.dir}"/>
- <property name="j2ee.platform.embeddableejb.classpath" value=""/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
- <!--
-
- JUNIT EXECUTION SECTION
- -->
- <target depends="init" if="have.tests" name="-pre-test-run">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
- <webproject2:junit testincludes="**/*Test.java"/>
- </target>
- <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init" if="have.tests" name="test-report"/>
- <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
- <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
- <target depends="init" if="have.tests" name="-pre-test-run-single">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <webproject2:junit excludes="" includes="${test.includes}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
- <!--
-
- JUNIT DEBUGGING SECTION
- -->
- <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
- <delete file="${test.report.file}"/>
- <!-- must exist, otherwise the XML formatter would fail -->
- <mkdir dir="${build.test.results.dir}"/>
- <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
- <customize>
- <arg value="showoutput=true"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
- </customize>
- </webproject1:debug>
- </target>
- <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
- </target>
- <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
- <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
- <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
- <!--
-
- CLEANUP SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
- <target depends="init" name="do-clean">
- <condition property="build.dir.to.clean" value="${build.web.dir}">
- <isset property="dist.ear.dir"/>
- </condition>
- <property name="build.dir.to.clean" value="${build.web.dir}"/>
- <delete includeEmptyDirs="true" quiet="true">
- <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
- </delete>
- <delete dir="${build.dir}"/>
- <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target depends="do-clean" if="status.clean-failed" name="check-clean">
- <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
- <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
- </target>
- <target depends="init" if="netbeans.home" name="undeploy-clean">
- <nbundeploy failOnError="false" startServer="false"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
- <target depends="clean" description="Clean build products." name="clean-ear"/>
-</project>
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 5683af2..0000000
--- 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 92fb06c..0000000
--- 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 bc91159..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/private/private.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>
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 56b3eb5..0000000
--- 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 a2c6f67..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/instance-restart-test/SFSBDriver/nbproject/project.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.web.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/web-project/3">
- <name>SFSBDriver</name>
- <minimum-ant-version>1.6.5</minimum-ant-version>
- <web-module-libraries/>
- <web-module-additional-libraries/>
- <source-roots>
- <root id="src.dir" name="Source Packages"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir" name="Test Packages"/>
- </test-roots>
- </data>
- </configuration>
-</project>
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 c37d861..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/ant-deploy.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project default="-deploy-ant" basedir=".">
- <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
- <property file="${deploy.ant.properties.file}" />
- <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
- <available file="${deploy.ant.resource.dir}" property="has.setup"/>
- <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
- </target>
-
- <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
- <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
- <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
- <!-- The doctype triggers resolution which can fail -->
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
- <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
- </replace>
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
- <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
- </replace>
- <xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
- <delete file="${temp.sun.web}"/>
- <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
- <property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
- </target>
- <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
- <property name="deploy.context.root.argument" value=""/>
- </target>
- <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
- <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
- <mkdir dir="${gfv3.resources.dir}"/>
- <mkdir dir="${gfv3.resources.dir}/META-INF"/>
- <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
- <copy todir="${gfv3.resources.dir}/META-INF">
- <fileset dir="${deploy.ant.resource.dir}"/>
- </copy>
- <jar destfile="${deploy.ant.archive}" update="true">
- <fileset dir="${gfv3.resources.dir}"/>
- </jar>
- <delete dir="${gfv3.resources.dir}"/>
- </target>
- <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
- <antcall target="-deploy-without-pw"/>
- <antcall target="-deploy-with-pw"/>
- </target>
-
- <target name="-deploy-without-pw" unless="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-deploy-with-pw" if="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
- <antcall target="-undeploy-without-pw"/>
- <antcall target="-undeploy-with-pw"/>
- </target>
-
- <target name="-undeploy-without-pw" unless="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-with-pw" if="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
-</project>
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 e752213..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/build-impl.xml
+++ /dev/null
@@ -1,979 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!--
- *** GENERATED FROM project.xml - DO NOT EDIT ***
- *** EDIT ../build.xml INSTEAD ***
-
- For the purpose of easier reading the script
- is divided into following sections:
- - initialization
- - compilation
- - dist
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - cleanup
-
- -->
-<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="SFSBMethodCheckpointDriver-impl">
- <import file="ant-deploy.xml"/>
- <fail message="Please build using Ant 1.7.1 or higher.">
- <condition>
- <not>
- <antversion atleast="1.7.1"/>
- </not>
- </condition>
- </fail>
- <target depends="dist,javadoc" description="Build whole project." name="default"/>
- <!--
- INITIALIZATION SECTION
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init" name="-init-private">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target depends="-pre-init,-init-private" name="-init-user">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user" name="-init-project">
- <property file="nbproject/project.properties"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="javac.compilerargs" value=""/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <condition property="no.dist.ear.dir">
- <not>
- <isset property="dist.ear.dir"/>
- </not>
- </condition>
- <property name="build.web.excludes" value="${build.classes.excludes}"/>
- <condition property="do.compile.jsps">
- <istrue value="${compile.jsps}"/>
- </condition>
- <condition property="do.debug.server">
- <or>
- <not>
- <isset property="debug.server"/>
- </not>
- <istrue value="${debug.server}"/>
- <and>
- <not>
- <istrue value="${debug.server}"/>
- </not>
- <not>
- <istrue value="${debug.client}"/>
- </not>
- </and>
- </or>
- </condition>
- <condition property="do.debug.client">
- <istrue value="${debug.client}"/>
- </condition>
- <condition property="do.display.browser">
- <istrue value="${display.browser}"/>
- </condition>
- <condition property="do.display.browser.debug">
- <and>
- <isset property="do.display.browser"/>
- <not>
- <isset property="do.debug.client"/>
- </not>
- </and>
- </condition>
- <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
- <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
- <condition property="do.war.package.with.custom.manifest">
- <isset property="has.custom.manifest"/>
- </condition>
- <condition property="do.war.package.without.custom.manifest">
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- </condition>
- <condition property="do.tmp.war.package.with.custom.manifest">
- <and>
- <isset property="has.custom.manifest"/>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package.without.custom.manifest">
- <and>
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package">
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </condition>
- <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
- <condition else="" property="application.args.param" value="${application.args}">
- <and>
- <isset property="application.args"/>
- <not>
- <equals arg1="${application.args}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <property name="source.encoding" value="${file.encoding}"/>
- <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
- <and>
- <isset property="javadoc.encoding"/>
- <not>
- <equals arg1="${javadoc.encoding}" arg2=""/>
- </not>
- </and>
- </condition>
- <property name="javadoc.encoding.used" value="${source.encoding}"/>
- <property name="includes" value="**"/>
- <property name="excludes" value=""/>
- <property name="runmain.jvmargs" value=""/>
- <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
- <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
- <length length="0" string="${endorsed.classpath}" when="greater"/>
- </condition>
- </target>
- <target depends="init" name="-init-cos" unless="deploy.on.save">
- <condition property="deploy.on.save" value="true">
- <istrue value="${j2ee.deploy.on.save}"/>
- </condition>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="build.web.dir">Must set build.web.dir</fail>
- <fail unless="build.generated.dir">Must set build.generated.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.war">Must set dist.war</fail>
- <condition property="missing.j2ee.server.home">
- <and>
- <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
- <not>
- <isset property="j2ee.server.home"/>
- </not>
- </and>
- </condition>
- <fail if="missing.j2ee.server.home">
-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>
- </fail>
- <fail unless="j2ee.platform.classpath">
-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)
- </fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <mkdir dir="@{apgeneratedsrcdir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <compilerarg value="-processorpath"/>
- <compilerarg path="@{processorpath}:${empty.dir}"/>
- <compilerarg line="${ap.processors.internal}"/>
- <compilerarg value="-s"/>
- <compilerarg path="@{apgeneratedsrcdir}"/>
- <compilerarg line="${ap.proc.none.internal}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
- <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </depend>
- </sequential>
- </macrodef>
- <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${build.classes.dir}" name="destdir"/>
- <sequential>
- <fail unless="javac.includes">Must set javac.includes</fail>
- <pathconvert pathsep="," property="javac.includes.binary">
- <path>
- <filelist dir="@{destdir}" files="${javac.includes}"/>
- </path>
- <globmapper from="*.java" to="*.class"/>
- </pathconvert>
- <delete>
- <files includes="${javac.includes.binary}"/>
- </delete>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="**" name="testincludes"/>
- <sequential>
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}" name="classpath"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjsdebug">
- <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${client.url}" name="webUrl"/>
- <sequential>
- <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="name"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${build.classes.dir}" name="dir"/>
- <sequential>
- <nbjpdareload>
- <fileset dir="@{dir}" includes="${fix.classes}">
- <include name="${fix.includes}*.class"/>
- </fileset>
- </nbjpdareload>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
- <sequential>
- <nbjpdaappreloaded/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
- <os family="windows"/>
- </condition>
- <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
- <isset property="debug.transport"/>
- </condition>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${application.args.param}" name="args"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <arg line="@{args}"/>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-taskdefs">
- <fail unless="libs.CopyLibs.classpath">
-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
- </fail>
- <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
- </target>
- <target name="-init-ap-cmdline-properties">
- <property name="annotation.processing.enabled" value="true"/>
- <property name="annotation.processing.processors.list" value=""/>
- <property name="annotation.processing.run.all.processors" value="true"/>
- <property name="javac.processorpath" value="${javac.classpath}"/>
- <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
- <condition property="ap.supported.internal" value="true">
- <not>
- <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
- </not>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
- <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
- <isfalse value="${annotation.processing.run.all.processors}"/>
- </condition>
- <condition else="" property="ap.proc.none.internal" value="-proc:none">
- <isfalse value="${annotation.processing.enabled}"/>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
- <property name="ap.cmd.line.internal" value=""/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
- <!--
- COMPILATION SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
- <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
- <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
- <target depends="init,deps-jar" name="-pre-pre-compile">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-copy-webdir">
- <copy todir="${build.web.dir}">
- <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
- </copy>
- <copy todir="${build.web.dir}/WEB-INF">
- <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
- </copy>
- </target>
- <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources" name="-do-compile">
- <webproject2:javac destdir="${build.classes.dir}" gensrcdir="${build.generated.sources.dir}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target if="has.custom.manifest" name="-copy-manifest">
- <mkdir dir="${build.meta.inf.dir}"/>
- <copy todir="${build.meta.inf.dir}">
- <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
- </copy>
- </target>
- <target if="has.persistence.xml" name="-copy-persistence-xml">
- <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
- <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
- <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
- <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
- </target>
- <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
- <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-jspc.files"/>
- <arg path="${jsp.includes}"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
- <customize>
- <patternset includes="${javac.jsp.includes}"/>
- </customize>
- </webproject2:javac>
- </target>
- <target name="compile-single-jsp">
- <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
- <antcall target="-do-compile-single-jsp"/>
- </target>
- <!--
- DIST BUILDING SECTION
- -->
- <target name="-pre-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
- <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
- <mkdir dir="${build.web.dir}/META-INF"/>
- <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
- </target>
- <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
- <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
- <delete dir="${build.web.dir}/WEB-INF/lib"/>
- </target>
- <target depends="init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
- <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target name="-post-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
- <target depends="init,-clean-webinf-lib,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
- <!--
- EXECUTION SECTION
- -->
- <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
- <target name="-pre-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-post-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-pre-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
- </target>
- <target name="-post-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
- </target>
- <target name="-run-deploy-am">
- <!-- Task to deploy to the Access Manager runtime. -->
- </target>
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
- <nbjpdaappreloaded/>
- </target>
- <target if="netbeans.home" name="-run-deploy-nb">
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
- </target>
- <target name="-init-deploy-ant" unless="netbeans.home">
- <property name="deploy.ant.archive" value="${dist.war}"/>
- <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
- <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
- <property name="deploy.ant.enabled" value="true"/>
- </target>
- <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
- <target if="netbeans.home" name="-run-undeploy-nb">
- <fail message="Undeploy is not supported from within the IDE"/>
- </target>
- <target depends="init,-pre-dist,dist,-post-dist" name="verify">
- <nbverify file="${dist.war}"/>
- </target>
- <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
- <target if="do.display.browser" name="-init-display-browser">
- <condition property="do.display.browser.nb">
- <isset property="netbeans.home"/>
- </condition>
- <condition property="do.display.browser.cl">
- <isset property="deploy.ant.enabled"/>
- </condition>
- </target>
- <target if="do.display.browser.nb" name="-display-browser-nb">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.display.browser.cl" name="-get-browser" unless="browser">
- <condition property="browser" value="rundll32">
- <os family="windows"/>
- </condition>
- <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
- <os family="windows"/>
- </condition>
- <condition property="browser" value="/usr/bin/open">
- <os family="mac"/>
- </condition>
- <property environment="env"/>
- <condition property="browser" value="${env.BROWSER}">
- <isset property="env.BROWSER"/>
- </condition>
- <condition property="browser" value="/usr/bin/firefox">
- <available file="/usr/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/local/firefox/firefox">
- <available file="/usr/local/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/usr/bin/mozilla">
- <available file="/usr/bin/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/local/mozilla/mozilla">
- <available file="/usr/local/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
- <available file="/usr/sfw/lib/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/firefox">
- <available file="/opt/csw/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
- <available file="/usr/sfw/lib/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/mozilla">
- <available file="/opt/csw/bin/mozilla"/>
- </condition>
- </target>
- <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
- <fail unless="browser">
- Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
- </fail>
- <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
- <echo>Launching ${browse.url}</echo>
- <exec executable="${browser}" spawn="true">
- <arg line="${browser.args} ${browse.url}"/>
- </exec>
- </target>
- <target depends="init,-init-cos,compile-single" name="run-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" name="run-test-with-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
- </target>
- <!--
- DEBUGGING SECTION
- -->
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
- <nbstartserver debugmode="true"/>
- <antcall target="connect-debugger"/>
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
- <antcall target="debug-display-browser"/>
- <antcall target="connect-client-debugger"/>
- </target>
- <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
- <classpath>
- <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <sourcepath>
- <path path="${web.docbase.dir}"/>
- </sourcepath>
- </nbjpdaconnect>
- </target>
- <target if="do.display.browser.debug" name="debug-display-browser">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.debug.client" name="connect-client-debugger">
- <webproject1:nbjsdebugstart webUrl="${client.url}"/>
- </target>
- <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
- <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
- </target>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger">
- <webproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}"/>
- </target>
- <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
- <target depends="init" name="-pre-debug-fix">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
- <webproject1:nbjpdareload/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
- <!--
- JAVADOC SECTION
- -->
- <target depends="init" if="have.sources" name="javadoc-build">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
- <classpath>
- <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="**/*.java"/>
- </fileset>
- </javadoc>
- </target>
- <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
- <!--
-
- JUNIT COMPILATION SECTION
- -->
- <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
- <mkdir dir="${build.test.classes.dir}"/>
- <property name="j2ee.platform.embeddableejb.classpath" value=""/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
- <!--
-
- JUNIT EXECUTION SECTION
- -->
- <target depends="init" if="have.tests" name="-pre-test-run">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
- <webproject2:junit testincludes="**/*Test.java"/>
- </target>
- <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init" if="have.tests" name="test-report"/>
- <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
- <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
- <target depends="init" if="have.tests" name="-pre-test-run-single">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <webproject2:junit excludes="" includes="${test.includes}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
- <!--
-
- JUNIT DEBUGGING SECTION
- -->
- <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
- <delete file="${test.report.file}"/>
- <!-- must exist, otherwise the XML formatter would fail -->
- <mkdir dir="${build.test.results.dir}"/>
- <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
- <customize>
- <arg value="showoutput=true"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
- </customize>
- </webproject1:debug>
- </target>
- <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
- </target>
- <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
- <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
- <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
- <!--
-
- CLEANUP SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
- <target depends="init" name="do-clean">
- <condition property="build.dir.to.clean" value="${build.web.dir}">
- <isset property="dist.ear.dir"/>
- </condition>
- <property name="build.dir.to.clean" value="${build.web.dir}"/>
- <delete includeEmptyDirs="true" quiet="true">
- <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
- </delete>
- <delete dir="${build.dir}"/>
- <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target depends="do-clean" if="status.clean-failed" name="check-clean">
- <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
- <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
- </target>
- <target depends="init" if="netbeans.home" name="undeploy-clean">
- <nbundeploy failOnError="false" startServer="false"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
- <target depends="clean" description="Clean build products." name="clean-ear"/>
-</project>
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 cae70d6..0000000
--- 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 7f300e9..0000000
--- 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 caba038..0000000
--- 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 63f041a..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/method-checkpoint/SFSBMethodCheckpointDriver/nbproject/project.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.web.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/web-project/3">
- <name>SFSBMethodCheckpointDriver</name>
- <minimum-ant-version>1.6.5</minimum-ant-version>
- <web-module-libraries/>
- <web-module-additional-libraries/>
- <source-roots>
- <root id="src.dir" name="Source Packages"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir" name="Test Packages"/>
- </test-roots>
- </data>
- </configuration>
-</project>
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 c37d861..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/ant-deploy.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project default="-deploy-ant" basedir=".">
- <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
- <property file="${deploy.ant.properties.file}" />
- <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
- <available file="${deploy.ant.resource.dir}" property="has.setup"/>
- <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
- </target>
-
- <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
- <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
- <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
- <!-- The doctype triggers resolution which can fail -->
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
- <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
- </replace>
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
- <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
- </replace>
- <xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
- <delete file="${temp.sun.web}"/>
- <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
- <property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
- </target>
- <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
- <property name="deploy.context.root.argument" value=""/>
- </target>
- <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
- <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
- <mkdir dir="${gfv3.resources.dir}"/>
- <mkdir dir="${gfv3.resources.dir}/META-INF"/>
- <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
- <copy todir="${gfv3.resources.dir}/META-INF">
- <fileset dir="${deploy.ant.resource.dir}"/>
- </copy>
- <jar destfile="${deploy.ant.archive}" update="true">
- <fileset dir="${gfv3.resources.dir}"/>
- </jar>
- <delete dir="${gfv3.resources.dir}"/>
- </target>
- <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
- <antcall target="-deploy-without-pw"/>
- <antcall target="-deploy-with-pw"/>
- </target>
-
- <target name="-deploy-without-pw" unless="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-deploy-with-pw" if="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
- <antcall target="-undeploy-without-pw"/>
- <antcall target="-undeploy-with-pw"/>
- </target>
-
- <target name="-undeploy-without-pw" unless="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-with-pw" if="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
-</project>
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 8a63173..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/build-impl.xml
+++ /dev/null
@@ -1,979 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!--
- *** GENERATED FROM project.xml - DO NOT EDIT ***
- *** EDIT ../build.xml INSTEAD ***
-
- For the purpose of easier reading the script
- is divided into following sections:
- - initialization
- - compilation
- - dist
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - cleanup
-
- -->
-<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="SFSBDriver-impl">
- <import file="ant-deploy.xml"/>
- <fail message="Please build using Ant 1.7.1 or higher.">
- <condition>
- <not>
- <antversion atleast="1.7.1"/>
- </not>
- </condition>
- </fail>
- <target depends="dist,javadoc" description="Build whole project." name="default"/>
- <!--
- INITIALIZATION SECTION
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init" name="-init-private">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target depends="-pre-init,-init-private" name="-init-user">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user" name="-init-project">
- <property file="nbproject/project.properties"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="javac.compilerargs" value=""/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <condition property="no.dist.ear.dir">
- <not>
- <isset property="dist.ear.dir"/>
- </not>
- </condition>
- <property name="build.web.excludes" value="${build.classes.excludes}"/>
- <condition property="do.compile.jsps">
- <istrue value="${compile.jsps}"/>
- </condition>
- <condition property="do.debug.server">
- <or>
- <not>
- <isset property="debug.server"/>
- </not>
- <istrue value="${debug.server}"/>
- <and>
- <not>
- <istrue value="${debug.server}"/>
- </not>
- <not>
- <istrue value="${debug.client}"/>
- </not>
- </and>
- </or>
- </condition>
- <condition property="do.debug.client">
- <istrue value="${debug.client}"/>
- </condition>
- <condition property="do.display.browser">
- <istrue value="${display.browser}"/>
- </condition>
- <condition property="do.display.browser.debug">
- <and>
- <isset property="do.display.browser"/>
- <not>
- <isset property="do.debug.client"/>
- </not>
- </and>
- </condition>
- <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
- <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
- <condition property="do.war.package.with.custom.manifest">
- <isset property="has.custom.manifest"/>
- </condition>
- <condition property="do.war.package.without.custom.manifest">
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- </condition>
- <condition property="do.tmp.war.package.with.custom.manifest">
- <and>
- <isset property="has.custom.manifest"/>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package.without.custom.manifest">
- <and>
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package">
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </condition>
- <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
- <condition else="" property="application.args.param" value="${application.args}">
- <and>
- <isset property="application.args"/>
- <not>
- <equals arg1="${application.args}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <property name="source.encoding" value="${file.encoding}"/>
- <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
- <and>
- <isset property="javadoc.encoding"/>
- <not>
- <equals arg1="${javadoc.encoding}" arg2=""/>
- </not>
- </and>
- </condition>
- <property name="javadoc.encoding.used" value="${source.encoding}"/>
- <property name="includes" value="**"/>
- <property name="excludes" value=""/>
- <property name="runmain.jvmargs" value=""/>
- <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
- <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
- <length length="0" string="${endorsed.classpath}" when="greater"/>
- </condition>
- </target>
- <target depends="init" name="-init-cos" unless="deploy.on.save">
- <condition property="deploy.on.save" value="true">
- <istrue value="${j2ee.deploy.on.save}"/>
- </condition>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="build.web.dir">Must set build.web.dir</fail>
- <fail unless="build.generated.dir">Must set build.generated.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.war">Must set dist.war</fail>
- <condition property="missing.j2ee.server.home">
- <and>
- <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
- <not>
- <isset property="j2ee.server.home"/>
- </not>
- </and>
- </condition>
- <fail if="missing.j2ee.server.home">
-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>
- </fail>
- <fail unless="j2ee.platform.classpath">
-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)
- </fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <mkdir dir="@{apgeneratedsrcdir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <compilerarg value="-processorpath"/>
- <compilerarg path="@{processorpath}:${empty.dir}"/>
- <compilerarg line="${ap.processors.internal}"/>
- <compilerarg value="-s"/>
- <compilerarg path="@{apgeneratedsrcdir}"/>
- <compilerarg line="${ap.proc.none.internal}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
- <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </depend>
- </sequential>
- </macrodef>
- <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${build.classes.dir}" name="destdir"/>
- <sequential>
- <fail unless="javac.includes">Must set javac.includes</fail>
- <pathconvert pathsep="," property="javac.includes.binary">
- <path>
- <filelist dir="@{destdir}" files="${javac.includes}"/>
- </path>
- <globmapper from="*.java" to="*.class"/>
- </pathconvert>
- <delete>
- <files includes="${javac.includes.binary}"/>
- </delete>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="**" name="testincludes"/>
- <sequential>
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}" name="classpath"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjsdebug">
- <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${client.url}" name="webUrl"/>
- <sequential>
- <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="name"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${build.classes.dir}" name="dir"/>
- <sequential>
- <nbjpdareload>
- <fileset dir="@{dir}" includes="${fix.classes}">
- <include name="${fix.includes}*.class"/>
- </fileset>
- </nbjpdareload>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
- <sequential>
- <nbjpdaappreloaded/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
- <os family="windows"/>
- </condition>
- <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
- <isset property="debug.transport"/>
- </condition>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${application.args.param}" name="args"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <arg line="@{args}"/>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-taskdefs">
- <fail unless="libs.CopyLibs.classpath">
-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
- </fail>
- <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
- </target>
- <target name="-init-ap-cmdline-properties">
- <property name="annotation.processing.enabled" value="true"/>
- <property name="annotation.processing.processors.list" value=""/>
- <property name="annotation.processing.run.all.processors" value="true"/>
- <property name="javac.processorpath" value="${javac.classpath}"/>
- <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
- <condition property="ap.supported.internal" value="true">
- <not>
- <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
- </not>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
- <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
- <isfalse value="${annotation.processing.run.all.processors}"/>
- </condition>
- <condition else="" property="ap.proc.none.internal" value="-proc:none">
- <isfalse value="${annotation.processing.enabled}"/>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
- <property name="ap.cmd.line.internal" value=""/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
- <!--
- COMPILATION SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
- <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
- <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
- <target depends="init,deps-jar" name="-pre-pre-compile">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-copy-webdir">
- <copy todir="${build.web.dir}">
- <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
- </copy>
- <copy todir="${build.web.dir}/WEB-INF">
- <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
- </copy>
- </target>
- <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources" name="-do-compile">
- <webproject2:javac destdir="${build.classes.dir}" gensrcdir="${build.generated.sources.dir}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target if="has.custom.manifest" name="-copy-manifest">
- <mkdir dir="${build.meta.inf.dir}"/>
- <copy todir="${build.meta.inf.dir}">
- <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
- </copy>
- </target>
- <target if="has.persistence.xml" name="-copy-persistence-xml">
- <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
- <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
- <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
- <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
- </target>
- <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
- <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-jspc.files"/>
- <arg path="${jsp.includes}"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
- <customize>
- <patternset includes="${javac.jsp.includes}"/>
- </customize>
- </webproject2:javac>
- </target>
- <target name="compile-single-jsp">
- <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
- <antcall target="-do-compile-single-jsp"/>
- </target>
- <!--
- DIST BUILDING SECTION
- -->
- <target name="-pre-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
- <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
- <mkdir dir="${build.web.dir}/META-INF"/>
- <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
- </target>
- <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
- <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
- <delete dir="${build.web.dir}/WEB-INF/lib"/>
- </target>
- <target depends="init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
- <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target name="-post-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
- <target depends="init,-clean-webinf-lib,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
- <!--
- EXECUTION SECTION
- -->
- <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
- <target name="-pre-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-post-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-pre-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
- </target>
- <target name="-post-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
- </target>
- <target name="-run-deploy-am">
- <!-- Task to deploy to the Access Manager runtime. -->
- </target>
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
- <nbjpdaappreloaded/>
- </target>
- <target if="netbeans.home" name="-run-deploy-nb">
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
- </target>
- <target name="-init-deploy-ant" unless="netbeans.home">
- <property name="deploy.ant.archive" value="${dist.war}"/>
- <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
- <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
- <property name="deploy.ant.enabled" value="true"/>
- </target>
- <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
- <target if="netbeans.home" name="-run-undeploy-nb">
- <fail message="Undeploy is not supported from within the IDE"/>
- </target>
- <target depends="init,-pre-dist,dist,-post-dist" name="verify">
- <nbverify file="${dist.war}"/>
- </target>
- <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
- <target if="do.display.browser" name="-init-display-browser">
- <condition property="do.display.browser.nb">
- <isset property="netbeans.home"/>
- </condition>
- <condition property="do.display.browser.cl">
- <isset property="deploy.ant.enabled"/>
- </condition>
- </target>
- <target if="do.display.browser.nb" name="-display-browser-nb">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.display.browser.cl" name="-get-browser" unless="browser">
- <condition property="browser" value="rundll32">
- <os family="windows"/>
- </condition>
- <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
- <os family="windows"/>
- </condition>
- <condition property="browser" value="/usr/bin/open">
- <os family="mac"/>
- </condition>
- <property environment="env"/>
- <condition property="browser" value="${env.BROWSER}">
- <isset property="env.BROWSER"/>
- </condition>
- <condition property="browser" value="/usr/bin/firefox">
- <available file="/usr/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/local/firefox/firefox">
- <available file="/usr/local/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/usr/bin/mozilla">
- <available file="/usr/bin/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/local/mozilla/mozilla">
- <available file="/usr/local/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
- <available file="/usr/sfw/lib/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/firefox">
- <available file="/opt/csw/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
- <available file="/usr/sfw/lib/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/mozilla">
- <available file="/opt/csw/bin/mozilla"/>
- </condition>
- </target>
- <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
- <fail unless="browser">
- Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
- </fail>
- <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
- <echo>Launching ${browse.url}</echo>
- <exec executable="${browser}" spawn="true">
- <arg line="${browser.args} ${browse.url}"/>
- </exec>
- </target>
- <target depends="init,-init-cos,compile-single" name="run-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" name="run-test-with-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
- </target>
- <!--
- DEBUGGING SECTION
- -->
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
- <nbstartserver debugmode="true"/>
- <antcall target="connect-debugger"/>
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
- <antcall target="debug-display-browser"/>
- <antcall target="connect-client-debugger"/>
- </target>
- <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
- <classpath>
- <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <sourcepath>
- <path path="${web.docbase.dir}"/>
- </sourcepath>
- </nbjpdaconnect>
- </target>
- <target if="do.display.browser.debug" name="debug-display-browser">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.debug.client" name="connect-client-debugger">
- <webproject1:nbjsdebugstart webUrl="${client.url}"/>
- </target>
- <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
- <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
- </target>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger">
- <webproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}"/>
- </target>
- <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
- <target depends="init" name="-pre-debug-fix">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
- <webproject1:nbjpdareload/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
- <!--
- JAVADOC SECTION
- -->
- <target depends="init" if="have.sources" name="javadoc-build">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
- <classpath>
- <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="**/*.java"/>
- </fileset>
- </javadoc>
- </target>
- <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
- <!--
-
- JUNIT COMPILATION SECTION
- -->
- <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
- <mkdir dir="${build.test.classes.dir}"/>
- <property name="j2ee.platform.embeddableejb.classpath" value=""/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
- <!--
-
- JUNIT EXECUTION SECTION
- -->
- <target depends="init" if="have.tests" name="-pre-test-run">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
- <webproject2:junit testincludes="**/*Test.java"/>
- </target>
- <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init" if="have.tests" name="test-report"/>
- <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
- <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
- <target depends="init" if="have.tests" name="-pre-test-run-single">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <webproject2:junit excludes="" includes="${test.includes}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
- <!--
-
- JUNIT DEBUGGING SECTION
- -->
- <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
- <delete file="${test.report.file}"/>
- <!-- must exist, otherwise the XML formatter would fail -->
- <mkdir dir="${build.test.results.dir}"/>
- <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
- <customize>
- <arg value="showoutput=true"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
- </customize>
- </webproject1:debug>
- </target>
- <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
- </target>
- <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
- <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
- <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
- <!--
-
- CLEANUP SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
- <target depends="init" name="do-clean">
- <condition property="build.dir.to.clean" value="${build.web.dir}">
- <isset property="dist.ear.dir"/>
- </condition>
- <property name="build.dir.to.clean" value="${build.web.dir}"/>
- <delete includeEmptyDirs="true" quiet="true">
- <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
- </delete>
- <delete dir="${build.dir}"/>
- <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target depends="do-clean" if="status.clean-failed" name="check-clean">
- <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
- <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
- </target>
- <target depends="init" if="netbeans.home" name="undeploy-clean">
- <nbundeploy failOnError="false" startServer="false"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
- <target depends="clean" description="Clean build products." name="clean-ear"/>
-</project>
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 5683af2..0000000
--- 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 95dc1e5..0000000
--- 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 bc91159..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/private/private.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>
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 56b3eb5..0000000
--- 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 a2c6f67..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/multi-restart/SFSBDriver/nbproject/project.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.web.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/web-project/3">
- <name>SFSBDriver</name>
- <minimum-ant-version>1.6.5</minimum-ant-version>
- <web-module-libraries/>
- <web-module-additional-libraries/>
- <source-roots>
- <root id="src.dir" name="Source Packages"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir" name="Test Packages"/>
- </test-roots>
- </data>
- </configuration>
-</project>
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 c37d861..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project default="-deploy-ant" basedir=".">
- <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
- <property file="${deploy.ant.properties.file}" />
- <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
- <available file="${deploy.ant.resource.dir}" property="has.setup"/>
- <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
- </target>
-
- <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
- <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
- <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
- <!-- The doctype triggers resolution which can fail -->
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
- <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
- </replace>
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
- <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
- </replace>
- <xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
- <delete file="${temp.sun.web}"/>
- <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
- <property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
- </target>
- <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
- <property name="deploy.context.root.argument" value=""/>
- </target>
- <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
- <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
- <mkdir dir="${gfv3.resources.dir}"/>
- <mkdir dir="${gfv3.resources.dir}/META-INF"/>
- <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
- <copy todir="${gfv3.resources.dir}/META-INF">
- <fileset dir="${deploy.ant.resource.dir}"/>
- </copy>
- <jar destfile="${deploy.ant.archive}" update="true">
- <fileset dir="${gfv3.resources.dir}"/>
- </jar>
- <delete dir="${gfv3.resources.dir}"/>
- </target>
- <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
- <antcall target="-deploy-without-pw"/>
- <antcall target="-deploy-with-pw"/>
- </target>
-
- <target name="-deploy-without-pw" unless="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-deploy-with-pw" if="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
- <antcall target="-undeploy-without-pw"/>
- <antcall target="-undeploy-with-pw"/>
- </target>
-
- <target name="-undeploy-without-pw" unless="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-with-pw" if="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
-</project>
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 63ce435..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml
+++ /dev/null
@@ -1,987 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!--
- *** GENERATED FROM project.xml - DO NOT EDIT ***
- *** EDIT ../build.xml INSTEAD ***
-
- For the purpose of easier reading the script
- is divided into following sections:
- - initialization
- - compilation
- - dist
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - cleanup
-
- -->
-<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="SFSBDriver-impl">
- <import file="ant-deploy.xml"/>
- <fail message="Please build using Ant 1.7.1 or higher.">
- <condition>
- <not>
- <antversion atleast="1.7.1"/>
- </not>
- </condition>
- </fail>
- <target depends="dist,javadoc" description="Build whole project." name="default"/>
- <!--
- INITIALIZATION SECTION
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init" name="-init-private">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target depends="-pre-init,-init-private" name="-init-user">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user" name="-init-project">
- <property file="nbproject/project.properties"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="javac.compilerargs" value=""/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <condition property="no.dist.ear.dir">
- <not>
- <isset property="dist.ear.dir"/>
- </not>
- </condition>
- <property name="build.web.excludes" value="${build.classes.excludes}"/>
- <condition property="do.compile.jsps">
- <istrue value="${compile.jsps}"/>
- </condition>
- <condition property="do.debug.server">
- <or>
- <not>
- <isset property="debug.server"/>
- </not>
- <istrue value="${debug.server}"/>
- <and>
- <not>
- <istrue value="${debug.server}"/>
- </not>
- <not>
- <istrue value="${debug.client}"/>
- </not>
- </and>
- </or>
- </condition>
- <condition property="do.debug.client">
- <istrue value="${debug.client}"/>
- </condition>
- <condition property="do.display.browser">
- <istrue value="${display.browser}"/>
- </condition>
- <condition property="do.display.browser.debug">
- <and>
- <isset property="do.display.browser"/>
- <not>
- <isset property="do.debug.client"/>
- </not>
- </and>
- </condition>
- <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
- <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
- <condition property="do.war.package.with.custom.manifest">
- <isset property="has.custom.manifest"/>
- </condition>
- <condition property="do.war.package.without.custom.manifest">
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- </condition>
- <condition property="do.tmp.war.package.with.custom.manifest">
- <and>
- <isset property="has.custom.manifest"/>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package.without.custom.manifest">
- <and>
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package">
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </condition>
- <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
- <condition else="" property="application.args.param" value="${application.args}">
- <and>
- <isset property="application.args"/>
- <not>
- <equals arg1="${application.args}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <property name="source.encoding" value="${file.encoding}"/>
- <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
- <and>
- <isset property="javadoc.encoding"/>
- <not>
- <equals arg1="${javadoc.encoding}" arg2=""/>
- </not>
- </and>
- </condition>
- <property name="javadoc.encoding.used" value="${source.encoding}"/>
- <property name="includes" value="**"/>
- <property name="excludes" value=""/>
- <property name="runmain.jvmargs" value=""/>
- <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
- <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
- <length length="0" string="${endorsed.classpath}" when="greater"/>
- </condition>
- </target>
- <target depends="init" name="-init-cos" unless="deploy.on.save">
- <condition property="deploy.on.save" value="true">
- <istrue value="${j2ee.deploy.on.save}"/>
- </condition>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="build.web.dir">Must set build.web.dir</fail>
- <fail unless="build.generated.dir">Must set build.generated.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.war">Must set dist.war</fail>
- <condition property="missing.j2ee.server.home">
- <and>
- <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
- <not>
- <isset property="j2ee.server.home"/>
- </not>
- </and>
- </condition>
- <fail if="missing.j2ee.server.home">
-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>
- </fail>
- <fail unless="j2ee.platform.classpath">
-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)
- </fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <mkdir dir="@{apgeneratedsrcdir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <compilerarg value="-processorpath"/>
- <compilerarg path="@{processorpath}:${empty.dir}"/>
- <compilerarg line="${ap.processors.internal}"/>
- <compilerarg value="-s"/>
- <compilerarg path="@{apgeneratedsrcdir}"/>
- <compilerarg line="${ap.proc.none.internal}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
- <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </depend>
- </sequential>
- </macrodef>
- <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${build.classes.dir}" name="destdir"/>
- <sequential>
- <fail unless="javac.includes">Must set javac.includes</fail>
- <pathconvert pathsep="," property="javac.includes.binary">
- <path>
- <filelist dir="@{destdir}" files="${javac.includes}"/>
- </path>
- <globmapper from="*.java" to="*.class"/>
- </pathconvert>
- <delete>
- <files includes="${javac.includes.binary}"/>
- </delete>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="**" name="testincludes"/>
- <sequential>
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}" name="classpath"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjsdebug">
- <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${client.url}" name="webUrl"/>
- <sequential>
- <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="name"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${build.classes.dir}" name="dir"/>
- <sequential>
- <nbjpdareload>
- <fileset dir="@{dir}" includes="${fix.classes}">
- <include name="${fix.includes}*.class"/>
- </fileset>
- </nbjpdareload>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
- <sequential>
- <nbjpdaappreloaded/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
- <os family="windows"/>
- </condition>
- <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
- <isset property="debug.transport"/>
- </condition>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${application.args.param}" name="args"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <arg line="@{args}"/>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-taskdefs">
- <fail unless="libs.CopyLibs.classpath">
-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
- </fail>
- <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
- </target>
- <target name="-init-ap-cmdline-properties">
- <property name="annotation.processing.enabled" value="true"/>
- <property name="annotation.processing.processors.list" value=""/>
- <property name="annotation.processing.run.all.processors" value="true"/>
- <property name="javac.processorpath" value="${javac.classpath}"/>
- <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
- <condition property="ap.supported.internal" value="true">
- <not>
- <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
- </not>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
- <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
- <isfalse value="${annotation.processing.run.all.processors}"/>
- </condition>
- <condition else="" property="ap.proc.none.internal" value="-proc:none">
- <isfalse value="${annotation.processing.enabled}"/>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
- <property name="ap.cmd.line.internal" value=""/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
- <!--
- COMPILATION SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
- <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
- <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
- <target depends="init,deps-jar" name="-pre-pre-compile">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-copy-webdir">
- <copy todir="${build.web.dir}">
- <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
- </copy>
- <copy todir="${build.web.dir}/WEB-INF">
- <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
- </copy>
- </target>
- <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources" name="-do-compile">
- <webproject2:javac destdir="${build.classes.dir}" gensrcdir="${build.generated.sources.dir}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target if="has.custom.manifest" name="-copy-manifest">
- <mkdir dir="${build.meta.inf.dir}"/>
- <copy todir="${build.meta.inf.dir}">
- <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
- </copy>
- </target>
- <target if="has.persistence.xml" name="-copy-persistence-xml">
- <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
- <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
- <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
- <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
- </target>
- <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
- <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-jspc.files"/>
- <arg path="${jsp.includes}"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
- <customize>
- <patternset includes="${javac.jsp.includes}"/>
- </customize>
- </webproject2:javac>
- </target>
- <target name="compile-single-jsp">
- <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
- <antcall target="-do-compile-single-jsp"/>
- </target>
- <!--
- DIST BUILDING SECTION
- -->
- <target name="-pre-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
- <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
- <mkdir dir="${build.web.dir}/META-INF"/>
- <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
- </target>
- <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
- <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
- <delete dir="${build.web.dir}/WEB-INF/lib"/>
- </target>
- <target depends="init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
- <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target name="-post-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
- <target depends="init,-clean-webinf-lib,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
- <!--
- EXECUTION SECTION
- -->
- <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
- <target name="-pre-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-post-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-pre-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
- </target>
- <target name="-post-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
- </target>
- <target name="-run-deploy-am">
- <!-- Task to deploy to the Access Manager runtime. -->
- </target>
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
- <nbjpdaappreloaded/>
- </target>
- <target if="netbeans.home" name="-run-deploy-nb">
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
- </target>
- <target name="-init-deploy-ant" unless="netbeans.home">
- <property name="deploy.ant.archive" value="${dist.war}"/>
- <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
- <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
- <property name="deploy.ant.enabled" value="true"/>
- </target>
- <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
- <target if="netbeans.home" name="-run-undeploy-nb">
- <fail message="Undeploy is not supported from within the IDE"/>
- </target>
- <target depends="init,-pre-dist,dist,-post-dist" name="verify">
- <nbverify file="${dist.war}"/>
- </target>
- <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
- <target if="do.display.browser" name="-init-display-browser">
- <condition property="do.display.browser.nb">
- <isset property="netbeans.home"/>
- </condition>
- <condition property="do.display.browser.cl">
- <isset property="deploy.ant.enabled"/>
- </condition>
- </target>
- <target if="do.display.browser.nb" name="-display-browser-nb">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.display.browser.cl" name="-get-browser" unless="browser">
- <condition property="browser" value="rundll32">
- <os family="windows"/>
- </condition>
- <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
- <os family="windows"/>
- </condition>
- <condition property="browser" value="/usr/bin/open">
- <os family="mac"/>
- </condition>
- <property environment="env"/>
- <condition property="browser" value="${env.BROWSER}">
- <isset property="env.BROWSER"/>
- </condition>
- <condition property="browser" value="/usr/bin/firefox">
- <available file="/usr/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/local/firefox/firefox">
- <available file="/usr/local/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/usr/bin/mozilla">
- <available file="/usr/bin/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/local/mozilla/mozilla">
- <available file="/usr/local/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
- <available file="/usr/sfw/lib/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/firefox">
- <available file="/opt/csw/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
- <available file="/usr/sfw/lib/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/mozilla">
- <available file="/opt/csw/bin/mozilla"/>
- </condition>
- </target>
- <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
- <fail unless="browser">
- Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
- </fail>
- <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
- <echo>Launching ${browse.url}</echo>
- <exec executable="${browser}" spawn="true">
- <arg line="${browser.args} ${browse.url}"/>
- </exec>
- </target>
- <target depends="init,-init-cos,compile-single" name="run-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" name="run-test-with-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
- </target>
- <!--
- DEBUGGING SECTION
- -->
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
- <nbstartserver debugmode="true"/>
- <antcall target="connect-debugger"/>
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
- <antcall target="debug-display-browser"/>
- <antcall target="connect-client-debugger"/>
- </target>
- <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
- <classpath>
- <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <sourcepath>
- <path path="${web.docbase.dir}"/>
- </sourcepath>
- </nbjpdaconnect>
- </target>
- <target if="do.display.browser.debug" name="debug-display-browser">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.debug.client" name="connect-client-debugger">
- <webproject1:nbjsdebugstart webUrl="${client.url}"/>
- </target>
- <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
- <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
- </target>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger">
- <webproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}"/>
- </target>
- <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
- <target depends="init" name="-pre-debug-fix">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
- <webproject1:nbjpdareload/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
- <!--
- JAVADOC SECTION
- -->
- <target depends="init" if="have.sources" name="javadoc-build">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
- <classpath>
- <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="**/*.java"/>
- </fileset>
- </javadoc>
- <copy todir="${dist.javadoc.dir}">
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/doc-files/**"/>
- </fileset>
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="**/doc-files/**"/>
- </fileset>
- </copy>
- </target>
- <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
- <!--
-
- JUNIT COMPILATION SECTION
- -->
- <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
- <mkdir dir="${build.test.classes.dir}"/>
- <property name="j2ee.platform.embeddableejb.classpath" value=""/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
- <!--
-
- JUNIT EXECUTION SECTION
- -->
- <target depends="init" if="have.tests" name="-pre-test-run">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
- <webproject2:junit testincludes="**/*Test.java"/>
- </target>
- <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init" if="have.tests" name="test-report"/>
- <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
- <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
- <target depends="init" if="have.tests" name="-pre-test-run-single">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <webproject2:junit excludes="" includes="${test.includes}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
- <!--
-
- JUNIT DEBUGGING SECTION
- -->
- <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
- <delete file="${test.report.file}"/>
- <!-- must exist, otherwise the XML formatter would fail -->
- <mkdir dir="${build.test.results.dir}"/>
- <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
- <customize>
- <arg value="showoutput=true"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
- </customize>
- </webproject1:debug>
- </target>
- <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
- </target>
- <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
- <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
- <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
- <!--
-
- CLEANUP SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
- <target depends="init" name="do-clean">
- <condition property="build.dir.to.clean" value="${build.web.dir}">
- <isset property="dist.ear.dir"/>
- </condition>
- <property name="build.dir.to.clean" value="${build.web.dir}"/>
- <delete includeEmptyDirs="true" quiet="true">
- <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
- </delete>
- <delete dir="${build.dir}"/>
- <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target depends="do-clean" if="status.clean-failed" name="check-clean">
- <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
- <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
- </target>
- <target depends="init" if="netbeans.home" name="undeploy-clean">
- <nbundeploy failOnError="false" startServer="false"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
- <target depends="clean" description="Clean build products." name="clean-ear"/>
-</project>
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 f103a0a..0000000
--- 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 5740c6e..0000000
--- 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 bd43729..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
- <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
- <file>file:/space/work/v3/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/web/WEB-INF/web.xml</file>
- <file>file:/space/work/v3/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java</file>
- <file>file:/space/work/v3/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SimpleSessionBean.java</file>
- </open-files>
-</project-private>
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 aad24a4..0000000
--- 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 a2c6f67..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SFSBDriver/nbproject/project.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.web.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/web-project/3">
- <name>SFSBDriver</name>
- <minimum-ant-version>1.6.5</minimum-ant-version>
- <web-module-libraries/>
- <web-module-additional-libraries/>
- <source-roots>
- <root id="src.dir" name="Source Packages"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir" name="Test Packages"/>
- </test-roots>
- </data>
- </configuration>
-</project>
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 c37d861..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/ant-deploy.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project default="-deploy-ant" basedir=".">
- <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
- <property file="${deploy.ant.properties.file}" />
- <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
- <available file="${deploy.ant.resource.dir}" property="has.setup"/>
- <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
- </target>
-
- <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
- <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
- <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
- <!-- The doctype triggers resolution which can fail -->
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
- <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
- </replace>
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
- <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
- </replace>
- <xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
- <delete file="${temp.sun.web}"/>
- <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
- <property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
- </target>
- <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
- <property name="deploy.context.root.argument" value=""/>
- </target>
- <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
- <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
- <mkdir dir="${gfv3.resources.dir}"/>
- <mkdir dir="${gfv3.resources.dir}/META-INF"/>
- <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
- <copy todir="${gfv3.resources.dir}/META-INF">
- <fileset dir="${deploy.ant.resource.dir}"/>
- </copy>
- <jar destfile="${deploy.ant.archive}" update="true">
- <fileset dir="${gfv3.resources.dir}"/>
- </jar>
- <delete dir="${gfv3.resources.dir}"/>
- </target>
- <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
- <antcall target="-deploy-without-pw"/>
- <antcall target="-deploy-with-pw"/>
- </target>
-
- <target name="-deploy-without-pw" unless="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-deploy-with-pw" if="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
- <antcall target="-undeploy-without-pw"/>
- <antcall target="-undeploy-with-pw"/>
- </target>
-
- <target name="-undeploy-without-pw" unless="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-with-pw" if="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
-</project>
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 ccbe604..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/build-impl.xml
+++ /dev/null
@@ -1,987 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!--
- *** GENERATED FROM project.xml - DO NOT EDIT ***
- *** EDIT ../build.xml INSTEAD ***
-
- For the purpose of easier reading the script
- is divided into following sections:
- - initialization
- - compilation
- - dist
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - cleanup
-
- -->
-<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="SimpleSFSBDriver-impl">
- <import file="ant-deploy.xml"/>
- <fail message="Please build using Ant 1.7.1 or higher.">
- <condition>
- <not>
- <antversion atleast="1.7.1"/>
- </not>
- </condition>
- </fail>
- <target depends="dist,javadoc" description="Build whole project." name="default"/>
- <!--
- INITIALIZATION SECTION
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init" name="-init-private">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target depends="-pre-init,-init-private" name="-init-user">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user" name="-init-project">
- <property file="nbproject/project.properties"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="javac.compilerargs" value=""/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <condition property="no.dist.ear.dir">
- <not>
- <isset property="dist.ear.dir"/>
- </not>
- </condition>
- <property name="build.web.excludes" value="${build.classes.excludes}"/>
- <condition property="do.compile.jsps">
- <istrue value="${compile.jsps}"/>
- </condition>
- <condition property="do.debug.server">
- <or>
- <not>
- <isset property="debug.server"/>
- </not>
- <istrue value="${debug.server}"/>
- <and>
- <not>
- <istrue value="${debug.server}"/>
- </not>
- <not>
- <istrue value="${debug.client}"/>
- </not>
- </and>
- </or>
- </condition>
- <condition property="do.debug.client">
- <istrue value="${debug.client}"/>
- </condition>
- <condition property="do.display.browser">
- <istrue value="${display.browser}"/>
- </condition>
- <condition property="do.display.browser.debug">
- <and>
- <isset property="do.display.browser"/>
- <not>
- <isset property="do.debug.client"/>
- </not>
- </and>
- </condition>
- <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
- <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
- <condition property="do.war.package.with.custom.manifest">
- <isset property="has.custom.manifest"/>
- </condition>
- <condition property="do.war.package.without.custom.manifest">
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- </condition>
- <condition property="do.tmp.war.package.with.custom.manifest">
- <and>
- <isset property="has.custom.manifest"/>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package.without.custom.manifest">
- <and>
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package">
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </condition>
- <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
- <condition else="" property="application.args.param" value="${application.args}">
- <and>
- <isset property="application.args"/>
- <not>
- <equals arg1="${application.args}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <property name="source.encoding" value="${file.encoding}"/>
- <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
- <and>
- <isset property="javadoc.encoding"/>
- <not>
- <equals arg1="${javadoc.encoding}" arg2=""/>
- </not>
- </and>
- </condition>
- <property name="javadoc.encoding.used" value="${source.encoding}"/>
- <property name="includes" value="**"/>
- <property name="excludes" value=""/>
- <property name="runmain.jvmargs" value=""/>
- <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
- <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
- <length length="0" string="${endorsed.classpath}" when="greater"/>
- </condition>
- </target>
- <target depends="init" name="-init-cos" unless="deploy.on.save">
- <condition property="deploy.on.save" value="true">
- <istrue value="${j2ee.deploy.on.save}"/>
- </condition>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="build.web.dir">Must set build.web.dir</fail>
- <fail unless="build.generated.dir">Must set build.generated.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.war">Must set dist.war</fail>
- <condition property="missing.j2ee.server.home">
- <and>
- <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
- <not>
- <isset property="j2ee.server.home"/>
- </not>
- </and>
- </condition>
- <fail if="missing.j2ee.server.home">
-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>
- </fail>
- <fail unless="j2ee.platform.classpath">
-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)
- </fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <mkdir dir="@{apgeneratedsrcdir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <compilerarg value="-processorpath"/>
- <compilerarg path="@{processorpath}:${empty.dir}"/>
- <compilerarg line="${ap.processors.internal}"/>
- <compilerarg value="-s"/>
- <compilerarg path="@{apgeneratedsrcdir}"/>
- <compilerarg line="${ap.proc.none.internal}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
- <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </depend>
- </sequential>
- </macrodef>
- <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${build.classes.dir}" name="destdir"/>
- <sequential>
- <fail unless="javac.includes">Must set javac.includes</fail>
- <pathconvert pathsep="," property="javac.includes.binary">
- <path>
- <filelist dir="@{destdir}" files="${javac.includes}"/>
- </path>
- <globmapper from="*.java" to="*.class"/>
- </pathconvert>
- <delete>
- <files includes="${javac.includes.binary}"/>
- </delete>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="**" name="testincludes"/>
- <sequential>
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}" name="classpath"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjsdebug">
- <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${client.url}" name="webUrl"/>
- <sequential>
- <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="name"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${build.classes.dir}" name="dir"/>
- <sequential>
- <nbjpdareload>
- <fileset dir="@{dir}" includes="${fix.classes}">
- <include name="${fix.includes}*.class"/>
- </fileset>
- </nbjpdareload>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
- <sequential>
- <nbjpdaappreloaded/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
- <os family="windows"/>
- </condition>
- <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
- <isset property="debug.transport"/>
- </condition>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${application.args.param}" name="args"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <arg line="@{args}"/>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-taskdefs">
- <fail unless="libs.CopyLibs.classpath">
-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
- </fail>
- <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
- </target>
- <target name="-init-ap-cmdline-properties">
- <property name="annotation.processing.enabled" value="true"/>
- <property name="annotation.processing.processors.list" value=""/>
- <property name="annotation.processing.run.all.processors" value="true"/>
- <property name="javac.processorpath" value="${javac.classpath}"/>
- <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
- <condition property="ap.supported.internal" value="true">
- <not>
- <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
- </not>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
- <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
- <isfalse value="${annotation.processing.run.all.processors}"/>
- </condition>
- <condition else="" property="ap.proc.none.internal" value="-proc:none">
- <isfalse value="${annotation.processing.enabled}"/>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
- <property name="ap.cmd.line.internal" value=""/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
- <!--
- COMPILATION SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
- <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
- <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
- <target depends="init,deps-jar" name="-pre-pre-compile">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-copy-webdir">
- <copy todir="${build.web.dir}">
- <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
- </copy>
- <copy todir="${build.web.dir}/WEB-INF">
- <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
- </copy>
- </target>
- <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources" name="-do-compile">
- <webproject2:javac destdir="${build.classes.dir}" gensrcdir="${build.generated.sources.dir}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target if="has.custom.manifest" name="-copy-manifest">
- <mkdir dir="${build.meta.inf.dir}"/>
- <copy todir="${build.meta.inf.dir}">
- <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
- </copy>
- </target>
- <target if="has.persistence.xml" name="-copy-persistence-xml">
- <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
- <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
- <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
- <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
- </target>
- <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
- <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-jspc.files"/>
- <arg path="${jsp.includes}"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
- <customize>
- <patternset includes="${javac.jsp.includes}"/>
- </customize>
- </webproject2:javac>
- </target>
- <target name="compile-single-jsp">
- <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
- <antcall target="-do-compile-single-jsp"/>
- </target>
- <!--
- DIST BUILDING SECTION
- -->
- <target name="-pre-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
- <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
- <mkdir dir="${build.web.dir}/META-INF"/>
- <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
- </target>
- <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
- <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
- <delete dir="${build.web.dir}/WEB-INF/lib"/>
- </target>
- <target depends="init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
- <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target name="-post-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
- <target depends="init,-clean-webinf-lib,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
- <!--
- EXECUTION SECTION
- -->
- <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
- <target name="-pre-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-post-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-pre-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
- </target>
- <target name="-post-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
- </target>
- <target name="-run-deploy-am">
- <!-- Task to deploy to the Access Manager runtime. -->
- </target>
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
- <nbjpdaappreloaded/>
- </target>
- <target if="netbeans.home" name="-run-deploy-nb">
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
- </target>
- <target name="-init-deploy-ant" unless="netbeans.home">
- <property name="deploy.ant.archive" value="${dist.war}"/>
- <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
- <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
- <property name="deploy.ant.enabled" value="true"/>
- </target>
- <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
- <target if="netbeans.home" name="-run-undeploy-nb">
- <fail message="Undeploy is not supported from within the IDE"/>
- </target>
- <target depends="init,-pre-dist,dist,-post-dist" name="verify">
- <nbverify file="${dist.war}"/>
- </target>
- <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
- <target if="do.display.browser" name="-init-display-browser">
- <condition property="do.display.browser.nb">
- <isset property="netbeans.home"/>
- </condition>
- <condition property="do.display.browser.cl">
- <isset property="deploy.ant.enabled"/>
- </condition>
- </target>
- <target if="do.display.browser.nb" name="-display-browser-nb">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.display.browser.cl" name="-get-browser" unless="browser">
- <condition property="browser" value="rundll32">
- <os family="windows"/>
- </condition>
- <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
- <os family="windows"/>
- </condition>
- <condition property="browser" value="/usr/bin/open">
- <os family="mac"/>
- </condition>
- <property environment="env"/>
- <condition property="browser" value="${env.BROWSER}">
- <isset property="env.BROWSER"/>
- </condition>
- <condition property="browser" value="/usr/bin/firefox">
- <available file="/usr/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/local/firefox/firefox">
- <available file="/usr/local/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/usr/bin/mozilla">
- <available file="/usr/bin/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/local/mozilla/mozilla">
- <available file="/usr/local/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
- <available file="/usr/sfw/lib/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/firefox">
- <available file="/opt/csw/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
- <available file="/usr/sfw/lib/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/mozilla">
- <available file="/opt/csw/bin/mozilla"/>
- </condition>
- </target>
- <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
- <fail unless="browser">
- Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
- </fail>
- <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
- <echo>Launching ${browse.url}</echo>
- <exec executable="${browser}" spawn="true">
- <arg line="${browser.args} ${browse.url}"/>
- </exec>
- </target>
- <target depends="init,-init-cos,compile-single" name="run-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" name="run-test-with-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
- </target>
- <!--
- DEBUGGING SECTION
- -->
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
- <nbstartserver debugmode="true"/>
- <antcall target="connect-debugger"/>
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
- <antcall target="debug-display-browser"/>
- <antcall target="connect-client-debugger"/>
- </target>
- <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
- <classpath>
- <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <sourcepath>
- <path path="${web.docbase.dir}"/>
- </sourcepath>
- </nbjpdaconnect>
- </target>
- <target if="do.display.browser.debug" name="debug-display-browser">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.debug.client" name="connect-client-debugger">
- <webproject1:nbjsdebugstart webUrl="${client.url}"/>
- </target>
- <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
- <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
- </target>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger">
- <webproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}"/>
- </target>
- <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
- <target depends="init" name="-pre-debug-fix">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
- <webproject1:nbjpdareload/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
- <!--
- JAVADOC SECTION
- -->
- <target depends="init" if="have.sources" name="javadoc-build">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
- <classpath>
- <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="**/*.java"/>
- </fileset>
- </javadoc>
- <copy todir="${dist.javadoc.dir}">
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/doc-files/**"/>
- </fileset>
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="**/doc-files/**"/>
- </fileset>
- </copy>
- </target>
- <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
- <!--
-
- JUNIT COMPILATION SECTION
- -->
- <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
- <mkdir dir="${build.test.classes.dir}"/>
- <property name="j2ee.platform.embeddableejb.classpath" value=""/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
- <!--
-
- JUNIT EXECUTION SECTION
- -->
- <target depends="init" if="have.tests" name="-pre-test-run">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
- <webproject2:junit testincludes="**/*Test.java"/>
- </target>
- <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init" if="have.tests" name="test-report"/>
- <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
- <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
- <target depends="init" if="have.tests" name="-pre-test-run-single">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <webproject2:junit excludes="" includes="${test.includes}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
- <!--
-
- JUNIT DEBUGGING SECTION
- -->
- <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
- <delete file="${test.report.file}"/>
- <!-- must exist, otherwise the XML formatter would fail -->
- <mkdir dir="${build.test.results.dir}"/>
- <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
- <customize>
- <arg value="showoutput=true"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
- </customize>
- </webproject1:debug>
- </target>
- <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
- </target>
- <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
- <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
- <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
- <!--
-
- CLEANUP SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
- <target depends="init" name="do-clean">
- <condition property="build.dir.to.clean" value="${build.web.dir}">
- <isset property="dist.ear.dir"/>
- </condition>
- <property name="build.dir.to.clean" value="${build.web.dir}"/>
- <delete includeEmptyDirs="true" quiet="true">
- <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
- </delete>
- <delete dir="${build.dir}"/>
- <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target depends="do-clean" if="status.clean-failed" name="check-clean">
- <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
- <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
- </target>
- <target depends="init" if="netbeans.home" name="undeploy-clean">
- <nbundeploy failOnError="false" startServer="false"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
- <target depends="clean" description="Clean build products." name="clean-ear"/>
-</project>
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 2c2aab9..0000000
--- 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 5740c6e..0000000
--- 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 bc91159..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/private/private.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>
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 2926753..0000000
--- 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 c8fe430..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/ee/cluster-tests/simple-failover/SimpleSFSBDriver/nbproject/project.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.web.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/web-project/3">
- <name>SimpleSFSBDriver</name>
- <minimum-ant-version>1.6.5</minimum-ant-version>
- <web-module-libraries/>
- <web-module-additional-libraries/>
- <source-roots>
- <root id="src.dir" name="Source Packages"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir" name="Test Packages"/>
- </test-roots>
- </data>
- </configuration>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/ejb/run_test.sh b/appserver/tests/appserv-tests/devtests/ejb/run_test.sh
index af86eeb..07dc1a4 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 @@
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 @@
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 @@
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 cede30f..49fc0c0 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 @@
<target name="runloadgenerator">
<java fork="true" failonerror="true"
- classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${assemble.dir}/ejb-sfsb-stressAppClient.jar:${env.APS_HOME}/lib/reporter.jar"
+ classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${assemble.dir}/ejb-sfsb-stressAppClient.jar:${env.APS_HOME}/lib/reporter.jar"
classname="${loadgenerator.client}">
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
<arg value="ejb/ejb_sfsb_stress_StressSFSBHome"/>
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 0da9b7b..cbdcbc9 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 @@
<target name="runclient_nooverride" depends="init-common">
<java fork="on"
failonerror="true"
- classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient/ejb-stubs-ejbapp-clientClient.jar:${env.APS_HOME}/lib/reporter.jar"
+ classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient/ejb-stubs-ejbapp-clientClient.jar:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
<jvmarg value="-Dorg.glassfish.gmbal.no.multipleUpperBoundsException=true" />
@@ -65,7 +65,7 @@
<target name="runclient_setnothing" depends="init-common">
<java fork="on"
failonerror="true"
- classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient.jar:${env.APS_HOME}/lib/reporter.jar"
+ classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient.jar:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
<arg value="ejb/ejb_stubs_ejbapp_HelloBean"/>
</java>
@@ -96,7 +96,7 @@
<target name="runclient_withoverride" depends="init-common">
<java fork="on"
failonerror="true"
- classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient.jar:${env.APS_HOME}/lib/reporter.jar"
+ classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/gf-client.jar:${build.classes.dir}:${assemble.dir}/ejb-stubs-ejbappAppClient.jar:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
<jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
<jvmarg
diff --git a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/sun-web.xml
index 1b48633..c066213 100644
--- a/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/ejb/stubs/webclient/descriptor/sun-web.xml
@@ -26,12 +26,6 @@
<ejb-ref-name>ejb/hello</ejb-ref-name>
<jndi-name>ejb/ejb_stubs_ejbapp_HelloBean</jndi-name>
</ejb-ref>
-<!--
- <ejb-ref>
- <ejb-ref-name>ejb/dummymejb</ejb-ref-name>
- <jndi-name>ejb/ejb_stubs_ejbapp_DummyMEJBBean</jndi-name>
- </ejb-ref>
--->
<class-loader delegate="true"/>
<jsp-config/>
</sun-web-app>
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 ce6e779..9059386 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 @@
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 c426b9f..aab0dc2 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 @@
<target name="runclient" depends="init-common">
<java fork="on"
failonerror="true"
- classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+ classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${simple.client}">
</java>
</target>
@@ -57,7 +57,7 @@
<target name="perf" depends="init-common">
<java fork="on"
failonerror="true"
- classpath="${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
+ classpath="${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}:${env.APS_HOME}/lib/reporter.jar"
classname="${perf.client}">
<arg value="javax.xml.rpc.Service"/>
<arg value="100000"/>
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 d590a1d..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.properties
+++ /dev/null
@@ -1,31 +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
-
--->
-
-
-<property name="module" value="ejb-webservice-commit"/>
-<property name="client_pkgname" value="com.sun.s1asdev.ejb.webservice.commit.client"/>
-<property name="appname" value="${module}"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
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 7b4f97a..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/commit/build.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonSetup SYSTEM "../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "../../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "build.properties">
-<!ENTITY run SYSTEM "../../../../config/run.xml">
-]>
-
-<project name="mix" default="usage" basedir=".">
-
- &commonSetup;
- &commonBuild;
- &testproperties;
- &run;
-
- <target name="all" depends="build,create_table,deploy,run,undeploy,delete_table"/>
-
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="compile" depends="clean">
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- </target>
-
- <target name="build" depends="compile">
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
- value="**/Commit*.class" />
- </antcall>
- </target>
-
- <target name="create_table" depends="init-common">
- <antcall target="execute-ejb-sql-common">
- <param name="sql.file" value="sql/create_pointbase.sql"/>
- </antcall>
- </target>
-
- <target name="deploy" depends="init-common">
- <antcall target="deploy-jar-common"/>
- <antcall target="wsdl-import"/>
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="com/sun/s1asdev/ejb/webservice/commit/client/*.class"/>
- </antcall>
- <jar jarfile="${assemble.dir}/${appname}-client.jar" update="yes">
- <zipfileset src="${env.APS_HOME}/lib/reporter.jar"
- excludes="META-INF/**"/>
- </jar>
- <antcall target="deploy-client-common"/>
- </target>
-
-
- <target name="wsdl-import">
- <antcall target="configurable-wsdl-import">
- <param name="host-name" value="${http.host}"/>
- <param name="host-port" value="${http.port}"/>
- <param name="protocol" value="http"/>
- </antcall>
- </target>
-
- <target name="configurable-wsdl-import">
- <echo message="wsimporting ${protocol}://${host-name}:${host-port}/${server}
- Service/${port}?WSDL; special args are ${wsimport-special-args}"/>
- <exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-keep -p ${client_pkgname} -d ${env.APS_HOME}/build/module/classes ${protocol}://${host-name}:${host-port}/CommitBeanService/CommitBean?WSDL"/>
- </exec>
- </target>
-
- <target name="run" depends="init-common">
- <exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/archive">
- <arg line="-client ${module}-clientClient.jar"/>
- </exec>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-jar-common"/>
- <antcall target="undeploy-client-common"/>
- </target>
-
- <target name="delete_table" depends="init-common">
- <antcall target="execute-ejb-sql-common">
- <param name="sql.file" value="sql/drop_pointbase.sql"/>
- </antcall>
- </target>
-
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
-
-</project>
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 e841e97..0000000
--- 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 81485c3..0000000
--- 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 ef6ecae..0000000
--- 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 ae72c11..0000000
--- 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 b132f74..0000000
--- 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 b0a3497..0000000
--- 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 d854b95..0000000
--- 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 b618634..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/GoogleSearch.wsdl
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.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
-
--->
-
-<!-- WSDL description of the Google Web APIs.
- The Google Web APIs are in beta release. All interfaces are subject to
- change as we refine and extend our APIs. Please see the terms of use
- for more information. -->
-
-<definitions name="urn:GoogleSearch"
- targetNamespace="urn:GoogleSearch"
- xmlns:typens="urn:GoogleSearch"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <!-- Types for search - result elements, directory categories -->
- <import namespace="urn:GoogleSearch" location="GoogleSearch_types.wsdl"/>
-
- <!-- Binding for Google Web APIs - RPC, SOAP over HTTP -->
-
- <binding name="GoogleSearchBinding" type="typens:GoogleSearchPort">
- <soap:binding style="rpc"
- transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <operation name="doGetCachedPage">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="doSpellingSuggestion">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="doGoogleSearch">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="helloOneWay">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
-
- </operation>
-
- </binding>
-
- <!-- Endpoint for Google Web APIs -->
- <service name="GoogleSearchService">
- <port name="GoogleSearchPort" binding="typens:GoogleSearchBinding">
- <soap:address location="http://api.google.com/search/beta2"/>
- </port>
- </service>
-
-</definitions>
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 845af9e..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/GoogleSearch_partial.wsdl
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.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
-
--->
-
-<!-- WSDL description of the Google Web APIs.
- The Google Web APIs are in beta release. All interfaces are subject to
- change as we refine and extend our APIs. Please see the terms of use
- for more information. -->
-
-<definitions name="urn:GoogleSearch"
- targetNamespace="urn:GoogleSearch"
- xmlns:typens="urn:GoogleSearch"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <!-- Types for search - result elements, directory categories -->
-
- <types>
- <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:GoogleSearch">
-
- <xsd:complexType name="GoogleSearchResult">
- <xsd:all>
- <xsd:element name="documentFiltering" type="xsd:boolean"/>
- <xsd:element name="searchComments" type="xsd:string"/>
- <xsd:element name="estimatedTotalResultsCount" type="xsd:int"/>
- <xsd:element name="estimateIsExact" type="xsd:boolean"/>
- <xsd:element name="resultElements" type="typens:ResultElementArray"/>
- <xsd:element name="searchQuery" type="xsd:string"/>
- <xsd:element name="startIndex" type="xsd:int"/>
- <xsd:element name="endIndex" type="xsd:int"/>
- <xsd:element name="searchTips" type="xsd:string"/>
- <xsd:element name="directoryCategories" type="typens:DirectoryCategoryArray"/>
- <xsd:element name="searchTime" type="xsd:double"/>
- </xsd:all>
- </xsd:complexType>
-
- <xsd:complexType name="ResultElement">
- <xsd:all>
- <xsd:element name="summary" type="xsd:string"/>
- <xsd:element name="URL" type="xsd:string"/>
- <xsd:element name="snippet" type="xsd:string"/>
- <xsd:element name="title" type="xsd:string"/>
- <xsd:element name="cachedSize" type="xsd:string"/>
- <xsd:element name="relatedInformationPresent" type="xsd:boolean"/>
- <xsd:element name="hostName" type="xsd:string"/>
- <xsd:element name="directoryCategory" type="typens:DirectoryCategory"/>
- <xsd:element name="directoryTitle" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
-
- <xsd:complexType name="ResultElementArray">
- <xsd:complexContent>
- <xsd:restriction base="soapenc:Array">
- <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:ResultElement[]"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="DirectoryCategoryArray">
- <xsd:complexContent>
- <xsd:restriction base="soapenc:Array">
- <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:DirectoryCategory[]"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="DirectoryCategory">
- <xsd:all>
- <xsd:element name="fullViewableName" type="xsd:string"/>
- <xsd:element name="specialEncoding" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
-
- </xsd:schema>
- </types>
-
- <!-- Messages for Google Web APIs - cached page, search, spelling. -->
-
- <message name="doGetCachedPage">
- <part name="key" type="xsd:string"/>
- <part name="url" type="xsd:string"/>
- </message>
-
- <message name="doGetCachedPageResponse">
- <part name="return" type="xsd:base64Binary"/>
- </message>
-
- <message name="doSpellingSuggestion">
- <part name="key" type="xsd:string"/>
- <part name="phrase" type="xsd:string"/>
- </message>
-
- <message name="doSpellingSuggestionResponse">
- <part name="return" type="xsd:string"/>
- </message>
-
- <message name="doGoogleSearch">
- <part name="key" type="xsd:string"/>
- <part name="q" type="xsd:string"/>
- <part name="start" type="xsd:int"/>
- <part name="maxResults" type="xsd:int"/>
- <part name="filter" type="xsd:boolean"/>
- <part name="restrict" type="xsd:string"/>
- <part name="safeSearch" type="xsd:boolean"/>
- <part name="lr" type="xsd:string"/>
- <part name="ie" type="xsd:string"/>
- <part name="oe" type="xsd:string"/>
- </message>
-
- <message name="doGoogleSearchResponse">
- <part name="return" type="typens:GoogleSearchResult"/>
- </message>
-
- <message name="helloOneWay">
- <part name="string" type="xsd:string"/>
- </message>
- <message name="helloOneWayResponse"/>
-
- <!-- Port for Google Web APIs, "GoogleSearch" -->
-
- <portType name="GoogleSearchPort">
-
- <operation name="doGetCachedPage">
- <input message="typens:doGetCachedPage"/>
- <output message="typens:doGetCachedPageResponse"/>
- </operation>
-
- <operation name="doSpellingSuggestion">
- <input message="typens:doSpellingSuggestion"/>
- <output message="typens:doSpellingSuggestionResponse"/>
- </operation>
-
- <operation name="doGoogleSearch">
- <input message="typens:doGoogleSearch"/>
- <output message="typens:doGoogleSearchResponse"/>
- </operation>
-
- <operation name="helloOneWay">
- <input message="typens:helloOneWay"/>
- </operation>
-
- </portType>
-
-
- <!-- Binding for Google Web APIs - RPC, SOAP over HTTP -->
-
- <binding name="GoogleSearchBinding" type="typens:GoogleSearchPort">
- <soap:binding style="rpc"
- transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <operation name="doGetCachedPage">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="doSpellingSuggestion">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="doGoogleSearch">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="helloOneWay">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- </operation>
-
- </binding>
-
-</definitions>
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 8bd2839..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/GoogleSearch_types.wsdl
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!-- WSDL description of the Google Web APIs.
- The Google Web APIs are in beta release. All interfaces are subject to
- change as we refine and extend our APIs. Please see the terms of use
- for more information. -->
-
-<definitions name="urn:GoogleSearch"
- targetNamespace="urn:GoogleSearch"
- xmlns:typens="urn:GoogleSearch"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <!-- Types for search - result elements, directory categories -->
-
- <types>
- <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:GoogleSearch">
-
- <xsd:complexType name="GoogleSearchResult">
- <xsd:all>
- <xsd:element name="documentFiltering" type="xsd:boolean"/>
- <xsd:element name="searchComments" type="xsd:string"/>
- <xsd:element name="estimatedTotalResultsCount" type="xsd:int"/>
- <xsd:element name="estimateIsExact" type="xsd:boolean"/>
- <xsd:element name="resultElements" type="typens:ResultElementArray"/>
- <xsd:element name="searchQuery" type="xsd:string"/>
- <xsd:element name="startIndex" type="xsd:int"/>
- <xsd:element name="endIndex" type="xsd:int"/>
- <xsd:element name="searchTips" type="xsd:string"/>
- <xsd:element name="directoryCategories" type="typens:DirectoryCategoryArray"/>
- <xsd:element name="searchTime" type="xsd:double"/>
- </xsd:all>
- </xsd:complexType>
-
- <xsd:complexType name="ResultElement">
- <xsd:all>
- <xsd:element name="summary" type="xsd:string"/>
- <xsd:element name="URL" type="xsd:string"/>
- <xsd:element name="snippet" type="xsd:string"/>
- <xsd:element name="title" type="xsd:string"/>
- <xsd:element name="cachedSize" type="xsd:string"/>
- <xsd:element name="relatedInformationPresent" type="xsd:boolean"/>
- <xsd:element name="hostName" type="xsd:string"/>
- <xsd:element name="directoryCategory" type="typens:DirectoryCategory"/>
- <xsd:element name="directoryTitle" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
-
- <xsd:complexType name="ResultElementArray">
- <xsd:complexContent>
- <xsd:restriction base="soapenc:Array">
- <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:ResultElement[]"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="DirectoryCategoryArray">
- <xsd:complexContent>
- <xsd:restriction base="soapenc:Array">
- <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:DirectoryCategory[]"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="DirectoryCategory">
- <xsd:all>
- <xsd:element name="fullViewableName" type="xsd:string"/>
- <xsd:element name="specialEncoding" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
-
- </xsd:schema>
- </types>
-
- <!-- Messages for Google Web APIs - cached page, search, spelling. -->
-
- <message name="doGetCachedPage">
- <part name="key" type="xsd:string"/>
- <part name="url" type="xsd:string"/>
- </message>
-
- <message name="doGetCachedPageResponse">
- <part name="return" type="xsd:base64Binary"/>
- </message>
-
- <message name="doSpellingSuggestion">
- <part name="key" type="xsd:string"/>
- <part name="phrase" type="xsd:string"/>
- </message>
-
- <message name="doSpellingSuggestionResponse">
- <part name="return" type="xsd:string"/>
- </message>
-
- <message name="doGoogleSearch">
- <part name="key" type="xsd:string"/>
- <part name="q" type="xsd:string"/>
- <part name="start" type="xsd:int"/>
- <part name="maxResults" type="xsd:int"/>
- <part name="filter" type="xsd:boolean"/>
- <part name="restrict" type="xsd:string"/>
- <part name="safeSearch" type="xsd:boolean"/>
- <part name="lr" type="xsd:string"/>
- <part name="ie" type="xsd:string"/>
- <part name="oe" type="xsd:string"/>
- </message>
-
- <message name="doGoogleSearchResponse">
- <part name="return" type="typens:GoogleSearchResult"/>
- </message>
-
- <message name="helloOneWay">
- <part name="string" type="xsd:string"/>
- </message>
- <message name="helloOneWayResponse"/>
-
- <!-- Port for Google Web APIs, "GoogleSearch" -->
-
- <portType name="GoogleSearchPort">
-
- <operation name="doGetCachedPage">
- <input message="typens:doGetCachedPage"/>
- <output message="typens:doGetCachedPageResponse"/>
- </operation>
-
- <operation name="doSpellingSuggestion">
- <input message="typens:doSpellingSuggestion"/>
- <output message="typens:doSpellingSuggestionResponse"/>
- </operation>
-
- <operation name="doGoogleSearch">
- <input message="typens:doGoogleSearch"/>
- <output message="typens:doGoogleSearchResponse"/>
- </operation>
-
- <operation name="helloOneWay">
- <input message="typens:helloOneWay"/>
- </operation>
-
- </portType>
-</definitions>
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 a602c92..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.properties
+++ /dev/null
@@ -1,37 +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
-
--->
-
-
-<property name="module" value="ksink"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="web.xml" value="descriptor/war/web.xml"/>
-<property name="sun-web.xml" value="descriptor/war/sun-web.xml"/>
-<property name="sun-webservices.xml" value="descriptor/war/webservices.xml"/>
-<property name="war.file" value="${assemble}/${appname}-web.war"/>
-<property name="app.type" value="application"/>
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 4352160..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/build.xml
+++ /dev/null
@@ -1,311 +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
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "../../../../config/common.xml">
-<!ENTITY commonRun SYSTEM "../../../../config/run.xml">
-<!ENTITY testproperties SYSTEM "build.properties">
-]>
-
-<project name="google test" default="all" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &commonRun;
- &testproperties;
-
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="${wscompile.command}" />
- </exec>
- </target>
-
- <target name="compile" depends="">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="web"/>
- </antcall>
- </target>
-
- <target name="build" depends="init-common, clean">
- <antcall target="gen-mapping-appclient"/>
- <antcall target="gen-mapping-ejb"/>
- <antcall target="gen-mapping-web"/>
- <antcall target="wscompile-appclient"/>
- <antcall target="wscompile-ejb"/>
- <antcall target="wscompile-web"/>
- <antcall target="assemble"/>
- <antcall target="build-appclient-file"/>
- </target>
-
- <target name="wscompile-appclient" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -f:norpcstructures -keep -d output -s output -classpath . -model googleclient.model wscompile_config_appclient.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/com/sun/s1asdev/ejb/webservice/ksink/googleclient">
- <fileset dir="output//com/sun/s1asdev/ejb/webservice/ksink/googleclient"
- includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchService.class, GoogleSearchPort.class, ResultElement.class"/>
- </copy>
- <!-- <delete dir="output"/> -->
- </target>
-
- <target name="wscompile-ejb" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -f:norpcstructures -keep -d output -s output -classpath . wscompile_config_ejb.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/com/sun/s1asdev/ejb/webservice/ksink/googleserver">
- <fileset dir="output/com/sun/s1asdev/ejb/webservice/ksink/googleserver"
- includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="wscompile-web" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -f:norpcstructures -keep -d output -s output -model googleweb.model -classpath . wscompile_config_web.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/com/sun/s1asdev/ejb/webservice/ksink/googleserverweb">
- <fileset dir="output/com/sun/s1asdev/ejb/webservice/ksink/googleserverweb"
- includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="assemble" depends="init-common, compile">
- <!--
- EJB module creation
- -->
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch.wsdl"/>
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch_types.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_ejb.xml"/>
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
- value="GoogleMapping_ejb.xml,META-INF/wsdl/**,**/*.class" />
-
- </antcall>
- <!--
- War module creation
- -->
- <antcall target="build-war-file"/>
- <!--
- AppClient module creation
- -->
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch.wsdl"/>
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch_types.wsdl"/>
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch_partial.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_appclient.xml"/>
- <copy todir="${build.classes.dir}"
- file="googleclient.model"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="googleclient.model,GoogleMapping_appclient.xml,META-INF/wsdl/**,**/*.class" />
-
- </antcall>
- <!--
- EAR file creation
- -->
- <antcall target="ear-common" />
- <copy todir="${build.classes.dir}/META-INF"
- file="${sun-application.xml}"/>
- <jar destfile = "${assemble.dir}/${appname}App.ear"
- update="true">
- <fileset dir="${build.classes.dir}">
- <include name="META-INF/sun-application.xml"/>
- </fileset>
- </jar>
-
- </target>
-
- <target name="build-appclient-file" depends="init-common">
- </target>
-
- <target name="build-war-file" depends="init-common">
- <echo message="my build classes dir is:${build.classes.dir}"/>
- <delete file="${war.file}"/>
- <mkdir dir="${build.classes.dir}/tmp"/>
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF"
- file="${web.xml}"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF"
- file="${sun-web.xml}"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF"
- file="${sun-webservices.xml}"/>
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF/classes"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF/wsdl"
- file="GoogleSearch.wsdl"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF/wsdl"
- file="GoogleSearch_types.wsdl"/>
- <copy todir="${build.classes.dir}/tmp"
- file="GoogleMapping_web.xml"/>
- <copy todir="${build.classes.dir}/tmp"
- file="googleweb.model"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF/classes/com/sun/s1asdev/ejb/webservice/ksink/googleserverweb">
- <fileset dir="${build.classes.dir}/com/sun/s1asdev/ejb/webservice/ksink/googleserverweb">
- <include name="**/*.class"/>
- </fileset>
- </copy>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp" casesensitive="yes">
- <include name="**/**"/>
- </fileset>
- </jar>
- <delete dir="${build.classes.dir}/tmp"/>
- </target>
-
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete dir="output"/>
- <delete dir="googleclient"/>
- <delete dir="googleserver"/>
- <delete dir="googleserverweb"/>
- <delete>
- <fileset dir="." includes="*.model"/>
- </delete>
- <delete file="GoogleMapping_ejb.xml"/>
- <delete file="GoogleMapping_appclient.xml"/>
- <delete file="GoogleMapping_web.xml"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="forwardejb http://${http.host}:${http.port}/ejb_webservice_ksink_GoogleServlet/GoogleSearch"/>
- </antcall>
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="forwardweb http://${http.host}:${http.port}/ejb_webservice_ksink_GoogleEJB/GoogleSearch"/>
- </antcall>
- <antcall target="run-standalone"/>
- </target>
-
- <target name="build-standalone" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen:client -keep -d ${build.classes.dir} -s ${build.classes.dir} -classpath . wscompile_config_standalone.xml"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="standalone"/>
- </antcall>
- </target>
-
- <target name="run-standalone" depends="init-common">
- <antcall target="build-standalone"/>
- <java fork="true" classname="com.sun.s1asdev.ejb.webservice.ksink.standalone.StandAloneClient"
- failonerror="true">
- <arg line="spellng http://${http.host}:${http.port}/ejb_webservice_ksink_GoogleServlet/GoogleSearch"/>
- <classpath>
- <pathelement location="${env.S1AS_HOME}/lib/j2ee.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/appserv-cmp.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/appserv-ext.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/appserv-rt.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/webservices-rt.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/webservices-tools.jar"/>
- <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
- <pathelement location="${build.classes.dir}"/>
- </classpath>
-
- <sysproperty key="http.proxyHost" value="scaweb2.sfbay"/>
- <sysproperty key="http.proxyPort" value="8080"/>
- </java>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="contactgoogle">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="spellng"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-appclient" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping GoogleMapping_appclient.xml wscompile_config_appclient.xml"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-ejb" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping GoogleMapping_ejb.xml wscompile_config_ejb.xml"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-web" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping GoogleMapping_web.xml wscompile_config_web.xml"/>
- </antcall>
- </target>
-
- <target name="create-user">
- <antcall target="create-user-common">
- <param name="user" value="j2ee"/>
- <param name="password" value="j2ee"/>
- <param name="groups" value="staff"/>
- </antcall>
- <antcall target="reconfig-common"/>
- </target>
-
- <target name="delete-user">
- <!-- remove test users, just cleanup. -->
- <antcall target="delete-user-common">
- <param name="user" value="j2ee"/>
- </antcall>
- </target>
-
- <target name="restart">
- <antcall target="restart-server-instance-common"/>
- </target>
-
- <target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- ant contactgoogle (Executes the appclient contacting the Google.com WebServices)
- </echo>
- </target>
-</project>
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 f3e96b6..0000000
--- 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 9b21cd4..0000000
--- 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 5e8bd3e..0000000
--- 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 03192a3..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application-client.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my google app client</description>
- <display-name>ksinkClient</display-name>
- <env-entry>
- <env-entry-name>googlekey</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>vCkqMIpV1WMKIRpNa7gBiYQZxDUYOYOj</env-entry-value>
- </env-entry>
- <ejb-ref>
- <ejb-ref-name>ejb/googleserverejb</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>com.sun.s1asdev.ejb.webservice.ksink.googleserver.FooHome</home>
- <remote>com.sun.s1asdev.ejb.webservice.ksink.googleserver.FooRemote</remote>
- <ejb-link>GoogleEjb</ejb-link>
- </ejb-ref>
- <service-ref>
- <description>google service ref</description>
- <display-name>MY GOOGLE SERVICE REF DISPLAY name</display-name>
- <service-ref-name>service/GoogleSearch</service-ref-name>
- <service-interface>com.sun.s1asdev.ejb.webservice.ksink.googleclient.GoogleSearchService</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_appclient.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>com.sun.s1asdev.ejb.webservice.ksink.googleclient.GoogleSearchPort
- </service-endpoint-interface>
- <port-component-link>GoogleSearchEjbPort</port-component-link>
- </port-component-ref>
- <handler>
- <description>handler 1</description>
- <handler-name>handler1</handler-name>
- <handler-class>com.sun.s1asdev.ejb.webservice.ksink.googleclient.ClientHandler</handler-class>
- <init-param>
- <description>param1 description</description>
- <param-name>a</param-name>
- <param-value>b</param-value>
- </init-param>
- <soap-header xmlns:googlens="urn:GoogleSearch">googlens:DirectoryCategory
- </soap-header>
- <soap-role>Role1</soap-role>
- <soap-role>Role2</soap-role>
- <port-name>GoogleSearchPort</port-name>
- </handler>
- </service-ref>
- <service-ref>
- <description>dynamic proxy google service ref</description>
- <service-ref-name>service/GoogleSearchProxy</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>googleclient.model</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>com.sun.s1asdev.ejb.webservice.ksink.googleclient.GoogleSearchPort
- </service-endpoint-interface>
- </port-component-ref>
- <handler>
- <description>handler 1</description>
- <handler-name>handler1</handler-name>
- <handler-class>com.sun.s1asdev.ejb.webservice.ksink.googleclient.ClientHandler</handler-class>
- <init-param>
- <description>param description</description>
- <param-name>c</param-name>
- <param-value>d</param-value>
- </init-param>
- </handler>
- </service-ref>
- <service-ref>
- <description>dii google service ref</description>
- <service-ref-name>service/DIINoWSDL</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- </service-ref>
- <service-ref>
- <description>partial wsdl test google service ref</description>
- <service-ref-name>service/partialGeneric</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch_partial.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_appclient.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>com.sun.s1asdev.ejb.webservice.ksink.googleclient.GoogleSearchPort
- </service-endpoint-interface>
- <port-component-link>ksink-web.war#GoogleSearchPort</port-component-link>
- </port-component-ref>
- </service-ref>
-<!-- <service-ref>
- <description>partial wsdl test google service ref</description>
- <service-ref-name>service/partialGenerated</service-ref-name>
- <service-interface>googleclient.GoogleSearchService</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch_partial.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_appclient.xml</jaxrpc-mapping-file>
- </service-ref>
--->
-</application-client>
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 55ef227..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/application.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>GoogleServerApp</display-name>
- <module>
- <web>
- <web-uri>ksink-web.war</web-uri>
- <context-root/>
- </web>
- </module>
- <module>
- <java>ksink-client.jar</java>
- </module>
- <module>
- <ejb>ksink-ejb.jar</ejb>
- </module>
-</application>
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 00f3f3f..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>GoogleEjb</ejb-name>
- <home>com.sun.s1asdev.ejb.webservice.ksink.googleserver.FooHome</home>
- <remote>com.sun.s1asdev.ejb.webservice.ksink.googleserver.FooRemote</remote>
- <service-endpoint>com.sun.s1asdev.ejb.webservice.ksink.googleserver.GoogleSearchPort</service-endpoint>
- <ejb-class>com.sun.s1asdev.ejb.webservice.ksink.googleserver.GoogleEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <env-entry>
- <env-entry-name>entry1</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>Blah</env-entry-value>
- </env-entry>
- <service-ref>
- <description>service ref for web endpoint</description>
- <service-ref-name>service/WebDIIReference</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>com.sun.s1asdev.ejb.webservice.ksink.googleserver.GoogleSearchPort
- </service-endpoint-interface>
- <port-component-link>ksink-web.war#GoogleSearchPort</port-component-link>
- </port-component-ref>
- </service-ref>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>GoogleEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <method>
- <ejb-name>GoogleEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>helloOneWay</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </method>
- <trans-attribute>NotSupported</trans-attribute>
- </container-transaction>
- <container-transaction>
- <method>
- <ejb-name>GoogleEjb</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
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 7a3aa87..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/GoogleSearch</service-ref-name>
- <port-info>
- <service-endpoint-interface>googleclient.GoogleSearchPort
- </service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>urn:GoogleSearch</namespaceURI>
- <localpart>GoogleSearchPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>javax.xml.rpc.security.auth.username</name>
- <value>j2ee</value>
- </stub-property>
- <stub-property>
- <name>javax.xml.rpc.security.auth.password</name>
- <value>j2ee</value>
- </stub-property>
- <call-property>
- <name>javax.xml.rpc.security.auth.username</name>
- <value>j2ee</value>
- </call-property>
- <call-property>
- <name>javax.xml.rpc.security.auth.password</name>
- <value>j2ee</value>
- </call-property>
- </port-info>
- </service-ref>
- <service-ref>
- <service-ref-name>service/GoogleSearchProxy</service-ref-name>
- <port-info>
- <service-endpoint-interface>googleclient.GoogleSearchPort
- </service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>urn:GoogleSearch</namespaceURI>
- <localpart>GoogleSearchPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>javax.xml.rpc.service.endpoint.address</name>
- <value>http://localhost:8000/google/GoogleSearch</value>
- </stub-property>
- <stub-property>
- <name>javax.xml.rpc.security.auth.username</name>
- <value>j2ee</value>
- </stub-property>
- <stub-property>
- <name>javax.xml.rpc.security.auth.password</name>
- <value>j2ee</value>
- </stub-property>
- <call-property>
- <name>javax.xml.rpc.security.auth.username</name>
- <value>j2ee</value>
- </call-property>
- <call-property>
- <name>javax.xml.rpc.security.auth.password</name>
- <value>j2ee</value>
- </call-property>
- </port-info>
- </service-ref>
- <service-ref>
- <service-ref-name>service/partialGeneric</service-ref-name>
- <wsdl-override>file:GoogleSearch_final.wsdl</wsdl-override>
- </service-ref>
-<!-- <service-ref>
- <service-ref-name>service/partialGenerated</service-ref-name>
- <wsdl-override>file:GoogleSearch_final.wsdl</wsdl-override>
- </service-ref>
--->
-</sun-application-client>
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 16ce779..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-application.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 7.0 J2EE Application 1.3//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application_1_3-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application>
- <web>
- <web-uri>ksink-web.war</web-uri>
- <context-root>ejb_webservice_ksink_GoogleServlet</context-root>
- </web>
-</sun-application>
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 3ab2d75..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <ejb>
- <ejb-name>GoogleEjb</ejb-name>
- <jndi-name>com_sun_s1asdev_ejb_webservice_ksink_GoogleEjb</jndi-name>
- <webservice-endpoint>
- <port-component-name>GoogleSearchEjbPort</port-component-name>
- <endpoint-address-uri>ejb_webservice_ksink_GoogleEJB/GoogleSearch</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- <webservice-description>
- <webservice-description-name>GoogleServiceEjb
- </webservice-description-name>
- <wsdl-publish-location>file:publish</wsdl-publish-location>
- </webservice-description>
- </enterprise-beans>
-</sun-ejb-jar>
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 26fc5e2..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/war/sun-web.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <service-ref>
- <service-ref-name>service/EjbDIIReference</service-ref-name>
- <port-info>
- <service-endpoint-interface>com.sun.s1asdev.ejb.webservice.ksink.googleserverweb.GoogleSearchPort
- </service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>urn:GoogleSearch</namespaceURI>
- <localpart>GoogleSearchPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>javax.xml.rpc.security.auth.username</name>
- <value>j2ee</value>
- </stub-property>
- <stub-property>
- <name>javax.xml.rpc.security.auth.password</name>
- <value>j2ee</value>
- </stub-property>
- </port-info>
- </service-ref>
-</sun-web-app>
-
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 c44ecde..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/war/web.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>GoogleWebApp</display-name>
- <servlet>
- <servlet-name>GoogleServlet</servlet-name>
- <servlet-class>com.sun.s1asdev.ejb.webservice.ksink.googleserverweb.GoogleServletImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>GoogleServlet</servlet-name>
- <url-pattern>/GoogleSearch</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
- <env-entry>
- <env-entry-name>entry1</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>Blah</env-entry-value>
- </env-entry>
- <service-ref>
- <description>service ref for ejb endpoint</description>
- <service-ref-name>service/EjbDIIReference</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>googleweb.model</jaxrpc-mapping-file>
- <service-qname xmlns:googlens="urn:GoogleSearch">googlens:GoogleSearchService</service-qname>
- <port-component-ref>
- <service-endpoint-interface>com.sun.s1asdev.ejb.webservice.ksink.googleserverweb.GoogleSearchPort
- </service-endpoint-interface>
- <port-component-link>ksink-ejb.jar#GoogleSearchEjbPort</port-component-link>
- </port-component-ref>
- </service-ref>
-</web-app>
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 a5f6d6f..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/war/webservices.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description xmlns:googlens="urn:GoogleSearch">
- <webservice-description-name>GoogleServiceServlet</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>googleweb.model</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>GoogleSearchPort</port-component-name>
- <wsdl-port>googlens:GoogleSearchPort</wsdl-port>
- <service-endpoint-interface>com.sun.s1asdev.ejb.webservice.ksink.googleserverweb.GoogleSearchPort
- </service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>GoogleServlet</servlet-link>
- </service-impl-bean>
- <handler>
- <description>handler 1</description>
- <handler-name>handler1</handler-name>
- <handler-class>com.sun.s1asdev.ejb.webservice.ksink.googleserverweb.FooHandler</handler-class>
- <init-param>
- <description>param1 description</description>
- <param-name>a</param-name>
- <param-value>b</param-value>
- </init-param>
- <soap-header>googlens:DirectoryCategory</soap-header>
- <soap-role>Role1</soap-role>
- <soap-role>Role2</soap-role>
- </handler>
- </port-component>
- </webservice-description>
-</webservices>
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 76f5cc4..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/descriptor/webservices.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description xmlns:googlens="urn:GoogleSearch">
- <webservice-description-name>GoogleServiceEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>GoogleSearchEjbPort</port-component-name>
- <wsdl-port>googlens:GoogleSearchPort</wsdl-port>
- <service-endpoint-interface>com.sun.s1asdev.ejb.webservice.ksink.googleserver.GoogleSearchPort
- </service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>GoogleEjb</ejb-link>
- </service-impl-bean>
- <handler>
- <description>handler 1</description>
- <handler-name>handler1</handler-name>
- <handler-class>com.sun.s1asdev.ejb.webservice.ksink.googleserver.FooHandler</handler-class>
- <init-param>
- <description>param1 description</description>
- <param-name>a</param-name>
- <param-value>b</param-value>
- </init-param>
- <soap-header>googlens:DirectoryCategory</soap-header>
- <soap-role>Role1</soap-role>
- <soap-role>Role2</soap-role>
- </handler>
- </port-component>
- </webservice-description>
-</webservices>
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 00390b9..0000000
--- 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 678759a..0000000
--- 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 d3483f4..0000000
--- 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 7f46ae9..0000000
--- 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 2b36e52..0000000
--- 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 f5c3a6d..0000000
--- 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 6d04ad3..0000000
--- 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 36f858e..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_appclient.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="GoogleSearch.wsdl"
- packageName="com.sun.s1asdev.ejb.webservice.ksink.googleclient"/>
-</configuration>
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 76c9951..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_ejb.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="GoogleSearch.wsdl"
- packageName="com.sun.s1asdev.ejb.webservice.ksink.googleserver"/>
-</configuration>
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 08a03a8..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_standalone.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="http://localhost:8080/ejb_webservice_ksink_GoogleServlet/GoogleSearch?WSDL"
- packageName="com.sun.s1asdev.ejb.webservice.ksink.standalone"/>
-</configuration>
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 cc93bfd..0000000
--- a/appserver/tests/appserv-tests/devtests/ejb/webservice/ksink/wscompile_config_web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="GoogleSearch.wsdl"
- packageName="com.sun.s1asdev.ejb.webservice.ksink.googleserverweb"/>
-</configuration>
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 44a25ae..23a83e9 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.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 0d510ba..86bb741 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
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 70c8a74..0000000
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/ant-deploy.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project default="-deploy-ant" basedir=".">
- <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
- <property file="${deploy.ant.properties.file}" />
- <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
- <available file="${deploy.ant.resource.dir}" property="has.setup"/>
- <tempfile prefix="sjsas" property="sjsas.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <echo message="AS_ADMIN_PASSWORD=${sjsas.password}" file="${sjsas.password.file}"/>
- </target>
-
- <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
- <tempfile prefix="sjsas" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
- <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
- <!-- The doctype triggers resolution which can fail -->
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
- <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
- </replace>
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
- <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
- </replace>
- <xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
- <delete file="${temp.sun.web}"/>
- <property name="deploy.ant.client.url" value="${sjsas.url}${sun-web-app.context-root}"/>
- </target>
- <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
- <tempfile prefix="sjsas" property="sjsas.resources.dir" destdir="${java.io.tmpdir}"/>
- <mkdir dir="${sjsas.resources.dir}"/>
- <mkdir dir="${sjsas.resources.dir}/META-INF"/>
- <property name="sjsas.resources.file" value="${sjsas.resources.dir}/META-INF/sun-resources.xml"/>
- <copy todir="${sjsas.resources.dir}/META-INF">
- <fileset dir="${deploy.ant.resource.dir}"/>
- </copy>
- <jar destfile="${deploy.ant.archive}" update="true">
- <fileset dir="${sjsas.resources.dir}"/>
- </jar>
- <delete dir="${sjsas.resources.dir}"/>
- </target>
- <target name="-deploy-ant" depends="-parse-sun-web,-add-resources" if="deploy.ant.enabled">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <taskdef name="sun-appserv-deploy" classname="org.apache.tools.ant.taskdefs.optional.sun.appserv.DeployTask"
- classpath="${sjsas.root}/lib/sun-appserv-ant.jar" />
- <sun-appserv-deploy user="${sjsas.username}"
- passwordfile="${sjsas.password.file}"
- host="${sjsas.host}" port="${sjsas.port}"
- file="${deploy.ant.archive}" asinstalldir="${sjsas.root}"/>
- <delete file="${sjsas.password.file}"/>
- </target>
- <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
- <taskdef name="sun-appserv-undeploy" classname="org.apache.tools.ant.taskdefs.optional.sun.appserv.UndeployTask"
- classpath="${sjsas.root}/lib/sun-appserv-ant.jar" />
- <sun-appserv-undeploy user="${sjsas.username}"
- passwordfile="${sjsas.password.file}"
- host="${sjsas.host}" port="${sjsas.port}"
- file="${deploy.ant.archive}" asinstalldir="${sjsas.root}"/>
- <delete file="${sjsas.password.file}"/>
- </target>
-</project>
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 31e0e91..0000000
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/build-impl.xml
+++ /dev/null
@@ -1,810 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!--
- *** GENERATED FROM project.xml - DO NOT EDIT ***
- *** EDIT ../build.xml INSTEAD ***
-
- For the purpose of easier reading the script
- is divided into following sections:
- - initialization
- - compilation
- - dist
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - cleanup
-
- -->
-<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="v3_jdbc_dev_tests-impl">
- <import file="ant-deploy.xml"/>
- <target depends="dist,javadoc" description="Build whole project." name="default"/>
- <!--
- INITIALIZATION SECTION
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init" name="-init-private">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target depends="-pre-init,-init-private" name="-init-user">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user" name="-init-project">
- <property file="nbproject/project.properties"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-do-ear-init" name="-do-init">
- <webproject1:property name="platform.home" value="platforms.${platform.active}.home"/>
- <webproject1:property name="platform.bootcp" value="platforms.${platform.active}.bootclasspath"/>
- <webproject1:property name="platform.compiler" value="platforms.${platform.active}.compile"/>
- <webproject1:property name="platform.javac.tmp" value="platforms.${platform.active}.javac"/>
- <condition property="platform.javac" value="${platform.home}/bin/javac">
- <equals arg1="${platform.javac.tmp}" arg2="$${platforms.${platform.active}.javac}"/>
- </condition>
- <property name="platform.javac" value="${platform.javac.tmp}"/>
- <webproject1:property name="platform.java.tmp" value="platforms.${platform.active}.java"/>
- <condition property="platform.java" value="${platform.home}/bin/java">
- <equals arg1="${platform.java.tmp}" arg2="$${platforms.${platform.active}.java}"/>
- </condition>
- <property name="platform.java" value="${platform.java.tmp}"/>
- <webproject1:property name="platform.javadoc.tmp" value="platforms.${platform.active}.javadoc"/>
- <condition property="platform.javadoc" value="${platform.home}/bin/javadoc">
- <equals arg1="${platform.javadoc.tmp}" arg2="$${platforms.${platform.active}.javadoc}"/>
- </condition>
- <property name="platform.javadoc" value="${platform.javadoc.tmp}"/>
- <fail unless="platform.home">Must set platform.home</fail>
- <fail unless="platform.bootcp">Must set platform.bootcp</fail>
- <fail unless="platform.java">Must set platform.java</fail>
- <fail unless="platform.javac">Must set platform.javac</fail>
- <fail if="platform.invalid">Platform is not correctly set up</fail>
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="javac.compilerargs" value=""/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <condition property="no.dist.ear.dir">
- <not>
- <isset property="dist.ear.dir"/>
- </not>
- </condition>
- <property name="build.web.excludes" value="${build.classes.excludes}"/>
- <condition property="do.compile.jsps">
- <istrue value="${compile.jsps}"/>
- </condition>
- <condition property="do.display.browser">
- <istrue value="${display.browser}"/>
- </condition>
- <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
- <available file="${conf.dir}/persistence.xml" property="has.persistence.xml"/>
- <condition property="do.war.package.with.custom.manifest">
- <isset property="has.custom.manifest"/>
- </condition>
- <condition property="do.war.package.without.custom.manifest">
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- </condition>
- <condition property="do.tmp.war.package.with.custom.manifest">
- <and>
- <isset property="has.custom.manifest"/>
- <isfalse value="${directory.deployment.supported}"/>
- </and>
- </condition>
- <condition property="do.tmp.war.package.without.custom.manifest">
- <and>
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- <isfalse value="${directory.deployment.supported}"/>
- </and>
- </condition>
- <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
- <condition else="" property="application.args.param" value="${application.args}">
- <and>
- <isset property="application.args"/>
- <not>
- <equals arg1="${application.args}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <property name="source.encoding" value="${file.encoding}"/>
- <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
- <and>
- <isset property="javadoc.encoding"/>
- <not>
- <equals arg1="${javadoc.encoding}" arg2=""/>
- </not>
- </and>
- </condition>
- <property name="javadoc.encoding.used" value="${source.encoding}"/>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="build.web.dir">Must set build.web.dir</fail>
- <fail unless="build.generated.dir">Must set build.generated.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.war">Must set dist.war</fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-javac">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.debug}" name="debug"/>
- <element name="customize" optional="true"/>
- <sequential>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" executable="${platform.javac}" fork="yes" includeantruntime="false" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}" tempdir="${java.io.tmpdir}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${javac.compilerargs} ${javac.compilerargs.jaxws}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="**/*Test.java" name="includes"/>
- <sequential>
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" jvm="${platform.java}" showoutput="true">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" includes="@{includes}"/>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true" jvm="${platform.java}">
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="name"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="dt_socket">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <bootclasspath>
- <path path="${platform.bootcp}"/>
- </bootclasspath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${build.classes.dir}" name="dir"/>
- <sequential>
- <nbjpdareload>
- <fileset dir="@{dir}" includes="${fix.includes}*.class"/>
- </nbjpdareload>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
- <sequential>
- <nbjpdaappreloaded/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <exec executable="${platform.java}" outputproperty="version-output">
- <arg value="-version"/>
- </exec>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${application.args.param}" name="args"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true" jvm="${platform.java}">
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <arg line="@{args}"/>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-copy-ear-war">
- <macrodef name="copy-ear-war">
- <attribute name="file"/>
- <attribute name="propname"/>
- <sequential>
- <basename file="@{file}" property="base_@{propname}"/>
- <zipfileset id="tld.files_@{propname}" includes="META-INF/*.tld META-INF/tlds/*.tld" src="@{file}"/>
- <pathconvert property="tld.files.path_@{propname}" refid="tld.files_@{propname}"/>
- <condition property="hastlds_@{propname}" value="yes">
- <contains casesensitive="false" string="${tld.files.path_@{propname}}" substring=".tld"/>
- </condition>
- <condition property="copy.to.dir_@{propname}" value="${build.web.dir}/WEB-INF/lib">
- <isset property="hastlds_@{propname}"/>
- </condition>
- <condition property="copy.to.dir_@{propname}" value="${dist.ear.dir}">
- <not>
- <isset property="hastlds_@{propname}"/>
- </not>
- </condition>
- <copy file="@{file}" todir="${copy.to.dir_@{propname}}"/>
- <condition property="@{propname}" value="${base_@{propname}}">
- <not>
- <isset property="hastlds_@{propname}"/>
- </not>
- </condition>
- <condition property="@{propname}" value="">
- <isset property="hastlds_@{propname}"/>
- </condition>
- </sequential>
- </macrodef>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-copy-ear-war" name="init"/>
- <!--
- COMPILATION SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
- <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
- <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
- <target depends="init,deps-jar" name="-pre-pre-compile">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-copy-webdir">
- <copy todir="${build.web.dir}">
- <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes}"/>
- </copy>
- <copy todir="${build.web.dir}/WEB-INF">
- <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
- </copy>
- </target>
- <target name="-do-ws-compile"/>
- <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest,-do-ws-compile" if="have.sources" name="-do-compile">
- <webproject2:javac destdir="${build.classes.dir}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
- </copy>
- </target>
- <target if="has.custom.manifest" name="-copy-manifest">
- <mkdir dir="${build.meta.inf.dir}"/>
- <copy todir="${build.meta.inf.dir}">
- <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
- </copy>
- </target>
- <target if="has.persistence.xml" name="-copy-persistence-xml">
- <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
- <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
- <fileset dir="${conf.dir}" includes="persistence.xml"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac>
- <customize>
- <patternset includes="${javac.includes}"/>
- </customize>
- </webproject2:javac>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
- </copy>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
- <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <classpath path="${java.home}/../lib/tools.jar:${copyfiles.classpath}:${jspcompilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
- </target>
- <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
- <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-jspc.files"/>
- <arg path="${jsp.includes}"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <classpath path="${java.home}/../lib/tools.jar:${copyfiles.classpath}:${jspcompilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${j2ee.platform.classpath}:${build.classes.dir}:${jspcompilation.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
- <customize>
- <patternset includes="${javac.jsp.includes}"/>
- </customize>
- </webproject2:javac>
- </target>
- <target name="compile-single-jsp">
- <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
- <antcall target="-do-compile-single-jsp"/>
- </target>
- <!--
- DIST BUILDING SECTION
- -->
- <target name="-pre-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
- <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
- <basename file="${file.reference.glassfish-api-10.0-SNAPSHOT.jar-4}" property="included.lib.file.reference.glassfish-api-10.0-SNAPSHOT.jar-4"/>
- <copy-ear-war file="${file.reference.glassfish-api-10.0-SNAPSHOT.jar-4}" propname="included.lib.file.reference.glassfish-api-10.0-SNAPSHOT.jar-4.X"/>
- <mkdir dir="${build.web.dir}/META-INF"/>
- <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
- <attribute name="Class-Path" value="${included.lib.file.reference.glassfish-api-10.0-SNAPSHOT.jar-4} "/>
- </manifest>
- <delete dir="${dist.ear.dir}/temp"/>
- </target>
- <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
- <copy file="${file.reference.glassfish-api-10.0-SNAPSHOT.jar-4}" todir="${build.web.dir}/WEB-INF/lib"/>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" name="do-ear-dist">
- <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target name="-post-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
- <target depends="init,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
- <!--
- EXECUTION SECTION
- -->
- <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
- <target name="-pre-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-post-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-pre-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
- </target>
- <target name="-post-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
- </target>
- <target name="-run-deploy-am">
- <!-- Task to deploy to the Access Manager runtime. -->
- </target>
- <target depends="init,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
- <nbjpdaappreloaded/>
- </target>
- <target if="netbeans.home" name="-run-deploy-nb">
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
- </target>
- <target name="-init-deploy-ant" unless="netbeans.home">
- <property name="deploy.ant.archive" value="${dist.war}"/>
- <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
- <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
- <property name="deploy.ant.enabled" value="true"/>
- </target>
- <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
- <target if="netbeans.home" name="-run-undeploy-nb">
- <fail message="Undeploy is not supported from within the IDE"/>
- </target>
- <target depends="init,-pre-dist,dist,-post-dist" name="verify">
- <nbverify file="${dist.war}"/>
- </target>
- <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
- <target if="do.display.browser" name="-init-display-browser">
- <condition property="do.display.browser.nb">
- <isset property="netbeans.home"/>
- </condition>
- <condition property="do.display.browser.cl">
- <isset property="deploy.ant.enabled"/>
- </condition>
- </target>
- <target if="do.display.browser.nb" name="-display-browser-nb">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.display.browser.cl" name="-get-browser" unless="browser">
- <condition property="browser" value="rundll32">
- <os family="windows"/>
- </condition>
- <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
- <os family="windows"/>
- </condition>
- <condition property="browser" value="/usr/bin/open">
- <os family="mac"/>
- </condition>
- <property environment="env"/>
- <condition property="browser" value="${env.BROWSER}">
- <isset property="env.BROWSER"/>
- </condition>
- <condition property="browser" value="/usr/bin/firefox">
- <available file="/usr/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/local/firefox/firefox">
- <available file="/usr/local/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/usr/bin/mozilla">
- <available file="/usr/bin/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/local/mozilla/mozilla">
- <available file="/usr/local/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
- <available file="/usr/sfw/lib/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/firefox">
- <available file="/opt/csw/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
- <available file="/usr/sfw/lib/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/mozilla">
- <available file="/opt/csw/bin/mozilla"/>
- </condition>
- </target>
- <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
- <fail unless="browser">
- Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
- </fail>
- <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
- <echo>Launching ${browse.url}</echo>
- <exec executable="${browser}" spawn="true">
- <arg line="${browser.args} ${browse.url}"/>
- </exec>
- </target>
- <target depends="init,compile-single" name="run-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}"/>
- </target>
- <!--
- DEBUGGING SECTION
- -->
- <target depends="init,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true"/>
- <antcall target="connect-debugger"/>
- <antcall target="debug-display-browser"/>
- </target>
- <target name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
- <classpath>
- <path path="${debug.classpath}:${j2ee.platform.classpath}:${ws.debug.classpaths}"/>
- </classpath>
- <sourcepath>
- <path path="${web.docbase.dir}:${ws.web.docbase.dirs}"/>
- </sourcepath>
- <bootclasspath>
- <path path="${platform.bootcp}"/>
- </bootclasspath>
- </nbjpdaconnect>
- </target>
- <target if="do.display.browser" name="debug-display-browser">
- <nbbrowse url="${client.url}"/>
- </target>
- <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger">
- <webproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}"/>
- </target>
- <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
- <target depends="init" name="-pre-debug-fix">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
- <webproject1:nbjpdareload/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
- <!--
- JAVADOC SECTION
- -->
- <target depends="init" name="javadoc-build">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
- <classpath>
- <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <sourcepath>
- <pathelement location="${src.dir}"/>
- </sourcepath>
- <packageset dir="${src.dir}" includes="*/**"/>
- <fileset dir="${src.dir}" includes="*.java"/>
- </javadoc>
- </target>
- <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
- <!--
-
- JUNIT COMPILATION SECTION
- -->
- <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
- <mkdir dir="${build.test.classes.dir}"/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="**/*.java"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}">
- <customize>
- <patternset includes="${javac.includes}"/>
- </customize>
- </webproject2:javac>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="**/*.java"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
- <!--
-
- JUNIT EXECUTION SECTION
- -->
- <target depends="init" if="have.tests" name="-pre-test-run">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
- <webproject2:junit/>
- </target>
- <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
- <fail if="tests.failed">Some tests failed; see details above.</fail>
- </target>
- <target depends="init" if="have.tests" name="test-report"/>
- <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
- <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
- <target depends="init" if="have.tests" name="-pre-test-run-single">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <webproject2:junit includes="${test.includes}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
- <fail if="tests.failed">Some tests failed; see details above.</fail>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
- <!--
-
- JUNIT DEBUGGING SECTION
- -->
- <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
- <delete file="${test.report.file}"/>
- <!-- must exist, otherwise the XML formatter would fail -->
- <mkdir dir="${build.test.results.dir}"/>
- <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}">
- <customize>
- <arg value="showoutput=true"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
- </customize>
- </webproject1:debug>
- </target>
- <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
- </target>
- <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
- <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
- <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
- <!--
-
- CLEANUP SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
- <target depends="init" name="do-clean">
- <condition property="build.dir.to.clean" value="${build.web.dir}">
- <isset property="dist.ear.dir"/>
- </condition>
- <property name="build.dir.to.clean" value="${build.web.dir}"/>
- <delete includeEmptyDirs="true" quiet="true">
- <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
- </delete>
- <delete dir="${build.dir}"/>
- <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target depends="do-clean" if="status.clean-failed" name="check-clean">
- <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
- <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
- <target depends="clean" description="Clean build products." name="clean-ear"/>
-</project>
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 bacbff3..0000000
--- 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 35c9e82..0000000
--- 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 47110b2..0000000
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/private/private.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-</project-private>
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 3f26e2d..0000000
--- 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 bfd6bbe..0000000
--- a/appserver/tests/appserv-tests/devtests/jdbc/v3/v3_jdbc_dev_tests/nbproject/project.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.web.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/web-project/3">
- <name>v3_jdbc_dev_tests</name>
- <minimum-ant-version>1.6</minimum-ant-version>
- <web-module-libraries>
- <library>
- <file>${file.reference.glassfish-api-10.0-SNAPSHOT.jar-3}</file>
- <path-in-war>WEB-INF/lib</path-in-war>
- </library>
- <library files="1">
- <file>${file.reference.glassfish-api-10.0-SNAPSHOT.jar-4}</file>
- <path-in-war>WEB-INF/lib</path-in-war>
- </library>
- </web-module-libraries>
- <web-module-additional-libraries/>
- <explicit-platform explicit-source-supported="true"/>
- <source-roots>
- <root id="src.dir"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir"/>
- </test-roots>
- </data>
- </configuration>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/naming/build.xml b/appserver/tests/appserv-tests/devtests/naming/build.xml
index 67132ad..9a7f31c 100644
--- a/appserver/tests/appserv-tests/devtests/naming/build.xml
+++ b/appserver/tests/appserv-tests/devtests/naming/build.xml
@@ -40,7 +40,7 @@
<fileset dir="." includes="*.output"/>
</delete>
<record name="naming.output" action="start" />
- <ant dir="externalnameservicelookup" target="all"/>
+<!-- <ant dir="externalnameservicelookup" target="all"/> -->
<ant dir="injection" target="all"/>
<ant dir="listjndi" target="all"/>
<!-- <ant dir="loadbalancing" target="all"/> -->
@@ -48,8 +48,10 @@
<ant dir="naming2" target="all"/>
<!-- <ant dir="nonfailover" target="all"/> -->
<ant dir="orb_annotation" target="all"/>
-<!-- <ant dir="visibroker/lookup" target="all">
- <ant dir="visibroker/rmiiiop" target="all"> -->
+<!--
+ <ant dir="visibroker/lookup" target="all">
+ <ant dir="visibroker/rmiiiop" target="all">
+ -->
<record name="naming.output" action="stop" />
</target>
diff --git a/appserver/tests/appserv-tests/devtests/naming/listjndi/ListJndiEntriesTest.java b/appserver/tests/appserv-tests/devtests/naming/listjndi/ListJndiEntriesTest.java
index 92fc39a..ef933c7 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 @@
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 @@
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 @@
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 @@
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 197f801..b5c7714 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 @@
</target>
<target name="run">
- <!--
<record name="listjndi.output" action="start" />
- -->
<antcall target="listjndi"/>
- <!--
<record name="admin.output" action="stop" />
<antcall target="dev-report"/>
- -->
</target>
<target name="clean">
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 431257c..35d36b3 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 @@
<target name="all" depends="cluster-setup,build,setup,deploy,run-appclient1,run-appclient2,run-appclient3,run-appclient4,undeploy,unsetup,cluster-unsetup"/>
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common"/>
+ </target>
- <target name="sql" depends="init-common">
- <!--
+ <target name="sql" depends="init-common">
+ <!--
Clean the database after the run since it prohibits re-running
-->
- <antcall target="execute-sql-common">
- <param name="sql.file" value="sql/drop_derby.sql"/>
- </antcall>
- <antcall target="execute-sql-common">
- <param name="sql.file" value="sql/create_derby.sql"/>
- </antcall>
- </target>
- <target name="run-appclient1" depends="init-common">
- <echo message="running in ACC with S1ASCtxFactory..."/>
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb.xml 129.145.133.64 33700"/>
- </antcall>
- <antcall target="sql"/>
-</target>
+ <antcall target="execute-sql-common">
+ <param name="sql.file" value="sql/drop_derby.sql"/>
+ </antcall>
+ <antcall target="execute-sql-common">
+ <param name="sql.file" value="sql/create_derby.sql"/>
+ </antcall>
+ </target>
+ <target name="run-appclient1" depends="init-common">
+ <echo message="running in ACC with S1ASCtxFactory..."/>
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb.xml 129.145.133.64 33700"/>
+ </antcall>
+ <antcall target="sql"/>
+ </target>
- <target name="run-appclient2" depends="init-common">
- <echo message="running in ACC with S1ASCtxFactory..."/>
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb1.xml 129.145.133.64 33700"/>
- </antcall>
- <antcall target="sql"/>
-</target>
+ <target name="run-appclient2" depends="init-common">
+ <echo message="running in ACC with S1ASCtxFactory..."/>
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb1.xml 129.145.133.64 33700"/>
+ </antcall>
+ <antcall target="sql"/>
+ </target>
- <target name="run-appclient3" depends="init-common">
- <echo message="running in ACC with S1ASCtxFactory..."/>
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb2.xml 129.145.133.64 33700"/>
- </antcall>
- <antcall target="sql"/>
-</target>
+ <target name="run-appclient3" depends="init-common">
+ <echo message="running in ACC with S1ASCtxFactory..."/>
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb2.xml 129.145.133.64 33700"/>
+ </antcall>
+ <antcall target="sql"/>
+ </target>
- <target name="run-appclient4" depends="init-common">
- <echo message="running in ACC with S1ASCtxFactory..."/>
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb3.xml 129.145.133.64 33700"/>
- </antcall>
- <antcall target="sql"/>
-</target>
+ <target name="run-appclient4" depends="init-common">
+ <echo message="running in ACC with S1ASCtxFactory..."/>
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="-xml ./descriptor/sun-acc-lb3.xml 129.145.133.64 33700"/>
+ </antcall>
+ <antcall target="sql"/>
+ </target>
- <target name="compile" depends="clean">
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- </target>
+ <target name="compile" depends="clean">
+ <antcall target="compile-common">
+ <param name="src" value="ejb"/>
+ </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="client"/>
+ </antcall>
+ </target>
- <target name="build" depends="compile">
- <antcall target="build-ear-common">
- <param name="ejbjar.classes"
+ <target name="build" depends="compile">
+ <antcall target="build-ear-common">
+ <param name="ejbjar.classes"
value="**/*Student*.class,**/*Enroller*.class,**/*Course*.class" />
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="**/Course.class,**/Enroller.class,**/Student.class,**/*Home*.class,**/*Client*.class" />
- </antcall>
- </target>
+ </antcall>
+ </target>
- <target name="setup" depends="init-common">
- <antcall target="execute-sql-common">
- <param name="sql.file" value="sql/create_derby.sql"/>
- </antcall>
- <antcall target="deploy-jdbc-common">
- <param name="jdbc.conpool.name" value="bmpEnrollerPool"/>
- <param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB"/>
- <param name="appserver.instance.name" value="C1"/>
- </antcall>
- <!--antcall target="deploy-jms-common"/>
- <antcall target="reconfig-common"/-->
- </target>
+ <target name="setup" depends="init-common">
+ <antcall target="execute-sql-common">
+ <param name="sql.file" value="sql/create_derby.sql"/>
+ </antcall>
+ <antcall target="deploy-jdbc-common">
+ <param name="jdbc.conpool.name" value="bmpEnrollerPool"/>
+ <param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB"/>
+ <param name="appserver.instance.name" value="C1"/>
+ </antcall>
+ </target>
- <target name="deploy" depends="init-common">
- <echo message="Deploying via asadmin..."/>
- <antcall target="deploy-common-ee">
- <param name="ee" value="enterprise edition"/>
-<param name="appserver.instance.name" value="C1"/>
-</antcall>
- </target>
+ <target name="deploy" depends="init-common">
+ <echo message="Deploying via asadmin..."/>
+ <antcall target="deploy-common-ee">
+ <param name="ee" value="enterprise edition"/>
+ <param name="appserver.instance.name" value="C1"/>
+ </antcall>
+ </target>
- <!-- =============================================== -->
- <!-- Target to run the standalone client without ACC -->
-<!---->
- <!-- =============================================== -->
- <target name="run-standalone-client" depends="init-common">
- <property name="client.type"
- value="standalone"/>
- <java classname="com.sun.s1peqe.loadbalancing.client.EnrollerClient"
- classpath="${env.S1AS_HOME}/imq/lib/imq.jar:${env.S1AS_HOME}/imq/lib/imqjmsra.jar:${env.S1AS_HOME}/imq/lib/jms.jar:${s1astest.classpath}:${assemble.dir}/${appname}AppClient.jar" failonerror="true" fork="true">
- <!--jvmarg value="-Dorg.omg.CORBA.ORBInitialHost=${admin.host}"/>
- <jvmarg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/-->
- <jvmarg value="-Djava.naming.provider.url=iiop://129.145.133.64:33700"/>
-
- <!--jvmarg value="-Dcom.sun.appserv.iiop.endpoints=pathfinder.sfbay.sun.com:3690,pathfinder.sfbay.sun.com:3880"/-->
- <jvmarg value="-Dcom.sun.appserv.iiop.loadbalancingpolicy=ic-based"/>
- <arg value="129.145.133.64"/>
- <arg value="33700"/>
- <arg value="${client.type}"/>
- </java>
- </target>
+ <!-- =============================================== -->
+ <!-- Target to run the standalone client without ACC -->
+ <!---->
+ <!-- =============================================== -->
+ <target name="run-standalone-client" depends="init-common">
+ <property name="client.type" value="standalone"/>
+ <java classname="com.sun.s1peqe.loadbalancing.client.EnrollerClient"
+ classpath="${env.S1AS_HOME}/imq/lib/imq.jar:${env.S1AS_HOME}/imq/lib/imqjmsra.jar:${env.S1AS_HOME}/imq/lib/jms.jar:${s1astest.classpath}:${assemble.dir}/${appname}AppClient.jar"
+ failonerror="true" fork="true"
+ >
+ <jvmarg value="-Djava.naming.provider.url=iiop://129.145.133.64:33700"/>
+ <jvmarg value="-Dcom.sun.appserv.iiop.loadbalancingpolicy=ic-based"/>
+ <arg value="129.145.133.64"/>
+ <arg value="33700"/>
+ <arg value="${client.type}"/>
+ </java>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common">
- <param name="appserver.instance.name" value="C1"/>
- </antcall>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-common">
+ <param name="appserver.instance.name" value="C1"/>
+ </antcall>
+ </target>
- <target name="unsetup" depends="init-common">
- <!--antcall target="undeploy-jms-common"/-->
- <antcall target="execute-sql-common">
- <param name="sql.file" value="sql/drop_derby.sql"/>
- </antcall>
- <antcall target="undeploy-jdbc-common">
- <param name="jdbc.conpool.name" value="bmpEnrollerPool"/>
- <param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB"/>
- <param name="appserver.instance.name" value="C1"/>
- </antcall>
- </target>
+ <target name="unsetup" depends="init-common">
+ <antcall target="execute-sql-common">
+ <param name="sql.file" value="sql/drop_derby.sql"/>
+ </antcall>
+ <antcall target="undeploy-jdbc-common">
+ <param name="jdbc.conpool.name" value="bmpEnrollerPool"/>
+ <param name="jdbc.resource.name" value="jdbc/bmp-enrollerDB"/>
+ <param name="appserver.instance.name" value="C1"/>
+ </antcall>
+ </target>
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
+ <target name="usage">
+ <antcall target="usage-common"/>
+ </target>
- <target name="restart">
- <antcall target="restart-server-instance-common"/>
- </target>
+ <target name="restart">
+ <antcall target="restart-server-instance-common"/>
+ </target>
-<!-- ================================================================ -->
-<!-- Running eeconfig/eeunsetup -->
-<!-- ================================================================ -->
-<target name="cluster-unsetup">
-<echo message="Cleaning up cluster setup" level="verbose"/>
- <exec executable="sh" failonerror="false">
- <arg line="${env.APS_HOME}/devtests/naming/loadbalancing/cluster-unsetup"/>
- </exec>
-</target>
+ <!-- ================================================================ -->
+ <!-- Running eeconfig/eeunsetup -->
+ <!-- ================================================================ -->
+ <target name="cluster-unsetup">
+ <echo message="Cleaning up cluster setup" level="verbose"/>
+ <exec executable="sh" failonerror="false">
+ <arg line="${env.APS_HOME}/devtests/naming/loadbalancing/cluster-unsetup"/>
+ </exec>
+ </target>
-<!-- ================================================================ -->
-<!-- Running eeconfig/eesetup -->
-<!-- ================================================================ -->
-<target name="cluster-setup" depends="init-common">
- <echo message="Setting up cluster, waiting ..." level="verbose"/>
- <exec executable="sh" failonerror="true" >
- <arg line="${env.APS_HOME}/devtests/naming/loadbalancing/cluster-setup"/>
- </exec>
- <waitfor>
- <http url="http://${http.host}:${http.port}"/>
- </waitfor>
- <sleep seconds="80"/>
-</target>
+ <!-- ================================================================ -->
+ <!-- Running eeconfig/eesetup -->
+ <!-- ================================================================ -->
+ <target name="cluster-setup" depends="init-common">
+ <echo message="Setting up cluster, waiting ..." level="verbose"/>
+ <exec executable="sh" failonerror="true" >
+ <arg line="${env.APS_HOME}/devtests/naming/loadbalancing/cluster-setup"/>
+ </exec>
+ <waitfor>
+ <http url="http://${http.host}:${http.port}"/>
+ </waitfor>
+ <sleep seconds="80"/>
+ </target>
</project>
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 9756749..2f5307b 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 @@
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 @@
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 @@
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 @@
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 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 6364074..caf36b6 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 @@
<artifact:mvn mavenHome="${env.M2_HOME}" fork="true">
<jvmarg value="-Dmaven.multiModuleProjectDirectory"/>
<jvmarg value="-Dmaven.javadoc.skip=true" />
+ <jvmarg value="-Dglassfish.version=${env.GF_VERSION}" />
<arg value="clean"/>
<arg value="verify"/>
</artifact:mvn>
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 aa60593..45b774d 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 @@
<parent>
<artifactId>naming2</artifactId>
<groupId>org.glassfish.devtests</groupId>
- <version>1.0-SNAPSHOT</version>
+ <version>6.2.6-SNAPSHOT</version>
</parent>
<groupId>org.glassfish.devtests</groupId>
<artifactId>naming-context-tests</artifactId>
<packaging>jar</packaging>
- <version>1.0-SNAPSHOT</version>
<name>GlassFish Naming Context Tests</name>
<dependencies>
<dependency>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
- <scope>test</scope>
+ <groupId>org.glassfish.main.extras</groupId>
+ <artifactId>glassfish-embedded-all</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.glassfish</groupId>
- <artifactId>jakarta.ejb</artifactId>
- <version>3.1.1</version>
- <scope>compile</scope>
+ <artifactId>jakarta.el</artifactId>
</dependency>
<dependency>
<groupId>junit</groupId>
@@ -56,23 +53,6 @@
</dependency>
</dependencies>
<build>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.9</version>
- <configuration>
- <enableAssertions>false</enableAssertions>
- </configuration>
- </plugin>
- </plugins>
<finalName>${project.artifactId}</finalName>
</build>
@@ -84,9 +64,9 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.glassfish.extras</groupId>
+ <groupId>org.glassfish.main.extras</groupId>
<artifactId>glassfish-embedded-all</artifactId>
- <version>4.0-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
</profile>
@@ -97,12 +77,9 @@
</activation>
<dependencies>
<dependency>
- <groupId>org.glassfish.extras</groupId>
+ <groupId>org.glassfish.main.extras</groupId>
<artifactId>glassfish-embedded-static-shell</artifactId>
<version>${project.version}</version>
- <scope>system</scope>
- <systemPath>${env.S1AS_HOME}/lib/embedded/glassfish-embedded-static-shell.jar
- </systemPath>
</dependency>
</dependencies>
</profile>
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 5993f4d..f5ff0aa 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<NameClassPair> 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<Binding> 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<NameClassPair> 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<Binding> 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<? extends NameClassPair> 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 e023fe2..512b837 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 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.glassfish.main.tests</groupId>
+ <artifactId>ant-tests</artifactId>
+ <version>6.2.6-SNAPSHOT</version>
+ <relativePath>../..</relativePath>
+ </parent>
<groupId>org.glassfish.devtests</groupId>
<artifactId>naming2</artifactId>
- <version>1.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>naming2</name>
<modules>
diff --git a/appserver/tests/appserv-tests/devtests/security/build.xml b/appserver/tests/appserv-tests/devtests/security/build.xml
index 4bd858a..28d7193 100644
--- a/appserver/tests/appserv-tests/devtests/security/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/build.xml
@@ -47,7 +47,6 @@
<ant dir="authConf" target="all"/>
<ant dir="negativeRealmPerApp" target="all"/>
<ant dir="realmPerApp" target="all"/>
- <ant dir="soteria" target="all"/>
<!-- <ant dir="weblogic-dd" target="all"/>--> <!-- DISABLED: Failures -->
<ant dir="sful" target="all"/>
<ant dir="userWithAtSymbol" target="all"/>
@@ -88,15 +87,6 @@
<ant dir="realmPerApp" target="all"/>
<ant dir="sful" target="all"/>
</target>
- <target name="soteria">
- <delete>
- <fileset dir="${env.APS_HOME}" includes="test_results*, security-gtest-results.xml"/>
- </delete>
- <record name="soteria.output" action="start" />
- <ant dir="soteria" target="all"/>
- <record name="soteria.output" action="stop" />
- <antcall target="report"/>
- </target>
<target name="usage">
<echo>
diff --git a/appserver/tests/appserv-tests/devtests/security/ciphertest/build.xml b/appserver/tests/appserv-tests/devtests/security/ciphertest/build.xml
index 3595ac1..b0c0a46 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 @@
<property name="https.1.port" value="1${https.port}" />
<property name="https.2.port" value="2${https.port}" />
-
-<!-- JDK 8 u172 - 3DES cipher suites disabled
<antcall target="cipher-test">
- <param name="should-pass-cipher" value="SSL_RSA_WITH_3DES_EDE_CBC_SHA"/>
- <param name="enable-cipher" value="SSL_RSA_WITH_3DES_EDE_CBC_SHA"/>
- <param name="https.port" value="${https.2.port}"/>
- </antcall>
--->
-
-<!-- Disable failing test cases (use of -Dsun.security.ssl.allowUnsafeRenegotiation=true has no impact)
- <antcall target="cipher-test">
- <param name="should-pass-cipher" value="SSL_RSA_WITH_DES_CBC_SHA"/>
- <param name="enable-cipher" value="SSL_RSA_WITH_DES_CBC_SHA"/>
- <param name="https.port" value="${https.2.port}"/>
- </antcall>
-
- <antcall target="cipher-test">
- <param name="should-pass-cipher" value="SSL_RSA_EXPORT_WITH_RC4_40_MD5"/>
- <param name="enable-cipher" value="SSL_RSA_EXPORT_WITH_RC4_40_MD5"/>
- <param name="https.port" value="${https.2.port}"/>
- </antcall>
--->
-
- <antcall target="cipher-test">
- <param name="should-pass-cipher" value="SSL_RSA_WITH_NULL_MD5"/>
- <param name="enable-cipher" value="SSL_RSA_WITH_NULL_MD5"/>
- <param name="https.port" value="${https.2.port}"/>
- </antcall>
-
- <antcall target="cipher-test">
- <param name="should-pass-cipher" value="SSL_RSA_WITH_NULL_SHA"/>
- <param name="enable-cipher" value="SSL_RSA_WITH_NULL_SHA"/>
- <param name="https.port" value="${https.2.port}"/>
- </antcall>
-
- <antcall target="cipher-test">
<param name="should-pass-cipher" value=""/>
<param name="enable-cipher" value="SSL_RSA_WITH_RC4_128_MD5"/>
<param name="https.port" value="${https.2.port}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/common.xml b/appserver/tests/appserv-tests/devtests/security/common.xml
index cd59de0..ff63d50 100644
--- a/appserver/tests/appserv-tests/devtests/security/common.xml
+++ b/appserver/tests/appserv-tests/devtests/security/common.xml
@@ -166,7 +166,10 @@
<target name="generate-jks-key" depends="init-common">
<exec executable="${java.home}/bin/keytool" failonerror="true">
- <arg line="-genkey -alias ssltest -dname"/>
+ <arg line="-genkey -alias ssltest"/>
+ <arg value="-keyalg" />
+ <arg value="RSA" />
+ <arg value="-dname" />
<arg value="CN=SSLTest, OU=Sun Java System Application Server, O=Sun Microsystems, L=Santa Clara, ST=California, C=US"/>
<arg value="-validity"/>
<arg value="3650"/>
@@ -387,12 +390,14 @@
<target name="wsgen" depends="init-common,setJAXWSToolsForWin,setJAXWSToolsForUnix">
<exec executable="${WSGEN}" failonerror="true" >
+ <env key="AS_JAVA" value="${env.JAVA_HOME}" />
<arg line="${wsgen.args}" />
</exec>
</target>
<target name="wsimport" depends="init-common,setJAXWSToolsForWin,setJAXWSToolsForUnix">
<exec executable="${WSIMPORT}" failonerror="true" >
+ <env key="AS_JAVA" value="${env.JAVA_HOME}" />
<env key="WSIMPORT_OPTS" value="${wsimport.VMARGS}"/>
<arg line="${wsimport.args}" />
</exec>
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 16a60db..4176672 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 @@
</target>
<target name="runaccxml" depends="init-common">
-<!--TODO uncomment later-->
- <java classname="AuthConfigTest" fork="yes">
+ <java classname="AuthConfigTest" fork="yes">
<classpath>
<pathelement path="${env.S1AS_HOME}/lib/appserv-rt.jar:${build.classes.dir}"/>
- <pathelement path="${env.S1AS_HOME}/lib/appserv-admin.jar"/>
- <pathelement path="${env.S1AS_HOME}/lib/j2ee.jar"/>
- <pathelement path="${env.S1AS_HOME}/lib/jmac-api.jar"/>
+ <pathelement path="${env.S1AS_HOME}/lib/javaee.jar"/>
<pathelement path="${env.S1AS_HOME}/lib/dtds"/>
<pathelement path="${env.S1AS_HOME}/lib/schemas"/>
<pathelement path="${env.APS_HOME}/lib/reporter.jar"/>
</classpath>
<arg value="xml-parse" />
<sysproperty key="java.security.debug" value="configfile,configxmlparser"/>
- <sysproperty key="sun-acc.xml.url" value="${env.APS_HOME}/devtests/security/container-auth/testConfig/sun-acc.xml"/>
- <!--<jvmarg value="-Xdebug" />
- <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8008"/>-->
+ <sysproperty key="glassfish-acc.xml.url" value="${env.APS_HOME}/devtests/security/container-auth/testConfig/glassfish-acc.xml"/>
</java>
</target>
<target name="usage">
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 028e169..e07d34b 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/glassfish-acc.xml b/appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/glassfish-acc.xml
new file mode 100644
index 0000000..184989f
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/glassfish-acc.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
+
+ This program and the accompanying materials are made available under the
+ terms of the Eclipse Public License v. 2.0, which is available at
+ http://www.eclipse.org/legal/epl-2.0.
+
+ This Source Code may also be made available under the following Secondary
+ Licenses when the conditions for such availability set forth in the
+ Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
+ version 2 with the GNU Classpath Exception, which is available at
+ https://www.gnu.org/software/classpath/license.html.
+
+ SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
+
+-->
+
+<!DOCTYPE client-container PUBLIC "-//Sun Microsystems Inc.//DTD Application Server 8.0 Application Client Container//EN" "http://www.sun.com/software/appserver/dtds/sun-application-client-container_1_2.dtd">
+
+<client-container>
+ <target-server name="d-usca14-133-73.SFBay.Sun.COM" address="d-usca14-133-73.SFBay.Sun.COM" port="3700"/>
+ <log-service file="" level="WARNING"/>
+
+ <message-security-config auth-layer="SOAP" default-provider="app7" default-client-provider="app2">
+ <provider-config provider-id="app1" provider-type="client" class-name="ClientModule1">
+ <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
+ <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
+ </provider-config>
+ <provider-config provider-id="app2" provider-type="client" class-name="ClientModule1">
+ <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
+ <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
+ <property name="option1" value="true"/>
+ </provider-config>
+ <provider-config provider-id="app3" provider-type="client" class-name="ClientModule1">
+ <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
+ </provider-config>
+ <provider-config provider-id="app4" provider-type="client" class-name="ClientModule1">
+ <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
+ </provider-config>
+ <provider-config provider-id="app5" provider-type="client" class-name="ClientModule1">
+ </provider-config>
+ <provider-config provider-id="app6" provider-type="server" class-name="ServerModule1">
+ </provider-config>
+ <provider-config provider-id="app7" provider-type="server" class-name="ServerModule1">
+ <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
+ <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
+ </provider-config>
+ </message-security-config>
+</client-container>
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/sun-acc.xml
deleted file mode 100644
index 4cae425..0000000
--- a/appserver/tests/appserv-tests/devtests/security/container-auth/testConfig/sun-acc.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2004, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE client-container PUBLIC "-//Sun Microsystems Inc.//DTD Application Server 8.0 Application Client Container//EN" "http://www.sun.com/software/appserver/dtds/sun-application-client-container_1_2.dtd">
-
-<client-container>
- <target-server name="d-usca14-133-73.SFBay.Sun.COM" address="d-usca14-133-73.SFBay.Sun.COM" port="3700"/>
- <log-service file="" level="WARNING"/>
-
- <message-security-config auth-layer="SOAP" default-provider="app7" default-client-provider="app2">
- <provider-config provider-id="app1" provider-type="client" class-name="ClientModule1">
- <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
- <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
- </provider-config>
- <provider-config provider-id="app2" provider-type="client" class-name="ClientModule1">
- <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
- <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
- <property name="option1" value="true"/>
- </provider-config>
- <provider-config provider-id="app3" provider-type="client" class-name="ClientModule1">
- <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
- </provider-config>
- <provider-config provider-id="app4" provider-type="client" class-name="ClientModule1">
- <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
- </provider-config>
- <provider-config provider-id="app5" provider-type="client" class-name="ClientModule1">
- </provider-config>
- <provider-config provider-id="app6" provider-type="server" class-name="ServerModule1">
- </provider-config>
- <provider-config provider-id="app7" provider-type="server" class-name="ServerModule1">
- <request-policy auth-source="sender" auth-recipient="before-content"></request-policy>
- <response-policy auth-source="content" auth-recipient="after-content"></response-policy>
- </provider-config>
- </message-security-config>
-
-
-<!-- not supported yet
-
-
- <message-security-config auth-layer="HTTP" default-provider="app8">
- </provider-config>
- <provider-config provider-id="app8" provider-type="server" class-name="ServerModule1">
- </provider-config>
- <provider-config provider-id="app9" provider-type="server" class-name="ServerModule1">
- </message-security-config>
-
-
- <message-security-config auth-layer="EJB" default-provider="app10">
- </provider-config>
- <provider-config provider-id="app10" provider-type="server" class-name="ServerModule1">
- </message-security-config>
-
--->
-
-</client-container>
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 527b250..7f94ffd 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 @@
// 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 2c95c03..a8ef830 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 @@
<ant dir="prog-auth" target="all"/>
</target>
<target name="run-test" depends="init-common">
- <java classname="javax.security.jacc.Test" fork="yes"
+ <java classname="jakarta.security.jacc.Test" fork="yes"
classpath="${s1astest.classpath}"/>
</target>
@@ -71,7 +71,7 @@
<property name="PFL" value="-Djava.security.policy=${basedir}/config/java.policy"/>
<property name="PFL2" value="-Djava.security.policy=${basedir}/config/java.policy2"/>
- <java classname="javax.security.jacc.TestPCF" fork="yes"
+ <java classname="jakarta.security.jacc.TestPCF" fork="yes"
classpath="${s1astest.classpath}">
<jvmarg value="-DAPS_HOME=${env.APS_HOME}"/>
<jvmarg value="${PFL2}"/>
@@ -79,7 +79,7 @@
<arg value="java.lang.ClassNotFoundException"/>
</java>
- <java classname="javax.security.jacc.TestPCF" fork="yes"
+ <java classname="jakarta.security.jacc.TestPCF" fork="yes"
classpath="${s1astest.classpath}">
<jvmarg value="-DAPS_HOME=${env.APS_HOME}"/>
<jvmarg value="${NOTPCF}"/>
@@ -88,16 +88,16 @@
<arg value="java.lang.ClassCastException"/>
</java>
- <java classname="javax.security.jacc.TestPCF" fork="yes"
+ <java classname="jakarta.security.jacc.TestPCF" fork="yes"
classpath="${s1astest.classpath}">
<jvmarg value="-DAPS_HOME=${env.APS_HOME}"/>
<jvmarg value="${ISPCF}"/>
<jvmarg value="${PFL2}"/>
<arg value="true"/>
- <arg value="javax.security.jacc.PolicyContextException"/>
+ <arg value="jakarta.security.jacc.PolicyContextException"/>
</java>
- <java classname="javax.security.jacc.TestPCF" fork="yes"
+ <java classname="jakarta.security.jacc.TestPCF" fork="yes"
classpath="${s1astest.classpath}">
<jvmarg value="-DAPS_HOME=${env.APS_HOME}"/>
<jvmarg value="${NOTPCF}"/>
@@ -106,7 +106,7 @@
<arg value="java.lang.ClassCastException"/>
</java>
- <java classname="javax.security.jacc.TestPCF" fork="yes"
+ <java classname="jakarta.security.jacc.TestPCF" fork="yes"
classpath="${s1astest.classpath}">
<jvmarg value="-DAPS_HOME=${env.APS_HOME}"/>
<jvmarg value="${ISPCF}"/>
@@ -116,21 +116,21 @@
</target>
<target name="run-ejbtests" depends="init-common">
- <java classname="javax.security.jacc.TestEJBPerms" fork="yes"
+ <java classname="jakarta.security.jacc.TestEJBPerms" fork="yes"
classpath="${s1astest.classpath}">
<jvmarg value="-Ddebug=${debug}"/>
</java>
</target>
<target name="run-urltests" depends="init-common">
- <java classname="javax.security.jacc.TestURLPattern" fork="yes"
+ <java classname="jakarta.security.jacc.TestURLPattern" fork="yes"
classpath="${s1astest.classpath}"/>
- <java classname="javax.security.jacc.TestURLPatternSpec" fork="yes"
+ <java classname="jakarta.security.jacc.TestURLPatternSpec" fork="yes"
classpath="${s1astest.classpath}"/>
</target>
<target name="run-webtests" depends="init-common">
- <java classname="javax.security.jacc.TestWebPerms" fork="yes"
+ <java classname="jakarta.security.jacc.TestWebPerms" fork="yes"
classpath="${s1astest.classpath}">
<jvmarg value="-Ddebug=${debug}"/>
</java>
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 ea284df..75fd865 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 @@
<target name="all" depends="runMaven"/>
<target name="runMaven">
<artifact:mvn mavenHome="${env.M2_HOME}" fork="true">
+ <jvmarg value="-Dglassfish.version=${env.GF_VERSION}" />
<jvmarg value="-Dmaven.multiModuleProjectDirectory"/>
<jvmarg value="-Dmaven.javadoc.skip=true" />
<arg value="clean"/>
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 9da9e9c..de07c87 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 a61312e..6b09b99 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 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.glassfish.jaccApi.test</groupId>
<artifactId>prog-auth</artifactId>
- <version>7.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
+ <parent>
+ <groupId>org.glassfish.main.tests</groupId>
+ <artifactId>ant-tests</artifactId>
+ <version>7.0.0-SNAPSHOT</version>
+ <relativePath>../../../..</relativePath>
+ </parent>
+
<name>Programmatic authentication with Jakarta Authorization api</name>
- <properties>
- <glassfish.version>5.0</glassfish.version>
- <maven.compiler.source>11</maven.compiler.source>
- <maven.compiler.target>11</maven.compiler.target>
- </properties>
<modules>
<module>common</module>
@@ -40,7 +41,7 @@
<dependency>
<groupId>org.jboss.arquillian</groupId>
<artifactId>arquillian-bom</artifactId>
- <version>1.3.0.Final</version>
+ <version>1.6.0.Final</version>
<scope>import</scope>
<type>pom</type>
</dependency>
@@ -64,13 +65,13 @@
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.29</version>
+ <version>2.58.0</version>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>7.0</version>
+ <groupId>jakarta.platform</groupId>
+ <artifactId>jakarta.jakartaee-api</artifactId>
+ <version>9.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -92,7 +93,6 @@
<plugins>
<plugin>
<artifactId>maven-failsafe-plugin</artifactId>
- <version>2.20</version>
<executions>
<execution>
<goals>
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 0e02126..2e99779 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 @@
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 ec94262..98ec09c 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;
- <property file="./config.properties"/>
+ <property file="./config.properties" />
- <target name="all" depends="display-header">
- <antcall target="setup"/>
- <antcall target="build"/>
- <antcall target="deploy"/>
- <antcall target="run"/>
- <antcall target="undeploy"/>
- <antcall target="unsetup"/>
- </target>
+ <target name="all" depends="display-header">
+ <antcall target="setup" />
+ <antcall target="build" />
+ <antcall target="deploy" />
+ <antcall target="run" />
+ <antcall target="undeploy" />
+ <antcall target="unsetup" />
+ </target>
- <target name="all-oracle" depends="display-header">
- <antcall target="setup-oracle"/>
- <antcall target="build"/>
- <antcall target="deploy"/>
- <antcall target="run"/>
- <antcall target="undeploy"/>
- <antcall target="unsetup-oracle"/>
- </target>
+ <target name="all-oracle" depends="display-header">
+ <antcall target="setup-oracle" />
+ <antcall target="build" />
+ <antcall target="deploy" />
+ <antcall target="run" />
+ <antcall target="undeploy" />
+ <antcall target="unsetup-oracle" />
+ </target>
- <target name="display-header">
- <echo message="-->Running ${ant.project.name} tests from ${basedir} ..."/>
- </target>
+ <target name="display-header">
+ <echo message="-->Running ${ant.project.name} tests from ${basedir} ..." />
+ </target>
- <target name="setup" depends="init-common">
- <antcall target="create-db-schema"/>
- <antcall target="create-db-usrgrps"/>
- <antcall target="modify-domain-xml"/>
- </target>
+ <target name="setup" depends="init-common">
+ <antcall target="create-db-schema" />
+ <antcall target="create-db-usrgrps" />
+ <antcall target="modify-domain-xml" />
+ </target>
- <target name="unsetup" depends="init-common">
- <antcall target="un-modify-domain-xml"/>
- <antcall target="delete-db-schema"/>
- </target>
+ <target name="unsetup" depends="init-common">
+ <antcall target="un-modify-domain-xml" />
+ <antcall target="delete-db-schema" />
+ </target>
- <target name="setup-oracle" depends="init-common">
- <antcall target="create-db-schema-oracle"/>
- <antcall target="create-db-usrgrps-oracle"/>
- <antcall target="modify-domain-xml-oracle"/>
- </target>
+ <target name="setup-oracle" depends="init-common">
+ <antcall target="create-db-schema-oracle" />
+ <antcall target="create-db-usrgrps-oracle" />
+ <antcall target="modify-domain-xml-oracle" />
+ </target>
- <target name="unsetup-oracle" depends="init-common">
- <antcall target="un-modify-domain-xml-oracle"/>
- <antcall target="delete-db-schema-oracle"/>
- </target>
+ <target name="unsetup-oracle" depends="init-common">
+ <antcall target="un-modify-domain-xml-oracle" />
+ <antcall target="delete-db-schema-oracle" />
+ </target>
- <target name="create-db-schema-oracle" depends="init-common">
- <echo message="Executing sql statement at ${basedir} from ${create.sql.file.oracle} for db.url ${oracle.db.url}"/>
- <sql
- driver="${oracle.db.driver}"
- url="${oracle.db.url}"
- userid="${oracle.db.user}"
- password="${oracle.db.user}"
- src="${create.sql.file.oracle}"
- onerror="continue"
- print="yes"
- output="create-db-schema.out"
- classpath="${env.APS_HOME}/lib/ojdbc14.jar:${s1astest.classpath}" />
- </target>
- <target name="delete-db-schema-oracle" depends="init-common">
- <echo message="Executing sql statement at ${basedir} from ${delete.sql.file}"
- level="verbose"/>
- <sql
- driver="${oracle.db.driver}"
- url="${oracle.db.url}"
- userid="${oracle.db.user}"
- password="${oracle.db.user}"
- src="${delete.sql.file}"
- onerror="continue"
- print="yes"
- output="delete-db-schema.out"
- classpath="${env.APS_HOME}/lib/ojdbc14.jar:${s1astest.classpath}" />
- </target>
+ <target name="create-db-schema-oracle" depends="init-common">
+ <echo message="Executing sql statement at ${basedir} from ${create.sql.file.oracle} for db.url ${oracle.db.url}"
+ />
+ <sql driver="${oracle.db.driver}"
+ url="${oracle.db.url}"
+ userid="${oracle.db.user}"
+ password="${oracle.db.user}"
+ src="${create.sql.file.oracle}"
+ onerror="continue"
+ print="yes"
+ output="create-db-schema.out"
+ classpath="${env.APS_HOME}/lib/ojdbc14.jar:${s1astest.classpath}"
+ />
+ </target>
+ <target name="delete-db-schema-oracle" depends="init-common">
+ <echo message="Executing sql statement at ${basedir} from ${delete.sql.file}" level="verbose" />
+ <sql driver="${oracle.db.driver}"
+ url="${oracle.db.url}"
+ userid="${oracle.db.user}"
+ password="${oracle.db.user}"
+ src="${delete.sql.file}"
+ onerror="continue"
+ print="yes"
+ output="delete-db-schema.out"
+ classpath="${env.APS_HOME}/lib/ojdbc14.jar:${s1astest.classpath}"
+ />
+ </target>
- <target name="create-db-schema" depends="init-common">
- <echo message="Executing sql statement at ${basedir} from ${create.sql.file} for db.url ${derby.db.url}"/>
- <sql
- driver="${derby.db.driver}"
- url="${derby.db.url}"
- userid="${derby.db.user}"
- password="${derby.db.user}"
- src="${create.sql.file}"
- onerror="continue"
- print="yes"
- output="create-db-schema.out"
- classpath="${s1astest.classpath}" />
- </target>
+ <target name="create-db-schema" depends="init-common">
+ <echo message="Executing sql statement at ${basedir} from ${create.sql.file} for db.url ${derby.db.url}"
+ />
+ <sql driver="${derby.db.driver}"
+ url="${derby.db.url}"
+ userid="${derby.db.user}"
+ password="${derby.db.user}"
+ src="${create.sql.file}"
+ onerror="continue"
+ print="yes"
+ output="create-db-schema.out"
+ classpath="${s1astest.classpath}"
+ />
+ </target>
- <target name="delete-db-schema" depends="init-common">
- <echo message="Executing sql statement at ${basedir} from ${delete.sql.file}"
- level="verbose"/>
- <sql
- driver="${derby.db.driver}"
- url="${derby.db.url}"
- userid="${derby.db.user}"
- password="${derby.db.user}"
- src="${delete.sql.file}"
- onerror="continue"
- print="yes"
- output="delete-db-schema.out"
- classpath="${s1astest.classpath}" />
- </target>
+ <target name="delete-db-schema" depends="init-common">
+ <echo message="Executing sql statement at ${basedir} from ${delete.sql.file}" level="verbose" />
+ <sql driver="${derby.db.driver}"
+ url="${derby.db.url}"
+ userid="${derby.db.user}"
+ password="${derby.db.user}"
+ src="${delete.sql.file}"
+ onerror="continue"
+ print="yes"
+ output="delete-db-schema.out"
+ classpath="${s1astest.classpath}"
+ />
+ </target>
- <target name="create-db-usrgrps" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="util"/>
- </antcall>
- <java classname="com.sun.devtests.security.jdbcrealm.PopulateDB" fork="true">
- <classpath>
- <pathelement path="${build.classes.dir}:${s1astest.classpath}"/>
- </classpath>
- <arg value="-url"/>
- <arg value="${derby.db.url}"/>
- <arg value="-dbDriver"/>
- <arg value="${derby.db.driver}"/>
- <arg value="-username"/>
- <arg value="${derby.db.user}"/>
- <arg value="-password"/>
- <arg value="${derby.db.pass}"/>
- </java>
- </target>
+ <target name="create-db-usrgrps" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="util" />
+ </antcall>
+ <java classname="com.sun.devtests.security.jdbcrealm.PopulateDB" fork="true">
+ <classpath>
+ <pathelement path="${build.classes.dir}:${s1astest.classpath}" />
+ </classpath>
+ <arg value="-url" />
+ <arg value="${derby.db.url}" />
+ <arg value="-dbDriver" />
+ <arg value="${derby.db.driver}" />
+ <arg value="-username" />
+ <arg value="${derby.db.user}" />
+ <arg value="-password" />
+ <arg value="${derby.db.pass}" />
+ </java>
+ </target>
- <target name="create-db-usrgrps-oracle" depends="init-common">
- <java classname="com.sun.devtests.security.jdbcrealm.PopulateDB" fork="true">
- <classpath>
- <pathelement path="${env.APS_HOME}/lib/ojdbc14.jar:${build.classes.dir}:${s1astest.classpath}"/>
- </classpath>
- <arg value="-url"/>
- <arg value="${oracle.db.url}"/>
- <arg value="-dbDriver"/>
- <arg value="${oracle.db.driver}"/>
- <arg value="-username"/>
- <arg value="${oracle.db.user}"/>
- <arg value="-password"/>
- <arg value="${oracle.db.pass}"/>
- <arg value="-verbose"/>
- </java>
- </target>
+ <target name="create-db-usrgrps-oracle" depends="init-common">
+ <java classname="com.sun.devtests.security.jdbcrealm.PopulateDB" fork="true">
+ <classpath>
+ <pathelement path="${env.APS_HOME}/lib/ojdbc14.jar:${build.classes.dir}:${s1astest.classpath}"
+ />
+ </classpath>
+ <arg value="-url" />
+ <arg value="${oracle.db.url}" />
+ <arg value="-dbDriver" />
+ <arg value="${oracle.db.driver}" />
+ <arg value="-username" />
+ <arg value="${oracle.db.user}" />
+ <arg value="-password" />
+ <arg value="${oracle.db.pass}" />
+ <arg value="-verbose" />
+ </java>
+ </target>
- <target name="modify-domain-xml" depends="init-common">
- <antcall target="create-jdbcrealm-connection-pool">
- <param name="db.datasource.classname"
- value="${derby.db.datasource.classname}"/>
- <param name="db.port" value="${derby.db.port}"/>
- <param name="db.host" value="${derby.db.host}"/>
- <param name="db.name" value="${derby.db.name}"/>
- <param name="db.poolname" value="${derby.db.poolname}"/>
- <param name="db.connection-attributes"
- value="connectionAttributes=;create\=true"/>
- </antcall>
- <antcall target="create-jdbcrealm-resource">
- <param name="db.poolname" value="${derby.db.poolname}"/>
- <param name="db.jndiname" value="${derby.db.jndiname}"/>
- </antcall>
- <antcall target="create-auth-jdbcrealm">
- <param name="db.poolname" value="${derby.db.poolname}"/>
- <param name="db.jndiname" value="${derby.db.jndiname}"/>
- <param name="db.user" value="${derby.db.user}"/>
- <param name="db.pass" value="${derby.db.pass}"/>
- </antcall>
- </target>
+ <target name="modify-domain-xml" depends="init-common">
+ <antcall target="create-jdbcrealm-connection-pool">
+ <param name="db.datasource.classname" value="${derby.db.datasource.classname}" />
+ <param name="db.port" value="${derby.db.port}" />
+ <param name="db.host" value="${derby.db.host}" />
+ <param name="db.name" value="${derby.db.name}" />
+ <param name="db.poolname" value="${derby.db.poolname}" />
+ <param name="db.connection-attributes" value="connectionAttributes=;create\=true" />
+ </antcall>
+ <antcall target="create-jdbcrealm-resource">
+ <param name="db.poolname" value="${derby.db.poolname}" />
+ <param name="db.jndiname" value="${derby.db.jndiname}" />
+ </antcall>
+ <antcall target="create-auth-jdbcrealm">
+ <param name="db.poolname" value="${derby.db.poolname}" />
+ <param name="db.jndiname" value="${derby.db.jndiname}" />
+ <param name="db.user" value="${derby.db.user}" />
+ <param name="db.pass" value="${derby.db.pass}" />
+ </antcall>
+ </target>
- <target name="modify-domain-xml-oracle" depends="init-common">
+ <target name="modify-domain-xml-oracle" depends="init-common">
-<!--
+ <!--
<antcall target="create-jdbcrealm-connection-pool">
<param name="db.datasource.classname"
value="${oracle.db.datasource.classname}"/>
@@ -210,724 +209,727 @@
<param name="db.connection-attributes" value=""/>
</antcall>
-->
- <exec executable="${ASADMIN}">
- <arg line="create-jdbc-connection-pool"/>
- <arg line="${as.props} --target=${appserver.instance.name}"/>
- <arg line="--datasourceclassname com.sun.sql.jdbcx.oracle.OracleDataSource"/>
- <arg line="--property"/>
- <arg value="PortNumber=${oracle.db.port}:serverName=${oracle.db.host}:SID=${oracle.db.SID}"/>
- <arg line="${oracle.db.poolname}"/>
- </exec>
+ <exec executable="${ASADMIN}">
+ <arg line="create-jdbc-connection-pool" />
+ <arg line="${as.props} --target=${appserver.instance.name}" />
+ <arg line="--datasourceclassname com.sun.sql.jdbcx.oracle.OracleDataSource" />
+ <arg line="--property" />
+ <arg value="PortNumber=${oracle.db.port}:serverName=${oracle.db.host}:SID=${oracle.db.SID}" />
+ <arg line="${oracle.db.poolname}" />
+ </exec>
- <antcall target="create-jdbcrealm-resource">
- <param name="db.poolname" value="${oracle.db.poolname}"/>
- <param name="db.jndiname" value="${oracle.db.jndiname}"/>
- </antcall>
+ <antcall target="create-jdbcrealm-resource">
+ <param name="db.poolname" value="${oracle.db.poolname}" />
+ <param name="db.jndiname" value="${oracle.db.jndiname}" />
+ </antcall>
- <antcall target="create-auth-jdbcrealm">
- <param name="db.poolname" value="${oracle.db.poolname}"/>
- <param name="db.jndiname" value="${oracle.db.jndiname}"/>
- <param name="db.user" value="${oracle.db.user}"/>
-<!-- <param name="db.pass" value="${oracle.db.pass}"/> -->
- <param name="db.pass" value="${oracle.db.alias-pass}"/>
- </antcall>
+ <antcall target="create-auth-jdbcrealm">
+ <param name="db.poolname" value="${oracle.db.poolname}" />
+ <param name="db.jndiname" value="${oracle.db.jndiname}" />
+ <param name="db.user" value="${oracle.db.user}" />
+ <!-- <param name="db.pass" value="${oracle.db.pass}"/> -->
+ <param name="db.pass" value="${oracle.db.alias-pass}" />
+ </antcall>
- </target>
+ </target>
- <target name="un-modify-domain-xml" depends="init-common">
- <antcall target="delete-auth-jdbcrealm"/>
- <antcall target="delete-jdbcrealm-resource">
- <param name="db.jndiname" value="${derby.db.jndiname}"/>
- </antcall>
- <antcall target="delete-jdbcrealm-connection-pool">
- <param name="db.poolname" value="${derby.db.poolname}"/>
- </antcall>
- </target>
+ <target name="un-modify-domain-xml" depends="init-common">
+ <antcall target="delete-auth-jdbcrealm" />
+ <antcall target="delete-jdbcrealm-resource">
+ <param name="db.jndiname" value="${derby.db.jndiname}" />
+ </antcall>
+ <antcall target="delete-jdbcrealm-connection-pool">
+ <param name="db.poolname" value="${derby.db.poolname}" />
+ </antcall>
+ </target>
- <target name="un-modify-domain-xml-oracle" depends="init-common">
- <antcall target="delete-auth-jdbcrealm"/>
- <antcall target="delete-jdbcrealm-resource">
- <param name="db.jndiname" value="${oracle.db.jndiname}"/>
- </antcall>
- <antcall target="delete-jdbcrealm-connection-pool">
- <param name="db.poolname" value="${oracle.db.poolname}"/>
- </antcall>
- </target>
+ <target name="un-modify-domain-xml-oracle" depends="init-common">
+ <antcall target="delete-auth-jdbcrealm" />
+ <antcall target="delete-jdbcrealm-resource">
+ <param name="db.jndiname" value="${oracle.db.jndiname}" />
+ </antcall>
+ <antcall target="delete-jdbcrealm-connection-pool">
+ <param name="db.poolname" value="${oracle.db.poolname}" />
+ </antcall>
+ </target>
- <target name="create-jdbcrealm-resource" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="create-jdbc-resource"/>
- <arg line="${as.props} --target=${appserver.instance.name}"/>
- <arg line="--connectionpoolid ${db.poolname}"/>
- <arg line="${db.jndiname}"/>
- </exec>
- </target>
+ <target name="create-jdbcrealm-resource" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="create-jdbc-resource" />
+ <arg line="${as.props} --target=${appserver.instance.name}" />
+ <arg line="--connectionpoolid ${db.poolname}" />
+ <arg line="${db.jndiname}" />
+ </exec>
+ </target>
- <target name="delete-jdbcrealm-resource" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="delete-jdbc-resource"/>
- <arg line="${as.props} --target=${appserver.instance.name}"/>
- <arg line="${db.jndiname}"/>
- </exec>
- </target>
+ <target name="delete-jdbcrealm-resource" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="delete-jdbc-resource" />
+ <arg line="${as.props} --target=${appserver.instance.name}" />
+ <arg line="${db.jndiname}" />
+ </exec>
+ </target>
- <target name="create-jdbcrealm-connection-pool" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="create-jdbc-connection-pool"/>
- <arg line="${as.props} --target=${appserver.instance.name}"/>
- <arg line="--datasourceclassname ${db.datasource.classname}"/>
- <arg line="--property"/>
- <arg value="PortNumber=${db.port}:serverName=${db.host}:DatabaseName=${db.name}:${db.connection-attributes}"/>
- <arg line="${db.poolname}"/>
- </exec>
- </target>
+ <target name="create-jdbcrealm-connection-pool" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="create-jdbc-connection-pool" />
+ <arg line="${as.props} --target=${appserver.instance.name}" />
+ <arg line="--datasourceclassname ${db.datasource.classname}" />
+ <arg line="--property" />
+ <arg value="PortNumber=${db.port}:serverName=${db.host}:DatabaseName=${db.name}:${db.connection-attributes}"
+ />
+ <arg line="${db.poolname}" />
+ </exec>
+ </target>
- <target name="delete-jdbcrealm-connection-pool" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="delete-jdbc-connection-pool"/>
- <arg line="${as.props} --target=${appserver.instance.name}"/>
- <arg line="${db.poolname}"/>
- </exec>
- </target>
+ <target name="delete-jdbcrealm-connection-pool" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="delete-jdbc-connection-pool" />
+ <arg line="${as.props} --target=${appserver.instance.name}" />
+ <arg line="${db.poolname}" />
+ </exec>
+ </target>
- <target name="create-auth-jdbcrealm" depends="init-common">
+ <target name="create-auth-jdbcrealm" depends="init-common">
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_CLEAR"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE:digest-algorithm=NONE"/>
- </antcall>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_CLEAR" />
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm" />
+ <param name="realmproperties"
+ value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE:digest-algorithm=NONE"
+ />
+ </antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_CLEAR_BASE64"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_BASE64:digest-algorithm=NONE:encoding=BASE64"/>
- </antcall>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_CLEAR_BASE64" />
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm" />
+ <param name="realmproperties"
+ value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_BASE64:digest-algorithm=NONE:encoding=BASE64"
+ />
+ </antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_CLEAR_HEX"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_HEX:digest-algorithm=NONE:encoding=HEX"/>
- </antcall>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_CLEAR_HEX" />
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm" />
+ <param name="realmproperties"
+ value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_HEX:digest-algorithm=NONE:encoding=HEX"
+ />
+ </antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_MD2_BASE64"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_MD2_BASE64:digest-algorithm=MD2:encoding=BASE64"/>
- </antcall>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_MD2_BASE64" />
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm" />
+ <param name="realmproperties"
+ value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_MD2_BASE64:digest-algorithm=MD2:encoding=BASE64"
+ />
+ </antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_MD5_BASE64"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_MD5_BASE64:digest-algorithm=MD5:encoding=BASE64"/>
- </antcall>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_MD5_BASE64" />
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm" />
+ <param name="realmproperties"
+ value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_MD5_BASE64:digest-algorithm=MD5:encoding=BASE64"
+ />
+ </antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_SHA_BASE64"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_SHA_BASE64:digest-algorithm=SHA:encoding=BASE64"/>
- </antcall>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_SHA_BASE64" />
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm" />
+ <param name="realmproperties"
+ value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_SHA_BASE64:digest-algorithm=SHA:encoding=BASE64"
+ />
+ </antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_SHA256_BASE64"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_SHA256_BASE64:digest-algorithm=SHA-256:encoding=BASE64"/>
- </antcall>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_SHA256_BASE64" />
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm" />
+ <param name="realmproperties"
+ value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:user-table=USER_TABLE_SHA256_BASE64:digest-algorithm=SHA-256:encoding=BASE64"
+ />
+ </antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_SHA384_BASE64"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=BASE64:user-table=USER_TABLE_SHA384_BASE64:digest-algorithm=SHA-384"/>
- </antcall>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_SHA384_BASE64" />
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm" />
+ <param name="realmproperties"
+ value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=BASE64:user-table=USER_TABLE_SHA384_BASE64:digest-algorithm=SHA-384"
+ />
+ </antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_SHA512_BASE64"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=BASE64:user-table=USER_TABLE_SHA512_BASE64:digest-algorithm=SHA-512"/>
- </antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_MD2_HEX"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_MD2_HEX:digest-algorithm=MD2"/>
- </antcall>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_MD2_HEX" />
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm" />
+ <param name="realmproperties"
+ value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_MD2_HEX:digest-algorithm=MD2"
+ />
+ </antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_MD5_HEX"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_MD5_HEX:digest-algorithm=MD5"/>
- </antcall>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_MD5_HEX" />
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm" />
+ <param name="realmproperties"
+ value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_MD5_HEX:digest-algorithm=MD5"
+ />
+ </antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_SHA_HEX"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_SHA_HEX:digest-algorithm=SHA"/>
- </antcall>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_SHA_HEX" />
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm" />
+ <param name="realmproperties"
+ value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_SHA_HEX:digest-algorithm=SHA"
+ />
+ </antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_SHA256_HEX"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_SHA256_HEX:digest-algorithm=SHA-256"/>
- </antcall>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_SHA256_HEX" />
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm" />
+ <param name="realmproperties"
+ value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_SHA256_HEX:digest-algorithm=SHA-256"
+ />
+ </antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_SHA384_HEX"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_SHA384_HEX:digest-algorithm=SHA-384"/>
- </antcall>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_SHA384_HEX" />
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm" />
+ <param name="realmproperties"
+ value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_SHA384_HEX:digest-algorithm=SHA-384"
+ />
+ </antcall>
- <antcall target="create-custom-auth-realm">
- <param name="realmname" value="JDBCRealm_SHA512_HEX"/>
- <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm"/>
- <param name="realmproperties" value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_SHA512_HEX:digest-algorithm=SHA-512"/>
- </antcall>
+ <antcall target="create-custom-auth-realm">
+ <param name="realmname" value="JDBCRealm_SHA512_HEX" />
+ <param name="realmclass" value="com.sun.enterprise.security.auth.realm.jdbc.JDBCRealm" />
+ <param name="realmproperties"
+ value="datasource-jndi=${db.jndiname}:jaas-context=jdbcRealm:db-user=${db.user}:db-password=${db.pass}:user-name-column=USERNAME:password-column=PASSWORD:group-table=GROUP_TABLE:group-name-column=GROUPNAME:encoding=HEX:user-table=USER_TABLE_SHA512_HEX:digest-algorithm=SHA-512"
+ />
+ </antcall>
- </target>
+ </target>
- <target name="delete-auth-jdbcrealm" depends="init-common">
+ <target name="delete-auth-jdbcrealm" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-auth-realm" />
- <param name="operand.props" value="JDBCRealm_CLEAR"/>
- </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-auth-realm" />
- <param name="operand.props" value="JDBCRealm_CLEAR_BASE64"/>
- </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-auth-realm" />
- <param name="operand.props" value="JDBCRealm_CLEAR_HEX"/>
- </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-auth-realm" />
+ <param name="operand.props" value="JDBCRealm_CLEAR" />
+ </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-auth-realm" />
+ <param name="operand.props" value="JDBCRealm_CLEAR_BASE64" />
+ </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-auth-realm" />
+ <param name="operand.props" value="JDBCRealm_CLEAR_HEX" />
+ </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-auth-realm" />
- <param name="operand.props" value="JDBCRealm_MD2_BASE64"/>
- </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-auth-realm" />
- <param name="operand.props" value="JDBCRealm_MD5_BASE64"/>
- </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-auth-realm" />
- <param name="operand.props" value="JDBCRealm_SHA_BASE64"/>
- </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-auth-realm" />
- <param name="operand.props" value="JDBCRealm_SHA256_BASE64"/>
- </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-auth-realm" />
- <param name="operand.props" value="JDBCRealm_SHA384_BASE64"/>
- </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-auth-realm" />
- <param name="operand.props" value="JDBCRealm_SHA512_BASE64"/>
- </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-auth-realm" />
+ <param name="operand.props" value="JDBCRealm_MD2_BASE64" />
+ </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-auth-realm" />
+ <param name="operand.props" value="JDBCRealm_MD5_BASE64" />
+ </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-auth-realm" />
+ <param name="operand.props" value="JDBCRealm_SHA_BASE64" />
+ </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-auth-realm" />
+ <param name="operand.props" value="JDBCRealm_SHA256_BASE64" />
+ </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-auth-realm" />
+ <param name="operand.props" value="JDBCRealm_SHA384_BASE64" />
+ </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-auth-realm" />
- <param name="operand.props" value="JDBCRealm_MD2_HEX"/>
- </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-auth-realm" />
- <param name="operand.props" value="JDBCRealm_MD5_HEX"/>
- </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-auth-realm" />
- <param name="operand.props" value="JDBCRealm_SHA_HEX"/>
- </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-auth-realm" />
- <param name="operand.props" value="JDBCRealm_SHA256_HEX"/>
- </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-auth-realm" />
- <param name="operand.props" value="JDBCRealm_SHA384_HEX"/>
- </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-auth-realm" />
- <param name="operand.props" value="JDBCRealm_SHA512_HEX"/>
- </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-auth-realm" />
+ <param name="operand.props" value="JDBCRealm_MD2_HEX" />
+ </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-auth-realm" />
+ <param name="operand.props" value="JDBCRealm_MD5_HEX" />
+ </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-auth-realm" />
+ <param name="operand.props" value="JDBCRealm_SHA_HEX" />
+ </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-auth-realm" />
+ <param name="operand.props" value="JDBCRealm_SHA256_HEX" />
+ </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-auth-realm" />
+ <param name="operand.props" value="JDBCRealm_SHA384_HEX" />
+ </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-auth-realm" />
+ <param name="operand.props" value="JDBCRealm_SHA512_HEX" />
+ </antcall>
- </target>
+ </target>
- <target name="create-custom-auth-realm" depends="init-common">
- <echo message="Creating auth realm ${realmname} ..."/>
- <exec executable="${ASADMIN}">
- <arg line="create-auth-realm"/>
- <arg line="${as.props} --target=${appserver.instance.name}"/>
- <arg line="--classname ${realmclass}"/>
- <arg line="--property"/>
- <arg value="${realmproperties}"/>
- <arg line="${realmname}"/>
- </exec>
- </target>
+ <target name="create-custom-auth-realm" depends="init-common">
+ <echo message="Creating auth realm ${realmname} ..." />
+ <exec executable="${ASADMIN}">
+ <arg line="create-auth-realm" />
+ <arg line="${as.props} --target=${appserver.instance.name}" />
+ <arg line="--classname ${realmclass}" />
+ <arg line="--property" />
+ <arg value="${realmproperties}" />
+ <arg line="${realmname}" />
+ </exec>
+ </target>
- <target name="clean" depends="init-common">
- <delete dir="${build.classes.dir}"/>
- <delete dir="${assemble.dir}"/>
- </target>
+ <target name="clean" depends="init-common">
+ <delete dir="${build.classes.dir}" />
+ <delete dir="${assemble.dir}" />
+ </target>
- <target name="compile" depends="clean">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="web"/>
- </antcall>
- </target>
+ <target name="compile" depends="clean">
+ <antcall target="compile-common">
+ <param name="src" value="client" />
+ </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="web" />
+ </antcall>
+ </target>
- <target name="build" depends="compile">
- <antcall target="custom-build">
- <param name="jdbc.realm.name" value="JDBCRealm_CLEAR"/>
- <param name="jdbc.realm.user" value="qwert"/>
- <param name="appname" value="jdbc-realm-clear"/>
- </antcall>
- <antcall target="custom-build">
- <param name="jdbc.realm.name" value="JDBCRealm_CLEAR_BASE64"/>
- <param name="jdbc.realm.user" value="qwertBASE64"/>
- <param name="appname" value="jdbc-realm-clear-base64"/>
- </antcall>
- <antcall target="custom-build">
- <param name="jdbc.realm.name" value="JDBCRealm_CLEAR_HEX"/>
- <param name="jdbc.realm.user" value="qwertHEX"/>
- <param name="appname" value="jdbc-realm-clear-hex"/>
- </antcall>
+ <target name="build" depends="compile">
+ <antcall target="custom-build">
+ <param name="jdbc.realm.name" value="JDBCRealm_CLEAR" />
+ <param name="jdbc.realm.user" value="qwert" />
+ <param name="appname" value="jdbc-realm-clear" />
+ </antcall>
+ <antcall target="custom-build">
+ <param name="jdbc.realm.name" value="JDBCRealm_CLEAR_BASE64" />
+ <param name="jdbc.realm.user" value="qwertBASE64" />
+ <param name="appname" value="jdbc-realm-clear-base64" />
+ </antcall>
+ <antcall target="custom-build">
+ <param name="jdbc.realm.name" value="JDBCRealm_CLEAR_HEX" />
+ <param name="jdbc.realm.user" value="qwertHEX" />
+ <param name="appname" value="jdbc-realm-clear-hex" />
+ </antcall>
- <antcall target="custom-build">
- <param name="jdbc.realm.name" value="JDBCRealm_MD2_BASE64"/>
- <param name="jdbc.realm.user" value="qwertMD2BASE64"/>
- <param name="appname" value="jdbc-realm-md2-base64"/>
- </antcall>
- <antcall target="custom-build">
- <param name="jdbc.realm.name" value="JDBCRealm_MD5_BASE64"/>
- <param name="jdbc.realm.user" value="qwertMD5BASE64"/>
- <param name="appname" value="jdbc-realm-md5-base64"/>
- </antcall>
- <antcall target="custom-build">
- <param name="jdbc.realm.name" value="JDBCRealm_SHA_BASE64"/>
- <param name="jdbc.realm.user" value="qwertSHABASE64"/>
- <param name="appname" value="jdbc-realm-sha-base64"/>
- </antcall>
- <antcall target="custom-build">
- <param name="jdbc.realm.name" value="JDBCRealm_SHA256_BASE64"/>
- <param name="jdbc.realm.user" value="qwertSHA256BASE64"/>
- <param name="appname" value="jdbc-realm-sha256-base64"/>
- </antcall>
- <antcall target="custom-build">
- <param name="jdbc.realm.name" value="JDBCRealm_SHA384_BASE64"/>
- <param name="jdbc.realm.user" value="qwertSHA384BASE64"/>
- <param name="appname" value="jdbc-realm-sha384-base64"/>
- </antcall>
- <antcall target="custom-build">
- <param name="jdbc.realm.name" value="JDBCRealm_SHA512_BASE64"/>
- <param name="jdbc.realm.user" value="qwertSHA512BASE64"/>
- <param name="appname" value="jdbc-realm-sha512-base64"/>
- </antcall>
+ <antcall target="custom-build">
+ <param name="jdbc.realm.name" value="JDBCRealm_MD2_BASE64" />
+ <param name="jdbc.realm.user" value="qwertMD2BASE64" />
+ <param name="appname" value="jdbc-realm-md2-base64" />
+ </antcall>
+ <antcall target="custom-build">
+ <param name="jdbc.realm.name" value="JDBCRealm_MD5_BASE64" />
+ <param name="jdbc.realm.user" value="qwertMD5BASE64" />
+ <param name="appname" value="jdbc-realm-md5-base64" />
+ </antcall>
+ <antcall target="custom-build">
+ <param name="jdbc.realm.name" value="JDBCRealm_SHA_BASE64" />
+ <param name="jdbc.realm.user" value="qwertSHABASE64" />
+ <param name="appname" value="jdbc-realm-sha-base64" />
+ </antcall>
+ <antcall target="custom-build">
+ <param name="jdbc.realm.name" value="JDBCRealm_SHA256_BASE64" />
+ <param name="jdbc.realm.user" value="qwertSHA256BASE64" />
+ <param name="appname" value="jdbc-realm-sha256-base64" />
+ </antcall>
+ <antcall target="custom-build">
+ <param name="jdbc.realm.name" value="JDBCRealm_SHA384_BASE64" />
+ <param name="jdbc.realm.user" value="qwertSHA384BASE64" />
+ <param name="appname" value="jdbc-realm-sha384-base64" />
+ </antcall>
-
- <antcall target="custom-build">
- <param name="jdbc.realm.name" value="JDBCRealm_MD2_HEX"/>
- <param name="jdbc.realm.user" value="qwertMD2HEX"/>
- <param name="appname" value="jdbc-realm-md2-hex"/>
- </antcall>
- <antcall target="custom-build">
- <param name="jdbc.realm.name" value="JDBCRealm_MD5_HEX"/>
- <param name="jdbc.realm.user" value="qwertMD5HEX"/>
- <param name="appname" value="jdbc-realm-md5-hex"/>
- </antcall>
- <antcall target="custom-build">
- <param name="jdbc.realm.name" value="JDBCRealm_SHA_HEX"/>
- <param name="jdbc.realm.user" value="qwertSHAHEX"/>
- <param name="appname" value="jdbc-realm-sha-hex"/>
- </antcall>
- <antcall target="custom-build">
- <param name="jdbc.realm.name" value="JDBCRealm_SHA256_HEX"/>
- <param name="jdbc.realm.user" value="qwertSHA256HEX"/>
- <param name="appname" value="jdbc-realm-sha256-hex"/>
- </antcall>
- <antcall target="custom-build">
- <param name="jdbc.realm.name" value="JDBCRealm_SHA384_HEX"/>
- <param name="jdbc.realm.user" value="qwertSHA384HEX"/>
- <param name="appname" value="jdbc-realm-sha384-hex"/>
- </antcall>
- <antcall target="custom-build">
- <param name="jdbc.realm.name" value="JDBCRealm_SHA512_HEX"/>
- <param name="jdbc.realm.user" value="qwertSHA512HEX"/>
- <param name="appname" value="jdbc-realm-sha512-hex"/>
- </antcall>
+ <antcall target="custom-build">
+ <param name="jdbc.realm.name" value="JDBCRealm_MD2_HEX" />
+ <param name="jdbc.realm.user" value="qwertMD2HEX" />
+ <param name="appname" value="jdbc-realm-md2-hex" />
+ </antcall>
+ <antcall target="custom-build">
+ <param name="jdbc.realm.name" value="JDBCRealm_MD5_HEX" />
+ <param name="jdbc.realm.user" value="qwertMD5HEX" />
+ <param name="appname" value="jdbc-realm-md5-hex" />
+ </antcall>
+ <antcall target="custom-build">
+ <param name="jdbc.realm.name" value="JDBCRealm_SHA_HEX" />
+ <param name="jdbc.realm.user" value="qwertSHAHEX" />
+ <param name="appname" value="jdbc-realm-sha-hex" />
+ </antcall>
+ <antcall target="custom-build">
+ <param name="jdbc.realm.name" value="JDBCRealm_SHA256_HEX" />
+ <param name="jdbc.realm.user" value="qwertSHA256HEX" />
+ <param name="appname" value="jdbc-realm-sha256-hex" />
+ </antcall>
+ <antcall target="custom-build">
+ <param name="jdbc.realm.name" value="JDBCRealm_SHA384_HEX" />
+ <param name="jdbc.realm.user" value="qwertSHA384HEX" />
+ <param name="appname" value="jdbc-realm-sha384-hex" />
+ </antcall>
+ <antcall target="custom-build">
+ <param name="jdbc.realm.name" value="JDBCRealm_SHA512_HEX" />
+ <param name="jdbc.realm.user" value="qwertSHA512HEX" />
+ <param name="appname" value="jdbc-realm-sha512-hex" />
+ </antcall>
- </target>
+ </target>
- <target name="deploy" depends="init-common">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="jdbc-realm-clear"/>
- <param name="appname" value="jdbc-realm-clear"/>
- </antcall>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="jdbc-realm-clear-base64"/>
- <param name="appname" value="jdbc-realm-clear-base64"/>
- </antcall>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="jdbc-realm-clear-hex"/>
- <param name="appname" value="jdbc-realm-clear-hex"/>
- </antcall>
+ <target name="deploy" depends="init-common">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="jdbc-realm-clear" />
+ <param name="appname" value="jdbc-realm-clear" />
+ </antcall>
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="jdbc-realm-clear-base64" />
+ <param name="appname" value="jdbc-realm-clear-base64" />
+ </antcall>
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="jdbc-realm-clear-hex" />
+ <param name="appname" value="jdbc-realm-clear-hex" />
+ </antcall>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="jdbc-realm-md2-base64"/>
- <param name="appname" value="jdbc-realm-md2-base64"/>
- </antcall>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="jdbc-realm-md5-base64"/>
- <param name="appname" value="jdbc-realm-md5-base64"/>
- </antcall>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="jdbc-realm-sha-base64"/>
- <param name="appname" value="jdbc-realm-sha-base64"/>
- </antcall>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="jdbc-realm-sha256-base64"/>
- <param name="appname" value="jdbc-realm-sha256-base64"/>
- </antcall>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="jdbc-realm-sha384-base64"/>
- <param name="appname" value="jdbc-realm-sha384-base64"/>
- </antcall>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="jdbc-realm-sha512-base64"/>
- <param name="appname" value="jdbc-realm-sha512-base64"/>
- </antcall>
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="jdbc-realm-md2-base64" />
+ <param name="appname" value="jdbc-realm-md2-base64" />
+ </antcall>
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="jdbc-realm-md5-base64" />
+ <param name="appname" value="jdbc-realm-md5-base64" />
+ </antcall>
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="jdbc-realm-sha-base64" />
+ <param name="appname" value="jdbc-realm-sha-base64" />
+ </antcall>
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="jdbc-realm-sha256-base64" />
+ <param name="appname" value="jdbc-realm-sha256-base64" />
+ </antcall>
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="jdbc-realm-sha384-base64" />
+ <param name="appname" value="jdbc-realm-sha384-base64" />
+ </antcall>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="jdbc-realm-md2-hex"/>
- <param name="appname" value="jdbc-realm-md2-hex"/>
- </antcall>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="jdbc-realm-md5-hex"/>
- <param name="appname" value="jdbc-realm-md5-hex"/>
- </antcall>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="jdbc-realm-sha-hex"/>
- <param name="appname" value="jdbc-realm-sha-hex"/>
- </antcall>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="jdbc-realm-sha256-hex"/>
- <param name="appname" value="jdbc-realm-sha256-hex"/>
- </antcall>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="jdbc-realm-sha384-hex"/>
- <param name="appname" value="jdbc-realm-sha384-hex"/>
- </antcall>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="jdbc-realm-sha512-hex"/>
- <param name="appname" value="jdbc-realm-sha512-hex"/>
- </antcall>
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="jdbc-realm-md2-hex" />
+ <param name="appname" value="jdbc-realm-md2-hex" />
+ </antcall>
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="jdbc-realm-md5-hex" />
+ <param name="appname" value="jdbc-realm-md5-hex" />
+ </antcall>
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="jdbc-realm-sha-hex" />
+ <param name="appname" value="jdbc-realm-sha-hex" />
+ </antcall>
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="jdbc-realm-sha256-hex" />
+ <param name="appname" value="jdbc-realm-sha256-hex" />
+ </antcall>
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="jdbc-realm-sha384-hex" />
+ <param name="appname" value="jdbc-realm-sha384-hex" />
+ </antcall>
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="jdbc-realm-sha512-hex" />
+ <param name="appname" value="jdbc-realm-sha512-hex" />
+ </antcall>
- </target>
+ </target>
- <target name="run" depends="init-common">
- <antcall target="run-positive"/>
- <antcall target="run-negative"/>
- </target>
+ <target name="run" depends="init-common">
+ <antcall target="run-positive" />
+ <antcall target="run-negative" />
+ </target>
- <target name="run-positive" depends="init-common">
+ <target name="run-positive" depends="init-common">
- <antcall target="custom-run">
- <param name="jdbc.realm.pass" value="qwert"/>
- <param name="jdbc.realm.user" value="qwert"/>
- <param name="appname" value="jdbc-realm-clear"/>
- </antcall>
- <antcall target="custom-run">
- <param name="jdbc.realm.pass" value="qwertBASE64"/>
- <param name="jdbc.realm.user" value="qwertBASE64"/>
- <param name="appname" value="jdbc-realm-clear-base64"/>
- </antcall>
- <antcall target="custom-run">
- <param name="jdbc.realm.pass" value="qwertHEX"/>
- <param name="jdbc.realm.user" value="qwertHEX"/>
- <param name="appname" value="jdbc-realm-clear-hex"/>
- </antcall>
+ <antcall target="custom-run">
+ <param name="jdbc.realm.pass" value="qwert" />
+ <param name="jdbc.realm.user" value="qwert" />
+ <param name="appname" value="jdbc-realm-clear" />
+ </antcall>
+ <antcall target="custom-run">
+ <param name="jdbc.realm.pass" value="qwertBASE64" />
+ <param name="jdbc.realm.user" value="qwertBASE64" />
+ <param name="appname" value="jdbc-realm-clear-base64" />
+ </antcall>
+ <antcall target="custom-run">
+ <param name="jdbc.realm.pass" value="qwertHEX" />
+ <param name="jdbc.realm.user" value="qwertHEX" />
+ <param name="appname" value="jdbc-realm-clear-hex" />
+ </antcall>
- <antcall target="custom-run">
- <param name="jdbc.realm.pass" value="qwertMD2BASE64"/>
- <param name="jdbc.realm.user" value="qwertMD2BASE64"/>
- <param name="appname" value="jdbc-realm-md2-base64"/>
- </antcall>
- <antcall target="custom-run">
- <param name="jdbc.realm.pass" value="qwertMD5BASE64"/>
- <param name="jdbc.realm.user" value="qwertMD5BASE64"/>
- <param name="appname" value="jdbc-realm-md5-base64"/>
- </antcall>
- <antcall target="custom-run">
- <param name="jdbc.realm.pass" value="qwertSHABASE64"/>
- <param name="jdbc.realm.user" value="qwertSHABASE64"/>
- <param name="appname" value="jdbc-realm-sha-base64"/>
- </antcall>
- <antcall target="custom-run">
- <param name="jdbc.realm.pass" value="qwertSHA256BASE64"/>
- <param name="jdbc.realm.user" value="qwertSHA256BASE64"/>
- <param name="appname" value="jdbc-realm-sha256-base64"/>
- </antcall>
- <antcall target="custom-run">
- <param name="jdbc.realm.pass" value="qwertSHA384BASE64"/>
- <param name="jdbc.realm.user" value="qwertSHA384BASE64"/>
- <param name="appname" value="jdbc-realm-sha384-base64"/>
- </antcall>
- <antcall target="custom-run">
- <param name="jdbc.realm.pass" value="qwertSHA512BASE64"/>
- <param name="jdbc.realm.user" value="qwertSHA512BASE64"/>
- <param name="appname" value="jdbc-realm-sha512-base64"/>
- </antcall>
+ <antcall target="custom-run">
+ <param name="jdbc.realm.pass" value="qwertMD2BASE64" />
+ <param name="jdbc.realm.user" value="qwertMD2BASE64" />
+ <param name="appname" value="jdbc-realm-md2-base64" />
+ </antcall>
+ <antcall target="custom-run">
+ <param name="jdbc.realm.pass" value="qwertMD5BASE64" />
+ <param name="jdbc.realm.user" value="qwertMD5BASE64" />
+ <param name="appname" value="jdbc-realm-md5-base64" />
+ </antcall>
+ <antcall target="custom-run">
+ <param name="jdbc.realm.pass" value="qwertSHABASE64" />
+ <param name="jdbc.realm.user" value="qwertSHABASE64" />
+ <param name="appname" value="jdbc-realm-sha-base64" />
+ </antcall>
+ <antcall target="custom-run">
+ <param name="jdbc.realm.pass" value="qwertSHA256BASE64" />
+ <param name="jdbc.realm.user" value="qwertSHA256BASE64" />
+ <param name="appname" value="jdbc-realm-sha256-base64" />
+ </antcall>
+ <antcall target="custom-run">
+ <param name="jdbc.realm.pass" value="qwertSHA384BASE64" />
+ <param name="jdbc.realm.user" value="qwertSHA384BASE64" />
+ <param name="appname" value="jdbc-realm-sha384-base64" />
+ </antcall>
- <antcall target="custom-run">
- <param name="jdbc.realm.pass" value="qwertMD2HEX"/>
- <param name="jdbc.realm.user" value="qwertMD2HEX"/>
- <param name="appname" value="jdbc-realm-md2-hex"/>
- </antcall>
- <antcall target="custom-run">
- <param name="jdbc.realm.pass" value="qwertMD5HEX"/>
- <param name="jdbc.realm.user" value="qwertMD5HEX"/>
- <param name="appname" value="jdbc-realm-md5-hex"/>
- </antcall>
- <antcall target="custom-run">
- <param name="jdbc.realm.pass" value="qwertSHAHEX"/>
- <param name="jdbc.realm.user" value="qwertSHAHEX"/>
- <param name="appname" value="jdbc-realm-sha-hex"/>
- </antcall>
- <antcall target="custom-run">
- <param name="jdbc.realm.pass" value="qwertSHA256HEX"/>
- <param name="jdbc.realm.user" value="qwertSHA256HEX"/>
- <param name="appname" value="jdbc-realm-sha256-hex"/>
- </antcall>
- <antcall target="custom-run">
- <param name="jdbc.realm.pass" value="qwertSHA384HEX"/>
- <param name="jdbc.realm.user" value="qwertSHA384HEX"/>
- <param name="appname" value="jdbc-realm-sha384-hex"/>
- </antcall>
- <antcall target="custom-run">
- <param name="jdbc.realm.pass" value="qwertSHA512HEX"/>
- <param name="jdbc.realm.user" value="qwertSHA512HEX"/>
- <param name="appname" value="jdbc-realm-sha512-hex"/>
- </antcall>
+ <antcall target="custom-run">
+ <param name="jdbc.realm.pass" value="qwertMD2HEX" />
+ <param name="jdbc.realm.user" value="qwertMD2HEX" />
+ <param name="appname" value="jdbc-realm-md2-hex" />
+ </antcall>
+ <antcall target="custom-run">
+ <param name="jdbc.realm.pass" value="qwertMD5HEX" />
+ <param name="jdbc.realm.user" value="qwertMD5HEX" />
+ <param name="appname" value="jdbc-realm-md5-hex" />
+ </antcall>
+ <antcall target="custom-run">
+ <param name="jdbc.realm.pass" value="qwertSHAHEX" />
+ <param name="jdbc.realm.user" value="qwertSHAHEX" />
+ <param name="appname" value="jdbc-realm-sha-hex" />
+ </antcall>
+ <antcall target="custom-run">
+ <param name="jdbc.realm.pass" value="qwertSHA256HEX" />
+ <param name="jdbc.realm.user" value="qwertSHA256HEX" />
+ <param name="appname" value="jdbc-realm-sha256-hex" />
+ </antcall>
+ <antcall target="custom-run">
+ <param name="jdbc.realm.pass" value="qwertSHA384HEX" />
+ <param name="jdbc.realm.user" value="qwertSHA384HEX" />
+ <param name="appname" value="jdbc-realm-sha384-hex" />
+ </antcall>
+ <antcall target="custom-run">
+ <param name="jdbc.realm.pass" value="qwertSHA512HEX" />
+ <param name="jdbc.realm.user" value="qwertSHA512HEX" />
+ <param name="appname" value="jdbc-realm-sha512-hex" />
+ </antcall>
- </target>
+ </target>
- <target name="run-negative" depends="init-common">
+ <target name="run-negative" depends="init-common">
- <antcall target="custom-neg-run">
- <param name="jdbc.realm.pass" value="qwert"/>
- <param name="jdbc.realm.user" value="qwerta"/>
- <param name="appname" value="jdbc-realm-clear"/>
- </antcall>
- <antcall target="custom-neg-run">
- <param name="jdbc.realm.pass" value="qwertBASE64"/>
- <param name="jdbc.realm.user" value="qwertBASE64a"/>
- <param name="appname" value="jdbc-realm-clear-base64"/>
- </antcall>
- <antcall target="custom-neg-run">
- <param name="jdbc.realm.pass" value="qwertHEX"/>
- <param name="jdbc.realm.user" value="qwertHEXa"/>
- <param name="appname" value="jdbc-realm-clear-hex"/>
- </antcall>
+ <antcall target="custom-neg-run">
+ <param name="jdbc.realm.pass" value="qwert" />
+ <param name="jdbc.realm.user" value="qwerta" />
+ <param name="appname" value="jdbc-realm-clear" />
+ </antcall>
+ <antcall target="custom-neg-run">
+ <param name="jdbc.realm.pass" value="qwertBASE64" />
+ <param name="jdbc.realm.user" value="qwertBASE64a" />
+ <param name="appname" value="jdbc-realm-clear-base64" />
+ </antcall>
+ <antcall target="custom-neg-run">
+ <param name="jdbc.realm.pass" value="qwertHEX" />
+ <param name="jdbc.realm.user" value="qwertHEXa" />
+ <param name="appname" value="jdbc-realm-clear-hex" />
+ </antcall>
- <antcall target="custom-neg-run">
- <param name="jdbc.realm.pass" value="qwertMD2BASE64"/>
- <param name="jdbc.realm.user" value="qwertMD2BASE64a"/>
- <param name="appname" value="jdbc-realm-md2-base64"/>
- </antcall>
- <antcall target="custom-neg-run">
- <param name="jdbc.realm.pass" value="qwertMD5BASE64"/>
- <param name="jdbc.realm.user" value="qwertMD5BASE64a"/>
- <param name="appname" value="jdbc-realm-md5-base64"/>
- </antcall>
- <antcall target="custom-neg-run">
- <param name="jdbc.realm.pass" value="qwertSHABASE64"/>
- <param name="jdbc.realm.user" value="qwertSHABASE64a"/>
- <param name="appname" value="jdbc-realm-sha-base64"/>
- </antcall>
- <antcall target="custom-neg-run">
- <param name="jdbc.realm.pass" value="qwertSHA256BASE64"/>
- <param name="jdbc.realm.user" value="qwertSHA256BASE64a"/>
- <param name="appname" value="jdbc-realm-sha256-base64"/>
- </antcall>
- <antcall target="custom-neg-run">
- <param name="jdbc.realm.pass" value="qwertSHA384BASE64"/>
- <param name="jdbc.realm.user" value="qwertSHA384BASE64a"/>
- <param name="appname" value="jdbc-realm-sha384-base64"/>
- </antcall>
- <antcall target="custom-neg-run">
- <param name="jdbc.realm.pass" value="qwertSHA512BASE64"/>
- <param name="jdbc.realm.user" value="qwertSHA512BASE64a"/>
- <param name="appname" value="jdbc-realm-sha512-base64"/>
- </antcall>
+ <antcall target="custom-neg-run">
+ <param name="jdbc.realm.pass" value="qwertMD2BASE64" />
+ <param name="jdbc.realm.user" value="qwertMD2BASE64a" />
+ <param name="appname" value="jdbc-realm-md2-base64" />
+ </antcall>
+ <antcall target="custom-neg-run">
+ <param name="jdbc.realm.pass" value="qwertMD5BASE64" />
+ <param name="jdbc.realm.user" value="qwertMD5BASE64a" />
+ <param name="appname" value="jdbc-realm-md5-base64" />
+ </antcall>
+ <antcall target="custom-neg-run">
+ <param name="jdbc.realm.pass" value="qwertSHABASE64" />
+ <param name="jdbc.realm.user" value="qwertSHABASE64a" />
+ <param name="appname" value="jdbc-realm-sha-base64" />
+ </antcall>
+ <antcall target="custom-neg-run">
+ <param name="jdbc.realm.pass" value="qwertSHA256BASE64" />
+ <param name="jdbc.realm.user" value="qwertSHA256BASE64a" />
+ <param name="appname" value="jdbc-realm-sha256-base64" />
+ </antcall>
+ <antcall target="custom-neg-run">
+ <param name="jdbc.realm.pass" value="qwertSHA384BASE64" />
+ <param name="jdbc.realm.user" value="qwertSHA384BASE64a" />
+ <param name="appname" value="jdbc-realm-sha384-base64" />
+ </antcall>
- <antcall target="custom-neg-run">
- <param name="jdbc.realm.pass" value="qwertMD2HEX"/>
- <param name="jdbc.realm.user" value="qwertMD2HEXa"/>
- <param name="appname" value="jdbc-realm-md2-hex"/>
- </antcall>
- <antcall target="custom-neg-run">
- <param name="jdbc.realm.pass" value="qwertMD5HEX"/>
- <param name="jdbc.realm.user" value="qwertMD5HEXa"/>
- <param name="appname" value="jdbc-realm-md5-hex"/>
- </antcall>
- <antcall target="custom-neg-run">
- <param name="jdbc.realm.pass" value="qwertSHAHEX"/>
- <param name="jdbc.realm.user" value="qwertSHAHEXa"/>
- <param name="appname" value="jdbc-realm-sha-hex"/>
- </antcall>
- <antcall target="custom-neg-run">
- <param name="jdbc.realm.pass" value="qwertSHA256HEX"/>
- <param name="jdbc.realm.user" value="qwertSHA256HEXa"/>
- <param name="appname" value="jdbc-realm-sha256-hex"/>
- </antcall>
- <antcall target="custom-neg-run">
- <param name="jdbc.realm.pass" value="qwertSHA384HEX"/>
- <param name="jdbc.realm.user" value="qwertSHA384HEXa"/>
- <param name="appname" value="jdbc-realm-sha384-hex"/>
- </antcall>
- <antcall target="custom-neg-run">
- <param name="jdbc.realm.pass" value="qwertSHA512HEX"/>
- <param name="jdbc.realm.user" value="qwertSHA512HEXa"/>
- <param name="appname" value="jdbc-realm-sha512-hex"/>
- </antcall>
+ <antcall target="custom-neg-run">
+ <param name="jdbc.realm.pass" value="qwertMD2HEX" />
+ <param name="jdbc.realm.user" value="qwertMD2HEXa" />
+ <param name="appname" value="jdbc-realm-md2-hex" />
+ </antcall>
+ <antcall target="custom-neg-run">
+ <param name="jdbc.realm.pass" value="qwertMD5HEX" />
+ <param name="jdbc.realm.user" value="qwertMD5HEXa" />
+ <param name="appname" value="jdbc-realm-md5-hex" />
+ </antcall>
+ <antcall target="custom-neg-run">
+ <param name="jdbc.realm.pass" value="qwertSHAHEX" />
+ <param name="jdbc.realm.user" value="qwertSHAHEXa" />
+ <param name="appname" value="jdbc-realm-sha-hex" />
+ </antcall>
+ <antcall target="custom-neg-run">
+ <param name="jdbc.realm.pass" value="qwertSHA256HEX" />
+ <param name="jdbc.realm.user" value="qwertSHA256HEXa" />
+ <param name="appname" value="jdbc-realm-sha256-hex" />
+ </antcall>
+ <antcall target="custom-neg-run">
+ <param name="jdbc.realm.pass" value="qwertSHA384HEX" />
+ <param name="jdbc.realm.user" value="qwertSHA384HEXa" />
+ <param name="appname" value="jdbc-realm-sha384-hex" />
+ </antcall>
+ <antcall target="custom-neg-run">
+ <param name="jdbc.realm.pass" value="qwertSHA512HEX" />
+ <param name="jdbc.realm.user" value="qwertSHA512HEXa" />
+ <param name="appname" value="jdbc-realm-sha512-hex" />
+ </antcall>
- </target>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common">
- <param name="appname" value="jdbc-realm-clear"/>
- </antcall>
- <antcall target="undeploy-war-common">
- <param name="appname" value="jdbc-realm-clear-base64"/>
- </antcall>
- <antcall target="undeploy-war-common">
- <param name="appname" value="jdbc-realm-clear-hex"/>
- </antcall>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common">
+ <param name="appname" value="jdbc-realm-clear" />
+ </antcall>
+ <antcall target="undeploy-war-common">
+ <param name="appname" value="jdbc-realm-clear-base64" />
+ </antcall>
+ <antcall target="undeploy-war-common">
+ <param name="appname" value="jdbc-realm-clear-hex" />
+ </antcall>
- <antcall target="undeploy-war-common">
- <param name="appname" value="jdbc-realm-md2-base64"/>
- </antcall>
- <antcall target="undeploy-war-common">
- <param name="appname" value="jdbc-realm-md5-base64"/>
- </antcall>
- <antcall target="undeploy-war-common">
- <param name="appname" value="jdbc-realm-sha-base64"/>
- </antcall>
- <antcall target="undeploy-war-common">
- <param name="appname" value="jdbc-realm-sha256-base64"/>
- </antcall>
- <antcall target="undeploy-war-common">
- <param name="appname" value="jdbc-realm-sha384-base64"/>
- </antcall>
- <antcall target="undeploy-war-common">
- <param name="appname" value="jdbc-realm-sha512-base64"/>
- </antcall>
+ <antcall target="undeploy-war-common">
+ <param name="appname" value="jdbc-realm-md2-base64" />
+ </antcall>
+ <antcall target="undeploy-war-common">
+ <param name="appname" value="jdbc-realm-md5-base64" />
+ </antcall>
+ <antcall target="undeploy-war-common">
+ <param name="appname" value="jdbc-realm-sha-base64" />
+ </antcall>
+ <antcall target="undeploy-war-common">
+ <param name="appname" value="jdbc-realm-sha256-base64" />
+ </antcall>
+ <antcall target="undeploy-war-common">
+ <param name="appname" value="jdbc-realm-sha384-base64" />
+ </antcall>
- <antcall target="undeploy-war-common">
- <param name="appname" value="jdbc-realm-md2-hex"/>
- </antcall>
- <antcall target="undeploy-war-common">
- <param name="appname" value="jdbc-realm-md5-hex"/>
- </antcall>
- <antcall target="undeploy-war-common">
- <param name="appname" value="jdbc-realm-sha-hex"/>
- </antcall>
- <antcall target="undeploy-war-common">
- <param name="appname" value="jdbc-realm-sha256-hex"/>
- </antcall>
- <antcall target="undeploy-war-common">
- <param name="appname" value="jdbc-realm-sha384-hex"/>
- </antcall>
- <antcall target="undeploy-war-common">
- <param name="appname" value="jdbc-realm-sha512-hex"/>
- </antcall>
+ <antcall target="undeploy-war-common">
+ <param name="appname" value="jdbc-realm-md2-hex" />
+ </antcall>
+ <antcall target="undeploy-war-common">
+ <param name="appname" value="jdbc-realm-md5-hex" />
+ </antcall>
+ <antcall target="undeploy-war-common">
+ <param name="appname" value="jdbc-realm-sha-hex" />
+ </antcall>
+ <antcall target="undeploy-war-common">
+ <param name="appname" value="jdbc-realm-sha256-hex" />
+ </antcall>
+ <antcall target="undeploy-war-common">
+ <param name="appname" value="jdbc-realm-sha384-hex" />
+ </antcall>
+ <antcall target="undeploy-war-common">
+ <param name="appname" value="jdbc-realm-sha512-hex" />
+ </antcall>
- </target>
+ </target>
- <target name="restart">
- <antcall target="restart-server-instance-common"/>
- </target>
+ <target name="restart">
+ <antcall target="restart-server-instance-common" />
+ </target>
- <!-- variables needed by custom-build
+ <!-- variables needed by custom-build
1. jdbc.realm.name
2. jdbc.realm.user
3. appname
-->
- <target name="custom-build">
- <echo message="web.xml is defined as ${web.xml}"/>
+ <target name="custom-build">
+ <echo message="web.xml is defined as ${web.xml}" />
- <copy file="web.xml.template" tofile="${web.xml}" overwrite="true" failonerror="false"/>
- <replace file="${web.xml}" token="REALM_NAME_HERE" value="${jdbc.realm.name}"/>
- <copy file="sun-web.xml.template" tofile="${sun-web.xml}" overwrite="true" failonerror="false"/>
- <replace file="${sun-web.xml}" token="USER_ID_HERE" value="${jdbc.realm.user}"/>
+ <copy file="web.xml.template" tofile="${web.xml}" overwrite="true" failonerror="false" />
+ <replace file="${web.xml}" token="REALM_NAME_HERE" value="${jdbc.realm.name}" />
+ <copy file="sun-web.xml.template"
+ tofile="${sun-web.xml}"
+ overwrite="true"
+ failonerror="false"
+ />
+ <replace file="${sun-web.xml}" token="USER_ID_HERE" value="${jdbc.realm.user}" />
- <antcall target="webclient-war-common">
- <param name="hasWebclient" value="true"/>
- <param name="appname" value="${appname}"/>
- </antcall>
+ <antcall target="webclient-war-common">
+ <param name="hasWebclient" value="true" />
+ <param name="appname" value="${appname}" />
+ </antcall>
- <delete file="${web.xml}"/>
- <delete file="${sun-web.xml}"/>
+ <delete file="${web.xml}" />
+ <delete file="${sun-web.xml}" />
- </target>
+ </target>
- <!-- variables needed by custom-build
+ <!-- variables needed by custom-build
1. jdbc.realm.pass
2. jdbc.realm.user
3. appname
-->
- <target name="custom-neg-run" depends="init-common">
+ <target name="custom-neg-run" depends="init-common">
- <echo message="Testing (NEGATIVE TEST) against URL http://${http.host}:${http.port}/${appname}/TestServlet using username/password ${jdbc.realm.user}/${jdbc.realm.pass}"/>
+ <echo message="Testing (NEGATIVE TEST) against URL http://${http.host}:${http.port}/${appname}/TestServlet using username/password ${jdbc.realm.user}/${jdbc.realm.pass}"
+ />
- <java classname="HttpBasicAuthTest" fork="true">
- <classpath>
- <pathelement path="${build.classes.dir}:${s1astest.classpath}"/>
- </classpath>
- <arg value="-url"/>
- <arg value="http://${http.host}:${http.port}/${appname}/TestServlet"/>
- <arg value="-user"/>
- <arg value="${jdbc.realm.user}"/>
- <arg value="-pass"/>
- <arg value="${jdbc.realm.pass}"/>
- <arg value="-tc"/>
- <arg value="10"/>
- <arg value="-lc"/>
- <arg value="10"/>
- <arg value="-negative"/>
- </java>
- </target>
+ <java classname="HttpBasicAuthTest" fork="true">
+ <classpath>
+ <pathelement path="${build.classes.dir}:${s1astest.classpath}" />
+ </classpath>
+ <arg value="-url" />
+ <arg value="http://${http.host}:${http.port}/${appname}/TestServlet" />
+ <arg value="-user" />
+ <arg value="${jdbc.realm.user}" />
+ <arg value="-pass" />
+ <arg value="${jdbc.realm.pass}" />
+ <arg value="-tc" />
+ <arg value="10" />
+ <arg value="-lc" />
+ <arg value="10" />
+ <arg value="-negative" />
+ </java>
+ </target>
- <target name="custom-run" depends="init-common">
+ <target name="custom-run" depends="init-common">
- <echo message="Testing against URL http://${http.host}:${http.port}/${appname}/TestServlet using username/password ${jdbc.realm.user}/${jdbc.realm.pass}"/>
+ <echo message="Testing against URL http://${http.host}:${http.port}/${appname}/TestServlet using username/password ${jdbc.realm.user}/${jdbc.realm.pass}"
+ />
- <java classname="HttpBasicAuthTest" fork="true">
- <classpath>
- <pathelement path="${build.classes.dir}:${s1astest.classpath}"/>
- </classpath>
- <arg value="-url"/>
- <arg value="http://${http.host}:${http.port}/${appname}/TestServlet"/>
- <arg value="-user"/>
- <arg value="${jdbc.realm.user}"/>
- <arg value="-pass"/>
- <arg value="${jdbc.realm.pass}"/>
- <arg value="-tc"/>
- <arg value="10"/>
- <arg value="-lc"/>
- <arg value="10"/>
- </java>
- </target>
+ <java classname="HttpBasicAuthTest" fork="true">
+ <classpath>
+ <pathelement path="${build.classes.dir}:${s1astest.classpath}" />
+ </classpath>
+ <arg value="-url" />
+ <arg value="http://${http.host}:${http.port}/${appname}/TestServlet" />
+ <arg value="-user" />
+ <arg value="${jdbc.realm.user}" />
+ <arg value="-pass" />
+ <arg value="${jdbc.realm.pass}" />
+ <arg value="-tc" />
+ <arg value="10" />
+ <arg value="-lc" />
+ <arg value="10" />
+ </java>
+ </target>
</project>
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 13c43dc..361886a 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 @@
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 78c16b5..8309d41 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 @@
ps.close();
ps = con.prepareStatement(INSERT_USER_STMT_BASE64);
- BASE64Encoder base64 = new BASE64Encoder();
+ Encoder base64 = Base64.getEncoder();
for(int i=0; i<users_BASE64.length; i++) {
ps.setString(1, users_BASE64[i][0]);
- ps.setString(2, new String(base64.encode(users_BASE64[i][1].getBytes())));
+ ps.setString(2, new String(base64.encodeToString(users_BASE64[i][1].getBytes())));
ps.executeUpdate();
}
ps.close();
@@ -210,7 +210,7 @@
MessageDigest md2 = MessageDigest.getInstance("MD2");
for(int i=0; i<users_MD2_BASE64.length; i++) {
ps.setString(1, users_MD2_BASE64[i][0]);
- ps.setString(2, base64.encode(md2.digest(users_MD2_BASE64[i][1].getBytes())));
+ ps.setString(2, base64.encodeToString(md2.digest(users_MD2_BASE64[i][1].getBytes())));
ps.executeUpdate();
md2.reset();
}
@@ -220,7 +220,7 @@
MessageDigest md5 = MessageDigest.getInstance("MD5");
for(int i=0; i<users_MD5_BASE64.length; i++) {
ps.setString(1, users_MD5_BASE64[i][0]);
- ps.setString(2, base64.encode(md5.digest(users_MD5_BASE64[i][1].getBytes())));
+ ps.setString(2, base64.encodeToString(md5.digest(users_MD5_BASE64[i][1].getBytes())));
ps.executeUpdate();
md5.reset();
}
@@ -230,7 +230,7 @@
MessageDigest sha = MessageDigest.getInstance("SHA");
for(int i=0; i<users_SHA_BASE64.length; i++) {
ps.setString(1, users_SHA_BASE64[i][0]);
- ps.setString(2, base64.encode(sha.digest(users_SHA_BASE64[i][1].getBytes())));
+ ps.setString(2, base64.encodeToString(sha.digest(users_SHA_BASE64[i][1].getBytes())));
ps.executeUpdate();
sha.reset();
}
@@ -240,7 +240,7 @@
MessageDigest sha256 = MessageDigest.getInstance("SHA-256");
for(int i=0; i<users_SHA256_BASE64.length; i++) {
ps.setString(1, users_SHA256_BASE64[i][0]);
- ps.setString(2, base64.encode(sha256.digest(users_SHA256_BASE64[i][1].getBytes())));
+ ps.setString(2, base64.encodeToString(sha256.digest(users_SHA256_BASE64[i][1].getBytes())));
ps.executeUpdate();
sha256.reset();
}
@@ -250,7 +250,7 @@
MessageDigest sha384 = MessageDigest.getInstance("SHA-384");
for(int i=0; i<users_SHA384_BASE64.length; i++) {
ps.setString(1, users_SHA384_BASE64[i][0]);
- ps.setString(2, base64.encode(sha384.digest(users_SHA384_BASE64[i][1].getBytes())));
+ ps.setString(2, base64.encodeToString(sha384.digest(users_SHA384_BASE64[i][1].getBytes())));
ps.executeUpdate();
sha384.reset();
}
@@ -260,7 +260,7 @@
MessageDigest sha512 = MessageDigest.getInstance("SHA-512");
for(int i=0; i<users_SHA512_BASE64.length; i++) {
ps.setString(1, users_SHA512_BASE64[i][0]);
- ps.setString(2, base64.encode(sha512.digest(users_SHA512_BASE64[i][1].getBytes())));
+ ps.setString(2, base64.encodeToString(sha512.digest(users_SHA512_BASE64[i][1].getBytes())));
ps.executeUpdate();
sha512.reset();
}
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/build.xml b/appserver/tests/appserv-tests/devtests/security/jmac/build.xml
index f8b6ea9..69d55fe 100644
--- a/appserver/tests/appserv-tests/devtests/security/jmac/build.xml
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/build.xml
@@ -32,10 +32,8 @@
&commonRun;
<target name="all">
- <!-- Expected output doesn't match. This test used to pass in 5.0
<ant dir="httpServlet" target="all"/>
- -->
- <ant dir="https" target="all"/>
+<!-- <ant dir="https" target="all"/> FAIL, bug in certificate realm processing? -->
<ant dir="httpServletChallenge" target="all"/>
<ant dir="httpServletForm" target="all"/>
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 8409f65..cdebc37 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 @@
<property name="app.type" value="war"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
+<property name="glassfish-web.xml" value="descriptor/glassfish-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/descriptor/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/descriptor/glassfish-web.xml
new file mode 100644
index 0000000..a895189
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/descriptor/glassfish-web.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
+<!--
+
+ 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
+
+-->
+
+<glassfish-web-app httpservlet-security-provider="httpServletTestAuthModule">
+ <security-role-mapping>
+ <role-name>myrole</role-name>
+ <group-name>mygroup</group-name>
+ </security-role-mapping>
+</glassfish-web-app>
+
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/sun-web.xml
deleted file mode 100644
index 7b24d54..0000000
--- a/appserver/tests/appserv-tests/devtests/security/jmac/httpServlet/descriptor/sun-web.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 7.0 Servlet 2.3//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_3-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app httpservlet-security-provider="httpServletTestAuthModule">
- <security-role-mapping>
- <role-name>myrole</role-name>
- <group-name>mygroup</group-name>
- </security-role-mapping>
-</sun-web-app>
-
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 ea8e942..d63057e 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 @@
<hr>
<%
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 b5e3587..4a47571 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!
<hr>
Hello, shingwai123 from com.sun.s1asdev.security.jmac.httpservlet.HttpServletTestAuthModule
PC = security-jmac-httpservlet-web/security-jmac-httpservlet-web
-
<hr>
-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 002e18e..5e11ae3 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 @@
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 @@
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 @@
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 43aaf4c..f347a91 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 @@
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 @@
}
}
- 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 0e9764e..b09ea53 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 8cb4c0a..1b71a54 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 @@
<property name="app.type" value="war"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
+<property name="glassfish-web.xml" value="descriptor/glassfish-web.xml"/>
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 9a3b3d5..5fa5884 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 @@
<target name="run" depends="init-common, init-security-util">
<java classname="com.sun.s1asdev.security.jmac.https.WebSSLClient" fork="true">
- <!-- jvmarg value="-Djavax.net.debug=ssl,handshake,data,trustmanager"/-->
+ <!--jvmarg value="-Djavax.net.debug=all" -->
<jvmarg value="-Djavax.net.ssl.keyStore=${mykeystore.db.file}"/>
<jvmarg value="-Djavax.net.ssl.trustStore=${mytruststore.db.file}"/>
<jvmarg value="-Djavax.net.ssl.keyStorePassword=${ssl.password}"/>
diff --git a/appserver/tests/appserv-tests/devtests/security/jmac/https/descriptor/glassfish-web.xml b/appserver/tests/appserv-tests/devtests/security/jmac/https/descriptor/glassfish-web.xml
new file mode 100644
index 0000000..486eda5
--- /dev/null
+++ b/appserver/tests/appserv-tests/devtests/security/jmac/https/descriptor/glassfish-web.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
+<!--
+
+ 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
+
+-->
+
+<glassfish-web-app httpservlet-security-provider="httpsTestAuthModule">
+ <security-role-mapping>
+ <role-name>myrole</role-name>
+ <principal-name>CN=SSLTest, OU=Sun Java System Application Server, O=Sun Microsystems, L=Santa Clara, ST=California, C=US</principal-name>
+ </security-role-mapping>
+</glassfish-web-app>
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/sun-web.xml
deleted file mode 100644
index d4e01e4..0000000
--- a/appserver/tests/appserv-tests/devtests/security/jmac/https/descriptor/sun-web.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 7.0 Servlet 2.3//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_3-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app httpservlet-security-provider="httpsTestAuthModule">
- <security-role-mapping>
- <role-name>myrole</role-name>
- <principal-name>CN=SSLTest, OU=Sun Java System Application Server, O=Sun Microsystems, L=Santa Clara, ST=California, C=US</principal-name>
- </security-role-mapping>
-</sun-web-app>
-
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 be4b2d9..f916027 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 @@
<hr>
<%
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 a583cb8..5e79e2d 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 @@
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 6acacaf..64b578a 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 @@
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 @@
+ ", 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 @@
});
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 9fd418d..1b9e072 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 @@
<replacefilter token="@PORT@" value="${http.port}"/>
</replace>
<javac srcdir="client" destdir="${build.classes.dir}/client"
- classpath="${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:${build.classes.dir}/client" debug="on" failonerror="true"/>
+ 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"/>
</target>
<target name="build-server" depends="compile-server">
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 fbe0b6a..87c7378 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 @@
<replacefilter token="@PORT@" value="${http.port}"/>
</replace>
<javac srcdir="client" destdir="${build.classes.dir}/client"
- classpath="${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:${env.S1AS_HOME}/lib/appserv-ws.jar:${build.classes.dir}/client" debug="on" failonerror="true"/>
+ 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"/>
</target>
<target name="build-server" depends="compile-server">
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 bc912c7..188822f 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;
- <target name="all" depends="clean, build-providers, setup, build-deploy, run, undeploy, unsetup"/>
+ <target name="all"
+ depends="clean, build-providers, setup, build-deploy, run, undeploy, unsetup"
+ />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="build-providers" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="authmodule"/>
- <param name="build.classes.dir" value="${build.classes.dir}/authmodule"/>
- </antcall>
+ <target name="build-providers" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="authmodule" />
+ <param name="build.classes.dir" value="${build.classes.dir}/authmodule" />
+ </antcall>
- <mkdir dir="${assemble.dir}"/>
- <jar jarfile="${assemble.dir}/test-${appname}-provider.jar">
- <fileset dir="${build.classes.dir}/authmodule"/>
- </jar>
- </target>
+ <mkdir dir="${assemble.dir}" />
+ <jar jarfile="${assemble.dir}/test-${appname}-provider.jar">
+ <fileset dir="${build.classes.dir}/authmodule" />
+ </jar>
+ </target>
- <target name="setup" depends="init-common">
- <!-- exports certdb stuff and imports into keystore -->
- <antcall target="prepare-store-nickname-common">
- <param name="cert.nickname" value="s1as"/>
- </antcall>
+ <target name="setup" depends="init-common">
+ <!-- exports certdb stuff and imports into keystore -->
+ <antcall target="prepare-store-nickname-common">
+ <param name="cert.nickname" value="s1as" />
+ </antcall>
- <copy file="${assemble.dir}/test-${appname}-provider.jar"
- todir="${env.S1AS_HOME}/lib"/>
+ <copy file="${assemble.dir}/test-${appname}-provider.jar" todir="${env.S1AS_HOME}/lib" />
- <antcall target="asadmin-common">
- <param name="admin.command" value="create-message-security-provider"/>
- <param name="as.props" value="${as.props} --classname com.sun.s1asdev.security.jmac.soapembedded.SOAPEmbeddedTestServerAuthModule --layer SOAP --providertype server --requestauthsource sender"/>
- <param name="operand.props" value="SOAPEmbeddedTestServerAuthModule"/>
- </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="create-message-security-provider"/>
- <param name="as.props" value="${as.props} --classname com.sun.s1asdev.security.jmac.soapembedded.SOAPEmbeddedTestClientAuthModule --layer SOAP --providertype client --requestauthsource sender"/>
- <param name="operand.props" value="SOAPEmbeddedTestClientAuthModule"/>
- </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="create-message-security-provider" />
+ <param name="as.props"
+ value="${as.props} --classname com.sun.s1asdev.security.jmac.soapembedded.SOAPEmbeddedTestServerAuthModule --layer SOAP --providertype server --requestauthsource sender"
+ />
+ <param name="operand.props" value="SOAPEmbeddedTestServerAuthModule" />
+ </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="create-message-security-provider" />
+ <param name="as.props"
+ value="${as.props} --classname com.sun.s1asdev.security.jmac.soapembedded.SOAPEmbeddedTestClientAuthModule --layer SOAP --providertype client --requestauthsource sender"
+ />
+ <param name="operand.props" value="SOAPEmbeddedTestClientAuthModule" />
+ </antcall>
- </target>
+ </target>
- <target name="unsetup" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-message-security-provider"/>
- <param name="as.props" value="${as.props} --layer SOAP"/>
- <param name="operand.props" value="SOAPEmbeddedTestServerAuthModule"/>
- </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-message-security-provider"/>
- <param name="as.props" value="${as.props} --layer SOAP"/>
- <param name="operand.props" value="SOAPEmbeddedTestClientAuthModule"/>
- </antcall>
+ <target name="unsetup" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-message-security-provider" />
+ <param name="as.props" value="${as.props} --layer SOAP" />
+ <param name="operand.props" value="SOAPEmbeddedTestServerAuthModule" />
+ </antcall>
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="delete-message-security-provider" />
+ <param name="as.props" value="${as.props} --layer SOAP" />
+ <param name="operand.props" value="SOAPEmbeddedTestClientAuthModule" />
+ </antcall>
- <!-- may not be able to delete this file in PC environment -->
- <delete file="${env.S1AS_HOME}/lib/test-${appname}-provider.jar" failonerror="false"/>
- </target>
+ <!-- may not be able to delete this file in PC environment -->
+ <delete file="${env.S1AS_HOME}/lib/test-${appname}-provider.jar" failonerror="false" />
+ </target>
- <target name="compile-server" depends="clean">
- <antcall target="compile-common">
- <param name="src" value="ejbws"/>
- <param name="build.classes.dir" value="${build.classes.dir}/ejbws"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="servletws"/>
- <param name="build.classes.dir" value="${build.classes.dir}/servletws/WEB-INF/classes"/>
- </antcall>
- </target>
+ <target name="compile-server" depends="clean">
+ <antcall target="compile-common">
+ <param name="src" value="ejbws" />
+ <param name="build.classes.dir" value="${build.classes.dir}/ejbws" />
+ </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="servletws" />
+ <param name="build.classes.dir" value="${build.classes.dir}/servletws/WEB-INF/classes" />
+ </antcall>
+ </target>
- <target name="compile-webclient">
- <mkdir dir="${build.classes.dir}/webclient"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient http://${http.host}:${http.port}/JmacSoapEmbeddedEjbService/HelloEjb?WSDL"/>
- </antcall>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient http://${http.host}:${http.port}/security-jmac-soapembedded-web/webservice/JmacSoapEmbeddedServletService/HelloServlet?WSDL"/>
- </antcall>
+ <target name="compile-webclient">
+ <mkdir dir="${build.classes.dir}/webclient" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient http://${http.host}:${http.port}/JmacSoapEmbeddedEjbService/HelloEjb?WSDL"
+ />
+ </antcall>
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient http://${http.host}:${http.port}/security-jmac-soapembedded-web/webservice/JmacSoapEmbeddedServletService/HelloServlet?WSDL"
+ />
+ </antcall>
- <delete file="webclient/Servlet.java" failonerror="false"/>
- <copy file="webclient/Servlet.java.template" tofile="webclient/Servlet.java"/>
- <replace file="webclient/Servlet.java">
- <replacefilter token="@HOST@" value="${http.host}"/>
- <replacefilter token="@PORT@" value="${http.port}"/>
- </replace>
- <javac srcdir="webclient" destdir="${build.classes.dir}/webclient"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar:${build.classes.dir}/webclient:${env.S1AS_HOME}/modules/jakarta.servlet.jar" debug="on" failonerror="true"/>
- </target>
+ <delete file="webclient/Servlet.java" failonerror="false" />
+ <copy file="webclient/Servlet.java.template" tofile="webclient/Servlet.java" />
+ <replace file="webclient/Servlet.java">
+ <replacefilter token="@HOST@" value="${http.host}" />
+ <replacefilter token="@PORT@" value="${http.port}" />
+ </replace>
+ <javac srcdir="webclient"
+ destdir="${build.classes.dir}/webclient"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${build.classes.dir}/webclient"
+ debug="on"
+ failonerror="true"
+ />
+ </target>
- <target name="build-server" depends="compile-server">
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
+ <target name="build-server" depends="compile-server">
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/META-INF" />
- <antcall target="package-ejbjar-common">
- <param name="ejbjar.files" value="${build.classes.dir}/ejbws"/>
- <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
- <param name="ejbjar.classes" value="com/sun/**/*.class"/>
- </antcall>
+ <antcall target="package-ejbjar-common">
+ <param name="ejbjar.files" value="${build.classes.dir}/ejbws" />
+ <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar" />
+ <param name="ejbjar.classes" value="com/sun/**/*.class" />
+ </antcall>
- <copy file="${web.xml}" tofile="${build.classes.dir}/servletws/WEB-INF/web.xml" failonerror="true"/>
- <copy file="${sun-web.xml}" tofile="${build.classes.dir}/servletws/WEB-INF/sun-web.xml" failonerror="true"/>
- <jar destfile="${assemble.dir}/${appname}-web.war">
- <fileset dir="${build.classes.dir}/servletws"/>
- </jar>
+ <copy file="${web.xml}"
+ tofile="${build.classes.dir}/servletws/WEB-INF/web.xml"
+ failonerror="true"
+ />
+ <copy file="${sun-web.xml}"
+ tofile="${build.classes.dir}/servletws/WEB-INF/sun-web.xml"
+ failonerror="true"
+ />
+ <jar destfile="${assemble.dir}/${appname}-web.war">
+ <fileset dir="${build.classes.dir}/servletws" />
+ </jar>
- <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
- <fileset dir="${build.classes.dir}">
- <include name="META-INF/sun-application.xml"/>
- </fileset>
- </jar>
- </target>
+ <copy file="${sun-application.xml}"
+ tofile="${build.classes.dir}/META-INF/sun-application.xml"
+ failonerror="false"
+ />
+ <jar jarfile="${assemble.dir}/${appname}App.ear">
+ <fileset dir="${assemble.dir}">
+ <include name="*.jar" />
+ <include name="*.war" />
+ </fileset>
+ <fileset dir="${build.classes.dir}">
+ <include name="META-INF/sun-application.xml" />
+ </fileset>
+ </jar>
+ </target>
- <target name="build-webclient" depends="compile-webclient">
- <mkdir dir="${assemble.dir}"/>
+ <target name="build-webclient" depends="compile-webclient">
+ <mkdir dir="${assemble.dir}" />
- <antcall target="package-war-common">
- <param name="web.xml" value="${web2.xml}"/>
- <param name="sun-web.xml" value="${sun-web2.xml}"/>
- <param name="war.classes"
- value="${build.classes.dir}/webclient"/>
- <param name="war.file"
- value="${assemble.dir}/${appname}-client-web.war"/>
- </antcall>
- </target>
+ <antcall target="package-war-common">
+ <param name="web.xml" value="${web2.xml}" />
+ <param name="sun-web.xml" value="${sun-web2.xml}" />
+ <param name="war.classes" value="${build.classes.dir}/webclient" />
+ <param name="war.file" value="${assemble.dir}/${appname}-client-web.war" />
+ </antcall>
+ </target>
- <target name="build-deploy" depends="init-common">
- <antcall target="build-server"/>
- <antcall target="deploy-common-libraries">
- <param name="as.props" value="${as.props}"/>
- <param name="libraries" value="${env.S1AS_HOME}/lib/test-${appname}-provider.jar"/>
- </antcall>
- <antcall target="build-webclient"/>
- <antcall target="deploy-war-libraries">
- <param name="as.props" value="${as.props}"/>
- <param name="libraries" value="${env.S1AS_HOME}/lib/test-${appname}-provider.jar"/>
- <param name="appname" value="${appname}-client"/>
- <param name="contextroot" value="${appname}-client-web"/>
- </antcall>
- </target>
+ <target name="build-deploy" depends="init-common">
+ <antcall target="build-server" />
+ <antcall target="deploy-common-libraries">
+ <param name="as.props" value="${as.props}" />
+ <param name="libraries" value="${env.S1AS_HOME}/lib/test-${appname}-provider.jar" />
+ </antcall>
+ <antcall target="build-webclient" />
+ <antcall target="deploy-war-libraries">
+ <param name="as.props" value="${as.props}" />
+ <param name="libraries" value="${env.S1AS_HOME}/lib/test-${appname}-provider.jar" />
+ <param name="appname" value="${appname}-client" />
+ <param name="contextroot" value="${appname}-client-web" />
+ </antcall>
+ </target>
- <target name="run" depends="init-common">
- <taskdef name="webtest" classname="${webtest.classname}" classpath="${webtest.classpath}" />
- <webtest request="GET /security-jmac-soapembedded-client-web/webclient/Servlet HTTP/1.0"
- debug="9"
- host="${http.host}"
- port="${http.port}"
- firstTask="true"
- lastTest="true"
- lastCase="true"
- lastTask="true"
- resultFileName="${webtest.report.dir}/security-gtest-results.xml"
- testSession="security-jmac-soapembedded"
- requestHeaders="Host:${http.host}:${http.port}"
- goldenFile="${env.APS_HOME}/devtests/security/jmac/soapEmbedded/goldenfiles/output.html"
- testSuiteId="security-jmac-soapembedded"
- testSuiteName="security-jmac-soapembedded"
- testSuiteDescription="Security Test"
- testId="security-jmac-soapembedded"
- testName="security-jmac-soapembedded"
- testDescription="JSR 196 SoapEmbedded test: ${testcaseid}"
- testCaseId="${testcaseid}"
- testCaseName="${testcaseid}"
- testCaseDescription="JSR 196 SoapEmbedded test"
- testStrategy="JSR 196 SoapEmbedded test"
- />
+ <target name="run" depends="init-common">
+ <taskdef name="webtest" classname="${webtest.classname}" classpath="${webtest.classpath}" />
+ <webtest request="GET /security-jmac-soapembedded-client-web/webclient/Servlet HTTP/1.0"
+ debug="9"
+ host="${http.host}"
+ port="${http.port}"
+ firstTask="true"
+ lastTest="true"
+ lastCase="true"
+ lastTask="true"
+ resultFileName="${webtest.report.dir}/security-gtest-results.xml"
+ testSession="security-jmac-soapembedded"
+ requestHeaders="Host:${http.host}:${http.port}"
+ goldenFile="${env.APS_HOME}/devtests/security/jmac/soapEmbedded/goldenfiles/output.html"
+ testSuiteId="security-jmac-soapembedded"
+ testSuiteName="security-jmac-soapembedded"
+ testSuiteDescription="Security Test"
+ testId="security-jmac-soapembedded"
+ testName="security-jmac-soapembedded"
+ testDescription="JSR 196 SoapEmbedded test: ${testcaseid}"
+ testCaseId="${testcaseid}"
+ testCaseName="${testcaseid}"
+ testCaseDescription="JSR 196 SoapEmbedded test"
+ testStrategy="JSR 196 SoapEmbedded test"
+ />
- </target>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- <antcall target="undeploy-war-common">
- <param name="appname"
- value="${appname}-client"/>
- </antcall>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-common" />
+ <antcall target="undeploy-war-common">
+ <param name="appname" value="${appname}-client" />
+ </antcall>
+ </target>
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
+ <target name="usage">
+ <antcall target="usage-common" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/security/run_test.sh b/appserver/tests/appserv-tests/devtests/security/run_test.sh
index 886ed34..888f28a 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 @@
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 f3900e1..0000000
--- 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/glassfish7/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 4e9d394..0000000
--- 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 d4da676..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-bundled-ham-basic-login-config-form</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-bundled-ham-basic-login-config-form</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
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 ce5646f..0000000
--- 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 c612e2d..0000000
--- 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 35b1b7d..0000000
--- 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 e69de29..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-bundled-ham-basic-login-config-form/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
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 2889bfa..0000000
--- 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 @@
-<!--
-
- 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
-
--->
-
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1">
-
- <servlet>
- <display-name>index</display-name>
- <servlet-name>index</servlet-name>
- <jsp-file>/index.jsp</jsp-file>
- </servlet>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>FORM Based Authentication Servlet</web-resource-name>
- <url-pattern>/</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>foo</role-name>
- </auth-constraint>
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <login-config>
- <auth-method>FORM</auth-method>
- <realm-name>file</realm-name>
- <form-login-config>
- <form-login-page>/loginform.jsp</form-login-page>
- <form-error-page>/loginerror.jsp</form-error-page>
- </form-login-config>
- </login-config>
-</web-app>
-
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 afdc05b..0000000
--- 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"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>Form-based Security - Success</title>
- </head>
- <body>
- <h1>Form-based Security - Success</h1>
-
- If you reached this page that means form-based security credentials are correctly configured.
- </body>
-</html>
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 63b43e4..0000000
--- 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"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>Form-Based Login Error Page</title>
- </head>
- <body>
- <h1>Login Error Page</h1>
-
- <h2>Invalid user name or password.</h2>
-
- <p>Please specify a valid user/password combination</p>
-
- Click here to <a href="loginform.jsp">Try Again</a></p>
-
- </body>
-</html>
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 71bc4fe..0000000
--- 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"%>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
- "http://www.w3.org/TR/html4/loose.dtd">
-
-<html>
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
- <title>Form-Based Login Page</title>
- </head>
- <body>
- <h1>Form-Based Login Page</h1>
-
- <form method="POST" action="j_security_check">
- Username: <input type="text" name="j_username"> <p/>
- Password: <input type="password" name="j_password" autocomplete="off"> <p/>
- <input type="submit" value="Submit" name="submitButton">
- <input type="reset" value="Reset">
- </form>
-
- </body>
-</html>
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 a9dd417..0000000
--- 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 0bb7d10..0000000
--- 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 c56687c..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-caller-principal</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-caller-principal</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
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 f52f925..0000000
--- 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 fdc7739..0000000
--- 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<Principal> principals = securityContext.getPrincipalsByType(java.security.Principal.class);
-
- Optional<Principal> 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<Principal> 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 e614c50..0000000
--- 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 c4556df..0000000
--- 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 e69de29..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
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 48a35fa..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-caller-principal/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app
- xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
->
-
- <!-- Security constraints and roles. -->
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>User pages</web-resource-name>
- <url-pattern>/protectedServlet</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>foo</role-name>
- </auth-constraint>
- </security-constraint>
-
-
- <security-role>
- <role-name>foo</role-name>
- </security-role>
-
-</web-app>
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 a272733..0000000
--- 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 0815c79..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-identity-store-handler/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-custom-identity-store-handler</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-custom-identity-store-handler</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.unboundid</groupId>
- <artifactId>unboundid-ldapsdk</artifactId>
- </dependency>
- </dependencies>
-</project>
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 6eb467f..0000000
--- 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<ValidationType> 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 c8cda52..0000000
--- 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 58b5972..0000000
--- 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<IdentityStore> validatingIdentityStores;
- private List<IdentityStore> groupProvidingIdentityStores;
-
- @PostConstruct
- public void init() {
- List<IdentityStore> 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<String> 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 3670fff..0000000
--- 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<String, Set<String>> 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<String> getCallerGroups(CredentialValidationResult validationResult) {
- Set<String> result = groupsPerCaller.get(validationResult.getCallerPrincipal().getName());
- if (result == null) {
- result = emptySet();
- }
-
- return result;
- }
-
- @Override
- public Set<ValidationType> 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 2e5e64a..0000000
--- 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 a9c2d7c..0000000
--- 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 89d5726..0000000
--- 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 a0a630c..0000000
--- 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 c7b9713..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<!--
-
- 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
-
--->
-
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_1_1.xsd"
- version="1.1" bean-discovery-mode="annotated">
-
- <alternatives>
- <class>org.glassfish.soteria.test.CustomIdentityStoreHandler</class>
- </alternatives>
-</beans>
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 6cefa70..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<!--
-
- 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
-
--->
-
-<glassfish-web-app>
-
- <security-role-mapping>
- <role-name>foo</role-name>
- <group-name>foo</group-name>
- </security-role-mapping>
-
- <security-role-mapping>
- <role-name>bar</role-name>
- <group-name>bar</group-name>
- </security-role-mapping>
-
- <security-role-mapping>
- <role-name>kaz</role-name>
- <group-name>kaz</group-name>
- </security-role-mapping>
-
- <security-role-mapping>
- <role-name>baz</role-name>
- <group-name>baz</group-name>
- </security-role-mapping>
-
- <security-role-mapping>
- <role-name>group1</role-name>
- <group-name>group1</group-name>
- </security-role-mapping>
-
- <security-role-mapping>
- <role-name>group2</role-name>
- <group-name>group2</group-name>
- </security-role-mapping>
-
- <security-role-mapping>
- <role-name>group3</role-name>
- <group-name>group3</group-name>
- </security-role-mapping>
-
- <parameter-encoding default-charset="UTF-8" />
-
-</glassfish-web-app>
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 4982544..0000000
--- 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 26f62da..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-custom-rememberme</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-custom-rememberme</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
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 d7c027b..0000000
--- 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 ddbdde0..0000000
--- 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 859eece..0000000
--- 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 1a3733a..0000000
--- 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 7a6f650..0000000
--- 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<String, CredentialValidationResult> 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<String> 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 e69de29..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-rememberme/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
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 11d0ee6..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<!--
-
- 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
-
--->
-
-<glassfish-web-app>
-
- <security-role-mapping>
- <role-name>foo</role-name>
- <group-name>foo</group-name>
- </security-role-mapping>
-
- <security-role-mapping>
- <role-name>bar</role-name>
- <group-name>bar</group-name>
- </security-role-mapping>
-
- <security-role-mapping>
- <role-name>kaz</role-name>
- <group-name>kaz</group-name>
- </security-role-mapping>
-
- <parameter-encoding default-charset="UTF-8" />
-
-</glassfish-web-app>
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 b7973e4..0000000
--- 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 e159522..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-custom-session</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-custom-session</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
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 ddbdde0..0000000
--- 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 227ae4a..0000000
--- 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 403af16..0000000
--- 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 e69de29..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom-session/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
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 11d0ee6..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<!--
-
- 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
-
--->
-
-<glassfish-web-app>
-
- <security-role-mapping>
- <role-name>foo</role-name>
- <group-name>foo</group-name>
- </security-role-mapping>
-
- <security-role-mapping>
- <role-name>bar</role-name>
- <group-name>bar</group-name>
- </security-role-mapping>
-
- <security-role-mapping>
- <role-name>kaz</role-name>
- <group-name>kaz</group-name>
- </security-role-mapping>
-
- <parameter-encoding default-charset="UTF-8" />
-
-</glassfish-web-app>
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 67c26bc..0000000
--- 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 b6fefaa..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-custom</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-custom</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
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 106324b..0000000
--- 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 51a17e9..0000000
--- 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 9efb76c..0000000
--- 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 c4556df..0000000
--- 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 e69de29..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
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 48a35fa..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-custom/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app
- xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
->
-
- <!-- Security constraints and roles. -->
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>User pages</web-resource-name>
- <url-pattern>/protectedServlet</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>foo</role-name>
- </auth-constraint>
- </security-constraint>
-
-
- <security-role>
- <role-name>foo</role-name>
- </security-role>
-
-</web-app>
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 2a89b80..0000000
--- 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 9ba40e8..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-db</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-db</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
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 0083211..0000000
--- 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 0d4d1c3..0000000
--- 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 aa26df2..0000000
--- 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<String, String> 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 e23a1f8..0000000
--- 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 45b2208..0000000
--- 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 e69de29..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
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 11d0ee6..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-db/src/main/webapp/WEB-INF/glassfish-web.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<!--
-
- 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
-
--->
-
-<glassfish-web-app>
-
- <security-role-mapping>
- <role-name>foo</role-name>
- <group-name>foo</group-name>
- </security-role-mapping>
-
- <security-role-mapping>
- <role-name>bar</role-name>
- <group-name>bar</group-name>
- </security-role-mapping>
-
- <security-role-mapping>
- <role-name>kaz</role-name>
- <group-name>kaz</group-name>
- </security-role-mapping>
-
- <parameter-encoding default-charset="UTF-8" />
-
-</glassfish-web-app>
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 9bf6a22..0000000
--- 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 e157f66..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-double-ham</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-double-ham</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
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 a4bdcdd..0000000
--- 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 d36ea39..0000000
--- 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 f83eabc..0000000
--- 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 c4556df..0000000
--- 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 e69de29..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
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 48a35fa..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-double-ham/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app
- xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
->
-
- <!-- Security constraints and roles. -->
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>User pages</web-resource-name>
- <url-pattern>/protectedServlet</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>foo</role-name>
- </auth-constraint>
- </security-constraint>
-
-
- <security-role>
- <role-name>foo</role-name>
- </security-role>
-
-</web-app>
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 1b5eb6e..0000000
--- 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 6c106a5..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-ham-ordering</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-ham-ordering</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
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 f9e5be7..0000000
--- 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<String> invList= new ArrayList<>();
- invList.add(methodName);
- request.setAttribute("methodInvList", invList.stream().collect(Collectors.joining(",")));
- }else{
- String invListStr = (String)request.getAttribute("methodInvList");
- List<String> 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 bd4c138..0000000
--- 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<String> invList= new ArrayList<>();
- invList.add(methodName);
- request.setAttribute("methodInvList", invList.stream().collect(Collectors.joining(",")));
- }else{
- String invListStr = (String)request.getAttribute("methodInvList");
- List<String> 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 c4556df..0000000
--- 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 e69de29..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
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 48a35fa..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-ham-ordering/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app
- xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1"
->
-
- <!-- Security constraints and roles. -->
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>User pages</web-resource-name>
- <url-pattern>/protectedServlet</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>foo</role-name>
- </auth-constraint>
- </security-constraint>
-
-
- <security-role>
- <role-name>foo</role-name>
- </security-role>
-
-</web-app>
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 caac72d..0000000
--- 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 4207451..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-mem-basic</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-mem-basic</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
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 4762328..0000000
--- 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 e69de29..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-basic/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
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 d68bb40..0000000
--- 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 6fb0fdc..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-mem-form</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-mem-form</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
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 aa66ff8..0000000
--- 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 f7da2df..0000000
--- 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
- "<html><body> Login failed! \n" +
- "<a href=\"login-servlet\">Try again</a>" +
- "</body></html>");
- }
-
-}
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 c703d92..0000000
--- 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(
- "<html><body> Login to continue \n" +
- "<form method=\"POST\" action=\"j_security_check\">" +
- "<p><strong>Username </strong>" +
- "<input type=\"text\" name=\"j_username\">" +
-
- "<p><strong>Password </strong>" +
- "<input type=\"password\" name=\"j_password\">" +
- "<p>" +
- "<input type=\"submit\" value=\"Submit\">" +
- "</form>" +
- "</body></html>");
- }
-
-}
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 88ea4f0..0000000
--- 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(
- "<html><body> This is a servlet <br><br>\n" +
-
- "web username: " + webName + "<br><br>\n" +
-
- "web user has role \"foo\": " + request.isUserInRole("foo") + "<br>\n" +
- "web user has role \"bar\": " + request.isUserInRole("bar") + "<br>\n" +
- "web user has role \"kaz\": " + request.isUserInRole("kaz") + "<br><br>\n" +
-
-
- "<form method=\"POST\">" +
- "<input type=\"hidden\" name=\"logout\" value=\"true\" >" +
- "<input type=\"submit\" value=\"Logout\">" +
- "</form>" +
- "</body></html>");
- }
-
- @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 1ac02f9..0000000
--- 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 e69de29..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-mem-form/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
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 1ac3a80..0000000
--- 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 bd10de2..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-multiple-store-backup</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-multiple-store-backup</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
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 407a705..0000000
--- 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 ce6f324..0000000
--- 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 a468058..0000000
--- 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 2cbf9b2..0000000
--- 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 e69de29..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store-backup/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
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 11d0ee6..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<!--
-
- 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
-
--->
-
-<glassfish-web-app>
-
- <security-role-mapping>
- <role-name>foo</role-name>
- <group-name>foo</group-name>
- </security-role-mapping>
-
- <security-role-mapping>
- <role-name>bar</role-name>
- <group-name>bar</group-name>
- </security-role-mapping>
-
- <security-role-mapping>
- <role-name>kaz</role-name>
- <group-name>kaz</group-name>
- </security-role-mapping>
-
- <parameter-encoding default-charset="UTF-8" />
-
-</glassfish-web-app>
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 46b0ecf..0000000
--- 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 97f26f4..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-multiple-store</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-multiple-store</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-</project>
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 a434ae8..0000000
--- 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<String, String> 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<ValidationType> 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 3a518df..0000000
--- 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<String, Set<String>> 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<String> getCallerGroups(CredentialValidationResult validationResult) {
- return authorization.get(validationResult.getCallerPrincipal().getName());
- }
-
- @Override
- public Set<ValidationType> 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 407a705..0000000
--- 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 4cd0736..0000000
--- 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 e69de29..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-multiple-store/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
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 11d0ee6..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE glassfish-web-app PUBLIC "-//GlassFish.org//DTD GlassFish Application Server 3.1 Servlet 3.0//EN" "http://glassfish.org/dtds/glassfish-web-app_3_0-1.dtd">
-<!--
-
- 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
-
--->
-
-<glassfish-web-app>
-
- <security-role-mapping>
- <role-name>foo</role-name>
- <group-name>foo</group-name>
- </security-role-mapping>
-
- <security-role-mapping>
- <role-name>bar</role-name>
- <group-name>bar</group-name>
- </security-role-mapping>
-
- <security-role-mapping>
- <role-name>kaz</role-name>
- <group-name>kaz</group-name>
- </security-role-mapping>
-
- <parameter-encoding default-charset="UTF-8" />
-
-</glassfish-web-app>
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 7cbba69..0000000
--- 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 fea016a..0000000
--- 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 d4f447d..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-no-application-caller-principal</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-no-application-caller-principal</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
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 8735509..0000000
--- 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 7e2b663..0000000
--- 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 c4556df..0000000
--- 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 d8f65e8..0000000
--- 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<Principal> principals = securityContext.getPrincipalsByType(java.security.Principal.class);
-
- Optional<Principal> 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 e69de29..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-application-caller-principal/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
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 ca37ae0..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app
- xmlns="http://xmlns.jcp.org/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
- version="3.1">
-
- <!-- Security constraints and roles. -->
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>User pages</web-resource-name>
- <url-pattern>/protectedServlet</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>foo</role-name>
- </auth-constraint>
- </security-constraint>
-
-
- <security-role>
- <role-name>foo</role-name>
- </security-role>
-
-</web-app>
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 af9cd34..0000000
--- 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 2ea7164..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-no-role-mapping</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-no-role-mapping</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
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 67d381b..0000000
--- 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 e69de29..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-no-role-mapping/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
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 3eb6946..0000000
--- 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 b70196e..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-securitycontext-auth-ejb</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-securitycontext-auth-ejb</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
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 a0f1b02..0000000
--- 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<String> 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 4c43cf1..0000000
--- 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 <code>GET</code> and <code>POST</code>
- * 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<String> 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 <code>GET</code> 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 <code>POST</code> 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 da648d4..0000000
--- 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 67d10f4..0000000
--- 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<String> 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 e69de29..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth-ejb/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
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 8c3dcd3..0000000
--- 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 628ac42..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>app-securitycontext-auth</artifactId>
- <packaging>war</packaging>
-
- <build>
- <finalName>app-securitycontext-auth</finalName>
- </build>
-
- <properties>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>common</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
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 a0f1b02..0000000
--- 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<String> 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 faaecdf..0000000
--- 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<String> 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 da648d4..0000000
--- 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 e69de29..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/app-securitycontext-auth/src/main/webapp/WEB-INF/beans.xml
+++ /dev/null
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 cfddf88..0000000
--- 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 fabf1d0..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/build.properties
+++ /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
-
--->
-
-
-<property name="module" value="security"/>
-<property name="sub-module" value="${module}-soteria"/>
-<property name="appname" value="${sub-module}"/>
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 6ad5c9c..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/build.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonSetup SYSTEM "./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
-<!ENTITY commonRun SYSTEM "./../../../config/run.xml">
-<!ENTITY testProperties SYSTEM "./build.properties">
-<!ENTITY commonSecurity SYSTEM "./../common.xml">
-]>
-
-
-<project name="jsr375R" basedir="." default="usage" xmlns:artifact="antlib:org.apache.maven.artifact.ant">
-
- &commonSetup;
- &commonBuild;
- &commonRun;
- &testProperties;
- &commonSecurity;
- <property environment="env"/>
- <get src="https://repo1.maven.org/maven2/org/apache/maven/maven-ant-tasks/2.1.3/maven-ant-tasks-2.1.3.jar" dest="${env.APS_HOME}/lib/maven-ant-tasks-2.1.3.jar"/>
- <path id="maven-ant-tasks.classpath" path="${env.APS_HOME}/lib/maven-ant-tasks-2.1.3.jar" />
- <typedef resource="org/apache/maven/artifact/ant/antlib.xml"
- uri="antlib:org.apache.maven.artifact.ant"
- classpathref="maven-ant-tasks.classpath" />
- <target name="all" depends="runMaven"/>
- <target name="runMaven">
- <artifact:mvn mavenHome="${env.M2_HOME}" fork="true">
- <jvmarg value="-Dmaven.multiModuleProjectDirectory"/>
- <jvmarg value="-Dmaven.javadoc.skip=true" />
- <arg value="clean"/>
- <arg value="verify"/>
- </artifact:mvn>
- </target>
-</project>
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 83fbed0..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/common/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>common</artifactId>
-
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.junit</groupId>
- <artifactId>arquillian-junit-container</artifactId>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>2.29</version>
- </dependency>
- </dependencies>
-</project>
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 25724da..0000000
--- 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 extends Page> 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 0cdad6f..0000000
--- 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<String>());
- }
-
- 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<String> 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 6398064..0000000
--- 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 01757f1..0000000
--- 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 dad2bcd..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/common/src/main/resources/server.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-
- 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
-
--->
-
-<server description="new server">
-
- <featureManager>
- <feature>javaee-7.0</feature>
- <feature>localConnector-1.0</feature>
- </featureManager>
-
- <httpEndpoint httpPort="9080" httpsPort="9443" id="defaultHttpEndpoint"/>
-
- <applicationManager autoExpand="true"/>
-
-</server>
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 52fdaf1..0000000
--- a/appserver/tests/appserv-tests/devtests/security/soteria/pom.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 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
-
--->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.glassfish.soteria.test</groupId>
- <artifactId>soteria</artifactId>
- <version>7.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
-
- <name>Soteria ${project.version} Integration tests and examples</name>
-
- <properties>
- <glassfish.version>5.0</glassfish.version>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- </properties>
-
- <modules>
- <module>common</module>
- <module>app-mem-basic</module>
- <module>app-custom</module>
- <module>app-custom-session</module>
- <module>app-custom-rememberme</module>
- <module>app-securitycontext-auth</module>
- <module>app-securitycontext-auth-ejb</module>
- <module>app-double-ham</module>
- <module>app-ham-ordering</module>
-<!-- <module>app-db</module> -->
- <module>app-custom-identity-store-handler</module>
- <module>app-multiple-store</module>
- <module>app-multiple-store-backup</module>
- <module>app-no-role-mapping</module>
- <module>app-bundled-ham-basic-login-config-form</module>
- <module>app-caller-principal</module>
- <module>app-no-application-caller-principal</module>
- </modules>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.jboss.arquillian</groupId>
- <artifactId>arquillian-bom</artifactId>
- <version>1.3.0.Final</version>
- <scope>import</scope>
- <type>pom</type>
- </dependency>
- <dependency>
- <groupId>com.unboundid</groupId>
- <artifactId>unboundid-ldapsdk</artifactId>
- <version>4.0.4</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.13.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-api</artifactId>
- <version>7.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.security.enterprise</groupId>
- <artifactId>javax.security.enterprise-api</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.glassfish.soteria</groupId>
- <artifactId>javax.security.enterprise</artifactId>
- <version>1.0</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.jboss.arquillian.container</groupId>
- <artifactId>arquillian-glassfish-remote-3.1</artifactId>
- <version>1.0.2</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.ejte.ccl.reporter</groupId>
- <artifactId>SimpleReporterAdapter</artifactId>
- <version>1.0</version>
- <scope>system</scope>
- <systemPath>${APS_HOME}/lib/reporter.jar</systemPath>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-failsafe-plugin</artifactId>
- <version>2.20</version>
- <executions>
- <execution>
- <goals>
- <goal>integration-test</goal>
- <goal>verify</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <systemPropertyVariables>
- <finalName>${project.build.finalName}</finalName>
- </systemPropertyVariables>
- <environmentVariables>
- <GLASSFISH_HOME>${env.S1AS_HOME}/..</GLASSFISH_HOME>
- </environmentVariables>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
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 75dd7ae..fa33889 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 @@
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 48a0c30..92d5c56 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 @@
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 0c37194..50458b1 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 @@
<target name="all">
<record name="security-wss.output" action="start" />
-
- <ant dir="encThenSign-default-conf" target="all"/>
- <ant dir="permethod" target="all"/>
-
- <!-- JWS 2.0 -->
<ant dir="gartner" target="all"/>
-<!-- <ant dir="roles" target="all"/> --> <!-- AppClient environment: not authorized for invocation -->
-<!-- <ant dir="roles2" target="all"/> -->
-<!-- <ant dir="ssl" target="all"/>-->
-<!-- <ant dir="sslclientcert" target="all"/>-->
-
<record name="security-wss.output" action="stop" />
</target>
</project>
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 068303a..0000000
--- 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
- <provider-config class-name="com.sun.xml.wss.provider.ClientSecurityAuthModule" provider-id="ClientProvider" provider-type="client">
- <request-policy auth-recipient="before-content" auth-source="content"/>
- <response-policy auth-recipient="after-content" auth-source="content"/>
- <property name="security.config" value="${com.sun.aas.instanceRoot}/config/wss-server-config.xml"/>
- </provider-config>
- <provider-config class-name="com.sun.xml.wss.provider.ServerSecurityAuthModule" provider-id="ServerProvider" provider-type="server">
- <request-policy auth-recipient="before-content" auth-source="content"/>
- <response-policy auth-recipient="after-content" auth-source="content"/>
- <property name="security.config" value="${com.sun.aas.instanceRoot}/config/wss-server-config.xml"/>
- </provider-config>
-
- sun-acc.xml
-
- <message-security-config auth-layer="SOAP" default-client-provider="ClientProvider">
- <provider-config class-name="com.sun.xml.wss.provider.ClientSecurityAuthModule" provider-id="ClientProvider" provider-type="client">
- <request-policy auth-source="content" auth-recipient="before-content"/>
- <response-policy auth-source="content" auth-recipient="after-content"/>
- <property name="security.config" value="/export/local/hsingh/SUNWappserver.ssl/lib/appclient/wss-client-config.xml"/>
- </provider-config>
-
-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 ae138e8..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/build.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonSetup SYSTEM "file:../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:../../../../config/common.xml">
-<!ENTITY commonRun SYSTEM "file:../../../../config/run.xml">
-<!ENTITY commonSecurity SYSTEM "file:../../common.xml">
-]>
-
-
-<project name="wss-encryptThenSign-default" default="usage" basedir=".">
- &commonSetup;
- &commonBuild;
- &commonSecurity;
- &commonRun;
-
- <property name="ws-target" value="all"/>
-
-<!-- ======== Targets by execution granularity ========== -->
- <target name="all">
- <antcall target="setup"/>
- <antcall target="runwstargets">
- <param name="ws-target" value="all"/>
- </antcall>
- <antcall target="unsetup"/>
- </target>
-
- <target name="run-test">
- <antcall target="runwstargets">
- <param name="ws-target" value="run-test"/>
- </antcall>
- </target>
-
- <target name="clean">
- <antcall target="runwstargets">
- <param name="ws-target" value="clean"/>
- </antcall>
- </target>
-
- <target name="build">
- <antcall target="runwstargets">
- <param name="ws-target" value="build"/>
- </antcall>
- </target>
-
- <target name="deploy">
- <antcall target="runwstargets">
- <param name="ws-target" value="deploy"/>
- </antcall>
- </target>
-
- <target name="undeploy">
- <antcall target="runwstargets">
- <param name="ws-target" value="undeploy"/>
- </antcall>
- </target>
-
- <target name="run">
- <antcall target="runwstargets">
- <param name="ws-target" value="run"/>
- </antcall>
- </target>
-
- <target name="setup" depends="init-common">
- <!-- exports certdb stuff and imports into keystore -->
- <antcall target="prepare-store-nickname-common">
- <param name="cert.nickname" value="s1as"/>
- </antcall>
- <antcall target="enable-wss-message-security-provider">
- <param name="wss.server.provider.name" value="ServerProvider"/>
- <param name="wss.client.provider.name" value="ClientProvider"/>
- </antcall>
-
- <antcall target="set-wss-provider-request-auth-recipient">
- <param name="wss.provider.name" value="ServerProvider"/>
- <param name="request.auth.recipient" value="before-content"/>
- </antcall>
- <antcall target="set-wss-provider-response-auth-recipient">
- <param name="wss.provider.name" value="ServerProvider"/>
- <param name="response.auth.recipient" value="after-content"/>
- </antcall>
- <antcall target="set-wss-provider-request-auth-recipient">
- <param name="wss.provider.name" value="ClientProvider"/>
- <param name="request.auth.recipient" value="before-content"/>
- </antcall>
- <antcall target="set-wss-provider-response-auth-recipient">
- <param name="wss.provider.name" value="ClientProvider"/>
- <param name="response.auth.recipient" value="after-content"/>
- </antcall>
-
- <antcall target="backup-glassfish-acc.xml"/>
- <antcall target="enable-wss-appclient-message-security-provider">
- <param name="wss.client.provider.name" value="ClientProvider"/>
- </antcall>
- <antcall target="set-wss-appclient-request-recipient">
- <param name="request.auth.recipient" value="before-content"/>
- </antcall>
- <antcall target="set-wss-appclient-response-recipient">
- <param name="response.auth.recipient" value="after-content"/>
- </antcall>
- <antcall target="restart-server-instance-common" />
- </target>
-
- <target name="unsetup" depends="init-common" >
- <antcall target="set-wss-provider-request-auth-recipient">
- <param name="wss.provider.name" value="ServerProvider"/>
- <param name="request.auth.recipient" value=""/>
- </antcall>
- <antcall target="set-wss-provider-response-auth-recipient">
- <param name="wss.provider.name" value="ServerProvider"/>
- <param name="response.auth.recipient" value=""/>
- </antcall>
- <antcall target="set-wss-provider-request-auth-recipient">
- <param name="wss.provider.name" value="ClientProvider"/>
- <param name="request.auth.recipient" value=""/>
- </antcall>
- <antcall target="set-wss-provider-response-auth-recipient">
- <param name="wss.provider.name" value="ClientProvider"/>
- <param name="response.auth.recipient" value=""/>
- </antcall>
- <antcall target="disable-wss-message-security-provider"/>
- <antcall target="disable-wss-appclient-message-security-provider">
- <param name="wss.client.provider.name" value="ClientProvider"/>
- </antcall>
- <antcall target="unset-wss-appclient-request-recipient">
- <param name="request.auth.recipient" value="before-content"/>
- </antcall>
- <antcall target="unset-wss-appclient-response-recipient">
- <param name="response.auth.recipient" value="after-content"/>
- </antcall>
- <antcall target="restart-server-instance-common" />
- </target>
-
-
- <target name="runwstargets">
- <antcall target="servletws"/>
- </target>
-
-<!-- ======== Targets by technology ========== -->
-
- <target name="servletws">
- <record name="security-wss.output" action="start" />
- <ant dir="servletws" target="${ws-target}"/>
- <record name="security-wss.output" action="stop" />
- </target>
- <target name="usage">
- <echo> 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
- </echo>
- </target>
-</project>
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 07dbc73..0000000
--- 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 082c99c..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.properties
+++ /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
-
--->
-
-
-<property name="module" value="ws"/>
-<property name="appname" value="${module}-taxcal"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.client.TaxCalClient"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
-<property name="wsdl-file" value="wsdl/TaxCalServletService.wsdl"/>
-<property name="client-mapping.xml" value="TaxCalClientMapping.xml"/>
-<property name="wsdlfile.location" value="wsdl"/>
-
-<!--- servlet based endpoint params -->
-<!--property name="mappingfile.location" value=""/-->
-<property name="web-mapping.xml" value="TaxCalServletMapping.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="web-webservices.xml" value="descriptor/webservices.xml"/>
-<property name="wsdlfile.name" value="TaxCalServletService.wsdl"/>
-<property name="wsdlfile.location" value="wsdl"/>
-
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 7d699c6..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/build.xml
+++ /dev/null
@@ -1,204 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonSetup SYSTEM "file:./../../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../../config/common.xml">
-<!ENTITY commonSecurity SYSTEM "file:../../../common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="SbMdbApp" default="usage" basedir=".">
-
- &commonSetup;
- &commonBuild;
- &testproperties;
- &commonSecurity;
-
- <target name="all"
- depends="clean, build, setup, deploy, run, undeploy, unsetup"/>
-
- <target name="run-test"
- depends="clean, build, deploy, run, undeploy"/>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="setup"/>
-
- <target name="unsetup"/>
-
- <target name="compile" depends="init-common,clean-common, generate-artifacts">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="web"/>
- </antcall>
- </target>
-
- <target name="generate-artifacts">
- <echo message=" Client Mapping file : ${client-mapping.xml}"/>
- <antcall target="import-wsdl">
- <param name="mapping.file"
- value="${client-mapping.xml}"/>
- <param name="config-wsdl.file"
- value="config/config-client.xml"/>
- </antcall>
- <echo message="Web Mapping File : ${web-mapping.xml}"/>
- <antcall target="import-wsdl">
- <param name="mapping.file"
- value="${web-mapping.xml}"/>
- <param name="config-wsdl.file"
- value="config/config-web.xml"/>
- </antcall>
- </target>
- <target name="ws-package-appclientjar-common">
- <mkdir dir="${assemble.dir}"/>
- <delete file="${appclient.jar}" failonerror="false"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${application-client.xml}"
- tofile="${build.classes.dir}/META-INF/application-client.xml"/>
- <copy file="${wsdl-file}"
- tofile="${build.classes.dir}/META-INF/${wsdl-file}"/>
- <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
- update="true" includes="${appclientjar.classes}"
- manifest="./client/MANIFEST.MF">
-
- <fileset dir="${build.classes.dir}" includes="${client-mapping.xml}"/>
- <metainf dir="${build.classes.dir}/META-INF">
- <include name="application-client.xml"/>
- <include name="${wsdl-file}"/>
- </metainf>
- </jar>
- <delete dir="${build.classes.dir}/META-INF" failonerror="false"/>
- </target>
- <target name="ws-package-war-common">
- <echo message="my build classes dir is:${build.classes.dir}"/>
- <delete file="${war.file}"/>
- <mkdir dir="${build.classes.dir}/tmp"/>
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF"/>
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF/classes"/>
- <copy file="${webservices.xml}"
- tofile="${build.classes.dir}/tmp/WEB-INF/webservices.xml"
- failonerror="false"/>
- <copy file="${mappingfile.location}/${mappingfile.name}"
- tofile="${build.classes.dir}/tmp/${mappingfile.name}"
- failonerror="false"/>
- <copy file="${wsdlfile.location}/${wsdlfile.name}"
- tofile="${build.classes.dir}/tmp/WEB-INF/wsdl/${wsdlfile.name}"
- failonerror="false"/>
- <copy file="${web.xml}"
- tofile="${build.classes.dir}/tmp/WEB-INF/web.xml"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
- <fileset dir="${build.classes.dir}">
- <include name="${war.classes}"/>
- </fileset>
- </copy>
- <echo message="Creating war file ${war.file}"/>
- <jar jarfile="${war.file}" update="true">
- <fileset dir="${build.classes.dir}/tmp" casesensitive="yes">
- <include name="**/*class*"/>
- </fileset>
- <fileset dir="${basedir}/web" casesensitive="yes">
- <include name="**/*.html"/>
- <include name="**/*.jsp"/>
- <include name="**/*.gif"/>
- <include name="**/*.do"/>
- <exclude name="**/*.java,**/*.xml,**/*.properties"/>
- </fileset>
- <fileset dir="${build.classes.dir}/tmp/" casesensitive="true">
- <include name="WEB-INF/web.xml"/>
- <include name="WEB-INF/webservices.xml"/>
- <include name="WEB-INF/wsdl/${wsdlfile.name}"/>
- <include name="${mappingfile.name}"/>
- </fileset>
- </jar>
- <echo message="created war file ${war.file}"/>
- <delete dir="${build.classes.dir}/tmp/WEB-INF" failonerror="false"/>
- <echo message="my webclient war classes are:${webclient.war.classes}"/>
- </target>
-
- <target name="build" depends="init-common,compile">
- <antcall target="ws-package-appclientjar-common">
- <param name="appclientjar.classes"
- value="com/sun/s1asdev/security/wss/defprovider/servlet/taxcal/client/*.class" />
- <param name="appclientjar.files"
- value="${build.classes.dir}"/>
- <param name="appclient.jar"
- value="${assemble.dir}/${appname}-client.jar"/>
- </antcall>
- <!--antcall target="ws-war-common"-->
- <antcall target="ws-package-war-common">
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- <param name="war.classes"
- value="com/sun/s1asdev/security/wss/defprovider/servlet/taxcal/*.class" />
- <param name="mappingfile.name"
- value="${web-mapping.xml}" />
- <param name="mappingfile.location"
- value="${build.classes.dir}"/>
- <param name="webservices.xml"
- value="${web-webservices.xml}" />
- </antcall>
- <antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
- <target name="run" depends="init-common">
- <property name="VMARGS" value="-Djavax.net.ssl.keyStore=${mykeystore.db.file} -Djavax.net.ssl.trustStore=${mytruststore.db.file} -Djavax.net.ssl.keyStorePassword=${ssl.password} -Djavax.net.ssl.trustStorePassword=${ssl.password}"/>
- <property name="statetax-endpoint-url"
- value="http://${http.host}:${http.port}/TaxCalWSServlet/statetaxservlet"/>
- <echo message="State Tax Endpoint URL = ${statetax-endpoint-url}"/>
- <property name="fedtax-endpoint-url"
- value="http://${http.host}:${http.port}/TaxCalWSServlet/fedtaxservlet"/>
- <echo message="Fed Tax Endpoint URL = ${fedtax-endpoint-url}"/>
- <echo message="VMARGS= ${VMARGS}"/>
- <exec executable="${APPCLIENT}">
- <env key="VMARGS" value="${VMARGS}"/>
- <arg value="-client" />
- <arg value="${assemble.dir}/${appname}AppClient.jar"/>
- <arg value="-textauth"/>
- <arg value="-user"/>
- <arg value="j2ee"/>
- <arg value="-password"/>
- <arg value="j2ee"/>
- <arg line="-xml ${admin.domain.dir}/${admin.domain}/config/glassfish-acc.xml"/>
- <arg line="${statetax-endpoint-url} ${fedtax-endpoint-url}"/>
- </exec>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
-
- <!--
- =======================================================
- User Defined specific targets
- =======================================================
- -->
-</project>
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 8edeacc..0000000
--- 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 b9e1712..0000000
--- 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 e998508..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="wsdl/TaxCalServletService.wsdl"
- packageName="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.client"/>
-</configuration>
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 7f875d3..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-sei.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service name="TaxCalServletService"
- targetNamespace="http://tax.org/wsdl"
- typeNamespace="http://tax.org/types"
- packageName="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal">
- <interface name="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.FedTaxIF"
- servantName="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.FedTaxServlet"/>
- <interface name="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.StateTaxIF"
- servantName="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.StateTaxServlet">
- </interface>
- </service>
-</configuration>
-
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 4b01e8b..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/config/config-web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="wsdl/TaxCalServletService.wsdl"
- packageName="com.sun.s1asdev.security.wss.defprovider.servlet.taxcal"/>
-</configuration>
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 5a6949f..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/application-client.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>app client dd for taxcalculator</description>
- <display-name>ws-taxcalClient</display-name>
- <service-ref>
- <description>taxcal service ref</description>
- <service-ref-name>service/TaxCalServletService</service-ref-name>
- <service-interface>com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.client.TaxCalServletService</service-interface>
- <wsdl-file>META-INF/wsdl/TaxCalServletService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>TaxCalClientMapping.xml</jaxrpc-mapping-file>
- </service-ref>
-</application-client>
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 c12a697..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/application.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
-<!--
-
- 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
-
--->
-
-<application>
- <display-name>TaxCalculatorApp</display-name>
- <module>
- <web>
- <web-uri>ws-taxcal-web.war</web-uri>
- <context-root>TaxCalWSServlet</context-root>
- </web>
- </module>
- <module>
- <java>ws-taxcal-client.jar</java>
- </module>
-</application>
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 fd88537..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/web.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>TaxCal ServletWS</display-name>
- <servlet>
- <servlet-name>StateTaxServlet</servlet-name>
- <servlet-class>com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.StateTaxServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet>
- <servlet-name>FedTaxServlet</servlet-name>
- <servlet-class>com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.FedTaxServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>StateTaxServlet</servlet-name>
- <url-pattern>/statetaxservlet</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>FedTaxServlet</servlet-name>
- <url-pattern>/fedtaxservlet</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
-</web-app>
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 1ed4f08..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/descriptor/webservices.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>TaxCalculator Servlet</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/TaxCalServletService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>TaxCalServletMapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>StateTaxIFPort</port-component-name>
- <wsdl-port xmlns:taxns="http://tax.org/wsdl">taxns:StateTaxIFPort
- </wsdl-port>
- <service-endpoint-interface>com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.StateTaxIF
- </service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>StateTaxServlet</servlet-link>
- </service-impl-bean>
- </port-component>
- <port-component>
- <description>port component description</description>
- <port-component-name>FedTaxIFPort</port-component-name>
- <wsdl-port xmlns:taxns="http://tax.org/wsdl">taxns:FedTaxIFPort
- </wsdl-port>
- <service-endpoint-interface>com.sun.s1asdev.security.wss.defprovider.servlet.taxcal.FedTaxIF
- </service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>FedTaxServlet</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 282d888..0000000
--- 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 1a7d117..0000000
--- 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 5207a81..0000000
--- 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 d216b8b..0000000
--- 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 866c9d6..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/encThenSign-default-conf/servletws/wsdl/TaxCalServletService.wsdl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<definitions name="TaxCalServletService" targetNamespace="http://tax.org/wsdl" xmlns:tns="http://tax.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types/>
- <message name="FedTaxIF_getFedTax">
- <part name="double_1" type="xsd:double"/>
- <part name="double_2" type="xsd:double"/></message>
- <message name="FedTaxIF_getFedTaxResponse">
- <part name="result" type="xsd:double"/></message>
- <message name="StateTaxIF_getStateTax">
- <part name="double_1" type="xsd:double"/>
- <part name="double_2" type="xsd:double"/></message>
- <message name="StateTaxIF_getStateTaxResponse">
- <part name="result" type="xsd:double"/></message>
- <portType name="FedTaxIF">
- <operation name="getFedTax" parameterOrder="double_1 double_2">
- <input message="tns:FedTaxIF_getFedTax"/>
- <output message="tns:FedTaxIF_getFedTaxResponse"/></operation></portType>
- <portType name="StateTaxIF">
- <operation name="getStateTax" parameterOrder="double_1 double_2">
- <input message="tns:StateTaxIF_getStateTax"/>
- <output message="tns:StateTaxIF_getStateTaxResponse"/></operation></portType>
- <binding name="FedTaxIFBinding" type="tns:FedTaxIF">
- <operation name="getFedTax">
- <input>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://tax.org/wsdl"/></input>
- <output>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://tax.org/wsdl"/></output>
- <soap:operation soapAction=""/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/></binding>
- <binding name="StateTaxIFBinding" type="tns:StateTaxIF">
- <operation name="getStateTax">
- <input>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://tax.org/wsdl"/></input>
- <output>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://tax.org/wsdl"/></output>
- <soap:operation soapAction=""/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/></binding>
- <service name="TaxCalServletService">
- <port name="FedTaxIFPort" binding="tns:FedTaxIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/></port>
- <port name="StateTaxIFPort" binding="tns:StateTaxIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/></port></service></definitions>
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 aecdd5f..3ae27ac 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 @@
</antcall>
<javac srcdir="client" destdir="${build.classes.dir}/client"
- classpath="${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:${build.classes.dir}/ejbws:${build.classes.dir}/servletws/WEB-INF/classes:${build.classes.dir}/client" debug="on" failonerror="true"/>
+ 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"/>
</target>
<target name="build" depends="compile">
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 7d16e8e..21251cc 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 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE
+<!DOCTYPE sun-application-client PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN'
+ 'http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd'>
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
@@ -18,8 +19,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'>
<sun-application-client>
<service-ref>
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 6a479b7..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/build.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonSetup SYSTEM "file:../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:../../../../config/common.xml">
-<!ENTITY commonRun SYSTEM "file:../../../../config/run.xml">
-<!ENTITY commonSecurity SYSTEM "file:../../common.xml">
-]>
-
-
-<project name="wss-permethod" default="usage" basedir=".">
- &commonSetup;
- &commonBuild;
- &commonSecurity;
- &commonRun;
-
- <property name="ws-target" value="all"/>
-
-<!-- ======== Targets by execution granularity ========== -->
- <target name="all">
- <antcall target="setup"/>
- <antcall target="runwstargets">
- <param name="ws-target" value="all"/>
- </antcall>
- <antcall target="unsetup"/>
- </target>
-
- <target name="run-test">
- <antcall target="runwstargets">
- <param name="ws-target" value="run-test"/>
- </antcall>
- </target>
-
- <target name="clean">
- <antcall target="runwstargets">
- <param name="ws-target" value="clean"/>
- </antcall>
- </target>
-
- <target name="build">
- <antcall target="runwstargets">
- <param name="ws-target" value="build"/>
- </antcall>
- </target>
-
- <target name="deploy">
- <antcall target="runwstargets">
- <param name="ws-target" value="deploy"/>
- </antcall>
- </target>
-
- <target name="undeploy">
- <antcall target="runwstargets">
- <param name="ws-target" value="undeploy"/>
- </antcall>
- </target>
-
- <target name="run">
- <antcall target="runwstargets">
- <param name="ws-target" value="run"/>
- </antcall>
- </target>
-
- <target name="setup" depends="init-common">
- <!-- exports certdb stuff and imports into keystore -->
- <antcall target="prepare-store-nickname-common">
- <param name="cert.nickname" value="s1as"/>
- </antcall>
- </target>
-
- <target name="unsetup" depends="init-common" >
- </target>
-
-
- <target name="runwstargets">
- <antcall target="servletws"/>
- </target>
-
-<!-- ======== Targets by technology ========== -->
-
- <target name="servletws">
- <record name="security-wss.output" action="start" />
- <ant dir="servletws" target="${ws-target}"/>
- <record name="security-wss.output" action="stop" />
- </target>
- <target name="usage">
- <echo> 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
- </echo>
- </target>
-</project>
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 79f306a..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.properties
+++ /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
-
--->
-
-
-<property name="module" value="security-wss-permethod-servlet"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="com.sun.s1asdev.security.wss.permethod.servlet.client.Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
-<property name="wsdl-file" value="wsdl/HelloServletService.wsdl"/>
-<property name="client-mapping.xml" value="HelloClientMapping.xml"/>
-<property name="wsdlfile.location" value="wsdl"/>
-
-<!--- servlet based endpoint params -->
-<!--property name="mappingfile.location" value=""/-->
-<property name="web-mapping.xml" value="HelloServletMapping.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="web-webservices.xml" value="descriptor/webservices.xml"/>
-<property name="wsdlfile.name" value="HelloServletService.wsdl"/>
-<property name="wsdlfile.location" value="wsdl"/>
-
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 e182731..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/build.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonSetup SYSTEM "file:./../../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../../config/common.xml">
-<!ENTITY commonSecurity SYSTEM "file:../../../common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="wss-permethod" default="usage" basedir=".">
-
- &commonSetup;
- &commonBuild;
- &testproperties;
- &commonSecurity;
-
- <target name="all"
- depends="clean, build, setup, deploy, run, undeploy, unsetup"/>
-
- <target name="run-test"
- depends="clean, build, deploy, run, undeploy"/>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="setup">
- <antcall target="create-user-common">
- <param name="user" value="j2ee"/>
- <param name="password" value="j2ee"/>
- <param name="groups" value="j2ee"/>
- </antcall>
- </target>
-
- <target name="unsetup">
- <antcall target="delete-user-common">
- <param name="user" value="j2ee"/>
- </antcall>
- </target>
-
- <target name="compile" depends="init-common,clean-common, generate-artifacts">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="web"/>
- </antcall>
- </target>
-
- <target name="generate-artifacts">
- <echo message=" Client Mapping file : ${client-mapping.xml}"/>
- <antcall target="import-wsdl">
- <param name="mapping.file"
- value="${client-mapping.xml}"/>
- <param name="config-wsdl.file"
- value="config/config-client.xml"/>
- </antcall>
- <echo message="Web Mapping File : ${web-mapping.xml}"/>
- <antcall target="import-wsdl">
- <param name="mapping.file"
- value="${web-mapping.xml}"/>
- <param name="config-wsdl.file"
- value="config/config-web.xml"/>
- </antcall>
- </target>
- <target name="ws-package-appclientjar-common">
- <mkdir dir="${assemble.dir}"/>
- <delete file="${appclient.jar}" failonerror="false"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${application-client.xml}"
- tofile="${build.classes.dir}/META-INF/application-client.xml"/>
- <copy file="${sun-application-client.xml}"
- tofile="${build.classes.dir}/META-INF/sun-application-client.xml"/>
- <copy file="${wsdl-file}"
- tofile="${build.classes.dir}/META-INF/${wsdl-file}"/>
- <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
- update="true" includes="${appclientjar.classes}"
- manifest="./client/MANIFEST.MF">
-
- <fileset dir="${build.classes.dir}" includes="${client-mapping.xml}"/>
- <metainf dir="${build.classes.dir}/META-INF">
- <include name="application-client.xml"/>
- <include name="sun-application-client.xml"/>
- <include name="${wsdl-file}"/>
- </metainf>
- </jar>
- <delete dir="${build.classes.dir}/META-INF" failonerror="false"/>
- </target>
- <target name="ws-package-war-common">
- <echo message="my build classes dir is:${build.classes.dir}"/>
- <delete file="${war.file}"/>
- <mkdir dir="${build.classes.dir}/tmp"/>
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF"/>
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF/classes"/>
- <copy file="${sun-web.xml}"
- tofile="${build.classes.dir}/tmp/WEB-INF/sun-web.xml" failonerror="false"/>
- <copy file="${webservices.xml}"
- tofile="${build.classes.dir}/tmp/WEB-INF/webservices.xml"
- failonerror="false"/>
- <copy file="${mappingfile.location}/${mappingfile.name}"
- tofile="${build.classes.dir}/tmp/${mappingfile.name}"
- failonerror="false"/>
- <copy file="${wsdlfile.location}/${wsdlfile.name}"
- tofile="${build.classes.dir}/tmp/WEB-INF/wsdl/${wsdlfile.name}"
- failonerror="false"/>
- <copy file="${web.xml}"
- tofile="${build.classes.dir}/tmp/WEB-INF/web.xml"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF/classes">
- <fileset dir="${build.classes.dir}">
- <include name="${war.classes}"/>
- </fileset>
- </copy>
- <echo message="Creating war file ${war.file}"/>
- <jar jarfile="${war.file}" update="true">
- <fileset dir="${build.classes.dir}/tmp" casesensitive="yes">
- <include name="**/*class*"/>
- </fileset>
- <fileset dir="${basedir}/web" casesensitive="yes">
- <include name="**/*.html"/>
- <include name="**/*.jsp"/>
- <include name="**/*.gif"/>
- <include name="**/*.do"/>
- <exclude name="**/*.java,**/*.xml,**/*.properties"/>
- </fileset>
- <fileset dir="${build.classes.dir}/tmp/" casesensitive="true">
- <include name="WEB-INF/web.xml"/>
- <include name="WEB-INF/sun-web.xml"/>
- <include name="WEB-INF/webservices.xml"/>
- <include name="WEB-INF/wsdl/${wsdlfile.name}"/>
- <include name="${mappingfile.name}"/>
- </fileset>
- </jar>
- <echo message="created war file ${war.file}"/>
- <delete dir="${build.classes.dir}/tmp/WEB-INF" failonerror="false"/>
- <echo message="my webclient war classes are:${webclient.war.classes}"/>
- </target>
-
- <target name="build" depends="init-common,compile">
- <antcall target="ws-package-appclientjar-common">
- <param name="appclientjar.classes"
- value="com/sun/s1asdev/security/wss/permethod/servlet/client/*.class" />
- <param name="appclientjar.files"
- value="${build.classes.dir}"/>
- <param name="appclient.jar"
- value="${assemble.dir}/${appname}-client.jar"/>
- </antcall>
- <!--antcall target="ws-war-common"-->
- <antcall target="ws-package-war-common">
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- <param name="war.classes"
- value="com/sun/s1asdev/security/wss/permethod/servlet/*.class" />
- <param name="mappingfile.name"
- value="${web-mapping.xml}" />
- <param name="mappingfile.location"
- value="${build.classes.dir}"/>
- <param name="webservices.xml"
- value="${web-webservices.xml}" />
- </antcall>
- <antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
- <target name="run" depends="init-common">
- <property name="VMARGS" value="-Djavax.net.ssl.keyStore=${mykeystore.db.file} -Djavax.net.ssl.trustStore=${mytruststore.db.file} -Djavax.net.ssl.keyStorePassword=${ssl.password} -Djavax.net.ssl.trustStorePassword=${ssl.password}"/>
- <property name="hello-endpoint-url"
- value="http://${http.host}:${http.port}/${appname}/helloservlet"/>
- <echo message="VMARGS= ${VMARGS}"/>
- <exec executable="${APPCLIENT}">
- <env key="VMARGS" value="${VMARGS}"/>
- <arg value="-client" />
- <arg value="${assemble.dir}/${appname}AppClient.jar"/>
- <arg value="-textauth"/>
- <arg value="-user"/>
- <arg value="j2ee"/>
- <arg value="-password"/>
- <arg value="j2ee"/>
- <arg line="-xml ${admin.domain.dir}/${admin.domain}/config/glassfish-acc.xml"/>
- <arg line="${hello-endpoint-url}"/>
- </exec>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
-
- <!--
- =======================================================
- User Defined specific targets
- =======================================================
- -->
-</project>
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 4592276..0000000
--- 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 32c6d74..0000000
--- 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 7118cee..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="wsdl/HelloServletService.wsdl"
- packageName="com.sun.s1asdev.security.wss.permethod.servlet.client"/>
-</configuration>
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 e4ccf47..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-sei.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service name="HelloServletService"
- targetNamespace="http://hello.org/wsdl"
- typeNamespace="http://hello.org/types"
- packageName="com.sun.s1asdev.security.wss.permethod.servlet">
- <interface name="com.sun.s1asdev.security.wss.permethod.servlet.HelloIF"
- servantName="com.sun.s1asdev.security.wss.permethod.servlet.HelloServlet"/>
- </interface>
- </service>
-</configuration>
-
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 d8a751d..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/config/config-web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="wsdl/HelloServletService.wsdl"
- packageName="com.sun.s1asdev.security.wss.permethod.servlet"/>
-</configuration>
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 ce75975..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/application-client.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>app client dd for hello</description>
- <display-name>ws-permethod-hello</display-name>
- <service-ref>
- <description>hello service ref</description>
- <service-ref-name>service/HelloServletService</service-ref-name>
- <service-interface>com.sun.s1asdev.security.wss.permethod.servlet.client.HelloServletService</service-interface>
- <wsdl-file>META-INF/wsdl/HelloServletService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>HelloClientMapping.xml</jaxrpc-mapping-file>
- </service-ref>
-</application-client>
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 d266f7c..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/application.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
-<!--
-
- 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
-
--->
-
-<application>
- <display-name>WSSServletHelloApp</display-name>
- <module>
- <web>
- <web-uri>security-wss-permethod-servlet-web.war</web-uri>
- <context-root>security-wss-permethod-servlet</context-root>
- </web>
- </module>
- <module>
- <java>security-wss-permethod-servlet-client.jar</java>
- </module>
-</application>
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 b551342..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/HelloServletService</service-ref-name>
- <port-info>
- <wsdl-port>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- <localpart>HelloIFPort</localpart>
- </wsdl-port>
- <message-security-binding auth-layer="SOAP"
- provider-id="ClientProvider">
- <message-security>
- <message>
- <operation-name>sayHello</operation-name>
- </message>
- <request-protection/>
- <response-protection/>
- </message-security>
- <message-security>
- <message>
- <operation-name>sendSecret</operation-name>
- </message>
- <request-protection
- auth-source="content"/>
- <response-protection
- auth-source="content"/>
- </message-security>
- <message-security>
- <message>
- <operation-name>getSecret</operation-name>
- </message>
- <request-protection
- auth-source="sender"/>
- <response-protection
- auth-source="content"/>
- </message-security>
- </message-security-binding>
- </port-info>
- </service-ref>
-</sun-application-client>
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 e811ba3..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/sun-web.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <servlet>
- <servlet-name>HelloServlet</servlet-name>
- <webservice-endpoint>
- <port-component-name>HelloIFPort</port-component-name>
- <endpoint-address-uri>helloservlet</endpoint-address-uri>
- <message-security-binding auth-layer="SOAP"
- provider-id="ServerProvider">
- <message-security>
- <message>
- <operation-name>sendSecret</operation-name>
- </message>
- <request-protection
- auth-source="content"/>
- <response-protection
- auth-source="content"/>
- </message-security>
- <message-security>
- <message>
- <operation-name>getSecret</operation-name>
- </message>
- <request-protection
- auth-source="sender"/>
- <response-protection
- auth-source="content"/>
- </message-security>
- </message-security-binding>
- </webservice-endpoint>
- </servlet>
-</sun-web-app>
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 3bdd4e9..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/web.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>Hello ServletWS</display-name>
- <servlet>
- <servlet-name>HelloServlet</servlet-name>
- <servlet-class>com.sun.s1asdev.security.wss.permethod.servlet.HelloServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>HelloServlet</servlet-name>
- <url-pattern>/helloservlet</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
-</web-app>
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 0ca2051..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/descriptor/webservices.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>Hello Servlet</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/HelloServletService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>HelloServletMapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>HelloIFPort</port-component-name>
- <wsdl-port xmlns:hellons="http://hello.org/wsdl">hellons:HelloIFPort
- </wsdl-port>
- <service-endpoint-interface>com.sun.s1asdev.security.wss.permethod.servlet.HelloIF
- </service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>HelloServlet</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 6a3bd1d..0000000
--- 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 d28184c..0000000
--- 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 af7cfc0..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/permethod/servletws/wsdl/HelloServletService.wsdl
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<definitions name="HelloServletService" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types/>
- <message name="HelloIF_sayHello">
- <part name="string" type="xsd:string"/>
- </message>
- <message name="HelloIF_sayHelloResponse">
- <part name="result" type="xsd:string"/>
- </message>
- <message name="HelloIF_sendSecret">
- <part name="string" type="xsd:string"/>
- </message>
- <message name="HelloIF_sendSecretResponse">
- <part name="result" type="xsd:int"/>
- </message>
- <message name="HelloIF_getSecret">
- <part name="string" type="xsd:double"/>
- </message>
- <message name="HelloIF_getSecretResponse">
- <part name="result" type="xsd:string"/>
- </message>
- <portType name="HelloIF">
- <operation name="sayHello">
- <input message="tns:HelloIF_sayHello"/>
- <output message="tns:HelloIF_sayHelloResponse"/>
- </operation>
- <operation name="sendSecret">
- <input message="tns:HelloIF_sendSecret"/>
- <output message="tns:HelloIF_sendSecretResponse"/>
- </operation>
- <operation name="getSecret">
- <input message="tns:HelloIF_getSecret"/>
- <output message="tns:HelloIF_getSecretResponse"/>
- </operation>
- </portType>
- <binding name="HelloIFBinding" type="tns:HelloIF">
- <operation name="sayHello">
- <input>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction=""/>
- </operation>
- <operation name="sendSecret">
- <input>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction=""/>
- </operation>
- <operation name="getSecret">
- <input>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction=""/>
- </operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/> </binding>
- <service name="HelloServletService">
- <port name="HelloIFPort" binding="tns:HelloIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/>
- </port>
- </service>
-</definitions>
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 331310a..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles/build.properties
+++ /dev/null
@@ -1,37 +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
-
--->
-
-
-<property name="module" value="security-wss-roles"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="com.sun.s1asdev.security.wss.roles.client.Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="sun-ejb-jar2.xml" value="descriptor/sun-ejb-jar2.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
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 1941a54..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles/build.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonSetup SYSTEM "file:./../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../config/common.xml">
-<!ENTITY commonSecurity SYSTEM "file:../../common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="security-wss-roles" default="usage" basedir=".">
-
- &commonSetup;
- &commonBuild;
- &testproperties;
- &commonSecurity;
-
- <target name="all" depends="clean, setup, build-deploy, run, undeploy, unsetup"/>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="setup" depends="init-common">
- <antcall target="create-auth-filerealm">
- <param name="file.realm.name" value="file2"/>
- <param name="keyfile.path" value="${admin.domain.dir}/${admin.domain}/config/keyfile2"/>
- </antcall>
- <!-- <antcall target="reconfig-common"/>-->
-
- <antcall target="create-user-common">
- <param name="user" value="javaee"/>
- <param name="password" value="javaee"/>
- <param name="groups" value="javaee"/>
- <param name="authrealmname" value="file2"/>
- </antcall>
- </target>
-
- <target name="unsetup" depends="init-common">
- <antcall target="delete-user-common">
- <param name="user" value="javaee"/>
- <param name="authrealmname" value="file2"/>
- </antcall>
- <antcall target="asadmin-common">
- <param name="admin.command" value="delete-auth-realm" />
- <param name="operand.props" value="file2"/>
- </antcall>
- </target>
-
- <target name="compile-server" depends="clean">
- <antcall target="compile-common">
- <param name="src" value="ejbws"/>
- <param name="build.classes.dir" value="${build.classes.dir}/ejbws"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="ejbws2"/>
- <param name="build.classes.dir" value="${build.classes.dir}/ejbws2"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="servletws"/>
- <param name="build.classes.dir" value="${build.classes.dir}/servletws"/>
- </antcall>
- </target>
-
- <target name="compile-client">
- <mkdir dir="${build.classes.dir}/client"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/WssRolesEjbService/HelloEjb?WSDL"/>
- </antcall>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/WssRolesEjb2Service/HelloEjb2?WSDL"/>
- </antcall>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/security-wss-roles-web/webservice/WssRolesServletService/HelloServlet?WSDL"/>
- </antcall>
-
- <delete file="client/Client.java" failonerror="false"/>
- <copy file="client/Client.java.template" tofile="client/Client.java"/>
- <replace file="client/Client.java">
- <replacefilter token="@HOST@" value="${http.host}"/>
- <replacefilter token="@PORT@" value="${http.port}"/>
- </replace>
- <javac srcdir="client" destdir="${build.classes.dir}/client"
- classpath="${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:${build.classes.dir}/client" debug="on" failonerror="true"/>
- </target>
-
- <target name="build-server" depends="compile-server">
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
-
- <antcall target="package-ejbjar-common">
- <param name="ejbjar.files" value="${build.classes.dir}/ejbws"/>
- <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
- <param name="ejbjar.classes" value="com/sun/**/*.class"/>
- </antcall>
- <antcall target="package-ejbjar-common">
- <param name="ejbjar.files" value="${build.classes.dir}/ejbws2"/>
- <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb2.jar"/>
- <param name="ejbjar.classes" value="com/sun/**/*.class"/>
- <param name="sun-ejb-jar.xml" value="${sun-ejb-jar2.xml}"/>
- </antcall>
- <war destfile="${assemble.dir}/${appname}-web.war" webxml="${web.xml}">
- <classes dir="${build.classes.dir}/servletws"/>
- </war>
-
- <copy file="${sun-application.xml}" tofile="${build.classes.dir}/META-INF/sun-application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
- <fileset dir="${build.classes.dir}">
- <include name="META-INF/sun-application.xml"/>
- </fileset>
- </jar>
- </target>
-
- <target name="build-client" depends="compile-client">
- <mkdir dir="${assemble.dir}"/>
-
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <antcall target="package-appclientjar-common">
- <param name="appclientjar.files"
- value="${build.classes.dir}/client"/>
- <param name="appclient.jar"
- value="${assemble.dir}/${appname}-client.jar"/>
- <param name="appclientjar.classes"
- value="com/sun/**/*.class"/>
- </antcall>
- </target>
-
- <target name="build-deploy" depends="init-common">
- <antcall target="build-server"/>
- <antcall target="deploy-common"/>
- <antcall target="build-client"/>
- <antcall target="deploy-client-common"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient1"/>
- <antcall target="runclient2"/>
- </target>
-
- <target name="runclient1" depends="init-common">
- <exec executable="${APPCLIENT}">
- <arg line="-client" />
- <arg line="${assemble.dir}/${appname}-clientClient.jar"/>
- <arg line="-textauth"/>
- <arg line="-user" />
- <arg line="javaee" />
- <arg line="-password" />
- <arg line="javaee" />
- </exec>
- </target>
-
- <target name="runclient2" depends="init-common">
- <exec executable="${APPCLIENT}">
- <arg line="-client" />
- <arg line="${assemble.dir}/${appname}-clientClient.jar"/>
- <arg line="authprop" />
- </exec>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- <antcall target="undeploy-client-common"/>
- </target>
-
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
-</project>
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 1f0df6b..0000000
--- 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<String, Object> 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 6e24fb0..0000000
--- 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 5b3df2c..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/sun-application.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 J2EE Application 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application_1_4-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application>
- <unique-id>0</unique-id>
- <security-role-mapping>
- <role-name>javaee</role-name>
- <principal-name>javaee</principal-name>
- </security-role-mapping>
- <security-role-mapping>
- <role-name>ejbuser</role-name>
- <principal-name>ejbuser</principal-name>
- </security-role-mapping>
- <realm>file2</realm>
-</sun-application>
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 3a6754d..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <ejb>
- <ejb-name>HelloEjb</ejb-name>
- <webservice-endpoint>
- <port-component-name>HelloEjb</port-component-name>
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm>file2</realm>
- </login-config>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
-
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 7b2352a..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/sun-ejb-jar2.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <ejb>
- <ejb-name>HelloEjb2</ejb-name>
- <webservice-endpoint>
- <port-component-name>HelloEjb2</port-component-name>
- <login-config>
- <auth-method>BASIC</auth-method>
- </login-config>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
-
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 a008245..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles/descriptor/web.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
- <servlet>
- <servlet-name>HelloServlet</servlet-name>
- <servlet-class>com.sun.s1asdev.security.wss.roles.servletws.HelloServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>HelloServlet</servlet-name>
- <url-pattern>/webservice/WssRolesServletService/HelloServlet</url-pattern>
- </servlet-mapping>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Secure Area</web-resource-name>
- <url-pattern>/webservice/WssRolesServletService/HelloServlet</url-pattern>
- <http-method>POST</http-method>
- </web-resource-collection>
- <auth-constraint>
- <role-name>javaee</role-name>
- </auth-constraint>
- </security-constraint>
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>file2</realm-name>
- </login-config>
- <security-role>
- <role-name>javaee</role-name>
- </security-role>
-</web-app>
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 5564a6c..0000000
--- 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 1c98945..0000000
--- 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 e73d0da..0000000
--- 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 d722d7d..0000000
--- 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 ed684cc..0000000
--- 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 7097c0c..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/build.properties
+++ /dev/null
@@ -1,35 +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
-
--->
-
-
-<property name="module" value="security-wss-roles2"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="com.sun.s1asdev.security.wss.roles2.client.Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
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 04a70cb..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/build.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonSetup SYSTEM "file:./../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../config/common.xml">
-<!ENTITY commonSecurity SYSTEM "file:../../common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="security-wss-roles2" default="usage" basedir=".">
-
- &commonSetup;
- &commonBuild;
- &testproperties;
- &commonSecurity;
-
- <target name="all" depends="clean, setup, build-deploy, run, undeploy, unsetup"/>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="setup" depends="init-common">
- <antcall target="create-user-common">
- <param name="user" value="javaee"/>
- <param name="password" value="javaee"/>
- <param name="groups" value="javaee"/>
- </antcall>
- <!-- exports certdb stuff and imports into keystore -->
- <antcall target="prepare-store-nickname-common">
- <param name="cert.nickname" value="s1as"/>
- </antcall>
- </target>
-
- <target name="unsetup" depends="init-common">
- <antcall target="delete-user-common">
- <param name="user" value="javaee"/>
- </antcall>
- </target>
-
- <target name="compile-server" depends="clean">
- <antcall target="compile-common">
- <param name="src" value="ejbws"/>
- <param name="build.classes.dir" value="${build.classes.dir}/ejbws"/>
- </antcall>
- </target>
-
- <target name="compile-client">
- <mkdir dir="${build.classes.dir}/client"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/WssRoles2EjbService/HelloEjb?WSDL"/>
- </antcall>
-
- <delete file="client/Client.java" failonerror="false"/>
- <copy file="client/Client.java.template" tofile="client/Client.java"/>
- <replace file="client/Client.java">
- <replacefilter token="@HOST@" value="${http.host}"/>
- <replacefilter token="@PORT@" value="${http.port}"/>
- </replace>
- <javac srcdir="client" destdir="${build.classes.dir}/client"
- classpath="${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:${build.classes.dir}/client" debug="on" failonerror="true"/>
- </target>
-
- <target name="build-server" depends="compile-server">
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
-
- <antcall target="package-ejbjar-common">
- <param name="ejbjar.files" value="${build.classes.dir}/ejbws"/>
- <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
- <param name="ejbjar.classes" value="com/sun/**/*.class"/>
- </antcall>
- </target>
-
- <target name="build-client" depends="compile-client">
- <mkdir dir="${assemble.dir}"/>
-
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <antcall target="package-appclientjar-common">
- <param name="appclientjar.files"
- value="${build.classes.dir}/client"/>
- <param name="appclient.jar"
- value="${assemble.dir}/${appname}-client.jar"/>
- <param name="appclientjar.classes"
- value="com/sun/**/*.class"/>
- </antcall>
- </target>
-
- <target name="build-deploy" depends="init-common">
- <antcall target="build-server"/>
- <antcall target="deploy-jar-common"/>
- <antcall target="build-client"/>
- <antcall target="deploy-client-common"/>
- </target>
-
- <target name="run" depends="init-common">
- <exec executable="${APPCLIENT}">
- <env key="VMARGS" value="-Djavax.net.ssl.keyStore=${mykeystore.db.file} -Djavax.net.ssl.trustStore=${mytruststore.db.file} -Djavax.net.ssl.keyStorePassword=${ssl.password} -Djavax.net.ssl.trustStorePassword=${ssl.password}"/>
- <arg line="-xml ${env.S1AS_HOME}/domains/domain1/config/glassfish-acc.xml" />
- <arg line="-client" />
- <arg line="${assemble.dir}/${appname}-clientClient.jar"/>
- <arg line="-texauth"/>
- <arg line="-user" />
- <arg line="javaee" />
- <arg line="-password" />
- <arg line="javaee" />
- </exec>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-jar-common"/>
- <antcall target="undeploy-client-common"/>
- </target>
-
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
-</project>
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 c3b1161..0000000
--- 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 f9a55a7..0000000
--- 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 7fef3f0..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>com.sun.s1asdev.security.wss.roles2.client.Client/service</service-ref-name>
- <port-info>
- <wsdl-port>
- <namespaceURI>http://ejbws.roles2.wss.security.s1asdev.sun.com</namespaceURI>
- <localpart>HelloEjbPort</localpart>
- </wsdl-port>
- <message-security-binding auth-layer="SOAP"
- provider-id="XWS_ClientProvider">
- <message-security>
- <message/>
- <request-protection auth-source="sender"/>
- <response-protection auth-source="content"/>
- </message-security>
- </message-security-binding>
- </port-info>
- </service-ref>
-</sun-application-client>
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 81ea10e..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/roles2/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <security-role-mapping>
- <role-name>javaee</role-name>
- <principal-name>javaee</principal-name>
- </security-role-mapping>
- <security-role-mapping>
- <role-name>javaeegp</role-name>
- <group-name>javaee</group-name>
- </security-role-mapping>
- <security-role-mapping>
- <role-name>ejbuser</role-name>
- <principal-name>ejbuser</principal-name>
- </security-role-mapping>
- <security-role-mapping>
- <role-name>j2ee</role-name>
- <principal-name>j2ee</principal-name>
- </security-role-mapping>
-
- <enterprise-beans>
- <ejb>
- <ejb-name>HelloEjb</ejb-name>
- <webservice-endpoint>
- <port-component-name>HelloEjb</port-component-name>
- <endpoint-address-uri>/WssRoles2EjbService/HelloEjb</endpoint-address-uri>
- <message-security-binding auth-layer="SOAP"
- provider-id="XWS_ServerProvider">
- <message-security>
- <message/>
- <request-protection auth-source="sender"/>
- <response-protection auth-source="content"/>
- </message-security>
- </message-security-binding>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
-
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 467f0fa..0000000
--- 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 4f1faf8..0000000
--- 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 02a8411..0000000
--- 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 debfd65..0000000
--- 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 ae59099..0000000
--- 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 e91a248..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/build.properties
+++ /dev/null
@@ -1,36 +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
-
--->
-
-
-<property name="module" value="security-wss-ssl"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="com.sun.s1asdev.security.wss.ssl.client.Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
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 d7df978..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/build.xml
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonSetup SYSTEM "file:./../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../config/common.xml">
-<!ENTITY commonSecurity SYSTEM "file:../../common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="security-wss-ssl" default="usage" basedir=".">
-
- &commonSetup;
- &commonBuild;
- &testproperties;
- &commonSecurity;
-
- <target name="all" depends="clean, setup, build-deploy, run, undeploy, unsetup"/>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="setup" depends="init-common">
- </target>
-
- <target name="unsetup" depends="init-common">
- </target>
-
- <target name="compile-server" depends="clean">
- <antcall target="compile-common">
- <param name="src" value="ejbws"/>
- <param name="build.classes.dir" value="${build.classes.dir}/ejbws"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="servletws"/>
- <param name="build.classes.dir" value="${build.classes.dir}/servletws"/>
- </antcall>
- </target>
-
- <target name="compile-client" depends="prepare-truststore-common, init-security-util">
- <mkdir dir="${build.classes.dir}/client"/>
- <antcall target="wsimport">
- <!--value="-keep -d ${build.classes.dir}/client https://${s1asCN}:${https.port}/WssSslEjbService/HelloEjb?WSDL"/>-->
- <param name="wsimport.VMARGS" value=" -Djavax.net.ssl.trustStore=${build.base.dir}/cacerts.jks -Djavax.net.ssl.trustStorePassword=${ssl.password}"/>
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client https://${s1asCN}:${https.port}/WssSslEjbService/HelloEjb?WSDL"/>
- </antcall>
- <antcall target="wsimport">
- <param name="wsimport.VMARGS" value=" -Djavax.net.ssl.trustStore=${build.base.dir}/cacerts.jks -Djavax.net.ssl.trustStorePassword=${ssl.password}"/>
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client https://${s1asCN}:${https.port}/security-wss-ssl/webservice/WssSslServletService/HelloServlet?WSDL"/>
- </antcall>
-
- <delete file="client/Client.java" failonerror="false"/>
- <copy file="client/Client.java.template" tofile="client/Client.java"/>
- <replace file="client/Client.java">
- <replacefilter token="@HOST@" value="${s1asCN}"/>
- <replacefilter token="@PORT@" value="${https.port}"/>
- </replace>
- <javac srcdir="client" destdir="${build.classes.dir}/client"
- classpath="${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:${build.classes.dir}/client" debug="on" failonerror="true"/>
- </target>
-
- <target name="build-server" depends="compile-server">
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
-
- <antcall target="package-ejbjar-common">
- <param name="ejbjar.files" value="${build.classes.dir}/ejbws"/>
- <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
- <param name="ejbjar.classes" value="com/sun/**/*.class"/>
- </antcall>
-
- <antcall target="package-war-common">
- <param name="war.classes" value="${build.classes.dir}/servletws"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
-
- <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
- <fileset dir="${build.classes.dir}">
- <include name="META-INF/application.xml"/>
- </fileset>
- </jar>
- </target>
-
- <target name="build-client" depends="compile-client">
- <mkdir dir="${assemble.dir}"/>
-
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <antcall target="package-appclientjar-common">
- <param name="appclientjar.files"
- value="${build.classes.dir}/client"/>
- <param name="appclient.jar"
- value="${assemble.dir}/${appname}-client.jar"/>
- <param name="appclientjar.classes"
- value="com/sun/**/*.class"/>
- </antcall>
- </target>
-
- <target name="build-deploy" depends="init-common">
- <antcall target="build-server"/>
- <antcall target="deploy-common"/>
- <antcall target="build-client"/>
- <antcall target="deploy-client-common"/>
- </target>
-
- <target name="run" depends="prepare-truststore-common">
- <exec executable="${APPCLIENT}">
- <env key="VMARGS" value=" -Djavax.net.ssl.trustStore=${build.base.dir}/cacerts.jks -Djavax.net.ssl.trustStorePassword=${ssl.password}"/>
- <arg line="-client" />
- <arg line="${assemble.dir}/${appname}-clientClient.jar"/>
- <arg line="-texauth"/>
- <arg line="-user" />
- <arg line="dummy" />
- <arg line="-password" />
- <arg line="dummy" />
- </exec>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- <antcall target="undeploy-client-common"/>
- </target>
-
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
-</project>
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 3a16825..0000000
--- 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 4a95741..0000000
--- 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 cd0b2e9..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/descriptor/application.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
-<!--
-
- 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
-
--->
-
-<application>
- <display-name>security-wss-sslApp</display-name>
- <module>
- <ejb>security-wss-ssl-ejb.jar</ejb>
- </module>
- <module>
- <web>
- <web-uri>security-wss-ssl-web.war</web-uri>
- <context-root>security-wss-ssl</context-root>
- </web>
- </module>
-</application>
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 5cf6228..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <ejb>
- <ejb-name>HelloEjb</ejb-name>
- <webservice-endpoint>
- <port-component-name>HelloEjb</port-component-name>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
-
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 9ede38c..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/ssl/descriptor/web.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
- <description>SSL WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>HelloServlet</servlet-name>
- <servlet-class>com.sun.s1asdev.security.wss.ssl.servletws.HelloServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>HelloServlet</servlet-name>
- <url-pattern>/webservice/WssSslServletService/HelloServlet</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/webservice/WssSslServletService/HelloServlet</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- </web-resource-collection>
- <user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-</web-app>
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 8d14ac3..0000000
--- 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 57db6b6..0000000
--- 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 050c8b5..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.properties
+++ /dev/null
@@ -1,36 +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
-
--->
-
-
-<property name="module" value="security-wss-sslclientcert"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="com.sun.s1asdev.security.wss.sslclientcert.client.Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
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 2a8260e..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/build.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE project [
-<!--
-
- 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
-
--->
-
-<!ENTITY commonSetup SYSTEM "file:./../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../config/common.xml">
-<!ENTITY commonSecurity SYSTEM "file:../../common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="security-wss-sslclientcert" default="usage" basedir=".">
-
- &commonSetup;
- &commonBuild;
- &testproperties;
- &commonSecurity;
-
- <target name="all" depends="clean, setup, build-deploy, run, undeploy, unsetup"/>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="setup" depends="init-common">
- <!-- exports certdb stuff and imports into keystore -->
- <antcall target="prepare-store-nickname-common">
- <param name="cert.nickname" value="s1as"/>
- </antcall>
- </target>
-
- <target name="unsetup" depends="init-common">
- </target>
-
- <target name="compile-server" depends="clean">
- <antcall target="compile-common">
- <param name="src" value="ejbws"/>
- <param name="build.classes.dir" value="${build.classes.dir}/ejbws"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="servletws"/>
- <param name="build.classes.dir" value="${build.classes.dir}/servletws"/>
- </antcall>
- </target>
-
- <target name="compile-client" depends="init-common, init-security-util">
- <mkdir dir="${build.classes.dir}/client"/>
- <antcall target="wsimport">
- <param name="wsimport.VMARGS" value=" -Djavax.net.ssl.trustStore=${mytruststore.db.file} -Djavax.net.ssl.trustStorePassword=${ssl.password}"/>
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client https://${s1asCN}:${https.port}/WssSslClientCertEjbService/HelloEjb?WSDL"/>
- </antcall>
- <antcall target="wsimport">
- <param name="wsimport.VMARGS" value=" -Djavax.net.ssl.trustStore=${mytruststore.db.file} -Djavax.net.ssl.trustStorePassword=${ssl.password}"/>
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client https://${s1asCN}:${https.port}/security-wss-sslclientcert/webservice/WssSslClientCertServletService/HelloServlet?WSDL"/>
- </antcall>
-
- <delete file="client/Client.java" failonerror="false"/>
- <copy file="client/Client.java.template" tofile="client/Client.java"/>
- <replace file="client/Client.java">
- <replacefilter token="@HOST@" value="${s1asCN}"/>
- <replacefilter token="@PORT@" value="${https.port}"/>
- </replace>
- <javac srcdir="client" destdir="${build.classes.dir}/client"
- classpath="${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:${build.classes.dir}/client" debug="on" failonerror="true"/>
- </target>
-
- <target name="build-server" depends="compile-server, init-security-util">
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
-
- <antcall target="package-ejbjar-common">
- <param name="ejbjar.files" value="${build.classes.dir}/ejbws"/>
- <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
- <param name="ejbjar.classes" value="com/sun/**/*.class"/>
- </antcall>
-
- <antcall target="package-war-common">
- <param name="war.classes" value="${build.classes.dir}/servletws"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
-
- <copy file="descriptor/sun-application.xml.template" tofile="${build.classes.dir}/META-INF/sun-application.xml"/>
- <replace file="${build.classes.dir}/META-INF/sun-application.xml">
- <replacefilter token="@HOST@" value="${s1asCN}"/>
- </replace>
- <copy file="${application.xml}" tofile="${build.classes.dir}/META-INF/application.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}App.ear">
- <fileset dir="${assemble.dir}">
- <include name="*.jar"/>
- <include name="*.war"/>
- </fileset>
- <fileset dir="${build.classes.dir}">
- <include name="META-INF/application.xml"/>
- <include name="META-INF/sun-application.xml"/>
- </fileset>
- </jar>
- </target>
-
- <target name="build-client" depends="compile-client">
- <mkdir dir="${assemble.dir}"/>
-
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <antcall target="package-appclientjar-common">
- <param name="appclientjar.files"
- value="${build.classes.dir}/client"/>
- <param name="appclient.jar"
- value="${assemble.dir}/${appname}-client.jar"/>
- <param name="appclientjar.classes"
- value="com/sun/**/*.class"/>
- </antcall>
- </target>
-
- <target name="build-deploy" depends="init-common">
- <antcall target="build-server"/>
- <antcall target="deploy-common"/>
- <antcall target="build-client"/>
- <antcall target="deploy-client-common"/>
- </target>
-
- <target name="run" depends="init-common">
- <exec executable="${APPCLIENT}">
- <env key="VMARGS" value=" -Djavax.net.ssl.trustStore=${mytruststore.db.file} -Djavax.net.ssl.trustStorePassword=${ssl.password} -Djavax.net.ssl.keyStore=${mykeystore.db.file} -Djavax.net.ssl.keyStorePassword=${ssl.password}"/>
- <arg line="-client" />
- <arg line="${assemble.dir}/${appname}-clientClient.jar"/>
- <arg line="-texauth"/>
- <arg line="-user" />
- <arg line="dummy" />
- <arg line="-password" />
- <arg line="dummy" />
- </exec>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- <antcall target="undeploy-client-common"/>
- </target>
-
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
-</project>
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 873fe6a..0000000
--- 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 2f0095f..0000000
--- 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 92757d8..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/application.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
-<!--
-
- 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
-
--->
-
-<application>
- <display-name>security-wss-sslclientcertApp</display-name>
- <module>
- <ejb>security-wss-sslclientcert-ejb.jar</ejb>
- </module>
- <module>
- <web>
- <web-uri>security-wss-sslclientcert-web.war</web-uri>
- <context-root>security-wss-sslclientcert</context-root>
- </web>
- </module>
-</application>
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 64a3d8c..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/sun-application.xml.template
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!--
-
- 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
-
--->
-
-<sun-application>
- <security-role-mapping>
- <role-name>SECUSER</role-name>
- <principal-name>CN=@HOST@, OU=GlassFish, O=Sun Microsystems, L=Santa Clara, ST=California, C=US</principal-name>
- </security-role-mapping>
-</sun-application>
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 4d7852d..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <ejb>
- <ejb-name>HelloEjb</ejb-name>
- <webservice-endpoint>
- <port-component-name>HelloEjb</port-component-name>
- <login-config>
- <auth-method>CLIENT-CERT</auth-method>
- </login-config>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
-
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 fc44e33..0000000
--- a/appserver/tests/appserv-tests/devtests/security/wss/sslclientcert/descriptor/web.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
-
- <description>SSL WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>HelloServlet</servlet-name>
- <servlet-class>com.sun.s1asdev.security.wss.sslclientcert.servletws.HelloServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>HelloServlet</servlet-name>
- <url-pattern>/webservice/WssSslClientCertServletService/HelloServlet</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/webservice/WssSslClientCertServletService/HelloServlet</url-pattern>
- <http-method>POST</http-method>
- </web-resource-collection>
- <auth-constraint>
- <role-name>SECUSER</role-name>
- </auth-constraint>
- <user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <login-config>
- <auth-method>CLIENT-CERT</auth-method>
- </login-config>
- <security-role>
- <role-name>SECUSER</role-name>
- </security-role>
-</web-app>
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 838e372..0000000
--- 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 c5ab01a..0000000
--- 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;
- }
-}
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 0d4bfa1..0000000
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project default="-deploy-ant" basedir=".">
- <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
- <property file="${deploy.ant.properties.file}" />
- <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
- <available file="${deploy.ant.resource.dir}" property="has.setup"/>
- <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
- </target>
-
- <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
- <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
- <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
- <!-- The doctype triggers resolution which can fail -->
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
- <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
- </replace>
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
- <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
- </replace>
- <xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
- <delete file="${temp.sun.web}"/>
- <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
- <property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
- </target>
- <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
- <property name="deploy.context.root.argument" value=""/>
- </target>
- <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
- <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
- <mkdir dir="${gfv3.resources.dir}"/>
- <mkdir dir="${gfv3.resources.dir}/META-INF"/>
- <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
- <copy todir="${gfv3.resources.dir}/META-INF">
- <fileset dir="${deploy.ant.resource.dir}"/>
- </copy>
- <jar destfile="${deploy.ant.archive}" update="true">
- <fileset dir="${gfv3.resources.dir}"/>
- </jar>
- <delete dir="${gfv3.resources.dir}"/>
- </target>
- <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
- <antcall target="-deploy-without-pw"/>
- <antcall target="-deploy-with-pw"/>
- </target>
-
- <target name="-deploy-without-pw" unless="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-deploy-with-pw" if="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
- <antcall target="-undeploy-without-pw"/>
- <antcall target="-undeploy-with-pw"/>
- </target>
-
- <target name="-undeploy-without-pw" unless="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-with-pw" if="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
-</project>
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 39049ec..0000000
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml
+++ /dev/null
@@ -1,979 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!--
- *** GENERATED FROM project.xml - DO NOT EDIT ***
- *** EDIT ../build.xml INSTEAD ***
-
- For the purpose of easier reading the script
- is divided into following sections:
- - initialization
- - compilation
- - dist
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - cleanup
-
- -->
-<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="SFSBDriver-impl">
- <import file="ant-deploy.xml"/>
- <fail message="Please build using Ant 1.7.1 or higher.">
- <condition>
- <not>
- <antversion atleast="1.7.1"/>
- </not>
- </condition>
- </fail>
- <target depends="dist,javadoc" description="Build whole project." name="default"/>
- <!--
- INITIALIZATION SECTION
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init" name="-init-private">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target depends="-pre-init,-init-private" name="-init-user">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user" name="-init-project">
- <property file="nbproject/project.properties"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="javac.compilerargs" value=""/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <condition property="no.dist.ear.dir">
- <not>
- <isset property="dist.ear.dir"/>
- </not>
- </condition>
- <property name="build.web.excludes" value="${build.classes.excludes}"/>
- <condition property="do.compile.jsps">
- <istrue value="${compile.jsps}"/>
- </condition>
- <condition property="do.debug.server">
- <or>
- <not>
- <isset property="debug.server"/>
- </not>
- <istrue value="${debug.server}"/>
- <and>
- <not>
- <istrue value="${debug.server}"/>
- </not>
- <not>
- <istrue value="${debug.client}"/>
- </not>
- </and>
- </or>
- </condition>
- <condition property="do.debug.client">
- <istrue value="${debug.client}"/>
- </condition>
- <condition property="do.display.browser">
- <istrue value="${display.browser}"/>
- </condition>
- <condition property="do.display.browser.debug">
- <and>
- <isset property="do.display.browser"/>
- <not>
- <isset property="do.debug.client"/>
- </not>
- </and>
- </condition>
- <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
- <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
- <condition property="do.war.package.with.custom.manifest">
- <isset property="has.custom.manifest"/>
- </condition>
- <condition property="do.war.package.without.custom.manifest">
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- </condition>
- <condition property="do.tmp.war.package.with.custom.manifest">
- <and>
- <isset property="has.custom.manifest"/>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package.without.custom.manifest">
- <and>
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package">
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </condition>
- <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
- <condition else="" property="application.args.param" value="${application.args}">
- <and>
- <isset property="application.args"/>
- <not>
- <equals arg1="${application.args}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <property name="source.encoding" value="${file.encoding}"/>
- <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
- <and>
- <isset property="javadoc.encoding"/>
- <not>
- <equals arg1="${javadoc.encoding}" arg2=""/>
- </not>
- </and>
- </condition>
- <property name="javadoc.encoding.used" value="${source.encoding}"/>
- <property name="includes" value="**"/>
- <property name="excludes" value=""/>
- <property name="runmain.jvmargs" value=""/>
- <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
- <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
- <length length="0" string="${endorsed.classpath}" when="greater"/>
- </condition>
- </target>
- <target depends="init" name="-init-cos" unless="deploy.on.save">
- <condition property="deploy.on.save" value="true">
- <istrue value="${j2ee.deploy.on.save}"/>
- </condition>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="build.web.dir">Must set build.web.dir</fail>
- <fail unless="build.generated.dir">Must set build.generated.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.war">Must set dist.war</fail>
- <condition property="missing.j2ee.server.home">
- <and>
- <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
- <not>
- <isset property="j2ee.server.home"/>
- </not>
- </and>
- </condition>
- <fail if="missing.j2ee.server.home">
-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>
- </fail>
- <fail unless="j2ee.platform.classpath">
-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)
- </fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <mkdir dir="@{apgeneratedsrcdir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <compilerarg value="-processorpath"/>
- <compilerarg path="@{processorpath}:${empty.dir}"/>
- <compilerarg line="${ap.processors.internal}"/>
- <compilerarg value="-s"/>
- <compilerarg path="@{apgeneratedsrcdir}"/>
- <compilerarg line="${ap.proc.none.internal}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
- <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </depend>
- </sequential>
- </macrodef>
- <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${build.classes.dir}" name="destdir"/>
- <sequential>
- <fail unless="javac.includes">Must set javac.includes</fail>
- <pathconvert pathsep="," property="javac.includes.binary">
- <path>
- <filelist dir="@{destdir}" files="${javac.includes}"/>
- </path>
- <globmapper from="*.java" to="*.class"/>
- </pathconvert>
- <delete>
- <files includes="${javac.includes.binary}"/>
- </delete>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="**" name="testincludes"/>
- <sequential>
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}" name="classpath"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjsdebug">
- <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${client.url}" name="webUrl"/>
- <sequential>
- <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="name"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${build.classes.dir}" name="dir"/>
- <sequential>
- <nbjpdareload>
- <fileset dir="@{dir}" includes="${fix.classes}">
- <include name="${fix.includes}*.class"/>
- </fileset>
- </nbjpdareload>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
- <sequential>
- <nbjpdaappreloaded/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
- <os family="windows"/>
- </condition>
- <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
- <isset property="debug.transport"/>
- </condition>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${application.args.param}" name="args"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <arg line="@{args}"/>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-taskdefs">
- <fail unless="libs.CopyLibs.classpath">
-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
- </fail>
- <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
- </target>
- <target name="-init-ap-cmdline-properties">
- <property name="annotation.processing.enabled" value="true"/>
- <property name="annotation.processing.processors.list" value=""/>
- <property name="annotation.processing.run.all.processors" value="true"/>
- <property name="javac.processorpath" value="${javac.classpath}"/>
- <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
- <condition property="ap.supported.internal" value="true">
- <not>
- <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
- </not>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
- <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
- <isfalse value="${annotation.processing.run.all.processors}"/>
- </condition>
- <condition else="" property="ap.proc.none.internal" value="-proc:none">
- <isfalse value="${annotation.processing.enabled}"/>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
- <property name="ap.cmd.line.internal" value=""/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
- <!--
- COMPILATION SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
- <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
- <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
- <target depends="init,deps-jar" name="-pre-pre-compile">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-copy-webdir">
- <copy todir="${build.web.dir}">
- <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
- </copy>
- <copy todir="${build.web.dir}/WEB-INF">
- <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
- </copy>
- </target>
- <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources" name="-do-compile">
- <webproject2:javac destdir="${build.classes.dir}" gensrcdir="${build.generated.sources.dir}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target if="has.custom.manifest" name="-copy-manifest">
- <mkdir dir="${build.meta.inf.dir}"/>
- <copy todir="${build.meta.inf.dir}">
- <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
- </copy>
- </target>
- <target if="has.persistence.xml" name="-copy-persistence-xml">
- <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
- <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
- <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
- <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
- </target>
- <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
- <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-jspc.files"/>
- <arg path="${jsp.includes}"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
- <customize>
- <patternset includes="${javac.jsp.includes}"/>
- </customize>
- </webproject2:javac>
- </target>
- <target name="compile-single-jsp">
- <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
- <antcall target="-do-compile-single-jsp"/>
- </target>
- <!--
- DIST BUILDING SECTION
- -->
- <target name="-pre-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
- <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
- <mkdir dir="${build.web.dir}/META-INF"/>
- <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
- </target>
- <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
- <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
- <delete dir="${build.web.dir}/WEB-INF/lib"/>
- </target>
- <target depends="init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
- <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target name="-post-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
- <target depends="init,-clean-webinf-lib,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
- <!--
- EXECUTION SECTION
- -->
- <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
- <target name="-pre-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-post-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-pre-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
- </target>
- <target name="-post-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
- </target>
- <target name="-run-deploy-am">
- <!-- Task to deploy to the Access Manager runtime. -->
- </target>
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
- <nbjpdaappreloaded/>
- </target>
- <target if="netbeans.home" name="-run-deploy-nb">
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
- </target>
- <target name="-init-deploy-ant" unless="netbeans.home">
- <property name="deploy.ant.archive" value="${dist.war}"/>
- <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
- <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
- <property name="deploy.ant.enabled" value="true"/>
- </target>
- <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
- <target if="netbeans.home" name="-run-undeploy-nb">
- <fail message="Undeploy is not supported from within the IDE"/>
- </target>
- <target depends="init,-pre-dist,dist,-post-dist" name="verify">
- <nbverify file="${dist.war}"/>
- </target>
- <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
- <target if="do.display.browser" name="-init-display-browser">
- <condition property="do.display.browser.nb">
- <isset property="netbeans.home"/>
- </condition>
- <condition property="do.display.browser.cl">
- <isset property="deploy.ant.enabled"/>
- </condition>
- </target>
- <target if="do.display.browser.nb" name="-display-browser-nb">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.display.browser.cl" name="-get-browser" unless="browser">
- <condition property="browser" value="rundll32">
- <os family="windows"/>
- </condition>
- <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
- <os family="windows"/>
- </condition>
- <condition property="browser" value="/usr/bin/open">
- <os family="mac"/>
- </condition>
- <property environment="env"/>
- <condition property="browser" value="${env.BROWSER}">
- <isset property="env.BROWSER"/>
- </condition>
- <condition property="browser" value="/usr/bin/firefox">
- <available file="/usr/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/local/firefox/firefox">
- <available file="/usr/local/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/usr/bin/mozilla">
- <available file="/usr/bin/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/local/mozilla/mozilla">
- <available file="/usr/local/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
- <available file="/usr/sfw/lib/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/firefox">
- <available file="/opt/csw/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
- <available file="/usr/sfw/lib/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/mozilla">
- <available file="/opt/csw/bin/mozilla"/>
- </condition>
- </target>
- <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
- <fail unless="browser">
- Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
- </fail>
- <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
- <echo>Launching ${browse.url}</echo>
- <exec executable="${browser}" spawn="true">
- <arg line="${browser.args} ${browse.url}"/>
- </exec>
- </target>
- <target depends="init,-init-cos,compile-single" name="run-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" name="run-test-with-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
- </target>
- <!--
- DEBUGGING SECTION
- -->
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
- <nbstartserver debugmode="true"/>
- <antcall target="connect-debugger"/>
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
- <antcall target="debug-display-browser"/>
- <antcall target="connect-client-debugger"/>
- </target>
- <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
- <classpath>
- <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <sourcepath>
- <path path="${web.docbase.dir}"/>
- </sourcepath>
- </nbjpdaconnect>
- </target>
- <target if="do.display.browser.debug" name="debug-display-browser">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.debug.client" name="connect-client-debugger">
- <webproject1:nbjsdebugstart webUrl="${client.url}"/>
- </target>
- <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
- <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
- </target>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger">
- <webproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}"/>
- </target>
- <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
- <target depends="init" name="-pre-debug-fix">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
- <webproject1:nbjpdareload/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
- <!--
- JAVADOC SECTION
- -->
- <target depends="init" if="have.sources" name="javadoc-build">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
- <classpath>
- <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="**/*.java"/>
- </fileset>
- </javadoc>
- </target>
- <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
- <!--
-
- JUNIT COMPILATION SECTION
- -->
- <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
- <mkdir dir="${build.test.classes.dir}"/>
- <property name="j2ee.platform.embeddableejb.classpath" value=""/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
- <!--
-
- JUNIT EXECUTION SECTION
- -->
- <target depends="init" if="have.tests" name="-pre-test-run">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
- <webproject2:junit testincludes="**/*Test.java"/>
- </target>
- <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init" if="have.tests" name="test-report"/>
- <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
- <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
- <target depends="init" if="have.tests" name="-pre-test-run-single">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <webproject2:junit excludes="" includes="${test.includes}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
- <!--
-
- JUNIT DEBUGGING SECTION
- -->
- <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
- <delete file="${test.report.file}"/>
- <!-- must exist, otherwise the XML formatter would fail -->
- <mkdir dir="${build.test.results.dir}"/>
- <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
- <customize>
- <arg value="showoutput=true"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
- </customize>
- </webproject1:debug>
- </target>
- <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
- </target>
- <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
- <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
- <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
- <!--
-
- CLEANUP SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
- <target depends="init" name="do-clean">
- <condition property="build.dir.to.clean" value="${build.web.dir}">
- <isset property="dist.ear.dir"/>
- </condition>
- <property name="build.dir.to.clean" value="${build.web.dir}"/>
- <delete includeEmptyDirs="true" quiet="true">
- <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
- </delete>
- <delete dir="${build.dir}"/>
- <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target depends="do-clean" if="status.clean-failed" name="check-clean">
- <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
- <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
- </target>
- <target depends="init" if="netbeans.home" name="undeploy-clean">
- <nbundeploy failOnError="false" startServer="false"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
- <target depends="clean" description="Clean build products." name="clean-ear"/>
-</project>
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 5683af2..0000000
--- 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 04bacf7..0000000
--- 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 aa6b0a6..0000000
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/private/private.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>
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 a11b91c..0000000
--- 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 63298e7..0000000
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/project.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.web.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/web-project/3">
- <name>SFSBDriver</name>
- <minimum-ant-version>1.6.5</minimum-ant-version>
- <web-module-libraries/>
- <web-module-additional-libraries/>
- <source-roots>
- <root id="src.dir" name="Source Packages"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir" name="Test Packages"/>
- </test-roots>
- </data>
- </configuration>
-</project>
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 c37d861..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project default="-deploy-ant" basedir=".">
- <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
- <property file="${deploy.ant.properties.file}" />
- <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
- <available file="${deploy.ant.resource.dir}" property="has.setup"/>
- <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
- </target>
-
- <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
- <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
- <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
- <!-- The doctype triggers resolution which can fail -->
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
- <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
- </replace>
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
- <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
- </replace>
- <xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
- <delete file="${temp.sun.web}"/>
- <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
- <property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
- </target>
- <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
- <property name="deploy.context.root.argument" value=""/>
- </target>
- <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
- <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
- <mkdir dir="${gfv3.resources.dir}"/>
- <mkdir dir="${gfv3.resources.dir}/META-INF"/>
- <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
- <copy todir="${gfv3.resources.dir}/META-INF">
- <fileset dir="${deploy.ant.resource.dir}"/>
- </copy>
- <jar destfile="${deploy.ant.archive}" update="true">
- <fileset dir="${gfv3.resources.dir}"/>
- </jar>
- <delete dir="${gfv3.resources.dir}"/>
- </target>
- <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
- <antcall target="-deploy-without-pw"/>
- <antcall target="-deploy-with-pw"/>
- </target>
-
- <target name="-deploy-without-pw" unless="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-deploy-with-pw" if="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
- <antcall target="-undeploy-without-pw"/>
- <antcall target="-undeploy-with-pw"/>
- </target>
-
- <target name="-undeploy-without-pw" unless="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-with-pw" if="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
-</project>
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 4c682f2..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!--
- *** GENERATED FROM project.xml - DO NOT EDIT ***
- *** EDIT ../build.xml INSTEAD ***
-
- For the purpose of easier reading the script
- is divided into following sections:
- - initialization
- - compilation
- - dist
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - cleanup
-
- -->
-<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="SFSBModifiedAttribute-impl">
- <import file="ant-deploy.xml"/>
- <fail message="Please build using Ant 1.7.1 or higher.">
- <condition>
- <not>
- <antversion atleast="1.7.1"/>
- </not>
- </condition>
- </fail>
- <target depends="dist,javadoc" description="Build whole project." name="default"/>
- <!--
- INITIALIZATION SECTION
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init" name="-init-private">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target depends="-pre-init,-init-private" name="-init-user">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user" name="-init-project">
- <property file="nbproject/project.properties"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="javac.compilerargs" value=""/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <condition property="no.dist.ear.dir">
- <not>
- <isset property="dist.ear.dir"/>
- </not>
- </condition>
- <property name="build.web.excludes" value="${build.classes.excludes}"/>
- <condition property="do.compile.jsps">
- <istrue value="${compile.jsps}"/>
- </condition>
- <condition property="do.debug.server">
- <or>
- <not>
- <isset property="debug.server"/>
- </not>
- <istrue value="${debug.server}"/>
- <and>
- <not>
- <istrue value="${debug.server}"/>
- </not>
- <not>
- <istrue value="${debug.client}"/>
- </not>
- </and>
- </or>
- </condition>
- <condition property="do.debug.client">
- <istrue value="${debug.client}"/>
- </condition>
- <condition property="do.display.browser">
- <istrue value="${display.browser}"/>
- </condition>
- <condition property="do.display.browser.debug">
- <and>
- <isset property="do.display.browser"/>
- <not>
- <isset property="do.debug.client"/>
- </not>
- </and>
- </condition>
- <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
- <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
- <condition property="do.war.package.with.custom.manifest">
- <isset property="has.custom.manifest"/>
- </condition>
- <condition property="do.war.package.without.custom.manifest">
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- </condition>
- <condition property="do.tmp.war.package.with.custom.manifest">
- <and>
- <isset property="has.custom.manifest"/>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package.without.custom.manifest">
- <and>
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package">
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </condition>
- <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
- <condition else="" property="application.args.param" value="${application.args}">
- <and>
- <isset property="application.args"/>
- <not>
- <equals arg1="${application.args}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <property name="source.encoding" value="${file.encoding}"/>
- <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
- <and>
- <isset property="javadoc.encoding"/>
- <not>
- <equals arg1="${javadoc.encoding}" arg2=""/>
- </not>
- </and>
- </condition>
- <property name="javadoc.encoding.used" value="${source.encoding}"/>
- <property name="includes" value="**"/>
- <property name="excludes" value=""/>
- <property name="runmain.jvmargs" value=""/>
- <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
- <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
- <length length="0" string="${endorsed.classpath}" when="greater"/>
- </condition>
- </target>
- <target depends="init" name="-init-cos" unless="deploy.on.save">
- <condition property="deploy.on.save" value="true">
- <istrue value="${j2ee.deploy.on.save}"/>
- </condition>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="build.web.dir">Must set build.web.dir</fail>
- <fail unless="build.generated.dir">Must set build.generated.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.war">Must set dist.war</fail>
- <condition property="missing.j2ee.server.home">
- <and>
- <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
- <not>
- <isset property="j2ee.server.home"/>
- </not>
- </and>
- </condition>
- <fail if="missing.j2ee.server.home">
-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>
- </fail>
- <fail unless="j2ee.platform.classpath">
-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)
- </fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <mkdir dir="@{apgeneratedsrcdir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <compilerarg value="-processorpath"/>
- <compilerarg path="@{processorpath}:${empty.dir}"/>
- <compilerarg line="${ap.processors.internal}"/>
- <compilerarg value="-s"/>
- <compilerarg path="@{apgeneratedsrcdir}"/>
- <compilerarg line="${ap.proc.none.internal}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
- <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </depend>
- </sequential>
- </macrodef>
- <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${build.classes.dir}" name="destdir"/>
- <sequential>
- <fail unless="javac.includes">Must set javac.includes</fail>
- <pathconvert pathsep="," property="javac.includes.binary">
- <path>
- <filelist dir="@{destdir}" files="${javac.includes}"/>
- </path>
- <globmapper from="*.java" to="*.class"/>
- </pathconvert>
- <delete>
- <files includes="${javac.includes.binary}"/>
- </delete>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="**" name="testincludes"/>
- <sequential>
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}" name="classpath"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjsdebug">
- <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${client.url}" name="webUrl"/>
- <sequential>
- <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="name"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${build.classes.dir}" name="dir"/>
- <sequential>
- <nbjpdareload>
- <fileset dir="@{dir}" includes="${fix.classes}">
- <include name="${fix.includes}*.class"/>
- </fileset>
- </nbjpdareload>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
- <sequential>
- <nbjpdaappreloaded/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
- <os family="windows"/>
- </condition>
- <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
- <isset property="debug.transport"/>
- </condition>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${application.args.param}" name="args"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <arg line="@{args}"/>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-taskdefs">
- <fail unless="libs.CopyLibs.classpath">
-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
- </fail>
- <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
- </target>
- <target name="-init-ap-cmdline-properties">
- <property name="annotation.processing.enabled" value="true"/>
- <property name="annotation.processing.processors.list" value=""/>
- <property name="annotation.processing.run.all.processors" value="true"/>
- <property name="javac.processorpath" value="${javac.classpath}"/>
- <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
- <condition property="ap.supported.internal" value="true">
- <not>
- <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
- </not>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
- <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
- <isfalse value="${annotation.processing.run.all.processors}"/>
- </condition>
- <condition else="" property="ap.proc.none.internal" value="-proc:none">
- <isfalse value="${annotation.processing.enabled}"/>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
- <property name="ap.cmd.line.internal" value=""/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
- <!--
- COMPILATION SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
- <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
- <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
- <target depends="init,deps-jar" name="-pre-pre-compile">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-copy-webdir">
- <copy todir="${build.web.dir}">
- <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
- </copy>
- <copy todir="${build.web.dir}/WEB-INF">
- <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
- </copy>
- </target>
- <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources" name="-do-compile">
- <webproject2:javac destdir="${build.classes.dir}" gensrcdir="${build.generated.sources.dir}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target if="has.custom.manifest" name="-copy-manifest">
- <mkdir dir="${build.meta.inf.dir}"/>
- <copy todir="${build.meta.inf.dir}">
- <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
- </copy>
- </target>
- <target if="has.persistence.xml" name="-copy-persistence-xml">
- <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
- <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
- <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
- <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
- </target>
- <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
- <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-jspc.files"/>
- <arg path="${jsp.includes}"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
- <customize>
- <patternset includes="${javac.jsp.includes}"/>
- </customize>
- </webproject2:javac>
- </target>
- <target name="compile-single-jsp">
- <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
- <antcall target="-do-compile-single-jsp"/>
- </target>
- <!--
- DIST BUILDING SECTION
- -->
- <target name="-pre-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
- <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
- <mkdir dir="${build.web.dir}/META-INF"/>
- <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
- </target>
- <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
- <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
- <delete dir="${build.web.dir}/WEB-INF/lib"/>
- </target>
- <target depends="init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
- <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target name="-post-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
- <target depends="init,-clean-webinf-lib,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
- <!--
- EXECUTION SECTION
- -->
- <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
- <target name="-pre-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-post-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-pre-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
- </target>
- <target name="-post-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
- </target>
- <target name="-run-deploy-am">
- <!-- Task to deploy to the Access Manager runtime. -->
- </target>
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
- <nbjpdaappreloaded/>
- </target>
- <target if="netbeans.home" name="-run-deploy-nb">
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
- </target>
- <target name="-init-deploy-ant" unless="netbeans.home">
- <property name="deploy.ant.archive" value="${dist.war}"/>
- <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
- <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
- <property name="deploy.ant.enabled" value="true"/>
- </target>
- <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
- <target if="netbeans.home" name="-run-undeploy-nb">
- <fail message="Undeploy is not supported from within the IDE"/>
- </target>
- <target depends="init,-pre-dist,dist,-post-dist" name="verify">
- <nbverify file="${dist.war}"/>
- </target>
- <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
- <target if="do.display.browser" name="-init-display-browser">
- <condition property="do.display.browser.nb">
- <isset property="netbeans.home"/>
- </condition>
- <condition property="do.display.browser.cl">
- <isset property="deploy.ant.enabled"/>
- </condition>
- </target>
- <target if="do.display.browser.nb" name="-display-browser-nb">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.display.browser.cl" name="-get-browser" unless="browser">
- <condition property="browser" value="rundll32">
- <os family="windows"/>
- </condition>
- <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
- <os family="windows"/>
- </condition>
- <condition property="browser" value="/usr/bin/open">
- <os family="mac"/>
- </condition>
- <property environment="env"/>
- <condition property="browser" value="${env.BROWSER}">
- <isset property="env.BROWSER"/>
- </condition>
- <condition property="browser" value="/usr/bin/firefox">
- <available file="/usr/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/local/firefox/firefox">
- <available file="/usr/local/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/usr/bin/mozilla">
- <available file="/usr/bin/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/local/mozilla/mozilla">
- <available file="/usr/local/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
- <available file="/usr/sfw/lib/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/firefox">
- <available file="/opt/csw/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
- <available file="/usr/sfw/lib/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/mozilla">
- <available file="/opt/csw/bin/mozilla"/>
- </condition>
- </target>
- <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
- <fail unless="browser">
- Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
- </fail>
- <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
- <echo>Launching ${browse.url}</echo>
- <exec executable="${browser}" spawn="true">
- <arg line="${browser.args} ${browse.url}"/>
- </exec>
- </target>
- <target depends="init,-init-cos,compile-single" name="run-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" name="run-test-with-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
- </target>
- <!--
- DEBUGGING SECTION
- -->
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
- <nbstartserver debugmode="true"/>
- <antcall target="connect-debugger"/>
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
- <antcall target="debug-display-browser"/>
- <antcall target="connect-client-debugger"/>
- </target>
- <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
- <classpath>
- <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <sourcepath>
- <path path="${web.docbase.dir}"/>
- </sourcepath>
- </nbjpdaconnect>
- </target>
- <target if="do.display.browser.debug" name="debug-display-browser">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.debug.client" name="connect-client-debugger">
- <webproject1:nbjsdebugstart webUrl="${client.url}"/>
- </target>
- <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
- <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
- </target>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger">
- <webproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}"/>
- </target>
- <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
- <target depends="init" name="-pre-debug-fix">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
- <webproject1:nbjpdareload/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
- <!--
- JAVADOC SECTION
- -->
- <target depends="init" if="have.sources" name="javadoc-build">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
- <classpath>
- <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="**/*.java"/>
- </fileset>
- </javadoc>
- </target>
- <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
- <!--
-
- JUNIT COMPILATION SECTION
- -->
- <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
- <mkdir dir="${build.test.classes.dir}"/>
- <property name="j2ee.platform.embeddableejb.classpath" value=""/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
- <!--
-
- JUNIT EXECUTION SECTION
- -->
- <target depends="init" if="have.tests" name="-pre-test-run">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
- <webproject2:junit testincludes="**/*Test.java"/>
- </target>
- <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init" if="have.tests" name="test-report"/>
- <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
- <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
- <target depends="init" if="have.tests" name="-pre-test-run-single">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <webproject2:junit excludes="" includes="${test.includes}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
- <!--
-
- JUNIT DEBUGGING SECTION
- -->
- <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
- <delete file="${test.report.file}"/>
- <!-- must exist, otherwise the XML formatter would fail -->
- <mkdir dir="${build.test.results.dir}"/>
- <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
- <customize>
- <arg value="showoutput=true"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
- </customize>
- </webproject1:debug>
- </target>
- <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
- </target>
- <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
- <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
- <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
- <!--
-
- CLEANUP SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
- <target depends="init" name="do-clean">
- <condition property="build.dir.to.clean" value="${build.web.dir}">
- <isset property="dist.ear.dir"/>
- </condition>
- <property name="build.dir.to.clean" value="${build.web.dir}"/>
- <delete includeEmptyDirs="true" quiet="true">
- <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
- </delete>
- <delete dir="${build.dir}"/>
- <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target depends="do-clean" if="status.clean-failed" name="check-clean">
- <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
- <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
- </target>
- <target depends="init" if="netbeans.home" name="undeploy-clean">
- <nbundeploy failOnError="false" startServer="false"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
- <target depends="clean" description="Clean build products." name="clean-ear"/>
-</project>
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 ece64ad..0000000
--- 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 04bacf7..0000000
--- 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 5476302..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
- <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
- <file>file:/home/rajiv/Workspaces/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/web/WEB-INF/sun-web.xml</file>
- <file>file:/home/rajiv/Workspaces/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/web/WEB-INF/web.xml</file>
- <file>file:/home/rajiv/Workspaces/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/web/index.jsp</file>
- <file>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>
- <file>file:/home/rajiv/Workspaces/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SimpleSessionBean.java</file>
- </open-files>
-</project-private>
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 6d5edb3..0000000
--- 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 aba658b..0000000
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/project.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.web.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/web-project/3">
- <name>SFSBModifiedAttribute</name>
- <minimum-ant-version>1.6.5</minimum-ant-version>
- <web-module-libraries/>
- <web-module-additional-libraries/>
- <source-roots>
- <root id="src.dir" name="Source Packages"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir" name="Test Packages"/>
- </test-roots>
- </data>
- </configuration>
-</project>
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 c37d861..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project default="-deploy-ant" basedir=".">
- <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
- <property file="${deploy.ant.properties.file}" />
- <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
- <available file="${deploy.ant.resource.dir}" property="has.setup"/>
- <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
- </target>
-
- <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
- <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
- <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
- <!-- The doctype triggers resolution which can fail -->
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
- <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
- </replace>
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
- <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
- </replace>
- <xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
- <delete file="${temp.sun.web}"/>
- <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
- <property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
- </target>
- <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
- <property name="deploy.context.root.argument" value=""/>
- </target>
- <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
- <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
- <mkdir dir="${gfv3.resources.dir}"/>
- <mkdir dir="${gfv3.resources.dir}/META-INF"/>
- <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
- <copy todir="${gfv3.resources.dir}/META-INF">
- <fileset dir="${deploy.ant.resource.dir}"/>
- </copy>
- <jar destfile="${deploy.ant.archive}" update="true">
- <fileset dir="${gfv3.resources.dir}"/>
- </jar>
- <delete dir="${gfv3.resources.dir}"/>
- </target>
- <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
- <antcall target="-deploy-without-pw"/>
- <antcall target="-deploy-with-pw"/>
- </target>
-
- <target name="-deploy-without-pw" unless="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-deploy-with-pw" if="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
- <antcall target="-undeploy-without-pw"/>
- <antcall target="-undeploy-with-pw"/>
- </target>
-
- <target name="-undeploy-without-pw" unless="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-with-pw" if="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
-</project>
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 a203249..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!--
- *** GENERATED FROM project.xml - DO NOT EDIT ***
- *** EDIT ../build.xml INSTEAD ***
-
- For the purpose of easier reading the script
- is divided into following sections:
- - initialization
- - compilation
- - dist
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - cleanup
-
- -->
-<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="SFSBModifiedSession-impl">
- <import file="ant-deploy.xml"/>
- <fail message="Please build using Ant 1.7.1 or higher.">
- <condition>
- <not>
- <antversion atleast="1.7.1"/>
- </not>
- </condition>
- </fail>
- <target depends="dist,javadoc" description="Build whole project." name="default"/>
- <!--
- INITIALIZATION SECTION
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init" name="-init-private">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target depends="-pre-init,-init-private" name="-init-user">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user" name="-init-project">
- <property file="nbproject/project.properties"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="javac.compilerargs" value=""/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <condition property="no.dist.ear.dir">
- <not>
- <isset property="dist.ear.dir"/>
- </not>
- </condition>
- <property name="build.web.excludes" value="${build.classes.excludes}"/>
- <condition property="do.compile.jsps">
- <istrue value="${compile.jsps}"/>
- </condition>
- <condition property="do.debug.server">
- <or>
- <not>
- <isset property="debug.server"/>
- </not>
- <istrue value="${debug.server}"/>
- <and>
- <not>
- <istrue value="${debug.server}"/>
- </not>
- <not>
- <istrue value="${debug.client}"/>
- </not>
- </and>
- </or>
- </condition>
- <condition property="do.debug.client">
- <istrue value="${debug.client}"/>
- </condition>
- <condition property="do.display.browser">
- <istrue value="${display.browser}"/>
- </condition>
- <condition property="do.display.browser.debug">
- <and>
- <isset property="do.display.browser"/>
- <not>
- <isset property="do.debug.client"/>
- </not>
- </and>
- </condition>
- <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
- <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
- <condition property="do.war.package.with.custom.manifest">
- <isset property="has.custom.manifest"/>
- </condition>
- <condition property="do.war.package.without.custom.manifest">
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- </condition>
- <condition property="do.tmp.war.package.with.custom.manifest">
- <and>
- <isset property="has.custom.manifest"/>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package.without.custom.manifest">
- <and>
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package">
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </condition>
- <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
- <condition else="" property="application.args.param" value="${application.args}">
- <and>
- <isset property="application.args"/>
- <not>
- <equals arg1="${application.args}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <property name="source.encoding" value="${file.encoding}"/>
- <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
- <and>
- <isset property="javadoc.encoding"/>
- <not>
- <equals arg1="${javadoc.encoding}" arg2=""/>
- </not>
- </and>
- </condition>
- <property name="javadoc.encoding.used" value="${source.encoding}"/>
- <property name="includes" value="**"/>
- <property name="excludes" value=""/>
- <property name="runmain.jvmargs" value=""/>
- <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
- <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
- <length length="0" string="${endorsed.classpath}" when="greater"/>
- </condition>
- </target>
- <target depends="init" name="-init-cos" unless="deploy.on.save">
- <condition property="deploy.on.save" value="true">
- <istrue value="${j2ee.deploy.on.save}"/>
- </condition>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="build.web.dir">Must set build.web.dir</fail>
- <fail unless="build.generated.dir">Must set build.generated.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.war">Must set dist.war</fail>
- <condition property="missing.j2ee.server.home">
- <and>
- <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
- <not>
- <isset property="j2ee.server.home"/>
- </not>
- </and>
- </condition>
- <fail if="missing.j2ee.server.home">
-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>
- </fail>
- <fail unless="j2ee.platform.classpath">
-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)
- </fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <mkdir dir="@{apgeneratedsrcdir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <compilerarg value="-processorpath"/>
- <compilerarg path="@{processorpath}:${empty.dir}"/>
- <compilerarg line="${ap.processors.internal}"/>
- <compilerarg value="-s"/>
- <compilerarg path="@{apgeneratedsrcdir}"/>
- <compilerarg line="${ap.proc.none.internal}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
- <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </depend>
- </sequential>
- </macrodef>
- <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${build.classes.dir}" name="destdir"/>
- <sequential>
- <fail unless="javac.includes">Must set javac.includes</fail>
- <pathconvert pathsep="," property="javac.includes.binary">
- <path>
- <filelist dir="@{destdir}" files="${javac.includes}"/>
- </path>
- <globmapper from="*.java" to="*.class"/>
- </pathconvert>
- <delete>
- <files includes="${javac.includes.binary}"/>
- </delete>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="**" name="testincludes"/>
- <sequential>
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}" name="classpath"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjsdebug">
- <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${client.url}" name="webUrl"/>
- <sequential>
- <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="name"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${build.classes.dir}" name="dir"/>
- <sequential>
- <nbjpdareload>
- <fileset dir="@{dir}" includes="${fix.classes}">
- <include name="${fix.includes}*.class"/>
- </fileset>
- </nbjpdareload>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
- <sequential>
- <nbjpdaappreloaded/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
- <os family="windows"/>
- </condition>
- <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
- <isset property="debug.transport"/>
- </condition>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${application.args.param}" name="args"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <arg line="@{args}"/>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-taskdefs">
- <fail unless="libs.CopyLibs.classpath">
-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
- </fail>
- <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
- </target>
- <target name="-init-ap-cmdline-properties">
- <property name="annotation.processing.enabled" value="true"/>
- <property name="annotation.processing.processors.list" value=""/>
- <property name="annotation.processing.run.all.processors" value="true"/>
- <property name="javac.processorpath" value="${javac.classpath}"/>
- <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
- <condition property="ap.supported.internal" value="true">
- <not>
- <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
- </not>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
- <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
- <isfalse value="${annotation.processing.run.all.processors}"/>
- </condition>
- <condition else="" property="ap.proc.none.internal" value="-proc:none">
- <isfalse value="${annotation.processing.enabled}"/>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
- <property name="ap.cmd.line.internal" value=""/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
- <!--
- COMPILATION SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
- <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
- <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
- <target depends="init,deps-jar" name="-pre-pre-compile">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-copy-webdir">
- <copy todir="${build.web.dir}">
- <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
- </copy>
- <copy todir="${build.web.dir}/WEB-INF">
- <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
- </copy>
- </target>
- <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources" name="-do-compile">
- <webproject2:javac destdir="${build.classes.dir}" gensrcdir="${build.generated.sources.dir}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target if="has.custom.manifest" name="-copy-manifest">
- <mkdir dir="${build.meta.inf.dir}"/>
- <copy todir="${build.meta.inf.dir}">
- <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
- </copy>
- </target>
- <target if="has.persistence.xml" name="-copy-persistence-xml">
- <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
- <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
- <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
- <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
- </target>
- <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
- <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-jspc.files"/>
- <arg path="${jsp.includes}"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
- <customize>
- <patternset includes="${javac.jsp.includes}"/>
- </customize>
- </webproject2:javac>
- </target>
- <target name="compile-single-jsp">
- <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
- <antcall target="-do-compile-single-jsp"/>
- </target>
- <!--
- DIST BUILDING SECTION
- -->
- <target name="-pre-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
- <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
- <mkdir dir="${build.web.dir}/META-INF"/>
- <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
- </target>
- <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
- <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
- <delete dir="${build.web.dir}/WEB-INF/lib"/>
- </target>
- <target depends="init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
- <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target name="-post-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
- <target depends="init,-clean-webinf-lib,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
- <!--
- EXECUTION SECTION
- -->
- <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
- <target name="-pre-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-post-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-pre-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
- </target>
- <target name="-post-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
- </target>
- <target name="-run-deploy-am">
- <!-- Task to deploy to the Access Manager runtime. -->
- </target>
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
- <nbjpdaappreloaded/>
- </target>
- <target if="netbeans.home" name="-run-deploy-nb">
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
- </target>
- <target name="-init-deploy-ant" unless="netbeans.home">
- <property name="deploy.ant.archive" value="${dist.war}"/>
- <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
- <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
- <property name="deploy.ant.enabled" value="true"/>
- </target>
- <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
- <target if="netbeans.home" name="-run-undeploy-nb">
- <fail message="Undeploy is not supported from within the IDE"/>
- </target>
- <target depends="init,-pre-dist,dist,-post-dist" name="verify">
- <nbverify file="${dist.war}"/>
- </target>
- <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
- <target if="do.display.browser" name="-init-display-browser">
- <condition property="do.display.browser.nb">
- <isset property="netbeans.home"/>
- </condition>
- <condition property="do.display.browser.cl">
- <isset property="deploy.ant.enabled"/>
- </condition>
- </target>
- <target if="do.display.browser.nb" name="-display-browser-nb">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.display.browser.cl" name="-get-browser" unless="browser">
- <condition property="browser" value="rundll32">
- <os family="windows"/>
- </condition>
- <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
- <os family="windows"/>
- </condition>
- <condition property="browser" value="/usr/bin/open">
- <os family="mac"/>
- </condition>
- <property environment="env"/>
- <condition property="browser" value="${env.BROWSER}">
- <isset property="env.BROWSER"/>
- </condition>
- <condition property="browser" value="/usr/bin/firefox">
- <available file="/usr/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/local/firefox/firefox">
- <available file="/usr/local/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/usr/bin/mozilla">
- <available file="/usr/bin/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/local/mozilla/mozilla">
- <available file="/usr/local/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
- <available file="/usr/sfw/lib/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/firefox">
- <available file="/opt/csw/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
- <available file="/usr/sfw/lib/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/mozilla">
- <available file="/opt/csw/bin/mozilla"/>
- </condition>
- </target>
- <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
- <fail unless="browser">
- Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
- </fail>
- <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
- <echo>Launching ${browse.url}</echo>
- <exec executable="${browser}" spawn="true">
- <arg line="${browser.args} ${browse.url}"/>
- </exec>
- </target>
- <target depends="init,-init-cos,compile-single" name="run-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" name="run-test-with-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
- </target>
- <!--
- DEBUGGING SECTION
- -->
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
- <nbstartserver debugmode="true"/>
- <antcall target="connect-debugger"/>
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
- <antcall target="debug-display-browser"/>
- <antcall target="connect-client-debugger"/>
- </target>
- <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
- <classpath>
- <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <sourcepath>
- <path path="${web.docbase.dir}"/>
- </sourcepath>
- </nbjpdaconnect>
- </target>
- <target if="do.display.browser.debug" name="debug-display-browser">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.debug.client" name="connect-client-debugger">
- <webproject1:nbjsdebugstart webUrl="${client.url}"/>
- </target>
- <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
- <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
- </target>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger">
- <webproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}"/>
- </target>
- <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
- <target depends="init" name="-pre-debug-fix">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
- <webproject1:nbjpdareload/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
- <!--
- JAVADOC SECTION
- -->
- <target depends="init" if="have.sources" name="javadoc-build">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
- <classpath>
- <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="**/*.java"/>
- </fileset>
- </javadoc>
- </target>
- <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
- <!--
-
- JUNIT COMPILATION SECTION
- -->
- <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
- <mkdir dir="${build.test.classes.dir}"/>
- <property name="j2ee.platform.embeddableejb.classpath" value=""/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
- <!--
-
- JUNIT EXECUTION SECTION
- -->
- <target depends="init" if="have.tests" name="-pre-test-run">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
- <webproject2:junit testincludes="**/*Test.java"/>
- </target>
- <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init" if="have.tests" name="test-report"/>
- <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
- <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
- <target depends="init" if="have.tests" name="-pre-test-run-single">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <webproject2:junit excludes="" includes="${test.includes}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
- <!--
-
- JUNIT DEBUGGING SECTION
- -->
- <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
- <delete file="${test.report.file}"/>
- <!-- must exist, otherwise the XML formatter would fail -->
- <mkdir dir="${build.test.results.dir}"/>
- <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
- <customize>
- <arg value="showoutput=true"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
- </customize>
- </webproject1:debug>
- </target>
- <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
- </target>
- <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
- <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
- <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
- <!--
-
- CLEANUP SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
- <target depends="init" name="do-clean">
- <condition property="build.dir.to.clean" value="${build.web.dir}">
- <isset property="dist.ear.dir"/>
- </condition>
- <property name="build.dir.to.clean" value="${build.web.dir}"/>
- <delete includeEmptyDirs="true" quiet="true">
- <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
- </delete>
- <delete dir="${build.dir}"/>
- <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target depends="do-clean" if="status.clean-failed" name="check-clean">
- <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
- <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
- </target>
- <target depends="init" if="netbeans.home" name="undeploy-clean">
- <nbundeploy failOnError="false" startServer="false"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
- <target depends="clean" description="Clean build products." name="clean-ear"/>
-</project>
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 6b8eb73..0000000
--- 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 04bacf7..0000000
--- 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 495effc..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
- <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/1">
- <file>file:/home/rajiv/Workspaces/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBDriver/web/WEB-INF/sun-web.xml</file>
- <file>file:/home/rajiv/Workspaces/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBDriver/web/WEB-INF/web.xml</file>
- </open-files>
-</project-private>
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 b42feb5..0000000
--- 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 953f04e..0000000
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/project.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.web.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/web-project/3">
- <name>SFSBModifiedSession</name>
- <minimum-ant-version>1.6.5</minimum-ant-version>
- <web-module-libraries/>
- <web-module-additional-libraries/>
- <source-roots>
- <root id="src.dir" name="Source Packages"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir" name="Test Packages"/>
- </test-roots>
- </data>
- </configuration>
-</project>
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 0d4bfa1..0000000
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project default="-deploy-ant" basedir=".">
- <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
- <property file="${deploy.ant.properties.file}" />
- <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
- <available file="${deploy.ant.resource.dir}" property="has.setup"/>
- <tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
- </target>
-
- <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
- <tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
- <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
- <!-- The doctype triggers resolution which can fail -->
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
- <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
- </replace>
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
- <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
- </replace>
- <xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
- <delete file="${temp.sun.web}"/>
- <property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
- <property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
- </target>
- <target name="-no-parse-sun-web" depends="-init-cl-deployment-env" unless="sun.web.present">
- <property name="deploy.context.root.argument" value=""/>
- </target>
- <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
- <tempfile prefix="gfv3" property="gfv3.resources.dir" destdir="${java.io.tmpdir}"/>
- <mkdir dir="${gfv3.resources.dir}"/>
- <mkdir dir="${gfv3.resources.dir}/META-INF"/>
- <property name="gfv3.resources.file" value="${gfv3.resources.dir}/META-INF/sun-resources.xml"/>
- <copy todir="${gfv3.resources.dir}/META-INF">
- <fileset dir="${deploy.ant.resource.dir}"/>
- </copy>
- <jar destfile="${deploy.ant.archive}" update="true">
- <fileset dir="${gfv3.resources.dir}"/>
- </jar>
- <delete dir="${gfv3.resources.dir}"/>
- </target>
- <target name="-deploy-ant" depends="-parse-sun-web,-no-parse-sun-web,-add-resources" if="deploy.ant.enabled">
- <antcall target="-deploy-without-pw"/>
- <antcall target="-deploy-with-pw"/>
- </target>
-
- <target name="-deploy-without-pw" unless="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-deploy-with-pw" if="gfv3.password">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
- <antcall target="-undeploy-without-pw"/>
- <antcall target="-undeploy-with-pw"/>
- </target>
-
- <target name="-undeploy-without-pw" unless="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
- <target name="-undeploy-with-pw" if="gfv3.password">
- <echo message="Undeploying ${deploy.ant.archive}"/>
- <tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <get username="${gfv3.username}" password="${gfv3.password}" src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
- dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
- </target>
-</project>
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 39049ec..0000000
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml
+++ /dev/null
@@ -1,979 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!--
- *** GENERATED FROM project.xml - DO NOT EDIT ***
- *** EDIT ../build.xml INSTEAD ***
-
- For the purpose of easier reading the script
- is divided into following sections:
- - initialization
- - compilation
- - dist
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - cleanup
-
- -->
-<project xmlns:webproject1="http://www.netbeans.org/ns/web-project/1" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" basedir=".." default="default" name="SFSBDriver-impl">
- <import file="ant-deploy.xml"/>
- <fail message="Please build using Ant 1.7.1 or higher.">
- <condition>
- <not>
- <antversion atleast="1.7.1"/>
- </not>
- </condition>
- </fail>
- <target depends="dist,javadoc" description="Build whole project." name="default"/>
- <!--
- INITIALIZATION SECTION
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init" name="-init-private">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target depends="-pre-init,-init-private" name="-init-user">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user" name="-init-project">
- <property file="nbproject/project.properties"/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir" name="-do-ear-init"/>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" name="-do-init">
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="javac.compilerargs" value=""/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <condition property="no.dist.ear.dir">
- <not>
- <isset property="dist.ear.dir"/>
- </not>
- </condition>
- <property name="build.web.excludes" value="${build.classes.excludes}"/>
- <condition property="do.compile.jsps">
- <istrue value="${compile.jsps}"/>
- </condition>
- <condition property="do.debug.server">
- <or>
- <not>
- <isset property="debug.server"/>
- </not>
- <istrue value="${debug.server}"/>
- <and>
- <not>
- <istrue value="${debug.server}"/>
- </not>
- <not>
- <istrue value="${debug.client}"/>
- </not>
- </and>
- </or>
- </condition>
- <condition property="do.debug.client">
- <istrue value="${debug.client}"/>
- </condition>
- <condition property="do.display.browser">
- <istrue value="${display.browser}"/>
- </condition>
- <condition property="do.display.browser.debug">
- <and>
- <isset property="do.display.browser"/>
- <not>
- <isset property="do.debug.client"/>
- </not>
- </and>
- </condition>
- <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
- <available file="${persistence.xml.dir}/persistence.xml" property="has.persistence.xml"/>
- <condition property="do.war.package.with.custom.manifest">
- <isset property="has.custom.manifest"/>
- </condition>
- <condition property="do.war.package.without.custom.manifest">
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- </condition>
- <condition property="do.tmp.war.package.with.custom.manifest">
- <and>
- <isset property="has.custom.manifest"/>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package.without.custom.manifest">
- <and>
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </and>
- </condition>
- <condition property="do.tmp.war.package">
- <or>
- <isfalse value="${directory.deployment.supported}"/>
- <isset property="dist.ear.dir"/>
- </or>
- </condition>
- <property name="build.meta.inf.dir" value="${build.web.dir}/META-INF"/>
- <condition else="" property="application.args.param" value="${application.args}">
- <and>
- <isset property="application.args"/>
- <not>
- <equals arg1="${application.args}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <property name="source.encoding" value="${file.encoding}"/>
- <condition property="javadoc.encoding.used" value="${javadoc.encoding}">
- <and>
- <isset property="javadoc.encoding"/>
- <not>
- <equals arg1="${javadoc.encoding}" arg2=""/>
- </not>
- </and>
- </condition>
- <property name="javadoc.encoding.used" value="${source.encoding}"/>
- <property name="includes" value="**"/>
- <property name="excludes" value=""/>
- <property name="runmain.jvmargs" value=""/>
- <path id="endorsed.classpath.path" path="${endorsed.classpath}"/>
- <condition else="" property="endorsed.classpath.cmd.line.arg" value="-Xbootclasspath/p:'${toString:endorsed.classpath.path}'">
- <length length="0" string="${endorsed.classpath}" when="greater"/>
- </condition>
- </target>
- <target depends="init" name="-init-cos" unless="deploy.on.save">
- <condition property="deploy.on.save" value="true">
- <istrue value="${j2ee.deploy.on.save}"/>
- </condition>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init" name="-init-check">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="build.web.dir">Must set build.web.dir</fail>
- <fail unless="build.generated.dir">Must set build.generated.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.war">Must set dist.war</fail>
- <condition property="missing.j2ee.server.home">
- <and>
- <matches pattern="j2ee.server.home" string="${j2ee.platform.classpath}"/>
- <not>
- <isset property="j2ee.server.home"/>
- </not>
- </and>
- </condition>
- <fail if="missing.j2ee.server.home">
-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>
- </fail>
- <fail unless="j2ee.platform.classpath">
-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)
- </fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-macrodef-javac-with-processors">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <mkdir dir="@{apgeneratedsrcdir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <compilerarg value="-processorpath"/>
- <compilerarg path="@{processorpath}:${empty.dir}"/>
- <compilerarg line="${ap.processors.internal}"/>
- <compilerarg value="-s"/>
- <compilerarg path="@{apgeneratedsrcdir}"/>
- <compilerarg line="${ap.proc.none.internal}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-ap-cmdline-properties" name="-init-macrodef-javac-without-processors" unless="ap.supported.internal">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${javac.processorpath}" name="processorpath"/>
- <attribute default="${build.generated.sources.dir}/ap-source-output" name="apgeneratedsrcdir"/>
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="${javac.debug}" name="debug"/>
- <attribute default="${empty.dir}" name="gensrcdir"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property location="${build.dir}/empty" name="empty.dir"/>
- <mkdir dir="${empty.dir}"/>
- <javac debug="@{debug}" deprecation="${javac.deprecation}" destdir="@{destdir}" encoding="${source.encoding}" excludes="@{excludes}" includeantruntime="false" includes="@{includes}" source="${javac.source}" srcdir="@{srcdir}" target="${javac.target}">
- <src>
- <dirset dir="@{gensrcdir}" erroronmissingdir="false">
- <include name="*"/>
- </dirset>
- </src>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${endorsed.classpath.cmd.line.arg}"/>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-macrodef-javac-with-processors,-init-macrodef-javac-without-processors" name="-init-macrodef-javac">
- <macrodef name="depend" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${src.dir}" name="srcdir"/>
- <attribute default="${build.classes.dir}" name="destdir"/>
- <attribute default="${javac.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <depend cache="${build.dir}/depcache" destdir="@{destdir}" excludes="${excludes}" includes="${includes}" srcdir="@{srcdir}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </depend>
- </sequential>
- </macrodef>
- <macrodef name="force-recompile" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${build.classes.dir}" name="destdir"/>
- <sequential>
- <fail unless="javac.includes">Must set javac.includes</fail>
- <pathconvert pathsep="," property="javac.includes.binary">
- <path>
- <filelist dir="@{destdir}" files="${javac.includes}"/>
- </path>
- <globmapper from="*.java" to="*.class"/>
- </pathconvert>
- <delete>
- <files includes="${javac.includes.binary}"/>
- </delete>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute default="${includes}" name="includes"/>
- <attribute default="${excludes}" name="excludes"/>
- <attribute default="**" name="testincludes"/>
- <sequential>
- <junit dir="${basedir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" showoutput="true" tempdir="${java.io.tmpdir}">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
- <filename name="@{testincludes}"/>
- </fileset>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper from="test-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}" name="classpath"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjsdebug">
- <macrodef name="nbjsdebugstart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${client.url}" name="webUrl"/>
- <sequential>
- <nbjsdebugstart urlPart="${client.urlPart}" webUrl="@{webUrl}"/>
- </sequential>
- </macrodef>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="name"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <sequential>
- <nbjpdastart addressproperty="jpda.address" name="@{name}" transport="${debug-transport}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${build.classes.dir}" name="dir"/>
- <sequential>
- <nbjpdareload>
- <fileset dir="@{dir}" includes="${fix.classes}">
- <include name="${fix.includes}*.class"/>
- </fileset>
- </nbjpdareload>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdaappreloaded" uri="http://www.netbeans.org/ns/web-project/1">
- <sequential>
- <nbjpdaappreloaded/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition else="-Xdebug" property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- <condition else="dt_socket" property="debug-transport-by-os" value="dt_shmem">
- <os family="windows"/>
- </condition>
- <condition else="${debug-transport-by-os}" property="debug-transport" value="${debug.transport}">
- <isset property="debug.transport"/>
- </condition>
- </target>
- <target depends="-init-debug-args" name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute default="${main.class}" name="classname"/>
- <attribute default="${debug.classpath}:${j2ee.platform.classpath}" name="classpath"/>
- <attribute default="${application.args.param}" name="args"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java classname="@{classname}" fork="true">
- <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=${debug-transport},address=${jpda.address}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper from="run-sys-prop.*" to="*" type="glob"/>
- </syspropertyset>
- <arg line="@{args}"/>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-taskdefs">
- <fail unless="libs.CopyLibs.classpath">
-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
- </fail>
- <taskdef classpath="${libs.CopyLibs.classpath}" resource="org/netbeans/modules/java/j2seproject/copylibstask/antlib.xml"/>
- </target>
- <target name="-init-ap-cmdline-properties">
- <property name="annotation.processing.enabled" value="true"/>
- <property name="annotation.processing.processors.list" value=""/>
- <property name="annotation.processing.run.all.processors" value="true"/>
- <property name="javac.processorpath" value="${javac.classpath}"/>
- <property name="javac.test.processorpath" value="${javac.test.classpath}"/>
- <condition property="ap.supported.internal" value="true">
- <not>
- <matches pattern="1\.[0-5](\..*)?" string="${javac.source}"/>
- </not>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties" if="ap.supported.internal" name="-init-ap-cmdline-supported">
- <condition else="" property="ap.processors.internal" value="-processor ${annotation.processing.processors.list}">
- <isfalse value="${annotation.processing.run.all.processors}"/>
- </condition>
- <condition else="" property="ap.proc.none.internal" value="-proc:none">
- <isfalse value="${annotation.processing.enabled}"/>
- </condition>
- </target>
- <target depends="-init-ap-cmdline-properties,-init-ap-cmdline-supported" name="-init-ap-cmdline">
- <property name="ap.cmd.line.internal" value=""/>
- </target>
- <target depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-nbjsdebug,-init-macrodef-debug,-init-taskdefs,-init-ap-cmdline" name="init"/>
- <!--
- COMPILATION SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-module-jar" unless="no.deps"/>
- <target depends="init" if="dist.ear.dir" name="deps-ear-jar" unless="no.deps"/>
- <target depends="init, deps-module-jar, deps-ear-jar" name="deps-jar" unless="no.deps"/>
- <target depends="init,deps-jar" name="-pre-pre-compile">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-copy-webdir">
- <copy todir="${build.web.dir}">
- <fileset dir="${web.docbase.dir}" excludes="${build.web.excludes},${excludes}" includes="${includes}"/>
- </copy>
- <copy todir="${build.web.dir}/WEB-INF">
- <fileset dir="${webinf.dir}" excludes="${build.web.excludes}"/>
- </copy>
- </target>
- <target depends="init, deps-jar, -pre-pre-compile, -pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources" name="-do-compile">
- <webproject2:javac destdir="${build.classes.dir}" gensrcdir="${build.generated.sources.dir}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target if="has.custom.manifest" name="-copy-manifest">
- <mkdir dir="${build.meta.inf.dir}"/>
- <copy todir="${build.meta.inf.dir}">
- <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
- </copy>
- </target>
- <target if="has.persistence.xml" name="-copy-persistence-xml">
- <mkdir dir="${build.web.dir}/WEB-INF/classes/META-INF"/>
- <copy todir="${build.web.dir}/WEB-INF/classes/META-INF">
- <fileset dir="${persistence.xml.dir}" includes="persistence.xml"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project." name="compile"/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile" name="-do-compile-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac excludes="" gensrcdir="${build.generated.sources.dir}" includes="${javac.includes}"/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single" name="compile-single"/>
- <target depends="compile" description="Test compile JSP pages to expose compilation errors." if="do.compile.jsps" name="compile-jsps">
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspC" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src"/>
- </target>
- <target depends="compile" if="jsp.includes" name="-do-compile-single-jsp">
- <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspCSingle" failonerror="true" fork="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-jspc.files"/>
- <arg path="${jsp.includes}"/>
- <arg value="-compilerSourceVM ${javac.source}"/>
- <arg value="-compilerTargetVM ${javac.target}"/>
- <arg value="-javaEncoding ${source.encoding}"/>
- <classpath path="${java.home}/../lib/tools.jar:${libs.jsp-compiler.classpath}:${libs.jsp-compilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac classpath="${build.classes.dir}:${libs.jsp-compilation.classpath}:${javac.classpath}:${j2ee.platform.classpath}" destdir="${build.generated.dir}/classes" srcdir="${build.generated.dir}/src">
- <customize>
- <patternset includes="${javac.jsp.includes}"/>
- </customize>
- </webproject2:javac>
- </target>
- <target name="compile-single-jsp">
- <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
- <antcall target="-do-compile-single-jsp"/>
- </target>
- <!--
- DIST BUILDING SECTION
- -->
- <target name="-pre-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.without.custom.manifest" name="-do-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.war.package.with.custom.manifest" name="-do-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.without.custom.manifest" name="-do-tmp-dist-without-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist" if="do.tmp.war.package.with.custom.manifest" name="-do-tmp-dist-with-manifest">
- <dirname file="${dist.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.war}" manifest="${build.meta.inf.dir}/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest" name="do-dist"/>
- <target depends="init" if="dist.ear.dir" name="library-inclusion-in-manifest">
- <mkdir dir="${build.web.dir}/META-INF"/>
- <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update"/>
- </target>
- <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir"/>
- <target depends="init" if="dist.ear.dir" name="-clean-webinf-lib">
- <delete dir="${build.web.dir}/WEB-INF/lib"/>
- </target>
- <target depends="init,-clean-webinf-lib,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">
- <dirname file="${dist.ear.war}" property="dist.jar.dir"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar compress="${jar.compress}" jarfile="${dist.ear.war}" manifest="${build.web.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.web.dir}"/>
- </jar>
- </target>
- <target name="-post-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)." name="dist"/>
- <target depends="init,-clean-webinf-lib,-init-cos,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR." name="dist-ear"/>
- <!--
- EXECUTION SECTION
- -->
- <target depends="run-deploy,run-display-browser" description="Deploy to server and show in browser." name="run"/>
- <target name="-pre-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-post-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-pre-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
- </target>
- <target name="-post-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
- </target>
- <target name="-run-deploy-am">
- <!-- Task to deploy to the Access Manager runtime. -->
- </target>
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy" name="run-deploy">
- <nbjpdaappreloaded/>
- </target>
- <target if="netbeans.home" name="-run-deploy-nb">
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="false" forceRedeploy="${forceRedeploy}"/>
- </target>
- <target name="-init-deploy-ant" unless="netbeans.home">
- <property name="deploy.ant.archive" value="${dist.war}"/>
- <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
- <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
- <property name="deploy.ant.enabled" value="true"/>
- </target>
- <target depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant" name="run-undeploy"/>
- <target if="netbeans.home" name="-run-undeploy-nb">
- <fail message="Undeploy is not supported from within the IDE"/>
- </target>
- <target depends="init,-pre-dist,dist,-post-dist" name="verify">
- <nbverify file="${dist.war}"/>
- </target>
- <target depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl" name="run-display-browser"/>
- <target if="do.display.browser" name="-init-display-browser">
- <condition property="do.display.browser.nb">
- <isset property="netbeans.home"/>
- </condition>
- <condition property="do.display.browser.cl">
- <isset property="deploy.ant.enabled"/>
- </condition>
- </target>
- <target if="do.display.browser.nb" name="-display-browser-nb">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.display.browser.cl" name="-get-browser" unless="browser">
- <condition property="browser" value="rundll32">
- <os family="windows"/>
- </condition>
- <condition else="" property="browser.args" value="url.dll,FileProtocolHandler">
- <os family="windows"/>
- </condition>
- <condition property="browser" value="/usr/bin/open">
- <os family="mac"/>
- </condition>
- <property environment="env"/>
- <condition property="browser" value="${env.BROWSER}">
- <isset property="env.BROWSER"/>
- </condition>
- <condition property="browser" value="/usr/bin/firefox">
- <available file="/usr/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/local/firefox/firefox">
- <available file="/usr/local/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/usr/bin/mozilla">
- <available file="/usr/bin/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/local/mozilla/mozilla">
- <available file="/usr/local/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
- <available file="/usr/sfw/lib/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/firefox">
- <available file="/opt/csw/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
- <available file="/usr/sfw/lib/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/mozilla">
- <available file="/opt/csw/bin/mozilla"/>
- </condition>
- </target>
- <target depends="-get-browser" if="do.display.browser.cl" name="-display-browser-cl">
- <fail unless="browser">
- Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
- </fail>
- <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
- <echo>Launching ${browse.url}</echo>
- <exec executable="${browser}" spawn="true">
- <arg line="${browser.args} ${browse.url}"/>
- </exec>
- </target>
- <target depends="init,-init-cos,compile-single" name="run-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" name="run-test-with-main">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}" classpath="${run.test.classpath}"/>
- </target>
- <!--
- DEBUGGING SECTION
- -->
- <target depends="init,-init-cos,compile,compile-jsps,-do-compile-single-jsp,-pre-dist,-do-tmp-dist-with-manifest,-do-tmp-dist-without-manifest" description="Debug project in IDE." if="netbeans.home" name="debug">
- <nbstartserver debugmode="true"/>
- <antcall target="connect-debugger"/>
- <nbdeploy clientUrlPart="${client.urlPart}" debugmode="true" forceRedeploy="true"/>
- <antcall target="debug-display-browser"/>
- <antcall target="connect-client-debugger"/>
- </target>
- <target if="do.debug.server" name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect address="${jpda.address}" host="${jpda.host}" name="${name}" transport="${jpda.transport}">
- <classpath>
- <path path="${debug.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <sourcepath>
- <path path="${web.docbase.dir}"/>
- </sourcepath>
- </nbjpdaconnect>
- </target>
- <target if="do.display.browser.debug" name="debug-display-browser">
- <nbbrowse url="${client.url}"/>
- </target>
- <target if="do.debug.client" name="connect-client-debugger">
- <webproject1:nbjsdebugstart webUrl="${client.url}"/>
- </target>
- <target depends="init,compile-test-single" if="netbeans.home" name="-debug-start-debuggee-main-test">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target depends="init,compile-test-single,-debug-start-debugger-main-test,-debug-start-debuggee-main-test" if="netbeans.home" name="debug-test-with-main"/>
- <target depends="init,compile,compile-jsps,-do-compile-single-jsp,debug" if="netbeans.home" name="debug-single"/>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger-main-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${debug.class}"/>
- </target>
- <target depends="init" if="netbeans.home" name="-debug-start-debugger">
- <webproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target depends="init,compile-single" if="netbeans.home" name="-debug-start-debuggee-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}"/>
- </target>
- <target depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single" if="netbeans.home" name="debug-single-main"/>
- <target depends="init" name="-pre-debug-fix">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target depends="init,-pre-debug-fix,compile-single" if="netbeans.home" name="-do-debug-fix">
- <webproject1:nbjpdareload/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix" if="netbeans.home" name="debug-fix"/>
- <!--
- JAVADOC SECTION
- -->
- <target depends="init" if="have.sources" name="javadoc-build">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc additionalparam="${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
- <classpath>
- <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <fileset dir="${src.dir}" excludes="${excludes}" includes="${includes}">
- <filename name="**/*.java"/>
- </fileset>
- <fileset dir="${build.generated.sources.dir}" erroronmissingdir="false">
- <include name="**/*.java"/>
- </fileset>
- </javadoc>
- </target>
- <target depends="init,javadoc-build" if="netbeans.home" name="javadoc-browse" unless="no.javadoc.preview">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
- <!--
-
- JUNIT COMPILATION SECTION
- -->
- <target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
- <mkdir dir="${build.test.classes.dir}"/>
- <property name="j2ee.platform.embeddableejb.classpath" value=""/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test" if="have.tests" name="-do-compile-test">
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test" name="compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac classpath="${javac.test.classpath}:${j2ee.platform.classpath}:${j2ee.platform.embeddableejb.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" srcdir="${test.src.dir}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
- <!--
-
- JUNIT EXECUTION SECTION
- -->
- <target depends="init" if="have.tests" name="-pre-test-run">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test,-pre-test-run" if="have.tests" name="-do-test-run">
- <webproject2:junit testincludes="**/*Test.java"/>
- </target>
- <target depends="init,compile-test,-pre-test-run,-do-test-run" if="have.tests" name="-post-test-run">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init" if="have.tests" name="test-report"/>
- <target depends="init" if="netbeans.home+have.tests" name="-test-browse"/>
- <target depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests." name="test"/>
- <target depends="init" if="have.tests" name="-pre-test-run-single">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single" if="have.tests" name="-do-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <webproject2:junit excludes="" includes="${test.includes}"/>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single" if="have.tests" name="-post-test-run-single">
- <fail if="tests.failed" unless="ignore.failing.tests">Some tests failed; see details above.</fail>
- </target>
- <target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
- <!--
-
- JUNIT DEBUGGING SECTION
- -->
- <target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <property location="${build.test.results.dir}/TEST-${test.class}.xml" name="test.report.file"/>
- <delete file="${test.report.file}"/>
- <!-- must exist, otherwise the XML formatter would fail -->
- <mkdir dir="${build.test.results.dir}"/>
- <webproject1:debug args="${test.class}" classname="org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner" classpath="${ant.home}/lib/ant.jar:${ant.home}/lib/ant-junit.jar:${debug.test.classpath}:${j2ee.platform.embeddableejb.classpath}">
- <customize>
- <arg value="showoutput=true"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.BriefJUnitResultFormatter"/>
- <arg value="formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,${test.report.file}"/>
- </customize>
- </webproject1:debug>
- </target>
- <target depends="init,compile-test" if="netbeans.home+have.tests" name="-debug-start-debugger-test">
- <webproject1:nbjpdastart classpath="${debug.test.classpath}" name="${test.class}"/>
- </target>
- <target depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test" name="debug-test"/>
- <target depends="init,-pre-debug-fix,compile-test-single" if="netbeans.home" name="-do-debug-fix-test">
- <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
- <!--
-
- CLEANUP SECTION
- -->
- <target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
- <target depends="init" name="do-clean">
- <condition property="build.dir.to.clean" value="${build.web.dir}">
- <isset property="dist.ear.dir"/>
- </condition>
- <property name="build.dir.to.clean" value="${build.web.dir}"/>
- <delete includeEmptyDirs="true" quiet="true">
- <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
- </delete>
- <delete dir="${build.dir}"/>
- <available file="${build.dir.to.clean}/WEB-INF/lib" property="status.clean-failed" type="dir"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target depends="do-clean" if="status.clean-failed" name="check-clean">
- <echo message="Warning: unable to delete some files in ${build.web.dir}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
- <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
- </target>
- <target depends="init" if="netbeans.home" name="undeploy-clean">
- <nbundeploy failOnError="false" startServer="false"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target depends="init,undeploy-clean,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products." name="clean"/>
- <target depends="clean" description="Clean build products." name="clean-ear"/>
-</project>
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 5683af2..0000000
--- 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 04bacf7..0000000
--- 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 aa6b0a6..0000000
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/private/private.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>
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 a11b91c..0000000
--- 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 63298e7..0000000
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/project.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.web.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/web-project/3">
- <name>SFSBDriver</name>
- <minimum-ant-version>1.6.5</minimum-ant-version>
- <web-module-libraries/>
- <web-module-additional-libraries/>
- <source-roots>
- <root id="src.dir" name="Source Packages"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir" name="Test Packages"/>
- </test-roots>
- </data>
- </configuration>
-</project>
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 e6fb687..658780c 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
@@ -53,7 +50,7 @@
<target name="compile-client">
<javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
- classpath="${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"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${build.classes.dir}/client"
includes="${client-src-name}"/>
</target>
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 36dfdfc..e13a16e 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"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${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"
- includes="client/**"/>
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="client/**"
+ />
</target>
<target name="deploy-app">
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 dfd257c..b4058a8 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="http://HTTP_HOST:HTTP_PORT/asyncservice/webservice/AsyncService?WSDL"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="client"/>
- <enableAsyncMapping>true</enableAsyncMapping>
- </bindings>
-</bindings>
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="client"/>
+ <ws:enableAsyncMapping>true</ws:enableAsyncMapping>
+ </ws:bindings>
+</ws:bindings>
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 ee5b26f..d27bbe2 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="**/*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="**/*.jar"/>
</fileset>
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 48f1716..3bf875c 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="client"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="client"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']" >
<jaxb:schemaBindings>
<jaxb:package name="client"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 0988122..53b52c8 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="endpoint"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="endpoint"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']">
<jaxb:schemaBindings>
<jaxb:package name="endpoint"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 b13b122..8a1a886 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="**/*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="**/*.jar"/>
</fileset>
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 48f1716..3bf875c 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="client"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="client"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']" >
<jaxb:schemaBindings>
<jaxb:package name="client"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 0988122..53b52c8 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="endpoint"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="endpoint"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']">
<jaxb:schemaBindings>
<jaxb:package name="endpoint"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 323c00e..250f690 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
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 4b99e1e..2544a8c 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 @@
<path id="classpath">
<fileset dir="${env.S1AS_HOME}/modules">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
+ <include name="*.jar"/>
</fileset>
<fileset dir="${env.APS_HOME}/lib">
- <include name="*.jar"/>
+ <include name="*.jar"/>
</fileset>
</path>
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 48f1716..3bf875c 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="client"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="client"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']" >
<jaxb:schemaBindings>
<jaxb:package name="client"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 0988122..53b52c8 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="endpoint"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="endpoint"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']">
<jaxb:schemaBindings>
<jaxb:package name="endpoint"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 9a9fdfc..f188a5f 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 b132d4f..41260b7 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 @@
-->
-<webservices xmlns="http://java.sun.com/xml/ns/javaee"
+<webservices xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="1.2"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://www.ibm.com/webservices/xsd/javaee_web_services_1_2.xsd">
+ version="2.0"
+ xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_2_0.xsd">
<webservice-description>
<display-name>SubtractNumbersService</display-name>
<webservice-description-name>SubtractNumbersService</webservice-description-name>
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 6d7128d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties
+++ /dev/null
@@ -1,37 +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
-
--->
-
-
-<property name="module" value="jaxrpcinjection"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
-<property name="app.type" value="application"/>
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 cb619c0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.xml
+++ /dev/null
@@ -1,109 +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
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="jaxrpcinjection" default="all" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="${wscompile.command}" />
- </exec>
- </target>
-
-<!-- NOTE. the simple mapping test and full mapping test can
- only be run one at a time, I didn't want to set up two
- tests for this. -->
-
- <target name="all" depends="clean, assemble, deploy, run, undeploy"/>
-
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="servlet"/>
- </antcall>
- </target>
-
- <target name="gen-servlet-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/WEB-INF/wsdl"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/SimpleHandlerMapping_servlet.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/WEB-INF/wsdl config-interface.xml"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile, gen-servlet-wsdl">
- <antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
- <param name="mappingfile.location" value="${build.classes.dir}"/>
- <param name="mappingfile.name" value="SimpleHandlerMapping_servlet.xml"/>
- <param name="wsdlfile.location" value="${build.classes.dir}/WEB-INF/wsdl"/>
- <param name="wsdlfile.name" value="SimpleHandlerServlet.wsdl"/>
- <param name="webwar.classes" value="servlet/*.class"/>
- </antcall>
- </target>
-
- <target name="assemble" depends="assemble-web, assemble-client"/>
-
- <target name="assemble-client" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <copy file="${build.classes.dir}/WEB-INF/wsdl/SimpleHandlerServlet.wsdl" todir="${build.classes.dir}/META-INF/wsdl"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar"
- dest="${build.classes.dir}"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="SimpleHandlerMapping_servlet.xml,META-INF/wsdl/**,simplehandler/**,servlet/SimpleServer.class,com/**" />
- </antcall>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/ServletHandlerTest/ServletHandlerTest"/>
- </antcall>
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="ServletHandlerTest"/>
- </antcall>
- <antcall target="deploy-client-common"/>
- <move file="${assemble.dir}/${appname}-clientClient.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client-common"/>
- </target>
-
-</project>
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 ea2b681..0000000
--- 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 5085a53..0000000
--- 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 4b08059..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SimpleHandlerServlet"
- targetNamespace="urn:HandlerTest"
- typeNamespace="urn:HandlerTest"
- packageName="handlertest">
- <interface name="servlet.SimpleServer"/>
- </service>
-</configuration>
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 d2d8301..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/application-client.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my handler app client</description>
- <display-name>handlerClient</display-name>
- <service-ref>
- <description>simple handler service ref</description>
- <service-ref-name>service/simplehandler</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/SimpleHandlerServlet.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SimpleHandlerMapping_servlet.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:HandlerTest">servicens:SimpleHandlerServlet</service-qname>
- <port-component-ref>
- <service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-</application-client>
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 a4ce49f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/simplehandler</service-ref-name>
- <port-info>
- <service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- <stub-property>
- <name>com.sun.enterprise.webservice.client.transport.log</name>
- <value>file:jaxrpc.log</value>
- </stub-property>
- </port-info>
- <service-qname>
- <namespaceURI>urn:HandlerTest</namespaceURI>
- <localpart>SimpleHandlerServer</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
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 2089c30..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/sun-web.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN' 'http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <context-root>ServletHandlerTest</context-root>
- <servlet>
- <servlet-name>ServletHandlerTest</servlet-name>
- <webservice-endpoint>
- <port-component-name>SimpleServerPort</port-component-name>
- <debugging-enabled>true</debugging-enabled>
- <property name="prop1" value="value1"/>
- <property name="prop2" value="value2"/>
- </webservice-endpoint>
- </servlet>
- </sun-web-app>
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 e3a3201..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/web.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <servlet>
- <servlet-name>ServletHandlerTest</servlet-name>
- <servlet-class>servlet.ServletHandlerTestImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>ServletHandlerTest</servlet-name>
- <url-pattern>/ServletHandlerTest</url-pattern>
- </servlet-mapping>
- <env-entry>
- <env-entry-name>stringValue</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>injectedValue</env-entry-value>
- </env-entry>
-</web-app>
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 e66dd79..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/webservices.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="1.2"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://www.ibm.com/webservices/xsd/javaee_web_services_1_2.xsd">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>SimpleHandlerServlet</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/SimpleHandlerServlet.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SimpleHandlerMapping_servlet.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>SimpleServerPort</port-component-name>
- <wsdl-port xmlns:servicens="urn:HandlerTest">servicens:SimpleServerPort</wsdl-port>
- <service-endpoint-interface>servlet.SimpleServer</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>ServletHandlerTest</servlet-link>
- </service-impl-bean>
- <handler>
- <handler-name>SimpleHandler</handler-name>
- <handler-class>servlet.SimpleHandler</handler-class>
- </handler>
- </port-component>
- </webservice-description>
-</webservices>
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 891d555..0000000
--- 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 5a81f19..0000000
--- 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 0675cd2..0000000
--- 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 9a5eaca..df1d91a 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
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 bace84a..01ef8c3 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 @@
<target name="assemble-web" depends="init-common, compile">
<mkdir dir="${assemble.dir}"/>
- <echo message="my build classes dir is:${build.classes.dir}" level="verbose"/> <mkdir dir="${build.classes.dir}/tmp"/>
+ <echo message="my build classes dir is:${build.classes.dir}" level="verbose"/>
+ <mkdir dir="${build.classes.dir}/tmp"/>
<mkdir dir="${build.classes.dir}/tmp/WEB-INF"/>
<mkdir dir="${build.classes.dir}/tmp/WEB-INF/classes"/>
<mkdir dir="${build.classes.dir}/tmp/WEB-INF/lib"/>
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 0e2c976..5e67cd9 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 74f9e12..ed1b4a4 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
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 48f1716..3bf875c 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="client"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="client"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']" >
<jaxb:schemaBindings>
<jaxb:package name="client"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 0988122..53b52c8 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="endpoint"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="endpoint"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']">
<jaxb:schemaBindings>
<jaxb:package name="endpoint"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 c3ec9e9..d5fa374 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"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${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"
- includes="client/**"/>
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="client/**"
+ />
</target>
<target name="deploy-app">
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 60f53c4..6c3f102 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
@@ -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"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/appclient"
- classpath="${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"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
includes="appclient/**"/>
<mkdir dir="${build.classes.dir}/appclient/META-INF/wsdl"/>
<copy file="AddNumbers.wsdl" todir="${build.classes.dir}/appclient/META-INF/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 713874b..d97f17c 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;
- <target name="all" depends="clean, setup, runclient, undeploy"/>
+ <target name="all" depends="clean, setup, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app, assemble-client"/>
+ <target name="setup" depends="assemble-web, deploy-app, assemble-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="assemble-web" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
- <replace file="client/Client.java" value="${http.host}" token="HTTP_HOST"/>
- <replace file="client/Client.java" value="${http.port}" token="HTTP_PORT"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${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"
- includes="client/**"/>
- </target>
+ <replace file="client/Client.java" value="${http.host}" token="HTTP_HOST" />
+ <replace file="client/Client.java" value="${http.port}" token="HTTP_PORT" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="client/**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="restful-svc-2"/>
- </antcall>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="restful-svc-2" />
+ </antcall>
-<!--restore the tokens back in file-->
- <replace file="client/Client.java" token="${http.host}" value="HTTP_HOST"/>
- <replace file="client/Client.java" token="${http.port}" value="HTTP_PORT"/>
- </target>
+ <!--restore the tokens back in file-->
+ <replace file="client/Client.java" token="${http.host}" value="HTTP_HOST" />
+ <replace file="client/Client.java" token="${http.port}" value="HTTP_PORT" />
+ </target>
</project>
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 85852de..2a2aee0 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;
- <target name="all" depends="clean, setup, runclient, undeploy"/>
+ <target name="all" depends="clean, setup, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app, assemble-client"/>
+ <target name="setup" depends="assemble-web, deploy-app, assemble-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="assemble-web" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
-<replace file="client/Client.java" value="${http.host}" token="HTTP_HOST"/>
- <replace file="client/Client.java" value="${http.port}" token="HTTP_PORT"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${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"
- includes="client/**"/>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <replace file="client/Client.java" value="${http.host}" token="HTTP_HOST" />
+ <replace file="client/Client.java" value="${http.port}" token="HTTP_PORT" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="client/**"
+ />
+ </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="restful-svc-1" />
+ </antcall>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- </target>
-
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="restful-svc-1"/>
- </antcall>
-
-
-<!--restore the tokens back in file-->
- <replace file="client/Client.java" token="${http.host}" value="HTTP_HOST"/>
- <replace file="client/Client.java" token="${http.port}" value="HTTP_PORT"/>
- </target>
+ <!--restore the tokens back in file-->
+ <replace file="client/Client.java" token="${http.host}" value="HTTP_HOST" />
+ <replace file="client/Client.java" token="${http.port}" value="HTTP_PORT" />
+ </target>
</project>
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 ef09191..5a9e622 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete dir="localwsdl"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ <delete dir="localwsdl" />
+ </target>
- <target name="setup" depends="assemble-web, assemble-appclient, deploy-app, deploy-appclient"/>
+ <target name="setup" depends="assemble-web, assemble-appclient, deploy-app, deploy-appclient" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="assemble-web" depends="init-common">
- <mkdir dir="${build.classes.dir}"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-wsdllocation WEB-INF/wsdl/AddNumbers.wsdl -extension -b custom-server.xml -keep -d ${build.classes.dir} ${env.APS_HOME}/devtests/webservice/annotations/soap12/AddNumbers.wsdl"/>
- </antcall>
- <antcall target="compile"/>
- <copy file="sun-web.xml.template" tofile="sun-web.xml"/>
- <replace file="sun-web.xml">
- <replacefilter token="%TOKEN%" value="file:${env.APS_HOME}/build/localwsdl"/>
- </replace>
- <antcall target="pkg-war">
- <param name="wsdlfile.location" value="${env.APS_HOME}/devtests/webservice/annotations/soap12"/>
- <param name="wsdlfile.name" value="AddNumbers.wsdl"/>
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
+ <target name="assemble-web" depends="init-common">
+ <mkdir dir="${build.classes.dir}" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-wsdllocation WEB-INF/wsdl/AddNumbers.wsdl -extension -b custom-server.xml -keep -d ${build.classes.dir} ${env.APS_HOME}/devtests/webservice/annotations/soap12/AddNumbers.wsdl"
+ />
+ </antcall>
+ <antcall target="compile" />
+ <copy file="sun-web.xml.template" tofile="sun-web.xml" />
+ <replace file="sun-web.xml">
+ <replacefilter token="%TOKEN%" value="file:${env.APS_HOME}/build/localwsdl" />
+ </replace>
+ <antcall target="pkg-war">
+ <param name="wsdlfile.location"
+ value="${env.APS_HOME}/devtests/webservice/annotations/soap12"
+ />
+ <param name="wsdlfile.name" value="AddNumbers.wsdl" />
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="assemble-appclient" depends="init-common">
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/appclient"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-b custom-client.xml -extension -keep -d ${build.classes.dir}/appclient ${env.APS_HOME}/devtests/webservice/annotations/soap12/AddNumbers.wsdl"/>
- </antcall>
- <replace file="appclient/Client.java" value="${http.host}" token="HTTP_HOST"/>
- <replace file="appclient/Client.java" value="${http.port}" token="HTTP_PORT"/>
- <javac srcdir="." destdir="${build.classes.dir}/appclient"
- classpath="${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"
- includes="appclient/**"/>
- <mkdir dir="${build.classes.dir}/appclient/META-INF/wsdl"/>
- <copy file="AddNumbers.wsdl" todir="${build.classes.dir}/appclient/META-INF/wsdl"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/appclient"/>
- <copy file="${application-client.xml}" tofile="${build.classes.dir}/META-INF/application-client.xml" failonerror="false"/>
- <copy file="sun-application-client.xml.template" tofile="sun-application-client.xml"/>
- <replace file="${sun-application-client.xml}">
- <replacefilter token="%TOKEN%" value="file:${env.APS_HOME}/build/localwsdl"/>
- </replace>
- <copy file="${sun-application-client.xml}" tofile="${build.classes.dir}/META-INF/sun-application-client.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}-client.jar" manifest="./appclient/MANIFEST.MF">
- <fileset dir="${build.classes.dir}/appclient">
- <include name="**"/>
- </fileset>
- </jar>
- </target>
+ <target name="assemble-appclient" depends="init-common">
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/appclient" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-b custom-client.xml -extension -keep -d ${build.classes.dir}/appclient ${env.APS_HOME}/devtests/webservice/annotations/soap12/AddNumbers.wsdl"
+ />
+ </antcall>
+ <replace file="appclient/Client.java" value="${http.host}" token="HTTP_HOST" />
+ <replace file="appclient/Client.java" value="${http.port}" token="HTTP_PORT" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/appclient"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="appclient/**"
+ />
+ <mkdir dir="${build.classes.dir}/appclient/META-INF/wsdl" />
+ <copy file="AddNumbers.wsdl" todir="${build.classes.dir}/appclient/META-INF/wsdl" />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/appclient" />
+ <copy file="${application-client.xml}"
+ tofile="${build.classes.dir}/META-INF/application-client.xml"
+ failonerror="false"
+ />
+ <copy file="sun-application-client.xml.template" tofile="sun-application-client.xml" />
+ <replace file="${sun-application-client.xml}">
+ <replacefilter token="%TOKEN%" value="file:${env.APS_HOME}/build/localwsdl" />
+ </replace>
+ <copy file="${sun-application-client.xml}"
+ tofile="${build.classes.dir}/META-INF/sun-application-client.xml"
+ failonerror="false"
+ />
+ <jar jarfile="${assemble.dir}/${appname}-client.jar" manifest="./appclient/MANIFEST.MF">
+ <fileset dir="${build.classes.dir}/appclient">
+ <include name="**" />
+ </fileset>
+ </jar>
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
- <target name="deploy-appclient">
- <antcall target="deploy-client-common"/>
- <move file="${assemble.dir}/${appname}-clientClient.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
- </target>
+ <target name="deploy-appclient">
+ <antcall target="deploy-client-common" />
+ <move file="${assemble.dir}/${appname}-clientClient.jar"
+ toFile="${assemble.dir}/${appname}AppClient.jar"
+ />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client-common" />
+ </target>
- <target name="runtest" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}"/>
- </antcall>
+ <target name="runtest" depends="init-common">
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="http://${http.host}:${http.port}" />
+ </antcall>
- <replace file="appclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
- <replace file="appclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
- </target>
+ <replace file="appclient/Client.java" token="${http.host}" value="HTTP_HOST" />
+ <replace file="appclient/Client.java" token="${http.port}" value="HTTP_PORT" />
+ </target>
</project>
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 fe3f736..4b4fa04 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="AddNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="client"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="client"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']" >
<jaxb:schemaBindings>
<jaxb:package name="client"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 e6bb237..23489f9 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="AddNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="endpoint"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="endpoint"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']">
<jaxb:schemaBindings>
<jaxb:package name="endpoint"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 01c9fca..df0b14d 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 @@
<path id="client-classpath">
<pathelement path="${env.APS_HOME}/lib/reporter.jar"/>
- <pathelement path="${env.S1AS_HOME}/lib/j2ee.jar"/>
- <pathelement path="${env.S1AS_HOME}/lib/webservices-rt.jar"/>
- <pathelement path="${env.S1AS_HOME}/lib/webservices-tools.jar"/>
- <pathelement path="${env.S1AS_HOME}/lib/activation.jar"/>
+ <pathelement path="${env.S1AS_HOME}/lib/javaee.jar"/>
+ <pathelement path="${env.S1AS_HOME}/lib/webservices-osgi.jar"/>
<pathelement path="${env.S1AS_HOME}/lib/appserv-rt.jar"/>
</path>
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 1188534..3e660e9 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="**/*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="**/*.jar"/>
</fileset>
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 48f1716..3bf875c 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="client"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="client"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']" >
<jaxb:schemaBindings>
<jaxb:package name="client"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 0988122..53b52c8 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="endpoint"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="endpoint"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']">
<jaxb:schemaBindings>
<jaxb:package name="endpoint"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 4931caf..d3d5205 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 @@
</target>
<target name="setup" depends="assemble-web, assemble-client, deploy-app, deploy-client"/>
-<path id="class.path">
+ <path id="class.path">
<fileset dir="${env.S1AS_HOME}/modules">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="**/*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="**/*.jar"/>
</fileset>
-
</path>
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 48f1716..3bf875c 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="client"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="client"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']" >
<jaxb:schemaBindings>
<jaxb:package name="client"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 0988122..53b52c8 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="endpoint"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="endpoint"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']">
<jaxb:schemaBindings>
<jaxb:package name="endpoint"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 e72a881..6569c97 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;
<target name="all" depends="clean, setup, runtest, undeploy"/>
-<path id="class.path">
+ <path id="class.path">
<fileset dir="${env.S1AS_HOME}/modules">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="**/*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="**/*.jar"/>
</fileset>
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 48f1716..3bf875c 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="client"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="client"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']" >
<jaxb:schemaBindings>
<jaxb:package name="client"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 0988122..53b52c8 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="endpoint"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="endpoint"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']">
<jaxb:schemaBindings>
<jaxb:package name="endpoint"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 1606289..55113ba 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;
-<path id="classpath">
+ <path id="classpath">
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
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 48f1716..3bf875c 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="client"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="client"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']" >
<jaxb:schemaBindings>
<jaxb:package name="client"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 0988122..53b52c8 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="endpoint"/>
- </bindings>
- <bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="endpoint"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']">
<jaxb:schemaBindings>
<jaxb:package name="endpoint"/>
</jaxb:schemaBindings>
- </bindings>
-</bindings>
-
+ </ws:bindings>
+</ws:bindings>
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 f1f48e9..e2a257e 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
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 4210493..1530e31 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
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 8aca3eb..751b71c 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 @@
-->
- <!DOCTYPE project [
+<!DOCTYPE project [
<!ENTITY commonSetup SYSTEM "file:./../../../../config/properties.xml">
<!ENTITY commonBuild SYSTEM "file:./../../../../config/common.xml">
<!ENTITY commonRun SYSTEM "file:./../../../../config/run.xml">
@@ -33,78 +33,86 @@
&testproperties;
&jaxwsTools;
- <target name="all" depends="clean, setup-web, clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all"
+ depends="clean, setup-web, clean, setup-ejb, assemble-client, runclient, undeploy"
+ />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-web" depends="assemble-web, deploy-web-app"/>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar"/>
+ <target name="setup-web" depends="assemble-web, deploy-web-app" />
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar" />
- <target name="assemble-ejb">
- <antcall target="compile-common">
- <param name="src" value="ejb_endpoint"/>
- </antcall>
- <antcall target="pkg-ejb-jar">
- <param name="jar.classes" value="ejb_endpoint"/>
- <param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar"/>
- </antcall>
- </target>
+ <target name="assemble-ejb">
+ <antcall target="compile-common">
+ <param name="src" value="ejb_endpoint" />
+ </antcall>
+ <antcall target="pkg-ejb-jar">
+ <param name="jar.classes" value="ejb_endpoint" />
+ <param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar" />
+ </antcall>
+ </target>
- <target name="assemble-web">
- <antcall target="compile-common">
- <param name="src" value="servlet_endpoint"/>
- </antcall>
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
+ <target name="assemble-web">
+ <antcall target="compile-common">
+ <param name="src" value="servlet_endpoint" />
+ </antcall>
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/${appname}/webservice/ServletHelloService?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/${appname}/webservice/ServletHelloService?WSDL"/>
- </antcall>
- <echo message="wsimporting http://${http.host}:${http.port}/WSHelloEJBService/WSHelloEJB?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/WSHelloEJBService/WSHelloEJB?WSDL"/>
- </antcall>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/${appname}/webservice/ServletHelloService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/${appname}/webservice/ServletHelloService?WSDL"
+ />
+ </antcall>
+ <echo message="wsimporting http://${http.host}:${http.port}/WSHelloEJBService/WSHelloEJB?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/WSHelloEJBService/WSHelloEJB?WSDL"
+ />
+ </antcall>
- <replace file="client/Client.java" value="${http.host}" token="HTTP_HOST"/>
- <replace file="client/Client.java" value="${http.port}" token="HTTP_PORT"/>
+ <replace file="client/Client.java" value="${http.host}" token="HTTP_HOST" />
+ <replace file="client/Client.java" value="${http.port}" token="HTTP_PORT" />
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${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"
- includes="client/**"/>
- </target>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="client/**"
+ />
+ </target>
- <target name="deploy-web-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-web-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
- <target name="deploy-ejb-jar">
- <antcall target="deploy-jar-common"/>
- </target>
+ <target name="deploy-ejb-jar">
+ <antcall target="deploy-jar-common" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-jar-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-jar-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="webservicerefs-test"/>
- </antcall>
- <replace file="client/Client.java" token="${http.host}" value="HTTP_HOST"/>
- <replace file="client/Client.java" token="${http.port}" value="HTTP_PORT"/>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="webservicerefs-test" />
+ </antcall>
+ <replace file="client/Client.java" token="${http.host}" value="HTTP_HOST" />
+ <replace file="client/Client.java" token="${http.port}" value="HTTP_PORT" />
+ </target>
</project>
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 0961163..530d5d5 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
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 4ae3018..fb8c04f 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
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 8ef10aa..b5073f9 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
@@ -78,7 +75,7 @@
<mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
<antcall target="wsimport">
<param name="wsimport.args"
- value="-p client -Xendorsed -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/webservices13-clientdds/webservice/SubtractNumbersService?wsdl"/>
+ value="-p client -Xendorsed -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/webservices13-clientdds/webservice/SubtractNumbersService?wsdl"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
includes="webclient/**">
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 4c9bc4e..3ecd866 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 12922e9..e06d393 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
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 7c41604..20c6aec 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app, assemble-client"/>
+ <target name="setup" depends="assemble-web, deploy-app, assemble-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="service"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="service" />
+ </antcall>
+ </target>
- <target name="run-wsimport">
- <mkdir dir="${build.classes.dir}"/>
- <replace file="HttpTestService.wsdl" value="${http.host}" token="HTTP_HOST"/>
- <replace file="HttpTestService.wsdl" value="${http.port}" token="HTTP_PORT"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-wsdllocation WEB-INF/wsdl/HttpTestService.wsdl -keep -b customservice.xml -d ${build.classes.dir} HttpTestService.wsdl"/>
- </antcall>
- </target>
+ <target name="run-wsimport">
+ <mkdir dir="${build.classes.dir}" />
+ <replace file="HttpTestService.wsdl" value="${http.host}" token="HTTP_HOST" />
+ <replace file="HttpTestService.wsdl" value="${http.port}" token="HTTP_PORT" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-wsdllocation WEB-INF/wsdl/HttpTestService.wsdl -keep -b customservice.xml -d ${build.classes.dir} HttpTestService.wsdl"
+ />
+ </antcall>
+ </target>
- <target name="assemble-web" depends="init-common, run-wsimport, compile">
- <antcall target="pkg-war">
- <param name="wsdlfile.location" value="."/>
- <param name="wsdlfile.name" value="HttpTestService.wsdl"/>
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
+ <target name="assemble-web" depends="init-common, run-wsimport, compile">
+ <antcall target="pkg-war">
+ <param name="wsdlfile.location" value="." />
+ <param name="wsdlfile.name" value="HttpTestService.wsdl" />
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting localWSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -wsdllocation ${env.APS_HOME}/devtests/webservice/annotations/wsdltojava/HttpTestService.wsdl -b customclient.xml -d ${build.classes.dir}/client HttpTestService.wsdl"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${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"
- includes="client/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting localWSDL" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -wsdllocation ${env.APS_HOME}/devtests/webservice/annotations/wsdltojava/HttpTestService.wsdl -b customclient.xml -d ${build.classes.dir}/client HttpTestService.wsdl"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="client/**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ </target>
- <target name="runtest">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="basic-wsdl-to-java-test-case"/>
- </antcall>
+ <target name="runtest">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="basic-wsdl-to-java-test-case" />
+ </antcall>
- <!--restore the tokens back in file-->
- <replace file="HttpTestService.wsdl" token="${http.host}" value="HTTP_HOST"/>
- <replace file="HttpTestService.wsdl" token="${http.port}" value="HTTP_PORT"/>
- </target>
+ <!--restore the tokens back in file-->
+ <replace file="HttpTestService.wsdl" token="${http.host}" value="HTTP_HOST" />
+ <replace file="HttpTestService.wsdl" token="${http.port}" value="HTTP_PORT" />
+ </target>
</project>
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 d15839e..f1eba8d 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 @@
-->
-<bindings wsdlLocation="HttpTestService.wsdl" xmlns="http://java.sun.com/xml/ns/jaxws">
-
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="client"/>
- </bindings>
-
- <bindings node="ns1:definitions/ns1:types/xs:schema[@targetNamespace='http://httptestservice.org/types']"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <ns2:schemaBindings xmlns:ns2="http://java.sun.com/xml/ns/jaxb">
- <ns2:package name="client"/>
- </ns2:schemaBindings>
- </bindings>
-
-</bindings>
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ wsdlLocation="HttpTestService.wsdl"
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="client"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://httptestservice.org/types']" >
+ <jaxb:schemaBindings>
+ <jaxb:package name="client"/>
+ </jaxb:schemaBindings>
+ </ws:bindings>
+</ws:bindings>
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 8ebaf93..dde9e4c 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 @@
-->
-<bindings wsdlLocation="HttpTestService.wsdl" xmlns="http://java.sun.com/xml/ns/jaxws">
-
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="service"/>
- </bindings>
-
- <bindings node="ns1:definitions/ns1:types/xs:schema[@targetNamespace='http://httptestservice.org/types']"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <ns2:schemaBindings xmlns:ns2="http://java.sun.com/xml/ns/jaxb">
- <ns2:package name="service"/>
- </ns2:schemaBindings>
- </bindings>
-
-</bindings>
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ wsdlLocation="HttpTestService.wsdl"
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="service"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://httptestservice.org/types']">
+ <jaxb:schemaBindings>
+ <jaxb:package name="service"/>
+ </jaxb:schemaBindings>
+ </ws:bindings>
+</ws:bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/build.xml b/appserver/tests/appserv-tests/devtests/webservice/build.xml
index ba142c3..e358c81 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/build.xml
@@ -36,59 +36,19 @@
<delete dir="${env.APS_HOME}/build/module"/>
<record name="webservice.output" action="start" />
<delete dir="${env.APS_HOME}/build/module"/>
- <ant dir="jaxrpc-hello-ejb" target="all"/>
- <delete dir="${env.APS_HOME}/build/module"/>
- <ant dir="jaxrpc-hello-web" target="all"/>
-<!-- <ant dir="googleserver" target="all"/>--> <!-- 3 tests -->
- <ant dir="xsdany" target="all"/> <!-- 1 test -->
- <ant dir="filter_urlhandling" target="all"/> <!-- 1 test -->
- <!-- <ant dir="security" target="all"/>--> <!-- 9 test -->
-<!-- <ant dir="simplefault" target="all"/>
- <ant dir="handler" target="all"/>
- <ant dir="webstub_properties" target="all"/>
- <ant dir="servlethandler" target="all"/>-->
+ <ant dir="filter_urlhandling" target="all"/>
+ <!--ant dir="security" target="all"/-->
<ant dir="annotations" target="all"/>
<ant dir="ejb_annotations" target="all"/>
- <ant dir="mapping/j2w/signature" target="all"/> <!-- 2 tests -->
- <ant dir="google" target="all"/> <!-- 1 test -->
- <ant dir="gf_dd/endpoint_address_uri" target="all"/> <!-- 1 test -->
+ <ant dir="gf_dd/endpoint_address_uri" target="all"/>
<record name="webservice.output" action="stop" />
<antcall target="report"/>
<antcall target="dev-report"/>
</target>
- <target name="google">
- <record name="google.output" action="start" />
- <ant dir="google" target="all"/>
- <record name="google.output" action="stop" />
- <antcall target="report"/>
- </target>
-
- <target name="xsdany">
- <record name="xsdany.output" action="start" />
- <ant dir="xsdany" target="all"/>
- <record name="xsdany.output" action="stop" />
- <antcall target="report"/>
- </target>
-
- <target name="soapfaults">
- <record name="soapfaults.output" action="start" />
- <ant dir="soapfaults" target="all"/>
- <record name="soapfaults.output" action="stop" />
- <antcall target="report"/>
- </target>
-
- <target name="signature">
- <record name="signature.output" action="start" />
- <ant dir="mapping/j2w/signature" target="all"/>
- <record name="signature.output" action="stop" />
- <antcall target="report"/>
- </target>
-
<target name="clean">
<delete>
- <fileset dir="${basedir}"
- includes="**.output, count.txt"/>
+ <fileset dir="${basedir}" includes="**.output, count.txt"/>
</delete>
<ant dir="google" target="clean"/>
<ant dir="xsdany" target="clean"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml b/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml
index d6dea53..7e6b433 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="**/*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="**/*.jar"/>
</fileset>
@@ -36,9 +33,6 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="**/*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="**/*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="**/*.jar"/>
</fileset>
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 9a35134..a5c5765 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 @@
<mkdir dir="${env.APS_HOME}/build/module/classes"/>
<mkdir dir="${env.APS_HOME}/build/module/archive"/>
</target>
- <path id="classpath">
-
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="*.jar"/>
-
- </fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
-
- </fileset>
- <fileset dir="${env.APS_HOME}/lib">
- <include name="reporter.jar"/>
- </fileset>
-
-
- </path>
+<path id="classpath">
+ <fileset dir="${env.S1AS_HOME}/modules">
+ <include name="*.jar" />
+ </fileset>
+ <fileset dir="${env.APS_HOME}/lib">
+ <include name="reporter.jar" />
+ </fileset>
+</path>
<target name="test-compile">
@@ -159,6 +151,10 @@
</target>
<target name="configurable-wsdl-import">
+ <tstamp>
+ <format property="TIMESTAMP" pattern="yyyy-MM-dd'T'HH:mm:ss.SSSZ" />
+ </tstamp>
+ <echo>Current time (ISO): ${TIMESTAMP}</echo>
<echo message="wsimporting ${protocol}://${host-name}:${host-port}/${server}Service/${port}?WSDL; special args are ${wsimport-special-args}"/>
<exec executable="${env.S1AS_HOME}/bin/wsimport">
<arg line="-keep -d ${env.APS_HOME}/build/module/classes ${protocol}://${host-name}:${host-port}/${server}Service/${port}?WSDL"/>
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 e02613e..e1f6813 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;
- <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar"/>
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar" />
- <target name="assemble-ejb">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- <antcall target="pkg-ejb-jar">
- <param name="jar.classes" value="endpoint"/>
- <param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar"/>
- </antcall>
- </target>
+ <target name="assemble-ejb">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ <antcall target="pkg-ejb-jar">
+ <param name="jar.classes" value="endpoint" />
+ <param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/AddNumbersImplService/AddNumbersImpl?WSDL"/>
- <replace file="custom-client.xml" value="${http.host}" token="HTTP_HOST"/>
- <replace file="custom-client.xml" value="${http.port}" token="HTTP_PORT"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -b custom-client.xml -d ${build.classes.dir}/client http://${http.host}:${http.port}/AddNumbersImplService/AddNumbersImpl?WSDL"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${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"
- includes="client/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/AddNumbersImplService/AddNumbersImpl?WSDL"
+ />
+ <replace file="custom-client.xml" value="${http.host}" token="HTTP_HOST" />
+ <replace file="custom-client.xml" value="${http.port}" token="HTTP_PORT" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -b custom-client.xml -d ${build.classes.dir}/client http://${http.host}:${http.port}/AddNumbersImplService/AddNumbersImpl?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${build.classes.dir}/client"
+ includes="client/**"
+ />
+ </target>
- <target name="deploy-ejb-jar">
- <antcall target="deploy-jar-common"/>
- </target>
+ <target name="deploy-ejb-jar">
+ <antcall target="deploy-jar-common" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-jar-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-jar-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="async-ejb-test"/>
- </antcall>
- <!--restore the tokens back in file-->
- <replace file="custom-client.xml" token="${http.host}" value="HTTP_HOST"/>
- <replace file="custom-client.xml" token="${http.port}" value="HTTP_PORT"/>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="async-ejb-test" />
+ </antcall>
+ <!--restore the tokens back in file-->
+ <replace file="custom-client.xml" token="${http.host}" value="HTTP_HOST" />
+ <replace file="custom-client.xml" token="${http.port}" value="HTTP_PORT" />
+ </target>
</project>
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 0e3aca6..e6e4e2b 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="http://HTTP_HOST:HTTP_PORT/AddNumbersImplService/AddNumbersImpl?WSDL"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="client"/>
- <enableAsyncMapping>true</enableAsyncMapping>
- </bindings>
-</bindings>
-
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="client"/>
+ <ws:enableAsyncMapping>true</ws:enableAsyncMapping>
+ </ws:bindings>
+</ws:bindings>
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 eafa23e..a4f6a98 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;
<property name="src-name" value="endpoint/WebServiceEJB.java"/>
- <property name="client-src-name" value="client/Client.java"/>
+ <property name="client-src-name" value="client/Client.java"/>
- <target name="all" depends="clean, deploy, private-run, private-undeploy, report"/>
+ <target name="all" depends="clean, deploy, private-run, private-undeploy, report"/>
- <target name="private-undeploy">
- <antcall target="autoundeploy-file">
- <param name="filename" value="EjbClient.jar"/>
- </antcall>
- <antcall target="autoundeploy-file">
- <param name="filename" value="WebServiceEJB.jar"/>
- </antcall>
- </target>
+ <target name="private-undeploy">
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="EjbClient.jar"/>
+ </antcall>
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="WebServiceEJB.jar"/>
+ </antcall>
+ </target>
- <target name="private-run">
- <antcall target="clean"/>
- <echo message="wsimporting http://${http.host}:${http.port}/WebServiceEJBService/WebServiceEJB?WSDL"/>
- <replace file="custom-client.xml" value="${http.host}" token="HTTP_HOST"/>
- <replace file="custom-client.xml" value="${http.port}" token="HTTP_PORT"/>
- <exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-keep -b custom-client.xml -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/WebServiceEJBService/WebServiceEJB?WSDL"/>
- </exec>
- <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
- includes="ejb/HelloEJB.java">
- <classpath refid="classpath"/>
- </javac>
- <jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar"
+ <target name="private-run">
+ <antcall target="clean"/>
+ <echo message="wsimporting http://${http.host}:${http.port}/WebServiceEJBService/WebServiceEJB?WSDL" />
+ <replace file="custom-client.xml" value="${http.host}" token="HTTP_HOST" />
+ <replace file="custom-client.xml" value="${http.port}" token="HTTP_PORT" />
+ <exec executable="${env.S1AS_HOME}/bin/wsimport">
+ <arg line="-keep -b custom-client.xml -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/WebServiceEJBService/WebServiceEJB?WSDL" />
+ </exec>
+ <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes" includes="ejb/HelloEJB.java">
+ <classpath refid="classpath"/>
+ </javac>
+ <jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar"
basedir="${env.APS_HOME}/build/module/classes"
includes="ejb/**,endpoint/**"/>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
- </or>
- </waitfor>
- <condition property="deploy_succeeded">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
- </condition>
- <condition property="deploy_failed">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
- </condition>
- <fail if="deploy_failed" message="Deployment failed"/>
- <basename file="${client-src-name}" property="client" suffix=".java"/>
- <dirname file="${client-src-name}" property="client-directory"/>
- <basename file="${client-directory}" property="client-pkg-name"/>
- <property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
- <antcall target="compile-client"/>
- <echo message="Running appclient with ${client-pkg-name}.${client}"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes"/>
- <exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
- <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
- <arg value="${client-pkg-name}.${client}"/>
- </exec>
+ <waitfor maxwait="100" maxwaitunit="second">
+ <or>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
+ </or>
+ </waitfor>
+ <condition property="deploy_succeeded">
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
+ </condition>
+ <condition property="deploy_failed">
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
+ </condition>
+ <fail if="deploy_failed" message="Deployment failed"/>
+ <basename file="${client-src-name}" property="client" suffix=".java"/>
+ <dirname file="${client-src-name}" property="client-directory"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
+ <property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
+ <antcall target="compile-client"/>
+ <echo message="Running appclient with ${client-pkg-name}.${client}"/>
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes"/>
+ <exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
+ <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
+ <arg value="${client-pkg-name}.${client}"/>
+ </exec>
-<!--restore the tokens back in file-->
- <replace file="custom-client.xml" token="${http.host}" value="HTTP_HOST"/>
- <replace file="custom-client.xml" token="${http.port}" value="HTTP_PORT"/>
- </target>
+ <!--restore the tokens back in file-->
+ <replace file="custom-client.xml" token="${http.host}" value="HTTP_HOST"/>
+ <replace file="custom-client.xml" token="${http.port}" value="HTTP_PORT"/>
+ </target>
- <target name="report-success">
- <echo message="Test PASSED"/>
- </target>
+ <target name="report-success">
+ <echo message="Test PASSED"/>
+ </target>
- <target name="report-failure">
- <echo message="Test FAILED"/>
- </target>
+ <target name="report-failure">
+ <echo message="Test FAILED"/>
+ </target>
</project>
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 67df59b..a65cc3e 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 @@
-->
-<bindings
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+<ws:bindings
+ xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="http://HTTP_HOST:HTTP_PORT/WebServiceEJBService/WebServiceEJB?WSDL"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="ejb"/>
- <enableAsyncMapping>true</enableAsyncMapping>
- </bindings>
-</bindings>
-
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="ejb"/>
+ <ws:enableAsyncMapping>true</ws:enableAsyncMapping>
+ </ws:bindings>
+</ws:bindings>
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 5a88fc3..aa86f6d 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;
- <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar"/>
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar" />
- <target name="assemble-ejb">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="persistence.xml" todir="${build.classes.dir}/META-INF"/>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="**">
- </jar>
- </target>
+ <target name="assemble-ejb">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/META-INF" />
+ <copy file="persistence.xml" todir="${build.classes.dir}/META-INF" />
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar" basedir="${build.classes.dir}" includes="**">
+ </jar>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/CustomerManagerService/CustomerManager?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/CustomerManagerService/CustomerManager?WSDL"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${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"
- includes="client/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/CustomerManagerService/CustomerManager?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/CustomerManagerService/CustomerManager?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="client/**"
+ />
+ </target>
- <target name="deploy-ejb-jar" depends="setToolProperty">
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="start-database"/>
- </exec>
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="deploy"/>
- <arg line="${as.props}"/>
- <arg line="--upload=true"/>
- <arg line="--dropandcreatetables"/>
- <arg line="--target ${appserver.instance.name}"/>
- <arg line="${assemble.dir}/${appname}-ejb.jar"/>
- </exec>
- </target>
+ <target name="deploy-ejb-jar" depends="setToolProperty">
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="start-database" />
+ </exec>
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="deploy" />
+ <arg line="${as.props}" />
+ <arg line="--upload=true" />
+ <arg line="--dropandcreatetables" />
+ <arg line="--target ${appserver.instance.name}" />
+ <arg line="${assemble.dir}/${appname}-ejb.jar" />
+ </exec>
+ </target>
- <target name="undeploy" depends="init-common,setToolProperty">
- <exec executable="${ASADMIN}" failonerror="false">
- <arg line="undeploy"/>
- <arg line="${as.props}"/>
- <arg line="--droptables=true"/>
- <arg line="--cascade=true"/>
- <arg line="--target ${appserver.instance.name}"/>
- <arg line="${appname}-ejb"/>
- </exec>
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="stop-database"/>
- </exec>
- </target>
+ <target name="undeploy" depends="init-common,setToolProperty">
+ <exec executable="${ASADMIN}" failonerror="false">
+ <arg line="undeploy" />
+ <arg line="${as.props}" />
+ <arg line="--droptables=true" />
+ <arg line="--cascade=true" />
+ <arg line="--target ${appserver.instance.name}" />
+ <arg line="${appname}-ejb" />
+ </exec>
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="stop-database" />
+ </exec>
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="async-ejb-test"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="async-ejb-test" />
+ </antcall>
+ </target>
</project>
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 c0a0496..89aa341 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 @@
<ant dir="noname" target="all"/>
<ant dir="nointf" target="all"/>
<ant dir="security" target="all"/>
- <!--ant dir="provider" target="all"/-->
+ <ant dir="provider" target="all" />
<ant dir="oneway" target="all"/>
<ant dir="wsctxtinterceptor" target="all"/>
<ant dir="ejbclient" target="all"/>
@@ -43,9 +43,9 @@
<ant dir="ejbwebservicesinwar-3" target="all"/>
<ant dir="ejbwebservicesinwar-sessioncontext" target="all"/>
<ant dir="ejbwebservicesinwar-interceptor" target="all"/>
- <ant dir="ejbservletwebservicesinwar" target="all"/>
+ <ant dir="ejbservletwebservicesinwar" target="all"/>
<ant dir="async" target="all"/>
- <!--<ant dir="bigint" target="all"/>-->
+ <ant dir="bigint" target="all"/>
<ant dir="libdependent" target="all"/>
<ant dir="libdependent-2" target="all"/>
<ant dir="svchandler" target="all"/>
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 6399029..c62159d 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 @@
<project name="Hello" default="core" basedir=".">
+ &commonBuild;
+ <property name="src-name" value="endpoint/WebServiceEJB.java" />
+ <property name="client-src-name" value="client/Client.java" />
- &commonBuild;
- <property name="src-name" value="endpoint/WebServiceEJB.java"/>
- <property name="client-src-name" value="client/Client.java"/>
-
- <target name="all" depends="clean, deploy, private-run, private-undeploy, report"/>
+ <target name="all" depends="clean, deploy, private-run, private-undeploy, report" />
- <target name="private-undeploy">
- <antcall target="autoundeploy-file">
- <param name="filename" value="EjbClient.jar"/>
- </antcall>
- <antcall target="autoundeploy-file">
- <param name="filename" value="WebServiceEJB.jar"/>
- </antcall>
- </target>
+ <target name="private-undeploy">
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="EjbClient.jar" />
+ </antcall>
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="WebServiceEJB.jar" />
+ </antcall>
+ </target>
- <target name="private-run">
- <antcall target="clean"/>
- <antcall target="wsdl-import">
- <param name="server" value="WebServiceEJB"/>
- <param name="port" value="WebServiceEJB"/>
- </antcall>
- <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
- includes="ejb/HelloEJB.java">
- <classpath refid="classpath"/>
- </javac>
- <jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar"
- basedir="${env.APS_HOME}/build/module/classes"
- includes="ejb/**,endpoint/**"/>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
- </or>
- </waitfor>
- <condition property="deploy_succeeded">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
- </condition>
- <condition property="deploy_failed">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
- </condition>
- <fail if="deploy_failed" message="Deployment failed"/>
- <basename file="${client-src-name}" property="client" suffix=".java"/>
- <dirname file="${client-src-name}" property="client-directory"/>
- <basename file="${client-directory}" property="client-pkg-name"/>
- <property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
- <antcall target="compile-client"/>
- <echo message="Running appclient with ${client-pkg-name}.${client}"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes"/>
- <exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
- <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
- <arg value="${client-pkg-name}.${client}"/>
- </exec>
- </target>
+ <target name="private-run">
+ <antcall target="clean" />
+ <antcall target="wsdl-import">
+ <param name="server" value="WebServiceEJB" />
+ <param name="port" value="WebServiceEJB" />
+ </antcall>
+ <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes" includes="ejb/HelloEJB.java">
+ <classpath refid="classpath" />
+ </javac>
+ <jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar"
+ basedir="${env.APS_HOME}/build/module/classes"
+ includes="ejb/**,endpoint/**"
+ />
+ <waitfor maxwait="100" maxwaitunit="second">
+ <or>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed" />
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed" />
+ </or>
+ </waitfor>
+ <condition property="deploy_succeeded">
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed" />
+ </condition>
+ <condition property="deploy_failed">
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed" />
+ </condition>
+ <fail if="deploy_failed" message="Deployment failed" />
+ <basename file="${client-src-name}" property="client" suffix=".java" />
+ <dirname file="${client-src-name}" property="client-directory" />
+ <basename file="${client-directory}" property="client-pkg-name" />
+ <property name="client-class-name" value="${client-pkg-name}/${client}.class" />
+ <antcall target="compile-client" />
+ <echo message="Running appclient with ${client-pkg-name}.${client}" />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes" />
+ <exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
+ <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}" />
+ <arg value="${client-pkg-name}.${client}" />
+ </exec>
+ </target>
- <target name="report-success">
- <echo message="Test PASSED"/>
- </target>
+ <target name="report-success">
+ <echo message="Test PASSED" />
+ </target>
- <target name="report-failure">
- <echo message="Test FAILED"/>
- </target>
+ <target name="report-failure">
+ <echo message="Test FAILED" />
+ </target>
</project>
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 23fc718..1b36595 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
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 f788575..2ced4e6 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
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 f788575..2ced4e6 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
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 f788575..2ced4e6 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
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 f788575..2ced4e6 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
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 911c65c..9cea891 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;
- <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ear"/>
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ear" />
- <target name="assemble-ejb">
- <antcall target="compile-common">
- <param name="src" value="outsidepkg"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/tmp"/>
- <mkdir dir="${build.classes.dir}/tmp"/>
- <jar destfile="${build.classes.dir}/tmp/mylib.jar"
- basedir="${build.classes.dir}"
- includes="outsidepkg/**"/>
- <jar destfile="${build.classes.dir}/tmp/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- manifest="MANIFEST.MF"
- includes="endpoint/**"/>
- <jar destfile="${assemble.dir}/${appname}App.ear"
- basedir="${build.classes.dir}/tmp"
- includes="**"/>
- </target>
+ <target name="assemble-ejb">
+ <antcall target="compile-common">
+ <param name="src" value="outsidepkg" />
+ </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/tmp" />
+ <mkdir dir="${build.classes.dir}/tmp" />
+ <jar destfile="${build.classes.dir}/tmp/mylib.jar"
+ basedir="${build.classes.dir}"
+ includes="outsidepkg/**"
+ />
+ <jar destfile="${build.classes.dir}/tmp/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ manifest="MANIFEST.MF"
+ includes="endpoint/**"
+ />
+ <jar destfile="${assemble.dir}/${appname}App.ear"
+ basedir="${build.classes.dir}/tmp"
+ includes="**"
+ />
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${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"
- includes="client/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="client/**"
+ />
+ </target>
- <target name="deploy-ear">
- <antcall target="deploy-common"/>
- </target>
+ <target name="deploy-ear">
+ <antcall target="deploy-common" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="ejb-libdependent-2-test"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="ejb-libdependent-2-test" />
+ </antcall>
+ </target>
</project>
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 995cdb6..aafc609 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;
- <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ear"/>
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ear" />
- <target name="assemble-ejb">
- <antcall target="compile-common">
- <param name="src" value="outsidepkg"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/tmp"/>
- <mkdir dir="${build.classes.dir}/tmp/lib"/>
- <jar destfile="${build.classes.dir}/tmp/lib/mylib.jar"
- basedir="${build.classes.dir}"
- includes="outsidepkg/**"/>
- <jar destfile="${build.classes.dir}/tmp/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**"/>
- <jar destfile="${assemble.dir}/${appname}App.ear"
- basedir="${build.classes.dir}/tmp"
- includes="**"/>
- </target>
+ <target name="assemble-ejb">
+ <antcall target="compile-common">
+ <param name="src" value="outsidepkg" />
+ </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/tmp" />
+ <mkdir dir="${build.classes.dir}/tmp/lib" />
+ <jar destfile="${build.classes.dir}/tmp/lib/mylib.jar"
+ basedir="${build.classes.dir}"
+ includes="outsidepkg/**"
+ />
+ <jar destfile="${build.classes.dir}/tmp/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ />
+ <jar destfile="${assemble.dir}/${appname}App.ear"
+ basedir="${build.classes.dir}/tmp"
+ includes="**"
+ />
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -Xendorsed -d ${build.classes.dir}/client http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"/>
- </antcall>
- <javac verbose="true" srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${env.S1AS_HOME}/modules/webservices-api-osgi.jar:${env.S1AS_HOME}/modules/jaxb-osgi.jar:${env.S1AS_HOME}/modules/jaxb-api-osgi.jar"
- includes="client/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -Xendorsed -d ${build.classes.dir}/client http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"
+ />
+ </antcall>
+ <javac verbose="true"
+ srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${env.S1AS_HOME}/modules/jaxb-osgi.jar:${env.S1AS_HOME}/modules/jaxb-api-osgi.jar"
+ includes="client/**"
+ />
+ </target>
- <target name="deploy-ear">
- <antcall target="deploy-common"/>
- </target>
+ <target name="deploy-ear">
+ <antcall target="deploy-common" />
+ </target>
- <target name="restart-test">
- <antcall target="restart-server-instance-common"/>
- <antcall target="runclient"/>
- </target>
+ <target name="restart-test">
+ <antcall target="restart-server-instance-common" />
+ <antcall target="runclient" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="ejb-libdependent-test"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="ejb-libdependent-test" />
+ </antcall>
+ </target>
</project>
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 cfd00f4..1f6ee84 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;
- <target name="all" depends="clean, setup, run, undeploy"/>
+ <target name="all" depends="clean, setup, run, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-ejb, deploy-app, assemble-client"/>
+ <target name="setup" depends="assemble-ejb, deploy-app, assemble-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="service"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="service" />
+ </antcall>
+ </target>
- <target name="run-wsimport">
- <mkdir dir="${build.classes.dir}"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-wsdllocation WEB-INF/wsdl/HttpTestService.wsdl -keep -b customservice.xml -d ${build.classes.dir} HttpTestService.wsdl"/>
- </antcall>
- </target>
+ <target name="run-wsimport">
+ <mkdir dir="${build.classes.dir}" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-wsdllocation WEB-INF/wsdl/HttpTestService.wsdl -keep -b customservice.xml -d ${build.classes.dir} HttpTestService.wsdl"
+ />
+ </antcall>
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-jar-common"/>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-jar-common" />
+ </target>
- <target name="assemble-ejb" depends="init-common, run-wsimport, compile">
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <copy file="HttpTestService.wsdl" todir="${build.classes.dir}/META-INF/wsdl"/>
- <echo message="my build classes dir is:${build.classes.dir}" level="verbose"/>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="service/**,META-INF/**">
- </jar>
- </target>
+ <target name="assemble-ejb" depends="init-common, run-wsimport, compile">
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/META-INF/wsdl" />
+ <copy file="HttpTestService.wsdl" todir="${build.classes.dir}/META-INF/wsdl" />
+ <echo message="my build classes dir is:${build.classes.dir}" level="verbose" />
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="service/**,META-INF/**"
+ >
+ </jar>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting localWSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -wsdllocation ${env.APS_HOME}/devtests/webservice/annotations/multiport/HttpTestService.wsdl -b customclient.xml -d ${build.classes.dir}/client HttpTestService.wsdl"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${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"
- includes="client/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting localWSDL" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -wsdllocation ${env.APS_HOME}/devtests/webservice/annotations/multiport/HttpTestService.wsdl -b customclient.xml -d ${build.classes.dir}/client HttpTestService.wsdl"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="client/**"
+ />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-jar-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-jar-common" />
+ </target>
- <target name="run">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="basic-wsdl-to-java-test-case"/>
- </antcall>
- </target>
+ <target name="run">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="basic-wsdl-to-java-test-case" />
+ </antcall>
+ </target>
</project>
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 29258f0..fccb706 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 @@
<project name="Hello" default="core" basedir=".">
- &commonBuild;
- <property name="src-name" value="endpoint/HelloImpl.java"/>
- <property name="client-src-name" value="client/Client.java"/>
- <target name="all" depends="clean">
- <antcall target="test_build"/>
- <basename file="${src-name}" property="server" suffix=".java"/>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployFailed"/>
- </or>
- </waitfor>
- <condition property="deploy_succeeded">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
- </condition>
+ &commonBuild;
+ <property name="src-name" value="endpoint/HelloImpl.java"/>
+ <property name="client-src-name" value="client/Client.java"/>
- <antcall target="run"/>
- <antcall target="undeploy"/>
- <antcall target="report"/>
- </target>
+ <target name="all" depends="clean">
+ <antcall target="test_build"/>
+ <basename file="${src-name}" property="server" suffix=".java"/>
+ <waitfor maxwait="100" maxwaitunit="second">
+ <or>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployFailed"/>
+ </or>
+ </waitfor>
+ <condition property="deploy_succeeded">
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
+ </condition>
- <target name="test_build">
- <exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-keep -d ${env.APS_HOME}/build/module/classes endpoint/wsdl/HelloImplService.wsdl"/>
- </exec>
- <antcall target="build"/>
- </target>
+ <antcall target="run">
+ <param name="port" value="endpoint.HelloImpl" />
+ </antcall>
+ <antcall target="undeploy"/>
+ <antcall target="report"/>
+ </target>
- <target name="report-success">
- <echo message="Test passed"/>
- </target>
+ <target name="test_build">
+ <exec executable="${env.S1AS_HOME}/bin/wsimport">
+ <arg line="-keep -d ${env.APS_HOME}/build/module/classes endpoint/wsdl/HelloImplService.wsdl" />
+ </exec>
+ <antcall target="build" />
+ </target>
- <target name="report-failure">
- <echo message="Test failed"/>
- </target>
+ <target name="report-success">
+ <echo message="Test passed" />
+ </target>
+
+ <target name="report-failure">
+ <echo message="Test failed"/>
+ </target>
</project>
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 1caffc3..311e1b6 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 @@
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 df6e1f3..ab78ffc 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;
- <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ear"/>
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ear" />
- <target name="assemble-ejb">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/tmp"/>
- <jar destfile="${build.classes.dir}/tmp/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**"/>
- <jar destfile="${assemble.dir}/${appname}App.ear"
- basedir="${build.classes.dir}/tmp"
- includes="**"/>
- </target>
+ <target name="assemble-ejb">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/tmp" />
+ <jar destfile="${build.classes.dir}/tmp/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ />
+ <jar destfile="${assemble.dir}/${appname}App.ear"
+ basedir="${build.classes.dir}/tmp"
+ includes="**"
+ />
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${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"
- includes="client/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="client/**"
+ />
+ </target>
- <target name="deploy-ear">
- <antcall target="deploy-common"/>
- </target>
+ <target name="deploy-ear">
+ <antcall target="deploy-common" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="restful-ejb-test"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="restful-ejb-test" />
+ </antcall>
+ </target>
</project>
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 563bed3..d0a7b33 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;
- <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ear"/>
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ear" />
- <target name="assemble-ejb">
- <antcall target="compile-common">
- <param name="src" value="outsidepkg"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/tmp"/>
- <mkdir dir="${build.classes.dir}/tmp/lib"/>
- <jar destfile="${build.classes.dir}/tmp/lib/mylib.jar"
- basedir="${build.classes.dir}"
- includes="outsidepkg/**"/>
- <jar destfile="${build.classes.dir}/tmp/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**"/>
- <jar destfile="${assemble.dir}/${appname}App.ear"
- basedir="${build.classes.dir}/tmp"
- includes="**"/>
- </target>
+ <target name="assemble-ejb">
+ <antcall target="compile-common">
+ <param name="src" value="outsidepkg" />
+ </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/tmp" />
+ <mkdir dir="${build.classes.dir}/tmp/lib" />
+ <jar destfile="${build.classes.dir}/tmp/lib/mylib.jar"
+ basedir="${build.classes.dir}"
+ includes="outsidepkg/**"
+ />
+ <jar destfile="${build.classes.dir}/tmp/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ />
+ <jar destfile="${assemble.dir}/${appname}App.ear"
+ basedir="${build.classes.dir}/tmp"
+ includes="**"
+ />
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -Xendorsed -d ${build.classes.dir}/client http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"/>
- </antcall>
- <javac verbose="true" srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${env.S1AS_HOME}/modules/webservices-api-osgi.jar:${env.S1AS_HOME}/modules/jaxb-osgi.jar:${env.S1AS_HOME}/modules/jaxb-api-osgi.jar"
- includes="client/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -Xendorsed -d ${build.classes.dir}/client http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"
+ />
+ </antcall>
+ <javac verbose="true"
+ srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${env.S1AS_HOME}/modules/jaxb-osgi.jar:${env.S1AS_HOME}/modules/jaxb-api-osgi.jar"
+ includes="client/**"
+ />
+ </target>
- <target name="deploy-ear">
- <antcall target="deploy-common"/>
- </target>
+ <target name="deploy-ear">
+ <antcall target="deploy-common" />
+ </target>
- <target name="restart-test">
- <antcall target="restart-server-instance-common"/>
- <antcall target="runclient"/>
- </target>
+ <target name="restart-test">
+ <antcall target="restart-server-instance-common" />
+ <antcall target="runclient" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="ejb-singleton-test"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="ejb-singleton-test" />
+ </antcall>
+ </target>
</project>
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 6acf7fe..9ce747f 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 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="*.jar"/>
- </fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
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 6435ae1..ff3d47a 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;
- <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar"/>
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar" />
- <target name="assemble-ejb">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- <antcall target="pkg-ejb-jar">
- <param name="jar.classes" value="endpoint"/>
- <param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar"/>
- </antcall>
- </target>
+ <target name="assemble-ejb">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ <antcall target="pkg-ejb-jar">
+ <param name="jar.classes" value="endpoint" />
+ <param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/AddNumbersImplService/ThisShouldBeIgnored?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/AddNumbersImplService/ThisShouldBeIgnored?WSDL"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${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"
- includes="client/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/AddNumbersImplService/ThisShouldBeIgnored?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/AddNumbersImplService/ThisShouldBeIgnored?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="client/**"
+ />
+ </target>
- <target name="deploy-ejb-jar">
- <antcall target="deploy-jar-common"/>
- </target>
+ <target name="deploy-ejb-jar">
+ <antcall target="deploy-jar-common" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-jar-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-jar-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="wsname-ejbname-test"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="wsname-ejbname-test" />
+ </antcall>
+ </target>
</project>
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 b544220..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/GoogleSearch.wsdl
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.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
-
--->
-
-<!-- WSDL description of the Google Web APIs.
- The Google Web APIs are in beta release. All interfaces are subject to
- change as we refine and extend our APIs. Please see the terms of use
- for more information. -->
-
-<definitions name="urn:GoogleSearch"
- targetNamespace="urn:GoogleSearch"
- xmlns:typens="urn:GoogleSearch"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <!-- Types for search - result elements, directory categories -->
-
- <types>
- <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:GoogleSearch">
-
- <xsd:complexType name="GoogleSearchResult">
- <xsd:all>
- <xsd:element name="documentFiltering" type="xsd:boolean"/>
- <xsd:element name="searchComments" type="xsd:string"/>
- <xsd:element name="estimatedTotalResultsCount" type="xsd:int"/>
- <xsd:element name="estimateIsExact" type="xsd:boolean"/>
- <xsd:element name="resultElements" type="typens:ResultElementArray"/>
- <xsd:element name="searchQuery" type="xsd:string"/>
- <xsd:element name="startIndex" type="xsd:int"/>
- <xsd:element name="endIndex" type="xsd:int"/>
- <xsd:element name="searchTips" type="xsd:string"/>
- <xsd:element name="directoryCategories" type="typens:DirectoryCategoryArray"/>
- <xsd:element name="searchTime" type="xsd:double"/>
- </xsd:all>
- </xsd:complexType>
-
- <xsd:complexType name="ResultElement">
- <xsd:all>
- <xsd:element name="summary" type="xsd:string"/>
- <xsd:element name="URL" type="xsd:string"/>
- <xsd:element name="snippet" type="xsd:string"/>
- <xsd:element name="title" type="xsd:string"/>
- <xsd:element name="cachedSize" type="xsd:string"/>
- <xsd:element name="relatedInformationPresent" type="xsd:boolean"/>
- <xsd:element name="hostName" type="xsd:string"/>
- <xsd:element name="directoryCategory" type="typens:DirectoryCategory"/>
- <xsd:element name="directoryTitle" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
-
- <xsd:complexType name="ResultElementArray">
- <xsd:complexContent>
- <xsd:restriction base="soapenc:Array">
- <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:ResultElement[]"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="DirectoryCategoryArray">
- <xsd:complexContent>
- <xsd:restriction base="soapenc:Array">
- <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:DirectoryCategory[]"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="DirectoryCategory">
- <xsd:all>
- <xsd:element name="fullViewableName" type="xsd:string"/>
- <xsd:element name="specialEncoding" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
-
- </xsd:schema>
- </types>
-
- <!-- Messages for Google Web APIs - cached page, search, spelling. -->
-
- <message name="doGetCachedPage">
- <part name="key" type="xsd:string"/>
- <part name="url" type="xsd:string"/>
- </message>
-
- <message name="doGetCachedPageResponse">
- <part name="return" type="xsd:base64Binary"/>
- </message>
-
- <message name="doSpellingSuggestion">
- <part name="key" type="xsd:string"/>
- <part name="phrase" type="xsd:string"/>
- </message>
-
- <message name="doSpellingSuggestionResponse">
- <part name="return" type="xsd:string"/>
- </message>
-
- <message name="doGoogleSearch">
- <part name="key" type="xsd:string"/>
- <part name="q" type="xsd:string"/>
- <part name="start" type="xsd:int"/>
- <part name="maxResults" type="xsd:int"/>
- <part name="filter" type="xsd:boolean"/>
- <part name="restrict" type="xsd:string"/>
- <part name="safeSearch" type="xsd:boolean"/>
- <part name="lr" type="xsd:string"/>
- <part name="ie" type="xsd:string"/>
- <part name="oe" type="xsd:string"/>
- </message>
-
- <message name="doGoogleSearchResponse">
- <part name="return" type="typens:GoogleSearchResult"/>
- </message>
-
- <!-- Port for Google Web APIs, "GoogleSearch" -->
-
- <portType name="GoogleSearchPort">
-
- <operation name="doGetCachedPage">
- <input message="typens:doGetCachedPage"/>
- <output message="typens:doGetCachedPageResponse"/>
- </operation>
-
- <operation name="doSpellingSuggestion">
- <input message="typens:doSpellingSuggestion"/>
- <output message="typens:doSpellingSuggestionResponse"/>
- </operation>
-
- <operation name="doGoogleSearch">
- <input message="typens:doGoogleSearch"/>
- <output message="typens:doGoogleSearchResponse"/>
- </operation>
-
- </portType>
-
-
- <!-- Binding for Google Web APIs - RPC, SOAP over HTTP -->
-
- <binding name="GoogleSearchBinding" type="typens:GoogleSearchPort">
- <soap:binding style="rpc"
- transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <operation name="doGetCachedPage">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="doSpellingSuggestion">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="doGoogleSearch">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
- </binding>
-
- <!-- Endpoint for Google Web APIs -->
- <service name="GoogleSearchService">
- <port name="GoogleSearchPort" binding="typens:GoogleSearchBinding">
- <soap:address location="dummy"/>
- </port>
- </service>
-
-</definitions>
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 1129dcf..0000000
--- 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 776d694..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/build.properties
+++ /dev/null
@@ -1,33 +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
-
--->
-
-
-<property name="module" value="google"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
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 31b65e4..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/build.xml
+++ /dev/null
@@ -1,180 +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
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="google test" default="usage" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
-
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
- <target name="compile" depends="">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="mejbclient"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- </target>
-
- <target name="build" depends="init-common, clean">
- <antcall target="gen-mapping-appclient"/>
- <antcall target="gen-mapping-ejb"/>
- <antcall target="wscompile-appclient"/>
- <antcall target="wscompile-ejb"/>
- <antcall target="assemble"/>
- </target>
-
- <target name="wscompile-appclient" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . wscompile_config_appclient.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/google">
- <fileset dir="output/google"
- includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchService.class, GoogleSearchPort.class, ResultElement.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="wscompile-ejb" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . wscompile_config_ejb.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/googleejb">
- <fileset dir="output/googleejb"
- includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="assemble" depends="init-common, compile">
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_appclient.xml"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="GoogleMapping_appclient.xml,META-INF/wsdl/**,google/*.class" />
-
- </antcall>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_ejb.xml"/>
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
- value="GoogleMapping_ejb.xml,META-INF/wsdl/**,googleejb/*.class" />
-
- </antcall>
- <antcall target="ear-common" />
- </target>
-
- <target name="build-mejb" depends="init-common, compile">
- <copy file="mejbclient/application-client.xml" tofile="${build.classes.dir}/META-INF/application-client.xml"/>
- <copy file="mejbclient/sun-application-client.xml" tofile="${build.classes.dir}/META-INF/sun-application-client.xml"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/mejbclient.jar" manifest="mejbclient/MANIFEST.MF">
- <fileset dir="${build.classes.dir}"
- includes="google/MEJBClient.class META-INF/application-client.xml META-INF/sun-application-client.xml"
- />
- </jar>
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete dir="output"/>
- <delete dir="google"/>
- <delete dir="googleejb"/>
- <delete file="GoogleMapping_ejb.xml"/>
- <delete file="GoogleMapping_appclient.xml"/>
- <delete file="jaxrpc.log"/>
- </target>
-
- <target name="run-mejbclient" depends="init-common">
- <exec executable="${APPCLIENT}" failonerror="true">
- <arg line="-client ${assemble.dir}/mejbclient.jar"/>
- <arg line="-textauth"/>
- <arg line="-user j2ee"/>
- <arg line="-password j2ee"/>
- <arg line="${appclient.application.args}"/>
- </exec>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="spellng http://${http.host}:${http.port}/googleejb/GoogleSearch"/>
- </antcall>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="contactgoogle">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="spellng"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-appclient" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping GoogleMapping_appclient.xml wscompile_config_appclient.xml"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-ejb" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping GoogleMapping_ejb.xml wscompile_config_ejb.xml"/>
- </antcall>
- </target>
-
- <target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- ant contactgoogle (Executes the appclient contacting the Google.com WebServices)
- </echo>
- </target>
-</project>
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 6ce28ab..0000000
--- 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 bbc5dde..0000000
--- 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 5590d34..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application-client.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my google app client</description>
- <display-name>googleClient</display-name>
- <env-entry>
- <env-entry-name>googlekey</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>vCkqMIpV1WMKIRpNa7gBiYQZxDUYOYOj</env-entry-value>
- </env-entry>
- <service-ref>
- <description>google service ref</description>
- <service-ref-name>service/GoogleSearch</service-ref-name>
- <service-interface>google.GoogleSearchService</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_appclient.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:GoogleSearch">servicens:GoogleSearchService
- </service-qname>
- </service-ref>
-</application-client>
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 f8709ba..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>GoogleApp</display-name>
- <module>
- <java>google-client.jar</java>
- </module>
- <module>
- <ejb>google-ejb.jar</ejb>
- </module>
-</application>
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 1ffa802..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>GoogleEjb</ejb-name>
- <service-endpoint>googleejb.GoogleSearchPort</service-endpoint>
- <ejb-class>googleejb.GoogleEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>GoogleEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
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 6b916e1..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/GoogleSearch</service-ref-name>
- <port-info>
- <service-endpoint-interface>google.GoogleSearchPort</service-endpoint-interface>
- </port-info>
- <service-qname>
- <namespaceURI>urn:GoogleSearch</namespaceURI>
- <localpart>GoogleSearchService</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
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 50713e3..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>GoogleEjb</ejb-name>
- <jndi-name>GoogleEjb</jndi-name>
- <pass-by-reference>false</pass-by-reference>
- <is-read-only-bean>false</is-read-only-bean>
- <refresh-period-in-seconds>-1</refresh-period-in-seconds>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>GoogleSearchPort</port-component-name>
- <endpoint-address-uri>googleejb/GoogleSearch</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 8625fc6..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/webservices.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>GoogleServiceEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>GoogleSearchPort</port-component-name>
- <wsdl-port xmlns:googlens="urn:GoogleSearch">googlens:GoogleSearchPort</wsdl-port>
- <service-endpoint-interface>googleejb.GoogleSearchPort
- </service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>GoogleEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 7205658..0000000
--- 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 5298488..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_appclient.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="GoogleSearch.wsdl"
- packageName="google"/>
-</configuration>
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 beb846c..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_ejb.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="GoogleSearch.wsdl"
- packageName="googleejb"/>
-</configuration>
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 b618634..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch.wsdl
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.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
-
--->
-
-<!-- WSDL description of the Google Web APIs.
- The Google Web APIs are in beta release. All interfaces are subject to
- change as we refine and extend our APIs. Please see the terms of use
- for more information. -->
-
-<definitions name="urn:GoogleSearch"
- targetNamespace="urn:GoogleSearch"
- xmlns:typens="urn:GoogleSearch"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <!-- Types for search - result elements, directory categories -->
- <import namespace="urn:GoogleSearch" location="GoogleSearch_types.wsdl"/>
-
- <!-- Binding for Google Web APIs - RPC, SOAP over HTTP -->
-
- <binding name="GoogleSearchBinding" type="typens:GoogleSearchPort">
- <soap:binding style="rpc"
- transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <operation name="doGetCachedPage">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="doSpellingSuggestion">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="doGoogleSearch">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="helloOneWay">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
-
- </operation>
-
- </binding>
-
- <!-- Endpoint for Google Web APIs -->
- <service name="GoogleSearchService">
- <port name="GoogleSearchPort" binding="typens:GoogleSearchBinding">
- <soap:address location="http://api.google.com/search/beta2"/>
- </port>
- </service>
-
-</definitions>
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 845af9e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch_partial.wsdl
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.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
-
--->
-
-<!-- WSDL description of the Google Web APIs.
- The Google Web APIs are in beta release. All interfaces are subject to
- change as we refine and extend our APIs. Please see the terms of use
- for more information. -->
-
-<definitions name="urn:GoogleSearch"
- targetNamespace="urn:GoogleSearch"
- xmlns:typens="urn:GoogleSearch"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <!-- Types for search - result elements, directory categories -->
-
- <types>
- <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:GoogleSearch">
-
- <xsd:complexType name="GoogleSearchResult">
- <xsd:all>
- <xsd:element name="documentFiltering" type="xsd:boolean"/>
- <xsd:element name="searchComments" type="xsd:string"/>
- <xsd:element name="estimatedTotalResultsCount" type="xsd:int"/>
- <xsd:element name="estimateIsExact" type="xsd:boolean"/>
- <xsd:element name="resultElements" type="typens:ResultElementArray"/>
- <xsd:element name="searchQuery" type="xsd:string"/>
- <xsd:element name="startIndex" type="xsd:int"/>
- <xsd:element name="endIndex" type="xsd:int"/>
- <xsd:element name="searchTips" type="xsd:string"/>
- <xsd:element name="directoryCategories" type="typens:DirectoryCategoryArray"/>
- <xsd:element name="searchTime" type="xsd:double"/>
- </xsd:all>
- </xsd:complexType>
-
- <xsd:complexType name="ResultElement">
- <xsd:all>
- <xsd:element name="summary" type="xsd:string"/>
- <xsd:element name="URL" type="xsd:string"/>
- <xsd:element name="snippet" type="xsd:string"/>
- <xsd:element name="title" type="xsd:string"/>
- <xsd:element name="cachedSize" type="xsd:string"/>
- <xsd:element name="relatedInformationPresent" type="xsd:boolean"/>
- <xsd:element name="hostName" type="xsd:string"/>
- <xsd:element name="directoryCategory" type="typens:DirectoryCategory"/>
- <xsd:element name="directoryTitle" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
-
- <xsd:complexType name="ResultElementArray">
- <xsd:complexContent>
- <xsd:restriction base="soapenc:Array">
- <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:ResultElement[]"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="DirectoryCategoryArray">
- <xsd:complexContent>
- <xsd:restriction base="soapenc:Array">
- <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:DirectoryCategory[]"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="DirectoryCategory">
- <xsd:all>
- <xsd:element name="fullViewableName" type="xsd:string"/>
- <xsd:element name="specialEncoding" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
-
- </xsd:schema>
- </types>
-
- <!-- Messages for Google Web APIs - cached page, search, spelling. -->
-
- <message name="doGetCachedPage">
- <part name="key" type="xsd:string"/>
- <part name="url" type="xsd:string"/>
- </message>
-
- <message name="doGetCachedPageResponse">
- <part name="return" type="xsd:base64Binary"/>
- </message>
-
- <message name="doSpellingSuggestion">
- <part name="key" type="xsd:string"/>
- <part name="phrase" type="xsd:string"/>
- </message>
-
- <message name="doSpellingSuggestionResponse">
- <part name="return" type="xsd:string"/>
- </message>
-
- <message name="doGoogleSearch">
- <part name="key" type="xsd:string"/>
- <part name="q" type="xsd:string"/>
- <part name="start" type="xsd:int"/>
- <part name="maxResults" type="xsd:int"/>
- <part name="filter" type="xsd:boolean"/>
- <part name="restrict" type="xsd:string"/>
- <part name="safeSearch" type="xsd:boolean"/>
- <part name="lr" type="xsd:string"/>
- <part name="ie" type="xsd:string"/>
- <part name="oe" type="xsd:string"/>
- </message>
-
- <message name="doGoogleSearchResponse">
- <part name="return" type="typens:GoogleSearchResult"/>
- </message>
-
- <message name="helloOneWay">
- <part name="string" type="xsd:string"/>
- </message>
- <message name="helloOneWayResponse"/>
-
- <!-- Port for Google Web APIs, "GoogleSearch" -->
-
- <portType name="GoogleSearchPort">
-
- <operation name="doGetCachedPage">
- <input message="typens:doGetCachedPage"/>
- <output message="typens:doGetCachedPageResponse"/>
- </operation>
-
- <operation name="doSpellingSuggestion">
- <input message="typens:doSpellingSuggestion"/>
- <output message="typens:doSpellingSuggestionResponse"/>
- </operation>
-
- <operation name="doGoogleSearch">
- <input message="typens:doGoogleSearch"/>
- <output message="typens:doGoogleSearchResponse"/>
- </operation>
-
- <operation name="helloOneWay">
- <input message="typens:helloOneWay"/>
- </operation>
-
- </portType>
-
-
- <!-- Binding for Google Web APIs - RPC, SOAP over HTTP -->
-
- <binding name="GoogleSearchBinding" type="typens:GoogleSearchPort">
- <soap:binding style="rpc"
- transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <operation name="doGetCachedPage">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="doSpellingSuggestion">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="doGoogleSearch">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="helloOneWay">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- </operation>
-
- </binding>
-
-</definitions>
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 8bd2839..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch_types.wsdl
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!-- WSDL description of the Google Web APIs.
- The Google Web APIs are in beta release. All interfaces are subject to
- change as we refine and extend our APIs. Please see the terms of use
- for more information. -->
-
-<definitions name="urn:GoogleSearch"
- targetNamespace="urn:GoogleSearch"
- xmlns:typens="urn:GoogleSearch"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <!-- Types for search - result elements, directory categories -->
-
- <types>
- <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:GoogleSearch">
-
- <xsd:complexType name="GoogleSearchResult">
- <xsd:all>
- <xsd:element name="documentFiltering" type="xsd:boolean"/>
- <xsd:element name="searchComments" type="xsd:string"/>
- <xsd:element name="estimatedTotalResultsCount" type="xsd:int"/>
- <xsd:element name="estimateIsExact" type="xsd:boolean"/>
- <xsd:element name="resultElements" type="typens:ResultElementArray"/>
- <xsd:element name="searchQuery" type="xsd:string"/>
- <xsd:element name="startIndex" type="xsd:int"/>
- <xsd:element name="endIndex" type="xsd:int"/>
- <xsd:element name="searchTips" type="xsd:string"/>
- <xsd:element name="directoryCategories" type="typens:DirectoryCategoryArray"/>
- <xsd:element name="searchTime" type="xsd:double"/>
- </xsd:all>
- </xsd:complexType>
-
- <xsd:complexType name="ResultElement">
- <xsd:all>
- <xsd:element name="summary" type="xsd:string"/>
- <xsd:element name="URL" type="xsd:string"/>
- <xsd:element name="snippet" type="xsd:string"/>
- <xsd:element name="title" type="xsd:string"/>
- <xsd:element name="cachedSize" type="xsd:string"/>
- <xsd:element name="relatedInformationPresent" type="xsd:boolean"/>
- <xsd:element name="hostName" type="xsd:string"/>
- <xsd:element name="directoryCategory" type="typens:DirectoryCategory"/>
- <xsd:element name="directoryTitle" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
-
- <xsd:complexType name="ResultElementArray">
- <xsd:complexContent>
- <xsd:restriction base="soapenc:Array">
- <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:ResultElement[]"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="DirectoryCategoryArray">
- <xsd:complexContent>
- <xsd:restriction base="soapenc:Array">
- <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:DirectoryCategory[]"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="DirectoryCategory">
- <xsd:all>
- <xsd:element name="fullViewableName" type="xsd:string"/>
- <xsd:element name="specialEncoding" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
-
- </xsd:schema>
- </types>
-
- <!-- Messages for Google Web APIs - cached page, search, spelling. -->
-
- <message name="doGetCachedPage">
- <part name="key" type="xsd:string"/>
- <part name="url" type="xsd:string"/>
- </message>
-
- <message name="doGetCachedPageResponse">
- <part name="return" type="xsd:base64Binary"/>
- </message>
-
- <message name="doSpellingSuggestion">
- <part name="key" type="xsd:string"/>
- <part name="phrase" type="xsd:string"/>
- </message>
-
- <message name="doSpellingSuggestionResponse">
- <part name="return" type="xsd:string"/>
- </message>
-
- <message name="doGoogleSearch">
- <part name="key" type="xsd:string"/>
- <part name="q" type="xsd:string"/>
- <part name="start" type="xsd:int"/>
- <part name="maxResults" type="xsd:int"/>
- <part name="filter" type="xsd:boolean"/>
- <part name="restrict" type="xsd:string"/>
- <part name="safeSearch" type="xsd:boolean"/>
- <part name="lr" type="xsd:string"/>
- <part name="ie" type="xsd:string"/>
- <part name="oe" type="xsd:string"/>
- </message>
-
- <message name="doGoogleSearchResponse">
- <part name="return" type="typens:GoogleSearchResult"/>
- </message>
-
- <message name="helloOneWay">
- <part name="string" type="xsd:string"/>
- </message>
- <message name="helloOneWayResponse"/>
-
- <!-- Port for Google Web APIs, "GoogleSearch" -->
-
- <portType name="GoogleSearchPort">
-
- <operation name="doGetCachedPage">
- <input message="typens:doGetCachedPage"/>
- <output message="typens:doGetCachedPageResponse"/>
- </operation>
-
- <operation name="doSpellingSuggestion">
- <input message="typens:doSpellingSuggestion"/>
- <output message="typens:doSpellingSuggestionResponse"/>
- </operation>
-
- <operation name="doGoogleSearch">
- <input message="typens:doGoogleSearch"/>
- <output message="typens:doGoogleSearchResponse"/>
- </operation>
-
- <operation name="helloOneWay">
- <input message="typens:helloOneWay"/>
- </operation>
-
- </portType>
-</definitions>
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 8c2012e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.properties
+++ /dev/null
@@ -1,37 +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
-
--->
-
-
-<property name="module" value="googleserver"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="web.xml" value="descriptor/war/web.xml"/>
-<property name="sun-web.xml" value="descriptor/war/sun-web.xml"/>
-<property name="sun-webservices.xml" value="descriptor/war/webservices.xml"/>
-<property name="war.file" value="${assemble}/${appname}-web.war"/>
-<property name="app.type" value="application"/>
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 04df2c0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.xml
+++ /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
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY commonRun SYSTEM "file:./../../../config/run.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="google test" default="all" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &commonRun;
- &testproperties;
-
- <target name="all" depends="clean,build,create-user,restart,deploy,run,undeploy,delete-user"/>
-
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
- <target name="compile" depends="">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="web"/>
- </antcall>
- </target>
-
- <target name="build" depends="init-common, clean">
- <antcall target="gen-mapping-appclient"/>
- <antcall target="gen-mapping-ejb"/>
- <antcall target="gen-mapping-web"/>
- <antcall target="wscompile-appclient"/>
- <antcall target="wscompile-ejb"/>
- <antcall target="wscompile-web"/>
- <antcall target="assemble"/>
- <antcall target="build-appclient-file"/>
- </target>
-
- <target name="wscompile-appclient" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -f:norpcstructures -keep -d output -s output -classpath . -model googleclient.model wscompile_config_appclient.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/googleclient">
- <fileset dir="output/googleclient"
- includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchService.class, GoogleSearchPort.class, ResultElement.class"/>
- </copy>
- <!-- <delete dir="output"/> -->
- </target>
-
- <target name="wscompile-ejb" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -f:norpcstructures -keep -d output -s output -classpath . wscompile_config_ejb.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/googleserver">
- <fileset dir="output/googleserver"
- includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="wscompile-web" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -f:norpcstructures -keep -d output -s output -model googleweb.model -classpath . wscompile_config_web.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/googleserverweb">
- <fileset dir="output/googleserverweb"
- includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="assemble" depends="init-common, compile">
- <!--
- EJB module creation
- -->
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch.wsdl"/>
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch_types.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_ejb.xml"/>
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
- value="GoogleMapping_ejb.xml,META-INF/wsdl/**,googleserver/*.class" />
-
- </antcall>
- <!--
- War module creation
- -->
- <antcall target="build-war-file"/>
- <!--
- AppClient module creation
- -->
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch.wsdl"/>
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch_types.wsdl"/>
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch_partial.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_appclient.xml"/>
- <copy todir="${build.classes.dir}"
- file="googleclient.model"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="googleclient.model,GoogleMapping_appclient.xml,META-INF/wsdl/**,googleclient/*.class" />
-
- </antcall>
- <!--
- EAR file creation
- -->
- <antcall target="ear-common" />
- <copy todir="${build.classes.dir}/META-INF"
- file="${sun-application.xml}"/>
- <jar destfile = "${assemble.dir}/${appname}App.ear"
- update="true">
- <fileset dir="${build.classes.dir}">
- <include name="META-INF/sun-application.xml"/>
- </fileset>
- </jar>
-
- </target>
-
- <target name="build-appclient-file" depends="init-common">
- </target>
-
- <target name="build-war-file" depends="init-common">
- <echo message="my build classes dir is:${build.classes.dir}"/>
- <delete file="${war.file}"/>
- <mkdir dir="${build.classes.dir}/tmp"/>
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF"
- file="${web.xml}"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF"
- file="${sun-web.xml}"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF"
- file="${sun-webservices.xml}"/>
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF/classes"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF/wsdl"
- file="GoogleSearch.wsdl"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF/wsdl"
- file="GoogleSearch_types.wsdl"/>
- <copy todir="${build.classes.dir}/tmp"
- file="GoogleMapping_web.xml"/>
- <copy todir="${build.classes.dir}/tmp"
- file="googleweb.model"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF/classes/googleserverweb">
- <fileset dir="${build.classes.dir}/googleserverweb">
- <include name="**/*.class"/>
- </fileset>
- </copy>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp" casesensitive="yes">
- <include name="**/**"/>
- </fileset>
- </jar>
- <delete dir="${build.classes.dir}/tmp"/>
- </target>
-
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete dir="output"/>
- <delete dir="googleclient"/>
- <delete dir="googleserver"/>
- <delete dir="googleserverweb"/>
- <delete>
- <fileset dir="." includes="*.model"/>
- </delete>
- <delete file="GoogleMapping_ejb.xml"/>
- <delete file="GoogleMapping_appclient.xml"/>
- <delete file="GoogleMapping_web.xml"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="forwardejb http://${http.host}:${http.port}/GoogleServlet/GoogleSearch"/>
- </antcall>
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="forwardweb http://${http.host}:${http.port}/google/GoogleSearch"/>
- </antcall>
- <antcall target="run-standalone"/>
- </target>
-
- <target name="build-standalone" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen:client -keep -d ${build.classes.dir} -s ${build.classes.dir} -classpath . wscompile_config_standalone.xml"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="standalone"/>
- </antcall>
- </target>
-
- <target name="run-standalone" depends="init-common">
- <antcall target="build-standalone"/>
- <java fork="true" classname="standalone.StandAloneClient"
- failonerror="true">
- <arg line="spellng http://${http.host}:${http.port}/google/GoogleSearch"/>
- <classpath>
- <pathelement location="${env.S1AS_HOME}/lib/j2ee.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/appserv-cmp.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/appserv-ext.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/appserv-rt.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/webservices-rt.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/webservices-tools.jar"/>
- <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
- <pathelement location="${build.classes.dir}"/>
- </classpath>
-
- <sysproperty key="http.proxyHost" value="scaweb2.sfbay"/>
- <sysproperty key="http.proxyPort" value="8080"/>
- </java>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="contactgoogle">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="spellng"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-appclient" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping GoogleMapping_appclient.xml wscompile_config_appclient.xml"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-ejb" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping GoogleMapping_ejb.xml wscompile_config_ejb.xml"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-web" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping GoogleMapping_web.xml wscompile_config_web.xml"/>
- </antcall>
- </target>
-
- <target name="create-user">
- <antcall target="create-user-common">
- <param name="user" value="j2ee"/>
- <param name="password" value="j2ee"/>
- <param name="groups" value="staff"/>
- </antcall>
- <antcall target="reconfig-common"/>
- </target>
-
- <target name="delete-user">
- <!-- remove test users, just cleanup. -->
- <antcall target="delete-user-common">
- <param name="user" value="j2ee"/>
- </antcall>
- </target>
-
- <target name="restart">
- <antcall target="restart-server-instance-common"/>
- </target>
-
- <target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- ant contactgoogle (Executes the appclient contacting the Google.com WebServices)
- </echo>
- </target>
-</project>
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 c8d2999..0000000
--- 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 36d7960..0000000
--- 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 6541a72..0000000
--- 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 4e7445a..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application-client.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my google app client</description>
- <display-name>googleserverClient</display-name>
- <env-entry>
- <env-entry-name>googlekey</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>vCkqMIpV1WMKIRpNa7gBiYQZxDUYOYOj</env-entry-value>
- </env-entry>
- <service-ref>
- <description>google service ref</description>
- <display-name>MY GOOGLE SERVICE REF DISPLAY name</display-name>
- <service-ref-name>service/GoogleSearch</service-ref-name>
- <service-interface>googleclient.GoogleSearchService</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_appclient.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>googleclient.GoogleSearchPort
- </service-endpoint-interface>
- <port-component-link>GoogleSearchEjbPort</port-component-link>
- </port-component-ref>
- <handler>
- <description>handler 1</description>
- <handler-name>handler1</handler-name>
- <handler-class>googleclient.ClientHandler</handler-class>
- <init-param>
- <description>param1 description</description>
- <param-name>a</param-name>
- <param-value>b</param-value>
- </init-param>
- <soap-header xmlns:googlens="urn:GoogleSearch">googlens:DirectoryCategory
- </soap-header>
- <soap-role>Role1</soap-role>
- <soap-role>Role2</soap-role>
- <port-name>GoogleSearchPort</port-name>
- </handler>
- </service-ref>
- <service-ref>
- <description>dynamic proxy google service ref</description>
- <service-ref-name>service/GoogleSearchProxy</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>googleclient.model</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>googleclient.GoogleSearchPort
- </service-endpoint-interface>
- </port-component-ref>
- <handler>
- <description>handler 1</description>
- <handler-name>handler1</handler-name>
- <handler-class>googleclient.ClientHandler</handler-class>
- <init-param>
- <description>param description</description>
- <param-name>c</param-name>
- <param-value>d</param-value>
- </init-param>
- </handler>
- </service-ref>
- <service-ref>
- <description>dii google service ref</description>
- <service-ref-name>service/DIINoWSDL</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- </service-ref>
- <service-ref>
- <description>partial wsdl test google service ref</description>
- <service-ref-name>service/partialGeneric</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch_partial.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_appclient.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>googleclient.GoogleSearchPort
- </service-endpoint-interface>
- <port-component-link>googleserver-web.war#GoogleSearchPort</port-component-link>
- </port-component-ref>
- </service-ref>
-<!-- <service-ref>
- <description>partial wsdl test google service ref</description>
- <service-ref-name>service/partialGenerated</service-ref-name>
- <service-interface>googleclient.GoogleSearchService</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch_partial.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_appclient.xml</jaxrpc-mapping-file>
- </service-ref>
--->
-</application-client>
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 8559847..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>GoogleServerApp</display-name>
- <module>
- <web>
- <web-uri>googleserver-web.war</web-uri>
- <context-root/>
- </web>
- </module>
- <module>
- <java>googleserver-client.jar</java>
- </module>
- <module>
- <ejb>googleserver-ejb.jar</ejb>
- </module>
-</application>
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 6a7e35e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>GoogleEjb</ejb-name>
- <service-endpoint>googleserver.GoogleSearchPort</service-endpoint>
- <ejb-class>googleserver.GoogleEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <env-entry>
- <env-entry-name>entry1</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>Blah</env-entry-value>
- </env-entry>
- <service-ref>
- <description>service ref for web endpoint</description>
- <service-ref-name>service/WebDIIReference</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>googleserver.GoogleSearchPort
- </service-endpoint-interface>
- <port-component-link>googleserver-web.war#GoogleSearchPort</port-component-link>
- </port-component-ref>
- </service-ref>
- <security-role-ref>
- <role-name>foo</role-name>
- <role-link>User</role-link>
- </security-role-ref>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <security-role>
- <role-name>User</role-name>
- </security-role>
- <security-role>
- <role-name>Admin</role-name>
- </security-role>
- <method-permission>
- <role-name>User</role-name>
- <method>
- <ejb-name>GoogleEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>doGoogleSearch</method-name>
- </method>
- <method>
- <ejb-name>GoogleEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>doSpellingSuggestion</method-name>
- </method>
- </method-permission>
- <container-transaction>
- <method>
- <ejb-name>GoogleEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
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 7a3aa87..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/GoogleSearch</service-ref-name>
- <port-info>
- <service-endpoint-interface>googleclient.GoogleSearchPort
- </service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>urn:GoogleSearch</namespaceURI>
- <localpart>GoogleSearchPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>javax.xml.rpc.security.auth.username</name>
- <value>j2ee</value>
- </stub-property>
- <stub-property>
- <name>javax.xml.rpc.security.auth.password</name>
- <value>j2ee</value>
- </stub-property>
- <call-property>
- <name>javax.xml.rpc.security.auth.username</name>
- <value>j2ee</value>
- </call-property>
- <call-property>
- <name>javax.xml.rpc.security.auth.password</name>
- <value>j2ee</value>
- </call-property>
- </port-info>
- </service-ref>
- <service-ref>
- <service-ref-name>service/GoogleSearchProxy</service-ref-name>
- <port-info>
- <service-endpoint-interface>googleclient.GoogleSearchPort
- </service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>urn:GoogleSearch</namespaceURI>
- <localpart>GoogleSearchPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>javax.xml.rpc.service.endpoint.address</name>
- <value>http://localhost:8000/google/GoogleSearch</value>
- </stub-property>
- <stub-property>
- <name>javax.xml.rpc.security.auth.username</name>
- <value>j2ee</value>
- </stub-property>
- <stub-property>
- <name>javax.xml.rpc.security.auth.password</name>
- <value>j2ee</value>
- </stub-property>
- <call-property>
- <name>javax.xml.rpc.security.auth.username</name>
- <value>j2ee</value>
- </call-property>
- <call-property>
- <name>javax.xml.rpc.security.auth.password</name>
- <value>j2ee</value>
- </call-property>
- </port-info>
- </service-ref>
- <service-ref>
- <service-ref-name>service/partialGeneric</service-ref-name>
- <wsdl-override>file:GoogleSearch_final.wsdl</wsdl-override>
- </service-ref>
-<!-- <service-ref>
- <service-ref-name>service/partialGenerated</service-ref-name>
- <wsdl-override>file:GoogleSearch_final.wsdl</wsdl-override>
- </service-ref>
--->
-</sun-application-client>
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 c534d78..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 7.0 J2EE Application 1.3//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application_1_3-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application>
- <web>
- <web-uri>googleserver-web.war</web-uri>
- <context-root>GoogleServlet</context-root>
- </web>
- <security-role-mapping>
- <role-name>User</role-name>
- <group-name>staff</group-name>
- </security-role-mapping>
- <security-role-mapping>
- <role-name>Admin</role-name>
- <group-name>staff</group-name>
- <group-name>eng</group-name>
- <group-name>mgr</group-name>
- <group-name>guest</group-name>
- </security-role-mapping>
-</sun-application>
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 5a1c38f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>GoogleEjb</ejb-name>
- <jndi-name>GoogleEjb</jndi-name>
- <pass-by-reference>false</pass-by-reference>
- <is-read-only-bean>false</is-read-only-bean>
- <refresh-period-in-seconds>-1</refresh-period-in-seconds>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>GoogleSearchEjbPort</port-component-name>
- <endpoint-address-uri>google/GoogleSearch</endpoint-address-uri>
- <login-config>
- <auth-method>BASIC</auth-method>
- </login-config>
- </webservice-endpoint>
- </ejb>
- <webservice-description>
- <webservice-description-name>GoogleServiceEjb
- </webservice-description-name>
- <wsdl-publish-location>file:publish</wsdl-publish-location>
- </webservice-description>
- </enterprise-beans>
-</sun-ejb-jar>
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 89b43b9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/sun-web.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <service-ref>
- <service-ref-name>service/EjbDIIReference</service-ref-name>
- <port-info>
- <service-endpoint-interface>googleserverweb.GoogleSearchPort
- </service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>urn:GoogleSearch</namespaceURI>
- <localpart>GoogleSearchPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>javax.xml.rpc.security.auth.username</name>
- <value>j2ee</value>
- </stub-property>
- <stub-property>
- <name>javax.xml.rpc.security.auth.password</name>
- <value>j2ee</value>
- </stub-property>
- </port-info>
- </service-ref>
-</sun-web-app>
-
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 07da282..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/web.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>GoogleWebApp</display-name>
- <servlet>
- <servlet-name>GoogleServlet</servlet-name>
- <servlet-class>googleserverweb.GoogleServletImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>GoogleServlet</servlet-name>
- <url-pattern>/GoogleSearch</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
- <env-entry>
- <env-entry-name>entry1</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>Blah</env-entry-value>
- </env-entry>
- <service-ref>
- <description>service ref for ejb endpoint</description>
- <service-ref-name>service/EjbDIIReference</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>googleweb.model</jaxrpc-mapping-file>
- <service-qname xmlns:googlens="urn:GoogleSearch">googlens:GoogleSearchService</service-qname>
- <port-component-ref>
- <service-endpoint-interface>googleserverweb.GoogleSearchPort
- </service-endpoint-interface>
- <port-component-link>googleserver-ejb.jar#GoogleSearchEjbPort</port-component-link>
- </port-component-ref>
- </service-ref>
-</web-app>
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 a433828..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/webservices.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description xmlns:googlens="urn:GoogleSearch">
- <webservice-description-name>GoogleServiceServlet</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>googleweb.model</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>GoogleSearchPort</port-component-name>
- <wsdl-port>googlens:GoogleSearchPort</wsdl-port>
- <service-endpoint-interface>googleserverweb.GoogleSearchPort
- </service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>GoogleServlet</servlet-link>
- </service-impl-bean>
- <handler>
- <description>handler 1</description>
- <handler-name>handler1</handler-name>
- <handler-class>googleserverweb.FooHandler</handler-class>
- <init-param>
- <description>param1 description</description>
- <param-name>a</param-name>
- <param-value>b</param-value>
- </init-param>
- <soap-header>googlens:DirectoryCategory</soap-header>
- <soap-role>Role1</soap-role>
- <soap-role>Role2</soap-role>
- </handler>
- </port-component>
- </webservice-description>
-</webservices>
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 804e42a..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/webservices.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description xmlns:googlens="urn:GoogleSearch">
- <webservice-description-name>GoogleServiceEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>GoogleSearchEjbPort</port-component-name>
- <wsdl-port>googlens:GoogleSearchPort</wsdl-port>
- <service-endpoint-interface>googleserver.GoogleSearchPort
- </service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>GoogleEjb</ejb-link>
- </service-impl-bean>
- <handler>
- <description>handler 1</description>
- <handler-name>handler1</handler-name>
- <handler-class>googleserver.FooHandler</handler-class>
- <init-param>
- <description>param1 description</description>
- <param-name>a</param-name>
- <param-value>b</param-value>
- </init-param>
- <soap-header>googlens:DirectoryCategory</soap-header>
- <soap-role>Role1</soap-role>
- <soap-role>Role2</soap-role>
- </handler>
- </port-component>
- </webservice-description>
-</webservices>
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 abe2723..0000000
--- 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 cc37d86..0000000
--- 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 7f11da1..0000000
--- 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 cbe53ff..0000000
--- 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 b41c202..0000000
--- 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 5634c14..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_appclient.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="GoogleSearch.wsdl"
- packageName="googleclient"/>
-</configuration>
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 f1a8116..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_ejb.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="GoogleSearch.wsdl"
- packageName="googleserver"/>
-</configuration>
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 99ad91c..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_standalone.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="http://localhost:8080/GoogleServlet/GoogleSearch?WSDL"
- packageName="standalone"/>
-</configuration>
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 db0ca77..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="GoogleSearch.wsdl"
- packageName="googleserverweb"/>
-</configuration>
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 389fdeb..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/build.properties
+++ /dev/null
@@ -1,37 +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
-
--->
-
-
-<property name="module" value="simplehandler"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
-<property name="app.type" value="application"/>
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 dec7290..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/build.xml
+++ /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
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="Simple Soap fault test" default="all" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
-<!-- NOTE. the simple mapping test and full mapping test can
- only be run one at a time, I didn't want to set up two
- tests for this. -->
-<!--
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
--->
-
- <target name="all" depends="assemble, deploy, run, undeploy"/>
-
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- </target>
-
- <target name="gen-ejb-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/SimpleHandlerMapping_ejb.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/META-INF/wsdl config-interface.xml"/>
- </antcall>
- </target>
-
- <target name="assemble-ejb" depends="init-common, compile, gen-ejb-wsdl">
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="SimpleHandlerMapping_ejb.xml,META-INF/wsdl/**,ejb/*.class"/>
- </antcall>
- </target>
-
- <target name="assemble" depends="assemble-ejb, assemble-client"/>
-
- <target name="assemble-client" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="gen-ejb-wsdl"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar"
- dest="${build.classes.dir}"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="SimpleHandlerMapping_ejb.xml,META-INF/wsdl/**,simplehandler/**,ejb/SimpleServer.class,com/**" />
- </antcall>
- <antcall target="deploy-client-common"/>
- <move file="${assemble.dir}/${appname}-clientClient.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/simplehandler"/>
- </antcall>
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-jar-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-jar-common"/>
- <antcall target="undeploy-client-common"/>
- </target>
-
-</project>
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 073cb49..0000000
--- 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 5085a53..0000000
--- 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 d7dba23..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SimpleHandlerServer"
- targetNamespace="urn:HandlerTest"
- typeNamespace="urn:HandlerTest"
- packageName="handlertest">
- <interface name="ejb.SimpleServer"/>
- </service>
-</configuration>
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 cb7fbe0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/application-client.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my handler app client</description>
- <display-name>handlerClient</display-name>
- <service-ref>
- <description>simple handler service ref</description>
- <service-ref-name>service/simplehandler</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/SimpleHandlerServer.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SimpleHandlerMapping_ejb.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:HandlerTest">servicens:SimpleHandlerServer</service-qname>
- <port-component-ref>
- <service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-</application-client>
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 f42856d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>SimpleHandlerEJB</ejb-name>
- <service-endpoint>ejb.SimpleServer</service-endpoint>
- <ejb-class>ejb.SimpleServerImpl</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
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 a4ce49f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/simplehandler</service-ref-name>
- <port-info>
- <service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- <stub-property>
- <name>com.sun.enterprise.webservice.client.transport.log</name>
- <value>file:jaxrpc.log</value>
- </stub-property>
- </port-info>
- <service-qname>
- <namespaceURI>urn:HandlerTest</namespaceURI>
- <localpart>SimpleHandlerServer</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
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 fdeffbe..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <ejb>
- <ejb-name>SimpleHandlerEJB</ejb-name>
- <jndi-name>SimpleHandlerEJB</jndi-name>
- <webservice-endpoint>
- <port-component-name>SimpleServerPort</port-component-name>
- <endpoint-address-uri>simplehandler</endpoint-address-uri>
- <debugging-enabled>true</debugging-enabled>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 a688510..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/webservices.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>SimpleHandlerServer</webservice-description-name>
- <wsdl-file>META-INF/wsdl/SimpleHandlerServer.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SimpleHandlerMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>SimpleServerPort</port-component-name>
- <wsdl-port xmlns:servicens="urn:HandlerTest">servicens:SimpleServerPort</wsdl-port>
- <service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>SimpleHandlerEJB</ejb-link>
- </service-impl-bean>
- <handler>
- <handler-name>ejb.SimpleHandler</handler-name>
- <handler-class>ejb.SimpleHandler</handler-class>
- </handler>
- </port-component>
- </webservice-description>
-</webservices>
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 d2ac35b..0000000
--- 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 653d44c..0000000
--- 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 27b2aad..0000000
--- 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 6c58733..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.properties
+++ /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
-
--->
-
-
-<property name="module" value="jaxrpc-hello-ejb"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml"
- value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
-<property name="app.type" value="application"/>
-
-
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 a5be6ef..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.xml
+++ /dev/null
@@ -1,188 +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
-
--->
-
-<!DOCTYPE project [
- <!ENTITY jaxrpctargets SYSTEM "../common/targets.xml">
- <!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
- <!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
- <!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="jaxrpc-hello-ejb" default="all" basedir=".">
-
- <property name="appname" value="MyHelloEJBService"/>
-
- <property environment="env" />
-
- <property file="${env.APS_HOME}/config.properties"/>
- <property file="samplebuild.properties"/>
-
- &jaxrpctargets;
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <path id="class.path">
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar"/>
- </fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="**/*.jar"/>
- </fileset>
- <fileset dir="${env.APS_HOME}/lib">
- <include name="**/*.jar"/>
- </fileset>
-
- </path>
-
- <target name="all" depends="clean,deploy,assemble-client,deploy-client,runtest,undeploy"/>
- <target name="create-ejb-jar" description="Packages the EJB JAR file">
- <echo message="Creating the EJB JAR...."/>
- <delete file="${assemble.ear}/${ejbjar.file}" />
- <delete dir="${assemble.ear}/META-INF" />
- <copy todir="${assemble.ear}">
- <fileset dir="${build}/"
- includes="**/*.class"
- excludes="**/*Client.class, **/*.wsdl, **/*mapping.xml"/>
- </copy>
- <copy file="${build}/MyHelloService.wsdl" todir="${assemble.ear}/META-INF/wsdl" />
- <copy file="${build}/mapping.xml" todir="${assemble.ear}/${build}/" />
- <copy file="webservices.xml" todir="${assemble.ear}/META-INF" />
- <copy file="ejb-jar.xml" todir="${assemble.ear}/META-INF" />
- <copy file="sun-ejb-jar.xml" todir="${assemble.ear}/META-INF" />
- <jar destfile="${assemble.ear}/${ejbjar.file}"
- >
- <fileset dir="${assemble.ear}" includes="META-INF/**, build/**,helloservice/**" />
- </jar>
- <copy file="${assemble.ear}/${ejbjar.file}" todir="." />
- </target>
-
- <target name="build" depends="build-service"
- description="Executes the targets needed to build the service.">
- </target>
-
- <target name="create-ear" depends="create-ejb-jar"
- description="Executes the targets needed to create the ejb jar.">
- <jar destfile="${assemble.ear}/${ear.file}"
- >
- <fileset dir="${assemble.ear}" includes="${ejbjar.file}" />
- </jar>
- </target>
-
- <target name="deploy" depends="set-asadmin,build,create-ear">
- <echo message="admin password file ${admin.password.file}"/>
- <echo message="admin user ${admin.user}"/>
- <echo message="admin host ${admin.host}"/>
- <echo message="admin port ${admin.port}"/>
- <echo message="Deploying ${ear.file} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${assemble.ear}/${ear.name}"/>
- </exec>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <antcall target="run-wscompile">
- <param name="param1" value="-gen:client -d ${build.classes.dir}/webclient/WEB-INF/classes -keep -s ${build.classes.dir}/webclient/WEB-INF/classes -classpath ${build.classes.dir}/webclient/WEB-INF/classes ${config.wsdl.file}"/>
- </antcall>
-
- <replace file="webclient/Client.java" value="${http.host}" token="HTTP_HOST"/>
- <replace file="webclient/Client.java" value="${http.port}" token="HTTP_PORT"/>
-
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- includes="webclient/**">
- <classpath refid="class.path"/>
- </javac>
- <copy file="client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="build/mapping.xml" tofile="${build.classes.dir}/webclient/WEB-INF/hello-mapping.xml"/>
- <copy file="build/MyHelloService.wsdl" tofile="${build.classes.dir}/webclient/WEB-INF/wsdl/hello.wsdl"/>
- <copy file="config-wsdl.xml" tofile="${build.classes.dir}/webclient/WEB-INF/hello-config.xml"/>
-
-
-
-
- <copy file="client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
-
- <target name="deploy-client" depends="init-common">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying wsclient.war from ${assemble.dir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
-
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
-
- <target name="undeploy" depends="undeploy-ear,undeploy-client"/>
-
-
- <target name="undeploy-ear" depends="init-common">
- <echo message="Undeploying ${ear.file} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${earname}"/>
- </exec>
- </target>
-
-
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
- </java>
-
- <!--restore the tokens back in file-->
- <replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
- <replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
- </target>
-
-
-</project>
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 000e376..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-sun-web.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server
-9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd">
-<sun-web-app>
-</sun-web-app>
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 dccfbc0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-web.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>A test application</description>
- <display-name>WebTier</display-name>
- <servlet>
- <display-name>centralServlet</display-name>
- <servlet-name>RequestProcessor</servlet-name>
- <servlet-class>client.Client</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>RequestProcessor</servlet-name>
- <url-pattern>/RequestProcessor</url-pattern>
- </servlet-mapping>
-
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
- <service-ref>
- <service-ref-name>service/MyHelloService</service-ref-name>
- <service-interface>helloservice.MyHelloService</service-interface>
- <wsdl-file>WEB-INF/wsdl/hello.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/hello-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>helloservice.HelloIF</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</web-app>
-
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 7628c1e..0000000
--- 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 b13a575..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="MyHelloService"
- targetNamespace="urn:Foo"
- typeNamespace="urn:Foo"
- packageName="helloservice">
- <interface name="helloservice.HelloIF"/>
- </service>
-</configuration>
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 54a2454..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-wsdl.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl location="build/MyHelloService.wsdl"
- packageName="helloservice"/>
-</configuration>
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 097927e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/ejb-jar.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" metadata-complete="false" version="3.0" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
-<enterprise-beans>
-<session>
-<display-name>HelloEJB</display-name>
-<ejb-name>HelloEJB</ejb-name>
-<service-endpoint>helloservice.HelloIF</service-endpoint>
-<ejb-class>helloservice.HelloImpl</ejb-class>
-<session-type>Stateless</session-type>
-<transaction-type>Container</transaction-type>
-</session>
-</enterprise-beans>
-</ejb-jar>
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 74f8a76..0000000
--- 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 af0f518..0000000
--- 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 aede911..0000000
--- 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 86b9714..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/sun-ejb-jar.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
- <!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 EJB 3.0//EN" "http://www.sun.com/software/appserver/dtds/sun-ejb-jar_3_0-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>HelloEJB</ejb-name>
- <webservice-endpoint>
- <port-component-name>HelloIF</port-component-name>
- <endpoint-address-uri>/hello-jaxrpc-ejb/hello</endpoint-address-uri>
- <service-qname>
- <namespaceURI>urn:Foo</namespaceURI>
- <localpart>MyHelloService</localpart>
- </service-qname>
- <debugging-enabled>true</debugging-enabled>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
-
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 e48c475..0000000
--- 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("<html>");
- out.println("<head>");
- out.println("<title>TestServlet</title>");
- out.println("</head>");
- out.println("<body>");
- out.println("<p>");
- out.println("So the RESULT OF jaxrpc web SERVICE IS :");
- out.println("</p>");
- out.println("[" + ret + "]");
- out.println("</body>");
- out.println("</html>");
- 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 0e8a818..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webservices.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee" version="1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd">
-<webservice-description>
-<display-name>MyHelloService</display-name>
-<webservice-description-name>MyHelloService</webservice-description-name>
-<wsdl-file>META-INF/wsdl/MyHelloService.wsdl</wsdl-file>
-<jaxrpc-mapping-file>build/mapping.xml</jaxrpc-mapping-file>
-<port-component>
-<display-name>HelloIF</display-name>
-<port-component-name>HelloIF</port-component-name>
-<wsdl-port xmlns:wsdl-port_ns__="urn:Foo">wsdl-port_ns__:HelloIFPort</wsdl-port>
-<service-endpoint-interface>helloservice.HelloIF</service-endpoint-interface>
-<service-impl-bean>
-<ejb-link>HelloEJB</ejb-link>
-</service-impl-bean>
-</port-component>
-</webservice-description>
-</webservices>
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 9a608f5..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.properties
+++ /dev/null
@@ -1,44 +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
-
--->
-
-
-<property name="module" value="jaxrpc-hello-web"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml"
- value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
-<property name="app.type" value="application"/>
-
-
-
-
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 448785b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.xml
+++ /dev/null
@@ -1,227 +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
-
--->
-
-<!DOCTYPE project [
- <!ENTITY jaxrpctargets SYSTEM "../common/targets.xml">
- <!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
- <!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
- <!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="jaxrpc-hello-web" default="all" basedir=".">
-
- <property name="appname" value="MyHelloService"/>
-
- <property environment="env" />
-
- <property file="${env.APS_HOME}/config.properties"/>
- <property file="samplebuild.properties"/>
-
- &jaxrpctargets;
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <path id="class.path">
- <fileset dir="${env.S1AS_HOME}/modules">
- <include name="**/*.jar"/>
- </fileset>
- <fileset dir="${env.S1AS_HOME}/modules/endorsed">
- <include name="**/*.jar"/>
- </fileset>
- <fileset dir="${env.APS_HOME}/lib">
- <include name="**/*.jar"/>
- </fileset>
-
- </path>
-
- <target name="all" depends="clean,deploy,assemble-client,deploy-client,runtest,undeploy"/>
-
-
- <target name="create-war" description="Packages the WAR file">
- <echo message="Creating the WAR...."/>
- <delete file="${assemble.war}/${war.file}" />
- <delete dir="${assemble.war}/WEB-INF" />
- <copy todir="${assemble.war}/WEB-INF/classes/">
- <fileset dir="${build}/"
- includes="**/*.class"
- excludes="**/*Client.class, **/*.wsdl, **/*mapping.xml"/>
- </copy>
- <copy file="${build}/MyHelloService.wsdl" todir="${assemble.war}/WEB-INF/wsdl" />
- <copy file="${build}/mapping.xml" todir="${assemble.war}/${build}/" />
- <copy file="sun-web.xml" todir="${assemble.war}/WEB-INF" />
- <copy file="webservices.xml" todir="${assemble.war}/WEB-INF" />
- <war destfile="${assemble.war}/${war.file}"
- webxml="./web.xml" filesonly="true" >
- <fileset dir="${assemble.war}" includes="WEB-INF/**, build/**" />
- </war>
- <copy file="${assemble.war}/${war.file}" todir="." />
- </target>
-
- <target name="build" depends="build-service"
- description="Executes the targets needed to build the service.">
- </target>
-
- <target name="deploy" depends="set-asadmin,build,create-war">
- <echo message="Deploying ${war.file} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${war.file}"/>
- </exec>
- </target>
-
-
-
- <target name="undeploy-war1" depends="init-common">
- <echo message="Undeploying ${war.file} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${warname}"/>
- </exec>
- </target>
-
-
- <!-- <target name="build-client" depends="build-static"
- description="Executes the targets needed to build a static stub client.">
- </target>
-
- <target name="runclient1" depends="run-client"
- description="Runs the client.">
- </target>
-
- <target name="run-client"
- description="Runs a stand-alone (non-J2EE) client">
- <java classname="${client.class}" fork="yes" >
- <arg line="${endpoint.address}" />
- <classpath refid="run.classpath" />
- </java>
- </target>
-
-
- <target name="generate-client-stubs"
- description="Runs wscompile to generate the client stub classes">
- <antcall target="run-wscompile">
- <param name="param1" value="-gen:client -d ${build.classes.dir} -keep -s ${build.classes.dir} -classpath ${build.classes.dir} ${config.wsdl.file}"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common,generate-client-stubs">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <copy file="${assemble.war}/WEB-INF/wsdl/MyHelloService.wsdl" todir="${build.classes.dir}/META-INF/wsdl"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar"
- dest="${build.classes.dir}"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="mapping.xml,META-INF/wsdl/**,helloservice/**,com/**" />
- </antcall>
-
- <antcall target="deploy-client-common"/>
- <move file="${assemble.dir}/${appname}-client.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
- </target>
-
- <target name="run" depends="init-common,assemble-client">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/hello-jaxrpc/hello"/>
- </antcall>
- </target> -->
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <antcall target="run-wscompile">
- <param name="param1" value="-gen:client -d ${build.classes.dir}/webclient/WEB-INF/classes -keep -s ${build.classes.dir}/webclient/WEB-INF/classes -classpath ${build.classes.dir}/webclient/WEB-INF/classes ${config.wsdl.file}"/>
- </antcall>
- <replace file="webclient/Client.java" value="${http.host}" token="HTTP_HOST"/>
- <replace file="webclient/Client.java" value="${http.port}" token="HTTP_PORT"/>
-
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- includes="webclient/**">
- <classpath refid="class.path"/>
- </javac>
- <copy file="client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="build/mapping.xml" tofile="${build.classes.dir}/webclient/WEB-INF/hello-mapping.xml"/>
- <copy file="build/MyHelloService.wsdl" tofile="${build.classes.dir}/webclient/WEB-INF/wsdl/hello.wsdl"/>
- <copy file="config-wsdl.xml" tofile="${build.classes.dir}/webclient/WEB-INF/hello-config.xml"/>
-
-
-
-
- <copy file="client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
-
- <target name="deploy-client" depends="init-common">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying wsclient.war from ${assemble.dir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
-
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
-
- <target name="undeploy" depends="undeploy-war1,undeploy-client"/>
-
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
- </java>
-
-
- <!--restore the tokens back in file-->
- <replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
- <replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
- </target>
-
-
-
-
-</project>
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 000e376..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-sun-web.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server
-9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd">
-<sun-web-app>
-</sun-web-app>
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 dccfbc0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-web.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>A test application</description>
- <display-name>WebTier</display-name>
- <servlet>
- <display-name>centralServlet</display-name>
- <servlet-name>RequestProcessor</servlet-name>
- <servlet-class>client.Client</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>RequestProcessor</servlet-name>
- <url-pattern>/RequestProcessor</url-pattern>
- </servlet-mapping>
-
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
- <service-ref>
- <service-ref-name>service/MyHelloService</service-ref-name>
- <service-interface>helloservice.MyHelloService</service-interface>
- <wsdl-file>WEB-INF/wsdl/hello.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/hello-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>helloservice.HelloIF</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</web-app>
-
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 3354283..0000000
--- 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 0fb13ca..0000000
--- 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 93aadd8..0000000
--- 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 b13a575..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="MyHelloService"
- targetNamespace="urn:Foo"
- typeNamespace="urn:Foo"
- packageName="helloservice">
- <interface name="helloservice.HelloIF"/>
- </service>
-</configuration>
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 54a2454..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-wsdl.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl location="build/MyHelloService.wsdl"
- packageName="helloservice"/>
-</configuration>
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 4083642..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/application-client.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my jaxrpc app client</description>
- <display-name>jaxrpcClient</display-name>
- <service-ref>
- <description>simple jaxrpc service ref</description>
- <service-ref-name>service/helloservice</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/MyHelloService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>mapping.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:Foo">servicens:HelloIF</service-qname>
- <port-component-ref>
- <service-endpoint-interface>helloservice.HelloIF</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-</application-client>
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 d0bac8d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/helloservice</service-ref-name>
- <port-info>
- <service-endpoint-interface>helloservice.helloIF</service-endpoint-interface>
- <stub-property>
- <name>com.sun.enterprise.webservice.client.transport.log</name>
- <value>file:jaxrpc.log</value>
- </stub-property>
- </port-info>
- <service-qname>
- <namespaceURI>urn:Foo</namespaceURI>
- <localpart>HelloImpl</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
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 2bc2a75..0000000
--- 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 af0f518..0000000
--- 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 aede911..0000000
--- 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 6c649bd..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/sun-web.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 8.0 Servlet 2.4//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_4-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <context-root>/hello-jaxrpc</context-root>
- <servlet>
- <servlet-name>HelloImpl</servlet-name>
- <webservice-endpoint>
- <port-component-name>HelloIF</port-component-name>
- <endpoint-address-uri>hello</endpoint-address-uri>
- </webservice-endpoint>
- </servlet>
-</sun-web-app>
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 ac8a55d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/web.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-<display-name>MyHelloService</display-name>
-<servlet>
-<display-name>HelloImpl</display-name>
-<servlet-name>HelloImpl</servlet-name>
-<servlet-class>helloservice.HelloImpl</servlet-class>
-</servlet>
-<servlet-mapping>
-<servlet-name>HelloImpl</servlet-name>
-<url-pattern>/hello</url-pattern>
-</servlet-mapping>
-</web-app>
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 fd8a8bc..0000000
--- 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("<html>");
- out.println("<head>");
- out.println("<title>TestServlet</title>");
- out.println("</head>");
- out.println("<body>");
- out.println("<p>");
- out.println("So the RESULT OF jaxrpc web SERVICE IS :");
- out.println("</p>");
- out.println("[" + ret + "]");
- out.println("</body>");
- out.println("</html>");
- 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 664e057..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webservices.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee" version="1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd">
-<webservice-description>
-<display-name>MyHelloService</display-name>
-<webservice-description-name>MyHelloService</webservice-description-name>
-<wsdl-file>WEB-INF/wsdl/MyHelloService.wsdl</wsdl-file>
-<jaxrpc-mapping-file>build/mapping.xml</jaxrpc-mapping-file>
-<port-component>
-<display-name>HelloIF</display-name>
-<port-component-name>HelloIF</port-component-name>
-<wsdl-port xmlns:wsdl-port_ns__="urn:Foo">wsdl-port_ns__:HelloIFPort</wsdl-port>
-<service-endpoint-interface>helloservice.HelloIF</service-endpoint-interface>
-<service-impl-bean>
-<servlet-link>HelloImpl</servlet-link>
-</service-impl-bean>
-</port-component>
-</webservice-description>
-</webservices>
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 1f07b61..608a37f 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
- <delete file="${basedir}/RepRunConf.txt"/>
- <delete dir="${basedir}/common:endpoint"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war" />
+ <delete file="${basedir}/RepRunConf.txt" />
+ <delete dir="${basedir}/common:endpoint" />
+ </target>
- <target name="setup" depends="clean, assemble-web, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="clean, assemble-web, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="common:endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <echo message="classes dir = ${build.classes.dir}"/>
- <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/bare_doc_literal-se_consumer_se_provider/webservice/CalculatorService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/bare_doc_literal-se_consumer_se_provider/webservice/CalculatorService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="common:endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
- includes="common/**, webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <echo message="classes dir = ${build.classes.dir}" />
+ <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war" />
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/bare_doc_literal-se_consumer_se_provider/webservice/CalculatorService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/bare_doc_literal-se_consumer_se_provider/webservice/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar"
+ includes="common/**, webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="undeploy-app" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-web"/>
- </exec>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-web"/>
- <param name="wsName" value="Calculator"/>
- <param name="module" value="web-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-web" />
+ </exec>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-client"/>
- <antcall target="undeploy-app"/>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="common/**, client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-web" />
+ <param name="wsName" value="Calculator" />
+ <param name="module" value="web-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-client" />
+ <antcall target="undeploy-app" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="common/**, client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
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 3abc8bb..34ed13c 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 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
@@ -34,102 +34,106 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client/webservice/CalculatorServicei?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client/webservice/CalculatorService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${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"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- <!--<antcall target="configure-webservice-management"/>
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.applications.web-module.${appname}-web.web-service-endpoint.Calculator.jbi-enabled=false"/>
- </antcall>-->
- <antcall target="deploy-jbi-component-su"/>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <antcall target="undeploy-jbi-component-su"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/jsr208-integration-web-client/webservice/CalculatorServicei?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/jsr208-integration-web-client/webservice/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ <antcall target="deploy-jbi-component-su" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ <antcall target="undeploy-jbi-component-su" />
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
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 793e527..482d5bd 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;
- <target name="all" depends="clean, setup-server, setup-client, deploy-provider-su, deploy-consumer-su, runtest, cleanup-client, cleanup-server"/>
+ <target name="all"
+ depends="clean, setup-server, setup-client, deploy-provider-su, deploy-consumer-su, runtest, cleanup-client, cleanup-server"
+ />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-server" depends="assemble-ejb, deploy-app, start-consumer-jms-binding"/>
+ <target name="setup-server" depends="assemble-ejb, deploy-app, start-consumer-jms-binding" />
- <target name="setup-client" depends="assemble-client,deploy-client, start-provider-jms-binding"/>
+ <target name="setup-client" depends="assemble-client,deploy-client, start-provider-jms-binding" />
- <target name="cleanup-server" depends="undeploy-app, undeploy-consumer-su,stop-consumer-jms-binding"/>
- <target name="cleanup-client" depends="undeploy-client, undeploy-provider-su,stop-provider-jms-binding"/>
+ <target name="cleanup-server"
+ depends="undeploy-app, undeploy-consumer-su,stop-consumer-jms-binding"
+ />
+ <target name="cleanup-client"
+ depends="undeploy-client, undeploy-provider-su,stop-provider-jms-binding"
+ />
- <target name="assemble-ejb" depends="init-common, compile">
- <echo message="Assembling web service module"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**">
- </jar>
- </target>
+ <target name="assemble-ejb" depends="init-common, compile">
+ <echo message="Assembling web service module" />
+ <mkdir dir="${assemble.dir}" />
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ >
+ </jar>
+ </target>
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="provider/endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="provider/endpoint" />
+ </antcall>
+ </target>
- <target name="deploy-app">
- <echo message="Deploying the web service"/>
- <antcall target="deploy-jar-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <echo message="Deploying the web service" />
+ <antcall target="deploy-jar-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
- <target name="deploy-consumer-su" depends="init-common">
- <echo message="Creating QueueConnectionFactory for JMS Binding acting as a web service consumer"/>
- <antcall target="create-jms-connection-factory">
- <param name="jms.cf.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <antcall target="create-jms-resource">
- <param name="domain.admin.port" value="${admin.port}"/>
- <param name="jms.res.type" value="${QueueConnectionFactory}"/>
- <param name="jms.res.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <echo message="deploying JMS Binding's consumer deployment "/>
- <antcall target="deploy-jbi-component-su">
- <param name="jbi-component-su-assembly" value="${jms-consumer-assembly}"/>
- <param name="jbi-component-su" value="${jms-consumer-su}"/>
- <param name="jbi-component-su-dir" value="${jms-consumer-su-dir}"/>
- </antcall>
- </target>
+ <target name="deploy-consumer-su" depends="init-common">
+ <echo message="Creating QueueConnectionFactory for JMS Binding acting as a web service consumer"
+ />
+ <antcall target="create-jms-connection-factory">
+ <param name="jms.cf.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <antcall target="create-jms-resource">
+ <param name="domain.admin.port" value="${admin.port}" />
+ <param name="jms.res.type" value="${QueueConnectionFactory}" />
+ <param name="jms.res.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <echo message="deploying JMS Binding's consumer deployment " />
+ <antcall target="deploy-jbi-component-su">
+ <param name="jbi-component-su-assembly" value="${jms-consumer-assembly}" />
+ <param name="jbi-component-su" value="${jms-consumer-su}" />
+ <param name="jbi-component-su-dir" value="${jms-consumer-su-dir}" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <echo message="Assembling web client"/>
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- </antcall>
- <javac srcdir="consumer" destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${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"
- debug="on"
- includes="webclient/**"/>
- <copy file="./consumer/client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./consumer/client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <echo message="Assembling web client" />
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ </antcall>
+ <javac srcdir="consumer"
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ debug="on"
+ includes="webclient/**"
+ />
+ <copy file="./consumer/client-web.xml"
+ tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"
+ />
+ <copy file="./consumer/client-sun-web.xml"
+ tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"
+ />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <echo message="Deploying the client application"/>
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--port ${domain2.admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
-
- <target name="deploy-provider-su" depends="init-common">
- <echo message="Creating physical destinations - queues : - provideroutgoingqueue and temporary_queue"/>
- <antcall target="create-physical-queue">
- <param name="queue.name" value="provideroutgoingqueue"/>
- </antcall>
- <antcall target="create-physical-queue">
- <param name="queue.name" value="temporary_queue"/>
- </antcall>
- <echo message="Create QueueConnectionFactory for JMS Binding which is acting as a provider"/>
- <antcall target="create-jms-connection-factory">
- <param name="jms.cf.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <antcall target="create-jms-resource">
- <param name="domain.admin.port" value="${domain2.admin.port}"/>
- <param name="jms.res.type" value="${QueueConnectionFactory}"/>
- <param name="jms.res.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <echo message="Create JMS resource for provideroutgoingqueue and temporary_queue"/>
- <antcall target="create-jms-queue">
- <param name="jms.queue.name" value="provideroutgoingqueue"/>
- <param name="queue.name" value="provideroutgoingqueue"/>
- </antcall>
- <antcall target="create-jms-queue">
- <param name="jms.queue.name" value="temporary_queue"/>
- <param name="queue.name" value="temporary_queue"/>
- </antcall>
- <echo message="Deploy JMS Binding provider deployment"/>
- <antcall target="deploy-jbi-component-su">
- <param name="jbi-component-su-assembly" value="${jms-provider-assembly}"/>
- <param name="jbi-component-su" value="${jms-provider-su}"/>
- <param name="jbi-component-su-dir" value="${jms-provider-su-dir}"/>
- <param name="jmx.port" value="${domain2.jmx.port}"/>
- </antcall>
- </target>
-
- <target name="undeploy-client" depends="init-common">
- <echo message="Undeploying client application"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${domain2.admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
-
- <target name="undeploy-app" depends="init-common">
- <echo message="Undeploying web service"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-ejb"/>
- </exec>
- </target>
-
- <target name="runtest" depends="init-common">
- <echo message="Running the test client"/>
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="consumer/client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${domain2.instance.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
-
-
- <target name="undeploy-consumer-su" depends="init-common">
- <echo message="Undeploying JMS resource : MyQueueConnectionFactory"/>
- <antcall target="delete-appserver-jms-resource">
- <param name="domain.admin.port" value="${admin.port}"/>
- <param name="jms.res.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <!--<antcall target="delete-jms-resource">
- <param name="jms.resource.name" value="MyQueueConnectionFactory"/>
- </antcall>-->
- <echo message="Undeploying JMS Binding consumer deployment"/>
- <antcall target="undeploy-jbi-component-su">
- <param name="jbi-component-su-assembly" value="${jms-consumer-assembly}"/>
- </antcall>
- </target>
-
- <target name="undeploy-provider-su" depends="init-common">
- <echo message="Undeploying JMS Resource :- provideroutgoingqueue and temporary_queue"/>
- <antcall target="delete-jms-resource">
- <param name="jms.resource.name" value="provideroutgoingqueue"/>
- </antcall>
- <antcall target="delete-jms-resource">
- <param name="jms.resource.name" value="temporary_queue"/>
- </antcall>
- <echo message="Undeploying JMS resource : MyQueueConnectionFactory"/>
- <antcall target="delete-appserver-jms-resource">
- <param name="domain.admin.port" value="${domain2.admin.port}"/>
- <param name="jms.res.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <antcall target="delete-jms-resource">
- <param name="jms.resource.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <echo message="Deleting physical queues : provideroutgoingqueue , temporary_queue"/>
- <antcall target="delete-physical-queue">
- <param name="queue.name" value="provideroutgoingqueue"/>
- </antcall>
- <antcall target="delete-physical-queue">
- <param name="queue.name" value="temporary_queue"/>
- </antcall>
- <echo message="Undeploying JMS Binding's provider deployment"/>
- <antcall target="undeploy-jbi-component-su">
- <param name="jbi-component-su-assembly" value="${jms-provider-assembly}"/>
- <param name="jmx.port" value="${domain2.jmx.port}"/>
- </antcall>
- </target>
-
- <target name="create-domain2" depends="init-common">
- <property name="admin.command" value="create-domain"/>
- <property name="operand.props" value="--adminport ${domain2.admin.port} --adminuser admin --passwordfile ${admin.password.file} --instanceport ${domain2.instance.port} --savemasterpassword=true --domainproperties domain.jmxPort=${domain2.jmx.port}:jms.port=${domain2.jms.port}:orb.listner.port=${domain2.orb.listner.port}:http.ssl.port=${domain2.http.ssl.port}:orb.mutualauth.port=${domain2.orb.mutualauth.port} ${domain.name}"/>
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="${admin.command} ${operand.props}" />
+ <target name="deploy-client" depends="assemble-client">
+ <echo message="Deploying the client application" />
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--port ${domain2.admin.port}" />
+ <arg line="${client.war}" />
</exec>
- </target>
+ </target>
- <target name="start-domain2" depends="init-common">
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="start-domain --user ${admin.user} ${domain.name}"/>
- </exec>
- </target>
+ <target name="deploy-provider-su" depends="init-common">
+ <echo message="Creating physical destinations - queues : - provideroutgoingqueue and temporary_queue"
+ />
+ <antcall target="create-physical-queue">
+ <param name="queue.name" value="provideroutgoingqueue" />
+ </antcall>
+ <antcall target="create-physical-queue">
+ <param name="queue.name" value="temporary_queue" />
+ </antcall>
+ <echo message="Create QueueConnectionFactory for JMS Binding which is acting as a provider" />
+ <antcall target="create-jms-connection-factory">
+ <param name="jms.cf.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <antcall target="create-jms-resource">
+ <param name="domain.admin.port" value="${domain2.admin.port}" />
+ <param name="jms.res.type" value="${QueueConnectionFactory}" />
+ <param name="jms.res.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <echo message="Create JMS resource for provideroutgoingqueue and temporary_queue" />
+ <antcall target="create-jms-queue">
+ <param name="jms.queue.name" value="provideroutgoingqueue" />
+ <param name="queue.name" value="provideroutgoingqueue" />
+ </antcall>
+ <antcall target="create-jms-queue">
+ <param name="jms.queue.name" value="temporary_queue" />
+ <param name="queue.name" value="temporary_queue" />
+ </antcall>
+ <echo message="Deploy JMS Binding provider deployment" />
+ <antcall target="deploy-jbi-component-su">
+ <param name="jbi-component-su-assembly" value="${jms-provider-assembly}" />
+ <param name="jbi-component-su" value="${jms-provider-su}" />
+ <param name="jbi-component-su-dir" value="${jms-provider-su-dir}" />
+ <param name="jmx.port" value="${domain2.jmx.port}" />
+ </antcall>
+ </target>
- <target name="create-physical-queue" depends="init-common">
- <exec executable="${env.S1AS_HOME}/imq/bin/imqcmd" failonerror="false">
- <arg line="create dst -n ${queue.name} -t q -u admin -passfile ${broker.password.file} -b localhost:${imq.broker.port}"/>
- </exec>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <echo message="Undeploying client application" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${domain2.admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <target name="create-jms-resource" depends="init-common">
- <exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="false">
- <arg line="create-jms-resource --user ${admin.user} --passwordfile ${admin.password.file} --port ${domain.admin.port} --restype ${jms.res.type} ${jms.res.name}"/>
- </exec>
- </target>
- <target name="create-jms-queue" depends="init-common">
- <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="false">
- <arg line="add -l "${jms.queue.name}" -t q -o "imqDestinationName=${queue.name}" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""/>
- </exec>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <echo message="Undeploying web service" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-ejb" />
+ </exec>
+ </target>
- <target name="create-jms-connection-factory" depends="init-common">
- <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="true">
- <arg line="add -f -l "${jms.cf.name}" -t qf -o "imqAddressList=mq://localhost:${imq.broker.port}/jms" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""/>
- </exec>
- </target>
+ <target name="runtest" depends="init-common">
+ <echo message="Running the test client" />
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="consumer/client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${domain2.instance.port}/wsclient/webclient/RequestProcessor"
+ />
+ </java>
+ </target>
- <target name="delete-physical-queue" depends="init-common" >
- <exec executable="${env.S1AS_HOME}/imq/bin/imqcmd" failonerror="false">
- <arg line="destroy dst -f -n ${queue.name} -t q -passfile ${broker.password.file} -u admin -b localhost:${imq.broker.port}" />
- </exec>
- </target>
- <target name="delete-jms-resource" depends="init-common">
- <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="false">
- <arg line="delete -f -l "${jms.resource.name}" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""/>
- </exec>
- </target>
- <target name="delete-appserver-jms-resource" depends="init-common">
- <exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="false">
- <arg line="delete-jms-resource --user ${admin.user} --passwordfile ${admin.password.file} --port ${domain.admin.port} ${jms.res.name}"/>
- </exec>
- </target>
+ <target name="undeploy-consumer-su" depends="init-common">
+ <echo message="Undeploying JMS resource : MyQueueConnectionFactory" />
+ <antcall target="delete-appserver-jms-resource">
+ <param name="domain.admin.port" value="${admin.port}" />
+ <param name="jms.res.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <echo message="Undeploying JMS Binding consumer deployment" />
+ <antcall target="undeploy-jbi-component-su">
+ <param name="jbi-component-su-assembly" value="${jms-consumer-assembly}" />
+ </antcall>
+ </target>
- <target name="delete-domain2" depends="init-common">
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="delete-domain domain2 " />
- </exec>
- </target>
- <target name="stop-provider-jms-binding" depends="init-common">
- <antcall target="stop-binding">
- <param name="jmx.port" value="${domain2.jmx.port}"/>
- <param name="jbi.component.name" value="SunJMSBinding"/>
- </antcall>
- </target>
- <target name="start-provider-jms-binding" depends="init-common">
- <antcall target="start-binding">
- <param name="jmx.port" value="${domain2.jmx.port}"/>
- <param name="jbi.component.name" value="SunJMSBinding"/>
- </antcall>
- </target>
- <target name="stop-consumer-jms-binding" depends="init-common">
- <antcall target="stop-binding">
- <param name="jbi.component.name" value="SunJMSBinding"/>
- </antcall>
- </target>
- <target name="start-consumer-jms-binding" depends="init-common">
- <antcall target="start-binding">
- <param name="jbi.component.name" value="SunJMSBinding"/>
- </antcall>
- </target>
+ <target name="undeploy-provider-su" depends="init-common">
+ <echo message="Undeploying JMS Resource :- provideroutgoingqueue and temporary_queue" />
+ <antcall target="delete-jms-resource">
+ <param name="jms.resource.name" value="provideroutgoingqueue" />
+ </antcall>
+ <antcall target="delete-jms-resource">
+ <param name="jms.resource.name" value="temporary_queue" />
+ </antcall>
+ <echo message="Undeploying JMS resource : MyQueueConnectionFactory" />
+ <antcall target="delete-appserver-jms-resource">
+ <param name="domain.admin.port" value="${domain2.admin.port}" />
+ <param name="jms.res.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <antcall target="delete-jms-resource">
+ <param name="jms.resource.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <echo message="Deleting physical queues : provideroutgoingqueue , temporary_queue" />
+ <antcall target="delete-physical-queue">
+ <param name="queue.name" value="provideroutgoingqueue" />
+ </antcall>
+ <antcall target="delete-physical-queue">
+ <param name="queue.name" value="temporary_queue" />
+ </antcall>
+ <echo message="Undeploying JMS Binding's provider deployment" />
+ <antcall target="undeploy-jbi-component-su">
+ <param name="jbi-component-su-assembly" value="${jms-provider-assembly}" />
+ <param name="jmx.port" value="${domain2.jmx.port}" />
+ </antcall>
+ </target>
+
+ <target name="create-domain2" depends="init-common">
+ <property name="admin.command" value="create-domain" />
+ <property name="operand.props"
+ value="--adminport ${domain2.admin.port} --adminuser admin --passwordfile ${admin.password.file} --instanceport ${domain2.instance.port} --savemasterpassword=true --domainproperties domain.jmxPort=${domain2.jmx.port}:jms.port=${domain2.jms.port}:orb.listner.port=${domain2.orb.listner.port}:http.ssl.port=${domain2.http.ssl.port}:orb.mutualauth.port=${domain2.orb.mutualauth.port} ${domain.name}"
+ />
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="${admin.command} ${operand.props}" />
+ </exec>
+ </target>
+
+ <target name="start-domain2" depends="init-common">
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="start-domain --user ${admin.user} ${domain.name}" />
+ </exec>
+ </target>
+
+ <target name="create-physical-queue" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqcmd" failonerror="false">
+ <arg line="create dst -n ${queue.name} -t q -u admin -passfile ${broker.password.file} -b localhost:${imq.broker.port}"
+ />
+ </exec>
+ </target>
+
+ <target name="create-jms-resource" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="false">
+ <arg line="create-jms-resource --user ${admin.user} --passwordfile ${admin.password.file} --port ${domain.admin.port} --restype ${jms.res.type} ${jms.res.name}"
+ />
+ </exec>
+ </target>
+ <target name="create-jms-queue" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="false">
+ <arg line="add -l "${jms.queue.name}" -t q -o "imqDestinationName=${queue.name}" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""
+ />
+ </exec>
+ </target>
+
+ <target name="create-jms-connection-factory" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="true">
+ <arg line="add -f -l "${jms.cf.name}" -t qf -o "imqAddressList=mq://localhost:${imq.broker.port}/jms" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""
+ />
+ </exec>
+ </target>
+
+ <target name="delete-physical-queue" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqcmd" failonerror="false">
+ <arg line="destroy dst -f -n ${queue.name} -t q -passfile ${broker.password.file} -u admin -b localhost:${imq.broker.port}"
+ />
+ </exec>
+ </target>
+
+ <target name="delete-jms-resource" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="false">
+ <arg line="delete -f -l "${jms.resource.name}" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""
+ />
+ </exec>
+ </target>
+ <target name="delete-appserver-jms-resource" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="false">
+ <arg line="delete-jms-resource --user ${admin.user} --passwordfile ${admin.password.file} --port ${domain.admin.port} ${jms.res.name}"
+ />
+ </exec>
+ </target>
+
+ <target name="delete-domain2" depends="init-common">
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="delete-domain domain2 " />
+ </exec>
+ </target>
+ <target name="stop-provider-jms-binding" depends="init-common">
+ <antcall target="stop-binding">
+ <param name="jmx.port" value="${domain2.jmx.port}" />
+ <param name="jbi.component.name" value="SunJMSBinding" />
+ </antcall>
+ </target>
+ <target name="start-provider-jms-binding" depends="init-common">
+ <antcall target="start-binding">
+ <param name="jmx.port" value="${domain2.jmx.port}" />
+ <param name="jbi.component.name" value="SunJMSBinding" />
+ </antcall>
+ </target>
+ <target name="stop-consumer-jms-binding" depends="init-common">
+ <antcall target="stop-binding">
+ <param name="jbi.component.name" value="SunJMSBinding" />
+ </antcall>
+ </target>
+ <target name="start-consumer-jms-binding" depends="init-common">
+ <antcall target="start-binding">
+ <param name="jbi.component.name" value="SunJMSBinding" />
+ </antcall>
+ </target>
</project>
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 632eb41..1e8d845 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/AdderService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/AdderService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${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"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- <!--<antcall target="configure-webservice-management"/>
+ <target name="assemble-web" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
+
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client/webservice/AdderService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client/webservice/AdderService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
+
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ <!--<antcall target="configure-webservice-management"/>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props" value="server.applications.web-module.${appname}-web.web-service-endpoint.Adder.jbi-enabled=false"/>
</antcall>
<antcall target="deploy-jbi-component-su"/>-->
- </target>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <!--<antcall target="undeploy-jbi-component-su"/>-->
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ <!--<antcall target="undeploy-jbi-component-su"/>-->
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-web"/>
- <param name="wsName" value="Adder"/>
- <param name="module" value="web-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-web" />
+ <param name="wsName" value="Adder" />
+ <param name="module" value="web-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client" />
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
</project>
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 06556a7..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/build.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<!DOCTYPE project [
-]>
-
-<project name="jsr208-integration-server" default="all" basedir=".">
-
-
- <target name="all">
- <ant dir="consumer" target="all"/>
- <ant dir="provider" target="all"/>
- </target>
-</project>
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 4dc31e9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterest.wsdl
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<definitions name="FindInterest" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<types>
- <xsd:schema>
- <xsd:import namespace="http://hello.org/wsdl" schemaLocation="FindInterest_Schema.xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
- </xsd:schema>
- </types>
-
- <message name="calculateInterest">
- <part name="parameters" element="tns:calculateInterest"/>
- </message>
- <message name="calculateInterestResponse">
- <part name="parameters" element="tns:calculateInterestResponse"/></message>
- <portType name="InterestIF">
- <operation name="calculateInterest">
- <input message="tns:calculateInterest"/>
- <output message="tns:calculateInterestResponse"/></operation></portType>
- <binding name="InterestIFBinding" type="tns:InterestIF">
- <operation name="calculateInterest">
- <input>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction="urn:calculateInterest"/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/></binding>
- <service name="FindInterest">
- <port name="InterestIFPort" binding="tns:InterestIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_ADDRESS"/></port></service></definitions>
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 4783528..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterestNonHttpBC.wsdl
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<definitions name="FindInterest" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types/>
- <message name="InterestIF_calculateInterest">
- <part name="double_1" type="xsd:double"/>
- <part name="double_2" type="xsd:double"/></message>
- <message name="InterestIF_calculateInterestResponse">
- <part name="result" type="xsd:double"/></message>
- <portType name="InterestIF">
- <operation name="calculateInterest" parameterOrder="double_1 double_2">
- <input message="tns:InterestIF_calculateInterest"/>
- <output message="tns:InterestIF_calculateInterestResponse"/></operation></portType>
- <binding name="InterestIFBinding" type="tns:InterestIF">
- <operation name="calculateInterest">
- <input>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction=""/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/></binding>
- <service name="FindInterest">
- <port name="InterestIFPort" binding="tns:InterestIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_ADDRESS"/></port></service></definitions>
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 fc4c721..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterest_Schema.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- 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
-
--->
-
-<xs:schema version="1.0" targetNamespace="http://hello.org/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="calculateInterest" type="ns1:calculateInterest" xmlns:ns1="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterest">
- <xs:sequence>
- <xs:element name="arg0" type="xs:double"/>
- <xs:element name="arg1" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:element name="calculateInterestResponse" type="ns2:calculateInterestResponse" xmlns:ns2="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterestResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
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 e6c5491..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.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
-
--->
-
-
-<property name="module" value="findinterest"/>
-<property name="appname" value="${module}"/>
-<property name="jbi-component-su-assembly" value="ejb_findinterest_provider_assembly"/>
-<property name="jbi-component-su" value="ejb_jaxrpc_provider_su"/>
-<property name="jbi-component-su-dir" value="soap-binding-su-alaska"/>
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 6816239..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.xml
+++ /dev/null
@@ -1,357 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "../../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../../config/common.xml">
-<!ENTITY jbicommon SYSTEM "file:./../../jbi_commons.xml">
-<!ENTITY jbiproperties SYSTEM "file:./../../jbi_commons.properties">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<!-- targets: clean, setup, compile, jar, war, ear, deploy, undeploy, runclient -->
-
-<project name="findintr" default="all" basedir=".">
-
- &commonSetup;
- &commonBuild;
- &jbicommon;
- &jbiproperties;
- &testproperties;
- <property environment="env" />
- <target name="all" depends="clean, setup, compile, ear, deploy, run-servlet-invoker, undeploy"/>
- <target name="setup" depends="init-common">
- <property name="root.dir" value="." />
- <property name="src.dir" value="." />
- <property name="appname" value="FindInterestApp" />
-
- <property name="build.dir" value="${env.APS_HOME}/build/module" />
- <property name="build.repository" value="${build.dir}/buildears"/>
- <property name="build.appclient" value="${build.dir}/buildappclient"/>
- <property name="build.ejbsrc" value="${build.dir}/src/ejb" />
- <property name="build.websrc" value="${build.dir}/src/web" />
- <property name="build.clientsrc" value="${build.dir}/src/client" />
-
- <property name="build.dest" value="${build.dir}/classes" />
- <property name="build.mapping" value="${build.dir}/jaxrpc-mapping" />
- <property name="build.desc" value="${build.dir}/descriptor" />
- <property name="build.webinf" value="${build.dir}/webinf" />
- <property name="build.metainf" value="${build.dir}/metainf" />
- <property name="build.jars" value="${build.dir}/jars" />
- <property name="build.ear" value="${build.repository}/"/>
-
- <property name="debug" value="on" />
- </target>
-
- <target name="clean" depends="setup">
- <delete dir="${build.dir}"/>
- <delete dir="${build.repository}"/>
- <delete dir="${build.appclient}"/>
- </target>
-
- <!-- target name="compile" depends="setup,clean" -->
- <target name="compile" depends="wscompile,setup" >
- <!-- ant target="makedirs"/ -->
- <!-- ant target="copyfiles"/ -->
- <javac srcdir="${build.ejbsrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- <javac srcdir="${build.websrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- <javac srcdir="${build.clientsrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- </target>
-
- <target name="jar" depends="compile">
- <jar jarfile="${build.jars}/ejb.jar" >
- <fileset dir="${build.dest}">
- <include name="myejb/*.class"/>
- </fileset>
-
- <fileset dir="${build.mapping}">
- <include name="IntrEjbMapping.xml" />
- </fileset>
- <metainf dir="${build.desc}/ejb">
- <include name="ejb-jar.xml"/>
- <include name="webservices.xml"/>
- <include name="sun-ejb-jar.xml"/>
- </metainf>
- <fileset dir="${build.metainf}">
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
-
- <antcall target="copy-to-webinf" />
-
- <jar jarfile="${build.jars}/web.war" >
- <fileset dir="${build.webinf}">
- <include name="**/*.class"/>
- </fileset>
- <fileset dir="${build.mapping}">
- <include name="IntrClientMapping.xml" />
- </fileset>
-
-
- <fileset dir="${build.webinf}">
- <include name="**/web.xml" />
- <include name="**/sun-web.xml" />
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
-
- <jar jarfile="${build.jars}/appclient.jar"
- manifest="${build.desc}/client/MANIFEST.MF">
-
- <fileset dir="${build.mapping}">
- <include name="IntrClientMapping.xml" />
- </fileset>
-
- <fileset dir="${build.dest}">
- <include name="myclient/*.class"/>
- </fileset>
- <metainf dir="${build.desc}/client">
- <include name="application-client.xml"/>
- <include name="sun-application-client.xml"/>
- </metainf>
- <fileset dir="${build.metainf}">
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
- </target>
-
- <target name="copy-to-webinf">
- <copy todir="${build.webinf}/WEB-INF/classes" filtering="on" overwrite="yes" >
- <fileset dir="${build.dest}">
- <include name="myclient/*.class"/>
- </fileset>
- </copy>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.webinf}/WEB-INF/classes"/>
- </target>
-
- <target name="ear" depends="clean,jar">
- <ear earfile="${build.ear}/${appname}.ear"
- appxml="${build.desc}/application.xml"
- manifest="${build.desc}/MANIFEST.MF">
-
- <fileset dir="${build.jars}" includes="*.jar,*.war" excludes="ejb.jar"/>
-
- <fileset dir="${env.APS_HOME}/lib">
- <include name="reporter.jar"/>
- </fileset>
- </ear>
- </target>
-
- <target name="deploy" depends="setup">
- <exec executable="${ASADMIN}">
- <arg value="deploy" />
- <arg value="--user" />
- <arg value="${admin.user}" />
- <arg value="--host" />
- <arg value="${admin.host}" />
- <arg value="--port" />
- <arg value="${admin.port}" />
- <arg value="--retrieve" />
- <arg value="${build.appclient}" />
- <arg value="${build.ear}/${appname}.ear" />
- </exec>
- <exec executable="${ASADMIN}">
- <arg value="deploy" />
- <arg value="--user" />
- <arg value="${admin.user}" />
- <arg value="--host" />
- <arg value="${admin.host}" />
- <arg value="--port" />
- <arg value="${admin.port}" />
- <arg value="--retrieve" />
- <arg value="${build.appclient}" />
- <arg value="${build.jars}/ejb.jar" />
- </exec>
-<antcall target="configure-webservice-management"/>
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.applications.ejb-module.ejb.web-service-endpoint.InterestIFPort.jbi-enabled=false"/>
- </antcall>
-
- <antcall target="deploy-jbi-component-su"/>
- </target>
-
- <target name="undeploy" depends="setup">
- <exec executable="${ASADMIN}">
- <arg value="undeploy" />
- <arg value="--user" />
- <arg value="${admin.user}" />
- <arg value="--host" />
- <arg value="${admin.host}" />
- <arg value="--port" />
- <arg value="${admin.port}" />
- <arg value="${appname}" />
- </exec>
- <exec executable="${ASADMIN}">
- <arg value="undeploy" />
- <arg value="--user" />
- <arg value="${admin.user}" />
- <arg value="--host" />
- <arg value="${admin.host}" />
- <arg value="--port" />
- <arg value="${admin.port}" />
- <arg value="ejb" />
- </exec>
-
- <antcall target="undeploy-jbi-component-su"/>
- </target>
-
- <target name="runclient" depends="setup">
- <echo message="Executing an appclient"/>
- <exec executable="${APPCLIENT}">
- <env key="VMARGS" value="-Dtest.results=${results.file}" />
- <arg value="-client" />
- <arg value="${build.appclient}/${appname}Client.jar"/>
- <arg value="-name" />
- <arg value="MyAppClient" />
- </exec>
- </target>
-
- <target name="makedirs">
- <mkdir dir="${build.dir}" />
- <mkdir dir="${build.repository}" />
- <mkdir dir="${build.appclient}" />
- <mkdir dir="${build.ejbsrc}" />
- <mkdir dir="${build.websrc}" />
- <mkdir dir="${build.clientsrc}" />
- <mkdir dir="${build.dest}" />
- <mkdir dir="${build.mapping}" />
- <mkdir dir="${build.desc}" />
- <mkdir dir="${build.desc}/META-INF"/>
- <mkdir dir="${build.desc}/ejb"/>
- <mkdir dir="${build.desc}/client"/>
- <mkdir dir="${build.jars}" />
- <mkdir dir="${build.webinf}" />
- <mkdir dir="${build.webinf}/WEB-INF" />
- <mkdir dir="${build.webinf}/WEB-INF/wsdl" />
- <mkdir dir="${build.webinf}/WEB-INF/classes" />
- <mkdir dir="${build.metainf}" />
- <mkdir dir="${build.metainf}/META-INF" />
- <mkdir dir="${build.metainf}/META-INF/wsdl" />
- <mkdir dir="${build.dir}/archive"/>
- </target>
-
- <target name="copyfiles">
-
- <copy todir="${build.webinf}/WEB-INF" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/web" >
- <include name="*.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/ejb" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/ejb" >
- <include name="*.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/client" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/client" >
- <include name="*.xml" />
- <include name="MANIFEST.MF" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor" >
- <include name="application.xml" />
- <include name="MANIFEST.MF" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/META-INF" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor">
- <include name="sun-j2ee-ri.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.ejbsrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/ejb" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.websrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/web" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.clientsrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/client" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.webinf}/WEB-INF/wsdl" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}" >
- <include name="FindInterest.wsdl" />
- <include name="FindInterest_Schema.xsd" />
- </fileset>
- </copy>
-
- <copy todir="${build.metainf}/META-INF/wsdl" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}" >
- <include name="FindInterest.wsdl" />
- <include name="FindInterest_Schema.xsd" />
- </fileset>
- </copy>
-
- </target>
-
- <target name="wscompile" depends="setup,makedirs,copyfiles">
-
- <exec executable="${WSCOMPILE}">
- <arg line="-source 1.1.2 -import -f:norpcstructures -keep -d ${build.dest} -s ${build.dest} -mapping ${build.mapping}/IntrEjbMapping.xml wscompile_config.xml
-" />
- </exec>
-
- <exec executable="${WSCOMPILE}">
- <arg line="-source 1.1.2 -import -f:norpcstructures -keep -d ${build.dest} -s ${build.dest} -mapping ${build.mapping}/IntrClientMapping.xml wscompile_config_client.xml
-" />
- </exec>
-
- </target>
-
- <target name="run-servlet-invoker" depends="init-common, compile">
- <echo message="Executing a Servlet invoker"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.dest}"/>
-
-<java classname="myclient.ServletInvoker">
- <classpath>
- <pathelement path="${build.dest}"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/FindInterestServlet/FindInterestClient"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="ejb#InterestIFPort"/>
- </antcall>
- </target>
-
-<!-- <target name="all" depends="clean,ear,deploy,runclient" />-->
-</project>
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 36ef163..0000000
--- 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 0ee7b94..0000000
--- 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 e260cc0..0000000
--- 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("<html>");
- out.println("<head>");
- out.println("<title>FindInterestServletClient</title>");
- out.println("</head>");
- out.println("<body>");
- out.println("<p>");
- out.println("So the RESULT OF FindInterest SERVICE IS :");
- out.println("</p>");
- out.println("[" + interest + "]");
- out.println("</body>");
- out.println("</html>");
- 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 3dfffb1..0000000
--- 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 87a75ed..0000000
--- 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 f5687e7..0000000
--- 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 d4ea871..0000000
--- 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 34de701..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/application.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
-<!--
-
- 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
-
--->
-
-<application>
- <display-name>FindInterestApp</display-name>
- <module>
- <web>
- <web-uri>web.war</web-uri>
- <context-root>FindInterestServlet</context-root>
- </web>
- </module>
- <module>
- <java>appclient.jar</java>
- </module>
-</application>
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 7cc1828..0000000
--- 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 f3268b8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/application-client.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my findintr app client</description>
- <display-name>MyAppClient</display-name>
- <service-ref>
- <description>findintr service ref</description>
- <service-ref-name>service/FindInterest</service-ref-name>
- <service-interface>myclient.FindInterest</service-interface>
- <wsdl-file>META-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrClientMapping.xml</jaxrpc-mapping-file>
- </service-ref>
-</application-client>
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 a313c5b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/sun-application-client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/FindInterest</service-ref-name>
- </service-ref>
-</sun-application-client>
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 d4ea871..0000000
--- 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 4acc04c..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/ejb-jar.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <display-name>InterestEjb</display-name>
- <ejb-name>InterestEjb</ejb-name>
- <service-endpoint>myejb.InterestIF</service-endpoint>
- <ejb-class>myejb.InterestEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>InterestEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
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 d23c426..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/sun-ejb-jar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <name>ejb.jar</name>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>InterestEjb</ejb-name>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>InterestIFPort</port-component-name>
- <endpoint-address-uri>findintr/FindInterest</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 f2719c9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/webservices.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>FindInterestEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrEjbMapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>InterestIFPort</port-component-name>
- <wsdl-port xmlns:hellons="http://hello.org/wsdl">hellons:InterestIFPort
- </wsdl-port>
- <service-endpoint-interface>myejb.InterestIF
- </service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>InterestEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 2b0cec3..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/sun-web.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <context-root>FindInterestServlet</context-root>
- <service-ref>
- <service-ref-name>service/FindInterest</service-ref-name>
- <port-info>
- <wsdl-port>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- <localpart>InterestIFPort</localpart>
-</wsdl-port>
- <stub-property name="jbi-enabled" value="true"/>
- </port-info>
- </service-ref>
-</sun-web-app>
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 0fc85ea..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>FindInterestApp</display-name>
- <servlet>
- <servlet-name>FindInterestServletClient</servlet-name>
- <servlet-class>myclient.FindInterestServletClient</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>FindInterestServletClient</servlet-name>
- <url-pattern>/FindInterestClient</url-pattern>
- </servlet-mapping>
- <service-ref>
- <description>findintr service ref</description>
- <service-ref-name>service/FindInterest</service-ref-name>
- <service-interface>myclient.FindInterest</service-interface>
- <wsdl-file>WEB-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrClientMapping.xml</jaxrpc-mapping-file>
- </service-ref>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
-</web-app>
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 b25badf..0000000
--- 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 4aa2bea..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/mapping/FIMapping.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- version="1.1">
- <package-mapping>
- <package-type>myejb</package-type>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
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 588fa00..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/mapping/FIMappingClient.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- version="1.1">
- <package-mapping>
- <package-type>myclient</package-type>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
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 ac2e5e6..0000000
--- 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 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<!-- jbi.xml file for the SOAP binding deployments binding. -->
-<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
- <service-assembly>
- <identification>
- <!--alias>SoapBinding Deployments</alias -->
- <name>ejb_findinterest_provider_assembly</name>
- <description>This is an AU for Soap Binding deployments</description>
- </identification>
- <service-unit>
- <identification>
- <name>provider_for_ejb_jaxrpc</name>
- <description>provider service to the soap binding</description>
- </identification>
- <target>
- <artifacts-zip>ejb_jaxrpc_provider_su.jar</artifacts-zip>
- <component-name>sun-http-binding</component-name>
- </target>
- </service-unit>
- </service-assembly>
-</jbi>
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 f269b0e..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<definitions name="FindInterest" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<types>
- <xsd:schema>
- <xsd:import namespace="http://hello.org/wsdl" schemaLocation="FindInterest_Schema.xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
- </xsd:schema>
- </types>
-
- <message name="calculateInterest">
- <part name="parameters" element="tns:calculateInterest"/>
- </message>
- <message name="calculateInterestResponse">
- <part name="parameters" element="tns:calculateInterestResponse"/></message>
- <portType name="InterestIF">
- <operation name="calculateInterest">
- <input message="tns:calculateInterest"/>
- <output message="tns:calculateInterestResponse"/></operation></portType>
- <binding name="InterestIFBinding" type="tns:InterestIF">
- <operation name="calculateInterest">
- <input>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction="urn:calculateInterest"/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/></binding>
- <service name="FindInterest">
- <port name="InterestIFPort" binding="tns:InterestIFBinding">
- <soap:address location="http://localhost:8080/findintr/FindInterest"/></port></service></definitions>
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 fc4c721..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- 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
-
--->
-
-<xs:schema version="1.0" targetNamespace="http://hello.org/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="calculateInterest" type="ns1:calculateInterest" xmlns:ns1="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterest">
- <xs:sequence>
- <xs:element name="arg0" type="xs:double"/>
- <xs:element name="arg1" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:element name="calculateInterestResponse" type="ns2:calculateInterestResponse" xmlns:ns2="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterestResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
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 09720f7..0000000
--- 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 @@
-<?xml version='1.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
-
--->
-
-<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://hello.org/wsdl"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:FindInterestInterface"
- service-name="tns:FindInterest"
- endpoint-name="InterestIFPort"/>
- <artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
-</jbi>
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 0c23185..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- 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
-
--->
-
-<portmaps>
-<portmap direction="outbound" endPoint="InterestIFPort" service="{http://hello.org/wsdl}FindInterest"/>
-</portmaps>
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 73efb32..0000000
--- 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 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<!-- jbi.xml file for the SOAP binding deployments binding. -->
-<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
- <service-assembly>
- <identification>
- <!--alias>SoapBinding Deployments</alias -->
- <name>ejb_findinterest_provider_assembly</name>
- <description>This is an AU for Soap Binding deployments</description>
- </identification>
- <service-unit>
- <identification>
- <name>provider_for_ejb_jaxrpc</name>
- <description>provider service to the soap binding</description>
- </identification>
- <target>
- <artifacts-zip>ejb_jaxrpc_provider_su.jar</artifacts-zip>
- <component-name>SunSOAPBinding</component-name>
- </target>
- </service-unit>
- </service-assembly>
-</jbi>
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 1d3719e..0000000
--- 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 @@
-<?xml version='1.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
-
--->
-
-<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://hello.org/wsdl"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:FindInterestInterface"
- service-name="tns:FindInterest"
- endpoint-name="InterestIFPort"/>
- <artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
-</jbi>
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 307693b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/endpoints.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.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
-
--->
-
- <endpoint xmlns="http://www.sun.com/ns/jbi/component/soap/deploy"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.sun.com/ns/jbi/component/soap/deploy ./endpoints.xsd">
-<service-name>
- <namespace-uri>http://hello.org/wsdl</namespace-uri>
- <local-part>FindInterest</local-part>
- </service-name>
- <endpoint-name>InterestIFPort</endpoint-name>
- <endpoint-role>provider</endpoint-role>
- <address-location>http://localhost:8080/findintr/FindInterest</address-location>
- <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
- <operation>
- <name>calculateInterest</name>
- <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
- <soapaction>""</soapaction>
- <input>
- <namespace-uri>http://hello.org/wsdl</namespace-uri>
- </input>
- <output>
- <namespace-uri>http://hello.org/wsdl</namespace-uri>
- </output>
- </operation>
-</endpoint>
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 180f8fd..0000000
--- 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 c11b886..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="FindInterest.wsdl"
- packageName="myejb"/>
-</configuration>
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 9c318c8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config_client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="FindInterest.wsdl"
- packageName="myclient"/>
-</configuration>
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 fd6d871..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/FindInterest.wsdl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<definitions name="FindInterest" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<types>
- <xsd:schema>
- <xsd:import namespace="http://hello.org/wsdl" schemaLocation="FindInterest_Schema.xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
- </xsd:schema>
- </types>
-
- <message name="calculateInterest">
- <part name="parameters" element="tns:calculateInterest"/>
- </message>
- <portType name="InterestIF">
- <operation name="calculateInterest">
- <input message="tns:calculateInterest"/>
- </operation></portType>
- <binding name="InterestIFBinding" type="tns:InterestIF">
- <operation name="calculateInterest">
- <input>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction="urn:calculateInterest"/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/></binding>
- <service name="FindInterest">
- <port name="InterestIFPort" binding="tns:InterestIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_ADDRESS"/></port></service></definitions>
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 8490a84..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/FindInterest_Schema.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- 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
-
--->
-
-<xs:schema version="1.0" targetNamespace="http://hello.org/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="calculateInterest" type="ns1:calculateInterest" xmlns:ns1="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterest">
- <xs:sequence>
- <xs:element name="arg0" type="xs:double"/>
- <xs:element name="arg1" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
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 ba6114f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.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
-
--->
-
-
-<property name="module" value="findinterest"/>
-<property name="appname" value="${module}"/>
-<property name="jbi-component-su-assembly" value="ejb_findinterest_assembly"/>
-<property name="jbi-component-su" value="ejb_jaxrpc_consumer_su"/>
-<property name="jbi-component-su-dir" value="soap-binding-su-alaska"/>
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 2e65e89..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.xml
+++ /dev/null
@@ -1,334 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "../../../../../config/properties.xml">
-<!ENTITY jbicommon SYSTEM "file:./../../jbi_commons.xml">
-<!ENTITY jbiproperties SYSTEM "file:./../../jbi_commons.properties">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<!-- targets: clean, setup, compile, jar, war, ear, deploy, undeploy, runclient -->
-
-<project name="findintr" default="all" basedir=".">
-
- &commonSetup;
- &jbicommon;
- &jbiproperties;
- &testproperties;
- <property environment="env" />
- <target name="all" depends="clean, setup, compile, ear, deploy, runclient, undeploy"/>
- <target name="setup" depends="init-common">
- <property name="root.dir" value="." />
- <property name="src.dir" value="." />
- <property name="appname" value="FindInterestApp" />
-
- <property name="build.dir" value="${env.APS_HOME}/build/module" />
- <property name="build.repository" value="${build.dir}/buildears"/>
- <property name="build.appclient" value="${build.dir}/buildappclient"/>
- <property name="build.ejbsrc" value="${build.dir}/src/ejb" />
- <property name="build.websrc" value="${build.dir}/src/web" />
- <property name="build.clientsrc" value="${build.dir}/src/client" />
-
- <property name="build.dest" value="${build.dir}/classes" />
- <property name="build.mapping" value="${build.dir}/jaxrpc-mapping" />
- <property name="build.desc" value="${build.dir}/descriptor" />
- <property name="build.webinf" value="${build.dir}/webinf" />
- <property name="build.metainf" value="${build.dir}/metainf" />
- <property name="build.jars" value="${build.dir}/jars" />
- <property name="build.ear" value="${build.repository}/"/>
-
- <property name="debug" value="on" />
- </target>
-
- <target name="clean" depends="setup">
- <delete dir="${build.dir}"/>
- <delete dir="${build.repository}"/>
- <delete dir="${build.appclient}"/>
- </target>
-
- <!-- target name="compile" depends="setup,clean" -->
- <target name="compile" depends="wscompile,setup" >
- <!-- ant target="makedirs"/ -->
- <!-- ant target="copyfiles"/ -->
- <javac srcdir="${build.ejbsrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- <javac srcdir="${build.websrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- <javac srcdir="${build.clientsrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- </target>
-
- <target name="jar" depends="compile">
- <jar jarfile="${build.jars}/ejb.jar" >
- <fileset dir="${build.dest}">
- <include name="myejb/*.class"/>
- </fileset>
-
- <fileset dir="${build.mapping}">
- <include name="IntrEjbMapping.xml" />
- </fileset>
-<!--
- <fileset dir=".">
- <include name="FIMapping.xml" />
- </fileset>
--->
- <metainf dir="${build.desc}/ejb">
- <include name="ejb-jar.xml"/>
- <include name="webservices.xml"/>
- <include name="sun-ejb-jar.xml"/>
- </metainf>
- <fileset dir="${build.metainf}">
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
-
- <antcall target="copy-to-webinf" />
-
- <jar jarfile="${build.jars}/web.war" >
- <fileset dir="${build.webinf}">
- <include name="**/*.class"/>
- </fileset>
-
- <fileset dir="${build.mapping}">
- <include name="IntrWebMapping.xml" />
- </fileset>
-
-<!--
- <fileset dir=".">
- <include name="FIMappingWeb.xml" />
- </fileset>
--->
- <fileset dir="${build.webinf}">
- <include name="**/web.xml" />
- <include name="**/sun-web.xml" />
- <include name="**/webservices.xml" />
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
-
- <jar jarfile="${build.jars}/appclient.jar"
- manifest="${build.desc}/client/MANIFEST.MF">
-<!--
- <fileset dir=".">
- <include name="FIMappingClient.xml" />
- </fileset>
--->
-
- <fileset dir="${build.mapping}">
- <include name="IntrClientMapping.xml" />
- </fileset>
-
- <fileset dir="${build.dest}">
- <include name="myclient/*.class"/>
- </fileset>
- <metainf dir="${build.desc}/client">
- <include name="application-client.xml"/>
- <include name="sun-application-client.xml"/>
- </metainf>
- <fileset dir="${build.metainf}">
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
- </target>
-
- <target name="copy-to-webinf">
- <copy todir="${build.webinf}/WEB-INF/classes" filtering="on" overwrite="yes" >
- <fileset dir="${build.dest}">
- <include name="myweb/*.class"/>
- </fileset>
- </copy>
- </target>
-
- <target name="ear" depends="clean,jar">
- <ear earfile="${build.ear}/${appname}.ear"
- appxml="${build.desc}/application.xml"
- manifest="${build.desc}/MANIFEST.MF">
-
- <!--<fileset dir="${build.jars}" includes="*.jar,.war"/>-->
- <fileset dir="${build.jars}" includes="*.jar"/>
-
- <fileset dir="${env.APS_HOME}/lib">
- <include name="reporter.jar"/>
- </fileset>
- </ear>
- </target>
-
- <target name="deploy" depends="setup">
- <exec executable="${ASADMIN}">
- <arg value="deploy" />
- <arg value="--user" />
- <arg value="${admin.user}" />
- <arg value="--host" />
- <arg value="${admin.host}" />
- <arg value="--port" />
- <arg value="${admin.port}" />
- <arg value="--retrieve" />
- <arg value="${build.appclient}" />
- <arg value="${build.ear}/${appname}.ear" />
- </exec>
- <antcall target="deploy-jbi-component-su"/>
- </target>
-
- <target name="undeploy" depends="setup">
- <exec executable="${ASADMIN}">
- <arg value="undeploy" />
- <arg value="--user" />
- <arg value="${admin.user}" />
- <arg value="--host" />
- <arg value="${admin.host}" />
- <arg value="--port" />
- <arg value="${admin.port}" />
- <arg value="${appname}" />
- </exec>
- <antcall target="undeploy-jbi-component-su"/>
- </target>
-
- <target name="runclient" depends="setup">
- <exec executable="${APPCLIENT}">
- <env key="VMARGS" value="-Dtest.results=${results.file}" />
- <arg value="-client" />
- <arg value="${build.appclient}/${appname}Client.jar"/>
- <arg value="-name" />
- <arg value="MyAppClient" />
- </exec>
- </target>
-
- <target name="makedirs">
- <mkdir dir="${build.dir}" />
- <mkdir dir="${build.repository}" />
- <mkdir dir="${build.appclient}" />
- <mkdir dir="${build.ejbsrc}" />
- <mkdir dir="${build.websrc}" />
- <mkdir dir="${build.clientsrc}" />
- <mkdir dir="${build.dest}" />
- <mkdir dir="${build.mapping}" />
- <mkdir dir="${build.desc}" />
- <mkdir dir="${build.desc}/META-INF"/>
- <mkdir dir="${build.desc}/ejb"/>
- <mkdir dir="${build.desc}/client"/>
- <mkdir dir="${build.jars}" />
- <mkdir dir="${build.webinf}" />
- <mkdir dir="${build.webinf}/WEB-INF" />
- <mkdir dir="${build.webinf}/WEB-INF/wsdl" />
- <mkdir dir="${build.webinf}/WEB-INF/classes" />
- <mkdir dir="${build.metainf}" />
- <mkdir dir="${build.metainf}/META-INF" />
- <mkdir dir="${build.metainf}/META-INF/wsdl" />
- <mkdir dir="${build.dir}/archive"/>
- </target>
-
- <target name="copyfiles">
-
- <copy todir="${build.webinf}/WEB-INF" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/web" >
- <include name="*.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/ejb" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/ejb" >
- <include name="*.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/client" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/client" >
- <include name="*.xml" />
- <include name="MANIFEST.MF" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor" >
- <include name="application.xml" />
- <include name="MANIFEST.MF" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/META-INF" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor">
- <include name="sun-j2ee-ri.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.ejbsrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/ejb" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.websrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/web" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.clientsrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/client" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.webinf}/WEB-INF/wsdl" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}" >
- <include name="FindInterest.wsdl" />
- <include name="FindInterest_Schema.xsd" />
- </fileset>
- </copy>
-
- <copy todir="${build.metainf}/META-INF/wsdl" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}" >
- <include name="FindInterest.wsdl" />
- <include name="FindInterest_Schema.xsd" />
- </fileset>
- </copy>
-
- </target>
-
- <target name="wscompile" depends="setup,makedirs,copyfiles">
-
- <exec executable="${WSCOMPILE}">
- <arg line="-source 1.1.2 -import -f:norpcstructures -keep -d ${build.dest} -s ${build.dest} -mapping ${build.mapping}/IntrEjbMapping.xml wscompile_config.xml
-" />
- </exec>
-
- <exec executable="${WSCOMPILE}">
- <arg line="-source 1.1.2 -import -f:norpcstructures -keep -d ${build.dest} -s ${build.dest} -mapping ${build.mapping}/IntrClientMapping.xml wscompile_config_client.xml
-" />
- </exec>
-
- <exec executable="${WSCOMPILE}">
- <arg line="-source 1.1.2 -import -f:norpcstructures -keep -d ${build.dest} -s ${build.dest} -mapping ${build.mapping}/IntrWebMapping.xml wscompile_config_web.xml
-" />
- </exec>
-
- </target>
- <!--<target name="deploy-soap-su" depends="init-common">
- <antcall target="deploy-jbi-component-su">
- <param name="jbi-component-su" value="${}"/>
- <param name="jbi-component-su" value="${}"/>
- </antcall>
- </target>-->
-<!-- <target name="all" depends="clean,ear,deploy,runclient" />-->
-
-</project>
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 91ae707..0000000
--- 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 38fb9d9..0000000
--- 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 e536ed6..0000000
--- 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 9bbacd5..0000000
--- 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 d4ea871..0000000
--- 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 abe9e08..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
-<!--
-
- 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
-
--->
-
-<application>
- <display-name>FindInterestApp</display-name>
- <module>
- <ejb>ejb.jar</ejb>
- </module>
- <module>
- <java>appclient.jar</java>
- </module>
-</application>
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 7cc1828..0000000
--- 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 f3268b8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/application-client.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my findintr app client</description>
- <display-name>MyAppClient</display-name>
- <service-ref>
- <description>findintr service ref</description>
- <service-ref-name>service/FindInterest</service-ref-name>
- <service-interface>myclient.FindInterest</service-interface>
- <wsdl-file>META-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrClientMapping.xml</jaxrpc-mapping-file>
- </service-ref>
-</application-client>
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 a313c5b..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/FindInterest</service-ref-name>
- </service-ref>
-</sun-application-client>
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 d4ea871..0000000
--- 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 4acc04c..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/ejb-jar.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <display-name>InterestEjb</display-name>
- <ejb-name>InterestEjb</ejb-name>
- <service-endpoint>myejb.InterestIF</service-endpoint>
- <ejb-class>myejb.InterestEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>InterestEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
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 d23c426..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <name>ejb.jar</name>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>InterestEjb</ejb-name>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>InterestIFPort</port-component-name>
- <endpoint-address-uri>findintr/FindInterest</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 f2719c9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/webservices.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>FindInterestEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrEjbMapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>InterestIFPort</port-component-name>
- <wsdl-port xmlns:hellons="http://hello.org/wsdl">hellons:InterestIFPort
- </wsdl-port>
- <service-endpoint-interface>myejb.InterestIF
- </service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>InterestEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 14674e9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/sun-web.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <context-root>FindInterestServlet</context-root>
-</sun-web-app>
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 0203114..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/web.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>FindInterestApp</display-name>
- <servlet>
- <servlet-name>FindInterestServlet</servlet-name>
- <servlet-class>myweb.FindInterestServletImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>FindInterestServlet</servlet-name>
- <url-pattern>/FindInterest</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
-</web-app>
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 51cd5ac..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/webservices.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>FindInterestServlet</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrWebMapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>InterestIFPort</port-component-name>
- <wsdl-port xmlns:hellons="http://hello.org/wsdl">hellons:InterestIFPort
- </wsdl-port>
- <service-endpoint-interface>myweb.InterestIF
- </service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>FindInterestServlet</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 bf15003..0000000
--- 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 4aa2bea..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMapping.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- version="1.1">
- <package-mapping>
- <package-type>myejb</package-type>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
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 588fa00..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMappingClient.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- version="1.1">
- <package-mapping>
- <package-type>myclient</package-type>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
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 fc8a3a8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMappingWeb.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- version="1.1">
- <package-mapping>
- <package-type>myweb</package-type>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
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 f1b3f7a..0000000
--- 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 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<!-- jbi.xml file for the SOAP binding deployments binding. -->
-<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
- <service-assembly>
- <identification>
- <!--alias>SoapBinding Deployments</alias -->
- <name>ejb_findinterest_assembly</name>
- <description>This is an AU for Soap Binding deployments</description>
- </identification>
- <service-unit>
- <identification>
- <name>consumer_for_ejb_jaxrpc</name>
- <description>consumer service to the soap binding</description>
- </identification>
- <target>
- <artifacts-zip>ejb_jaxrpc_consumer_su.jar</artifacts-zip>
- <component-name>sun-http-binding</component-name>
- </target>
- </service-unit>
- </service-assembly>
-</jbi>
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 4727803..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<definitions name="FindInterest" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<types>
- <xsd:schema>
- <xsd:import namespace="http://hello.org/wsdl" schemaLocation="FindInterest_Schema.xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
- </xsd:schema>
- </types>
-
- <message name="calculateInterest">
- <part name="parameters" element="tns:calculateInterest"/>
- </message>
- <portType name="InterestIF">
- <operation name="calculateInterest">
- <input message="tns:calculateInterest"/></operation></portType>
- <binding name="InterestIFBinding" type="tns:InterestIF">
- <operation name="calculateInterest">
- <input>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></input>
- <soap:operation soapAction="urn:calculateInterest"/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/></binding>
- <service name="FindInterest">
- <port name="InterestIFPort" binding="tns:InterestIFBinding">
- <soap:address location="http://localhost:12013/InterestIFPort"/></port></service></definitions>
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 8490a84..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- 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
-
--->
-
-<xs:schema version="1.0" targetNamespace="http://hello.org/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="calculateInterest" type="ns1:calculateInterest" xmlns:ns1="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterest">
- <xs:sequence>
- <xs:element name="arg0" type="xs:double"/>
- <xs:element name="arg1" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
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 beec080..0000000
--- 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 @@
-<?xml version='1.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
-
--->
-
-<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://hello.org/wsdl"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- </services>
-</jbi>
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 66627fd..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- 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
-
--->
-
-<portmaps>
-<portmap direction="inbound" endPoint="InterestIFPort" service="{http://hello.org/wsdl}FindInterest"/>
-</portmaps>
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 f9d56f5..0000000
--- 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 c11b886..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="FindInterest.wsdl"
- packageName="myejb"/>
-</configuration>
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 9c318c8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="FindInterest.wsdl"
- packageName="myclient"/>
-</configuration>
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 e8001cd..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="FindInterest.wsdl"
- packageName="myweb"/>
-</configuration>
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 4dc31e9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterest.wsdl
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<definitions name="FindInterest" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<types>
- <xsd:schema>
- <xsd:import namespace="http://hello.org/wsdl" schemaLocation="FindInterest_Schema.xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
- </xsd:schema>
- </types>
-
- <message name="calculateInterest">
- <part name="parameters" element="tns:calculateInterest"/>
- </message>
- <message name="calculateInterestResponse">
- <part name="parameters" element="tns:calculateInterestResponse"/></message>
- <portType name="InterestIF">
- <operation name="calculateInterest">
- <input message="tns:calculateInterest"/>
- <output message="tns:calculateInterestResponse"/></operation></portType>
- <binding name="InterestIFBinding" type="tns:InterestIF">
- <operation name="calculateInterest">
- <input>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction="urn:calculateInterest"/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/></binding>
- <service name="FindInterest">
- <port name="InterestIFPort" binding="tns:InterestIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_ADDRESS"/></port></service></definitions>
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 4783528..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterestNonHttpBC.wsdl
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<definitions name="FindInterest" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types/>
- <message name="InterestIF_calculateInterest">
- <part name="double_1" type="xsd:double"/>
- <part name="double_2" type="xsd:double"/></message>
- <message name="InterestIF_calculateInterestResponse">
- <part name="result" type="xsd:double"/></message>
- <portType name="InterestIF">
- <operation name="calculateInterest" parameterOrder="double_1 double_2">
- <input message="tns:InterestIF_calculateInterest"/>
- <output message="tns:InterestIF_calculateInterestResponse"/></operation></portType>
- <binding name="InterestIFBinding" type="tns:InterestIF">
- <operation name="calculateInterest">
- <input>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction=""/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/></binding>
- <service name="FindInterest">
- <port name="InterestIFPort" binding="tns:InterestIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_ADDRESS"/></port></service></definitions>
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 fc4c721..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterest_Schema.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- 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
-
--->
-
-<xs:schema version="1.0" targetNamespace="http://hello.org/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="calculateInterest" type="ns1:calculateInterest" xmlns:ns1="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterest">
- <xs:sequence>
- <xs:element name="arg0" type="xs:double"/>
- <xs:element name="arg1" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:element name="calculateInterestResponse" type="ns2:calculateInterestResponse" xmlns:ns2="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterestResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
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 ba6114f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.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
-
--->
-
-
-<property name="module" value="findinterest"/>
-<property name="appname" value="${module}"/>
-<property name="jbi-component-su-assembly" value="ejb_findinterest_assembly"/>
-<property name="jbi-component-su" value="ejb_jaxrpc_consumer_su"/>
-<property name="jbi-component-su-dir" value="soap-binding-su-alaska"/>
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 fc952cb..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.xml
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../../config/common.xml">
-<!ENTITY jbicommon SYSTEM "file:./../../jbi_commons.xml">
-<!ENTITY jbiproperties SYSTEM "file:./../../jbi_commons.properties">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<!-- targets: clean, setup, compile, jar, war, ear, deploy, undeploy, runclient -->
-
-<project name="findintr" default="all" basedir=".">
-
- &commonSetup;
- &commonBuild;
- &jbicommon;
- &jbiproperties;
- &testproperties;
- <property environment="env" />
- <target name="all" depends="clean, setup, compile, ear, deploy, set-flag, runclient, undeploy"/>
- <target name="setup" depends="init-common">
- <property name="root.dir" value="." />
- <property name="src.dir" value="." />
- <property name="appname" value="FindInterestApp" />
-
- <property name="build.dir" value="${env.APS_HOME}/build/module" />
- <property name="build.repository" value="${build.dir}/buildears"/>
- <property name="build.appclient" value="${build.dir}/buildappclient"/>
- <property name="build.ejbsrc" value="${build.dir}/src/ejb" />
- <property name="build.websrc" value="${build.dir}/src/web" />
- <property name="build.clientsrc" value="${build.dir}/src/client" />
-
- <property name="build.dest" value="${build.dir}/classes" />
- <property name="build.mapping" value="${build.dir}/jaxrpc-mapping" />
- <property name="build.desc" value="${build.dir}/descriptor" />
- <property name="build.webinf" value="${build.dir}/webinf" />
- <property name="build.metainf" value="${build.dir}/metainf" />
- <property name="build.jars" value="${build.dir}/jars" />
- <property name="build.ear" value="${build.repository}/"/>
-
- <property name="debug" value="on" />
- </target>
-
- <target name="clean" depends="setup">
- <delete dir="${build.dir}"/>
- <delete dir="${build.repository}"/>
- <delete dir="${build.appclient}"/>
- </target>
-
- <!-- target name="compile" depends="setup,clean" -->
- <target name="compile" depends="wscompile,setup" >
- <!-- ant target="makedirs"/ -->
- <!-- ant target="copyfiles"/ -->
- <javac srcdir="${build.ejbsrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- <javac srcdir="${build.websrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- <javac srcdir="${build.clientsrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- </target>
-
- <target name="jar" depends="compile">
- <jar jarfile="${build.jars}/ejb.jar" >
- <fileset dir="${build.dest}">
- <include name="myejb/*.class"/>
- </fileset>
-
- <fileset dir="${build.mapping}">
- <include name="IntrEjbMapping.xml" />
- </fileset>
-<!--
- <fileset dir=".">
- <include name="FIMapping.xml" />
- </fileset>
--->
- <metainf dir="${build.desc}/ejb">
- <include name="ejb-jar.xml"/>
- <include name="webservices.xml"/>
- <include name="sun-ejb-jar.xml"/>
- </metainf>
- <fileset dir="${build.metainf}">
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
-
- <antcall target="copy-to-webinf" />
-
- <jar jarfile="${build.jars}/web.war" >
- <fileset dir="${build.webinf}">
- <include name="**/*.class"/>
- </fileset>
-
- <fileset dir="${build.mapping}">
- <include name="IntrWebMapping.xml" />
- </fileset>
-
-<!--
- <fileset dir=".">
- <include name="FIMappingWeb.xml" />
- </fileset>
--->
- <fileset dir="${build.webinf}">
- <include name="**/web.xml" />
- <include name="**/sun-web.xml" />
- <include name="**/webservices.xml" />
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
-
- <jar jarfile="${build.jars}/appclient.jar"
- manifest="${build.desc}/client/MANIFEST.MF">
-<!--
- <fileset dir=".">
- <include name="FIMappingClient.xml" />
- </fileset>
--->
-
- <fileset dir="${build.mapping}">
- <include name="IntrClientMapping.xml" />
- </fileset>
-
- <fileset dir="${build.dest}">
- <include name="myclient/*.class"/>
- </fileset>
- <metainf dir="${build.desc}/client">
- <include name="application-client.xml"/>
- <include name="sun-application-client.xml"/>
- </metainf>
- <fileset dir="${build.metainf}">
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
- </target>
-
- <target name="copy-to-webinf">
- <copy todir="${build.webinf}/WEB-INF/classes" filtering="on" overwrite="yes" >
- <fileset dir="${build.dest}">
- <include name="myweb/*.class"/>
- </fileset>
- </copy>
- </target>
-
- <target name="ear" depends="clean,jar">
- <ear earfile="${build.ear}/${appname}.ear"
- appxml="${build.desc}/application.xml"
- manifest="${build.desc}/MANIFEST.MF">
-
- <!--<fileset dir="${build.jars}" includes="*.jar,.war"/>-->
- <fileset dir="${build.jars}" includes="*.jar"/>
-
- <fileset dir="${env.APS_HOME}/lib">
- <include name="reporter.jar"/>
- </fileset>
- </ear>
- </target>
-
- <target name="deploy" depends="setup">
- <exec executable="${ASADMIN}">
- <arg value="deploy" />
- <arg value="--user" />
- <arg value="${admin.user}" />
- <arg value="--host" />
- <arg value="${admin.host}" />
- <arg value="--port" />
- <arg value="${admin.port}" />
- <arg value="--retrieve" />
- <arg value="${build.appclient}" />
- <arg value="${build.ear}/${appname}.ear" />
- </exec>
- <antcall target="deploy-jbi-component-su"/>
- </target>
-
- <target name="undeploy" depends="setup">
- <exec executable="${ASADMIN}">
- <arg value="undeploy" />
- <arg value="--user" />
- <arg value="${admin.user}" />
- <arg value="--host" />
- <arg value="${admin.host}" />
- <arg value="--port" />
- <arg value="${admin.port}" />
- <arg value="${appname}" />
- </exec>
- <antcall target="undeploy-jbi-component-su"/>
- </target>
-
- <target name="runclient" depends="setup">
- <exec executable="${APPCLIENT}">
- <env key="VMARGS" value="-Dtest.results=${results.file}" />
- <arg value="-client" />
- <arg value="${build.appclient}/${appname}Client.jar"/>
- <arg value="-name" />
- <arg value="MyAppClient" />
- </exec>
- </target>
-
- <target name="makedirs">
- <mkdir dir="${build.dir}" />
- <mkdir dir="${build.repository}" />
- <mkdir dir="${build.appclient}" />
- <mkdir dir="${build.ejbsrc}" />
- <mkdir dir="${build.websrc}" />
- <mkdir dir="${build.clientsrc}" />
- <mkdir dir="${build.dest}" />
- <mkdir dir="${build.mapping}" />
- <mkdir dir="${build.desc}" />
- <mkdir dir="${build.desc}/META-INF"/>
- <mkdir dir="${build.desc}/ejb"/>
- <mkdir dir="${build.desc}/client"/>
- <mkdir dir="${build.jars}" />
- <mkdir dir="${build.webinf}" />
- <mkdir dir="${build.webinf}/WEB-INF" />
- <mkdir dir="${build.webinf}/WEB-INF/wsdl" />
- <mkdir dir="${build.webinf}/WEB-INF/classes" />
- <mkdir dir="${build.metainf}" />
- <mkdir dir="${build.metainf}/META-INF" />
- <mkdir dir="${build.metainf}/META-INF/wsdl" />
- <mkdir dir="${build.dir}/archive"/>
- </target>
-
- <target name="copyfiles">
-
- <copy todir="${build.webinf}/WEB-INF" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/web" >
- <include name="*.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/ejb" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/ejb" >
- <include name="*.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/client" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/client" >
- <include name="*.xml" />
- <include name="MANIFEST.MF" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor" >
- <include name="application.xml" />
- <include name="MANIFEST.MF" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/META-INF" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor">
- <include name="sun-j2ee-ri.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.ejbsrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/ejb" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.websrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/web" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.clientsrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/client" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.webinf}/WEB-INF/wsdl" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}" >
- <include name="FindInterest.wsdl" />
- <include name="FindInterest_Schema.xsd" />
- </fileset>
- </copy>
-
- <copy todir="${build.metainf}/META-INF/wsdl" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}" >
- <include name="FindInterest.wsdl" />
- <include name="FindInterest_Schema.xsd" />
- </fileset>
- </copy>
-
- </target>
-
- <target name="wscompile" depends="setup,makedirs,copyfiles">
-
- <exec executable="${WSCOMPILE}">
- <arg line="-source 1.1.2 -import -f:norpcstructures -keep -d ${build.dest} -s ${build.dest} -mapping ${build.mapping}/IntrEjbMapping.xml wscompile_config.xml
-" />
- </exec>
-
- <exec executable="${WSCOMPILE}">
- <arg line="-source 1.1.2 -import -f:norpcstructures -keep -d ${build.dest} -s ${build.dest} -mapping ${build.mapping}/IntrClientMapping.xml wscompile_config_client.xml
-" />
- </exec>
-
- <exec executable="${WSCOMPILE}">
- <arg line="-source 1.1.2 -import -f:norpcstructures -keep -d ${build.dest} -s ${build.dest} -mapping ${build.mapping}/IntrWebMapping.xml wscompile_config_web.xml
-" />
- </exec>
-
- </target>
- <!--<target name="deploy-soap-su" depends="init-common">
- <antcall target="deploy-jbi-component-su">
- <param name="jbi-component-su" value="${}"/>
- <param name="jbi-component-su" value="${}"/>
- </antcall>
- </target>-->
-<!-- <target name="all" depends="clean,ear,deploy,runclient" />-->
-
- <target name="set-flag" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}#ejb.jar#InterestIFPort"/>
- </antcall>
-
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.applications.j2ee-application.${appname}.web-service-endpoint.ejb\.jar#InterestIFPort.jbi-enabled=true"/>
- </antcall>
- </target>
-
-</project>
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 f2c4d98..0000000
--- 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 87688b5..0000000
--- 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 d26175a..0000000
--- 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 a32d4ef..0000000
--- 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 d4ea871..0000000
--- 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 abe9e08..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
-<!--
-
- 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
-
--->
-
-<application>
- <display-name>FindInterestApp</display-name>
- <module>
- <ejb>ejb.jar</ejb>
- </module>
- <module>
- <java>appclient.jar</java>
- </module>
-</application>
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 7cc1828..0000000
--- 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 f3268b8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/application-client.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my findintr app client</description>
- <display-name>MyAppClient</display-name>
- <service-ref>
- <description>findintr service ref</description>
- <service-ref-name>service/FindInterest</service-ref-name>
- <service-interface>myclient.FindInterest</service-interface>
- <wsdl-file>META-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrClientMapping.xml</jaxrpc-mapping-file>
- </service-ref>
-</application-client>
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 a313c5b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/sun-application-client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/FindInterest</service-ref-name>
- </service-ref>
-</sun-application-client>
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 d4ea871..0000000
--- 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 4acc04c..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/ejb-jar.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <display-name>InterestEjb</display-name>
- <ejb-name>InterestEjb</ejb-name>
- <service-endpoint>myejb.InterestIF</service-endpoint>
- <ejb-class>myejb.InterestEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>InterestEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
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 d23c426..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/sun-ejb-jar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <name>ejb.jar</name>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>InterestEjb</ejb-name>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>InterestIFPort</port-component-name>
- <endpoint-address-uri>findintr/FindInterest</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 f2719c9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/webservices.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>FindInterestEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrEjbMapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>InterestIFPort</port-component-name>
- <wsdl-port xmlns:hellons="http://hello.org/wsdl">hellons:InterestIFPort
- </wsdl-port>
- <service-endpoint-interface>myejb.InterestIF
- </service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>InterestEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 14674e9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/sun-web.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <context-root>FindInterestServlet</context-root>
-</sun-web-app>
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 0203114..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/web.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>FindInterestApp</display-name>
- <servlet>
- <servlet-name>FindInterestServlet</servlet-name>
- <servlet-class>myweb.FindInterestServletImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>FindInterestServlet</servlet-name>
- <url-pattern>/FindInterest</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
-</web-app>
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 51cd5ac..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/webservices.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>FindInterestServlet</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrWebMapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>InterestIFPort</port-component-name>
- <wsdl-port xmlns:hellons="http://hello.org/wsdl">hellons:InterestIFPort
- </wsdl-port>
- <service-endpoint-interface>myweb.InterestIF
- </service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>FindInterestServlet</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 b25badf..0000000
--- 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 4aa2bea..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMapping.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- version="1.1">
- <package-mapping>
- <package-type>myejb</package-type>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
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 588fa00..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMappingClient.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- version="1.1">
- <package-mapping>
- <package-type>myclient</package-type>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
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 fc8a3a8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMappingWeb.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- version="1.1">
- <package-mapping>
- <package-type>myweb</package-type>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
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 f1b3f7a..0000000
--- 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 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<!-- jbi.xml file for the SOAP binding deployments binding. -->
-<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
- <service-assembly>
- <identification>
- <!--alias>SoapBinding Deployments</alias -->
- <name>ejb_findinterest_assembly</name>
- <description>This is an AU for Soap Binding deployments</description>
- </identification>
- <service-unit>
- <identification>
- <name>consumer_for_ejb_jaxrpc</name>
- <description>consumer service to the soap binding</description>
- </identification>
- <target>
- <artifacts-zip>ejb_jaxrpc_consumer_su.jar</artifacts-zip>
- <component-name>sun-http-binding</component-name>
- </target>
- </service-unit>
- </service-assembly>
-</jbi>
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 601e969..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<definitions name="FindInterest" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<types>
- <xsd:schema>
- <xsd:import namespace="http://hello.org/wsdl" schemaLocation="FindInterest_Schema.xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
- </xsd:schema>
- </types>
-
- <message name="calculateInterest">
- <part name="parameters" element="tns:calculateInterest"/>
- </message>
- <message name="calculateInterestResponse">
- <part name="parameters" element="tns:calculateInterestResponse"/></message>
- <portType name="InterestIF">
- <operation name="calculateInterest">
- <input message="tns:calculateInterest"/>
- <output message="tns:calculateInterestResponse"/></operation></portType>
- <binding name="InterestIFBinding" type="tns:InterestIF">
- <operation name="calculateInterest">
- <input>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction="urn:calculateInterest"/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/></binding>
- <service name="FindInterest">
- <port name="InterestIFPort" binding="tns:InterestIFBinding">
- <soap:address location="http://localhost:12013/InterestIFPort"/></port></service></definitions>
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 fc4c721..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- 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
-
--->
-
-<xs:schema version="1.0" targetNamespace="http://hello.org/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="calculateInterest" type="ns1:calculateInterest" xmlns:ns1="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterest">
- <xs:sequence>
- <xs:element name="arg0" type="xs:double"/>
- <xs:element name="arg1" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:element name="calculateInterestResponse" type="ns2:calculateInterestResponse" xmlns:ns2="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterestResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
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 e5a98e6..0000000
--- 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 @@
-<?xml version='1.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
-
--->
-
-<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://hello.org/wsdl"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:FindInterestInterface"
- service-name="tns:FindInterest"
- endpoint-name="InterestIFPort"/>
- <artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
-</jbi>
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 66627fd..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- 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
-
--->
-
-<portmaps>
-<portmap direction="inbound" endPoint="InterestIFPort" service="{http://hello.org/wsdl}FindInterest"/>
-</portmaps>
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 3891d55..0000000
--- 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 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<!-- jbi.xml file for the SOAP binding deployments binding. -->
-<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
- <service-assembly>
- <identification>
- <!--alias>SoapBinding Deployments</alias -->
- <name>ejb_findinterest_assembly</name>
- <description>This is an AU for Soap Binding deployments</description>
- </identification>
- <service-unit>
- <identification>
- <name>consumer_for_ejb_jaxrpc</name>
- <description>consumer service to the soap binding</description>
- </identification>
- <target>
- <artifacts-zip>ejb_jaxrpc_consumer_su.jar</artifacts-zip>
- <component-name>SunSOAPBinding</component-name>
- </target>
- </service-unit>
- </service-assembly>
-</jbi>
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 1d3719e..0000000
--- 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 @@
-<?xml version='1.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
-
--->
-
-<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://hello.org/wsdl"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:FindInterestInterface"
- service-name="tns:FindInterest"
- endpoint-name="InterestIFPort"/>
- <artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
-</jbi>
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 5ef965d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/endpoints.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.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
-
--->
-
- <endpoint xmlns="http://www.sun.com/ns/jbi/component/soap/deploy"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.sun.com/ns/jbi/component/soap/deploy ./endpoints.xsd">
-<service-name>
- <namespace-uri>http://hello.org/wsdl</namespace-uri>
- <local-part>FindInterest</local-part>
- </service-name>
- <endpoint-name>InterestIFPort</endpoint-name>
- <endpoint-role>consumer</endpoint-role>
- <address-location>http://localhost:8080/soap/web/findinterest</address-location>
- <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
- <operation>
- <name>calculateInterest</name>
- <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
- <soapaction>""</soapaction>
- <input>
- <namespace-uri>http://hello.org/wsdl</namespace-uri>
- </input>
- <output>
- <namespace-uri>http://hello.org/wsdl</namespace-uri>
- </output>
- </operation>
-</endpoint>
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 180f8fd..0000000
--- 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 c11b886..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="FindInterest.wsdl"
- packageName="myejb"/>
-</configuration>
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 9c318c8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="FindInterest.wsdl"
- packageName="myclient"/>
-</configuration>
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 e8001cd..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="FindInterest.wsdl"
- packageName="myweb"/>
-</configuration>
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 1bfc164..fd0ca87 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/OneWayService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/OneWayService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${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"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- <antcall target="configure-webservice-management"/>
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.applications.web-module.${appname}-web.web-service-endpoint.OneWay.jbi-enabled=true"/>
- </antcall>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <!--<antcall target="undeploy-jbi-component-su"/>-->
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client/webservice/OneWayService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client/webservice/OneWayService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ <antcall target="configure-webservice-management" />
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="set" />
+ <param name="operand.props"
+ value="server.applications.web-module.${appname}-web.web-service-endpoint.OneWay.jbi-enabled=true"
+ />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ <!--<antcall target="undeploy-jbi-component-su"/>-->
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#OneWay"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#OneWay" />
+ </antcall>
+ </target>
</project>
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 dc2aad0..8e43b87 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
- <delete file="${basedir}/RepRunConf.txt"/>
- <delete dir="${basedir}/common:endpoint"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war" />
+ <delete file="${basedir}/RepRunConf.txt" />
+ <delete dir="${basedir}/common:endpoint" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-jbi-component-su,assemble-client,deploy-client"/>
+ <target name="setup"
+ depends="assemble-web, deploy-jbi-component-su,assemble-client,deploy-client"
+ />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="common:endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <echo message="classes dir = ${build.classes.dir}"/>
- <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- <!-- Add META-INF/jbi.xml to .war file -->
- <mkdir dir="${build.classes.dir}/tmp/META-INF"/>
- <echo message="created dir = ${build.classes.dir}/tmp/META-INF"/>
- <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml" tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"/>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp">
- <include name="META-INF/jbi.xml"/>
- </fileset>
- </jar>
-
- <!-- Add the WSDL -->
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
- <copy file="${basedir}/wsdl/CalculatorService_schema1.xsd" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
- <copy file="${basedir}/wsdl/CalculatorService.wsdl" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp">
- <include name="WEB-INF/wsdl/CalculatorService_schema1.xsd"/>
- <include name="WEB-INF/wsdl/CalculatorService.wsdl"/>
- </fileset>
- </jar>
-
- <!-- Copy the JavaEE app to the service assembly -->
- <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly"/>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/rpc-literal-bundled-wsdl/webservice/CalculatorService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/rpc-literal-bundled-wsdl/webservice/CalculatorService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="common:endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
- includes="common/**,webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <echo message="classes dir = ${build.classes.dir}" />
+ <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war" />
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ <!-- Add META-INF/jbi.xml to .war file -->
+ <mkdir dir="${build.classes.dir}/tmp/META-INF" />
+ <echo message="created dir = ${build.classes.dir}/tmp/META-INF" />
+ <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml"
+ tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"
+ />
+ <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
+ <fileset dir="${build.classes.dir}/tmp">
+ <include name="META-INF/jbi.xml" />
+ </fileset>
+ </jar>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <antcall target="undeploy-jbi-component-su"/>
- </target>
+ <!-- Add the WSDL -->
+ <mkdir dir="${build.classes.dir}/tmp/WEB-INF/wsdl" />
+ <copy file="${basedir}/wsdl/CalculatorService_schema1.xsd"
+ todir="${build.classes.dir}/tmp/WEB-INF/wsdl"
+ />
+ <copy file="${basedir}/wsdl/CalculatorService.wsdl"
+ todir="${build.classes.dir}/tmp/WEB-INF/wsdl"
+ />
+ <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
+ <fileset dir="${build.classes.dir}/tmp">
+ <include name="WEB-INF/wsdl/CalculatorService_schema1.xsd" />
+ <include name="WEB-INF/wsdl/CalculatorService.wsdl" />
+ </fileset>
+ </jar>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <!-- Copy the JavaEE app to the service assembly -->
+ <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-client"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/rpc-literal-bundled-wsdl/webservice/CalculatorService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/rpc-literal-bundled-wsdl/webservice/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar"
+ includes="common/**,webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="common/**,client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
+
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ <antcall target="undeploy-jbi-component-su" />
+ </target>
+
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="common/**,client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
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 4cb08cf..ffbd6bf 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
- <delete file="${basedir}/RepRunConf.txt"/>
- <delete dir="${basedir}/common:endpoint"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war" />
+ <delete file="${basedir}/RepRunConf.txt" />
+ <delete dir="${basedir}/common:endpoint" />
+ </target>
- <target name="setup" depends="clean, assemble-web, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="clean, assemble-web, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="common:endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <echo message="classes dir = ${build.classes.dir}"/>
- <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/rpc-literal-generated-wsdl/webservice/CalculatorService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/rpc-literal-generated-wsdl/webservice/CalculatorService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="common:endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
- includes="common/**, webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <echo message="classes dir = ${build.classes.dir}" />
+ <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war" />
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/rpc-literal-generated-wsdl/webservice/CalculatorService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/rpc-literal-generated-wsdl/webservice/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar"
+ includes="common/**, webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="undeploy-app" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-web"/>
- </exec>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-web"/>
- <param name="wsName" value="Calculator"/>
- <param name="module" value="web-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-web" />
+ </exec>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-client"/>
- <antcall target="undeploy-app"/>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="common/**, client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-web" />
+ <param name="wsName" value="Calculator" />
+ <param name="module" value="web-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-client" />
+ <antcall target="undeploy-app" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="common/**, client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
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 b62313f..f80c17d 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client"/>
+ <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="create-user" depends="init-common">
- <antcall target="create-user-common">
- <param name="user" value="${fileUser}"/>
- <param name="password" value="${fileUserPassword}"/>
- <param name="groups" value="${fileUserGroups}"/>
- </antcall>
- </target>
+ <target name="create-user" depends="init-common">
+ <antcall target="create-user-common">
+ <param name="user" value="${fileUser}" />
+ <param name="password" value="${fileUserPassword}" />
+ <param name="groups" value="${fileUserGroups}" />
+ </antcall>
+ </target>
- <target name="delete-user" depends="init-common">
- <antcall target="delete-user-common">
- <param name="user" value="${fileUser}"/>
- </antcall>
- </target>
+ <target name="delete-user" depends="init-common">
+ <antcall target="delete-user-common">
+ <param name="user" value="${fileUser}" />
+ </antcall>
+ </target>
- <target name="assemble-ejb" depends="init-common, compile">
- <echo message="Assembling web service module"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**">
- </jar>
- </target>
+ <target name="assemble-ejb" depends="init-common, compile">
+ <echo message="Assembling web service module" />
+ <mkdir dir="${assemble.dir}" />
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ >
+ </jar>
+ </target>
- <target name="assemble-client" depends="init-common">
- <echo message="Assembling web client"/>
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${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"
- debug="on"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <echo message="Assembling web client" />
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ debug="on"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-client" depends="assemble-client, create-user">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="deploy-client" depends="assemble-client, create-user">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="deploy-app">
- <echo message="Deploying the web service"/>
- <antcall target="deploy-jar-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-ejb"/>
- <param name="wsName" value="HelloEJB"/>
- <param name="module" value="ejb-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <echo message="Deploying the web service" />
+ <antcall target="deploy-jar-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-ejb" />
+ <param name="wsName" value="HelloEJB" />
+ <param name="module" value="ejb-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common, delete-user">
- <antcall target="undeploy-app"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy" depends="init-common, delete-user">
+ <antcall target="undeploy-app" />
+ <antcall target="undeploy-client" />
+ </target>
- <target name="undeploy-client" depends="init-common">
- <echo message="Undeploying client application"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <echo message="Undeploying client application" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <target name="undeploy-app" depends="init-common">
- <echo message="Undeploying web service"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-ejb"/>
- </exec>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <echo message="Undeploying web service" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-ejb" />
+ </exec>
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- <arg value="${fileUser}:${fileUserPassword}"/>
- </java>
- </target>
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ <arg value="${fileUser}:${fileUserPassword}" />
+ </java>
+ </target>
</project>
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 96dc0d9..f81e35a 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 @@
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 f42d6d6..5e402eb 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;
- <property name="src-name" value="endpoint/jaxws/HelloEJB.java"/>
- <property name="client-src-name" value="stressclient/StressSOAPEjbConsumer.java"/>
- <property name="pkg-name" value="endpoint/jaxws"/>
- <target name="all" depends="deploy-jbi-component-su, another_servlet, another_ejb, mytest-all, undeploy-jbi-component-su,undeploy-all,clean"/>
+ <property name="src-name" value="endpoint/jaxws/HelloEJB.java" />
+ <property name="client-src-name" value="stressclient/StressSOAPEjbConsumer.java" />
+ <property name="pkg-name" value="endpoint/jaxws" />
+ <target name="all"
+ depends="deploy-jbi-component-su, another_servlet, another_ejb, mytest-all, undeploy-jbi-component-su,undeploy-all,clean"
+ />
- <target name="mytest-all" >
- <basename file="${src-name}" property="server" suffix=".java"/>
- <dirname file="${src-name}" property="directory"/>
- <echo message="Starting Test ${directory}"/>
- <basename file="${directory}" property="pkg-name"/>
+ <target name="mytest-all">
+ <basename file="${src-name}" property="server" suffix=".java" />
+ <dirname file="${src-name}" property="directory" />
+ <echo message="Starting Test ${directory}" />
+ <basename file="${directory}" property="pkg-name" />
<antcall target="deploy">
- <param name="pkg-name" value="${pkg-name}"/>
+ <param name="pkg-name" value="${pkg-name}" />
</antcall>
<condition property="deploy_succeeded">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed" />
</condition>
<condition property="deploy_failed">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployFailed"/>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployFailed" />
</condition>
- <fail message="Deployment failed" if="deploy_failed"/>
+ <fail message="Deployment failed" if="deploy_failed" />
<antcall target="wsdl-import">
- <param name="server" value="${server}"/>
- <param name="port" value="HelloEJB"/>
+ <param name="server" value="${server}" />
+ <param name="port" value="HelloEJB" />
</antcall>
- <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
- classpath="${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:${env.APS_HOME}/build/module/classes/client"
- includes="${client-src-name}">
+ <javac srcdir="."
+ destdir="${env.APS_HOME}/build/module/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${env.APS_HOME}/build/module/classes/client"
+ includes="${client-src-name}"
+ >
</javac>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes"/>
- <copydir src="${env.APS_HOME}/build/module/classes/client/com" dest="${env.APS_HOME}/build/module/classes/com"/>
- <exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
- <arg line="stressclient.StressSOAPEjbConsumer ${minutes}"/>
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes" />
+ <copydir src="${env.APS_HOME}/build/module/classes/client/com"
+ dest="${env.APS_HOME}/build/module/classes/com"
+ />
+ <exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
+ <arg line="stressclient.StressSOAPEjbConsumer ${minutes}" />
</exec>
- <echo message="Removing jar bundle ${server}.jar from autodeploy directory"/>
- <antcall target="undeploy"/>
- <antcall target="report"/>
- </target>
+ <echo message="Removing jar bundle ${server}.jar from autodeploy directory" />
+ <antcall target="undeploy" />
+ <antcall target="report" />
+ </target>
- <target name="another_ejb">
- <ant inheritAll="false" dir="./another_ejb"/>
- </target>
+ <target name="another_ejb">
+ <ant inheritAll="false" dir="./another_ejb" />
+ </target>
- <target name="another_servlet">
- <ant inheritAll="false" dir="./another_servlet"/>
- </target>
+ <target name="another_servlet">
+ <ant inheritAll="false" dir="./another_servlet" />
+ </target>
- <target name="undeploy-all">
- <ant inheritAll="false" dir="./another_ejb" target="custom-undeploy"/>
- <ant inheritAll="false" dir="./another_servlet" target="custom-undeploy"/>
- </target>
+ <target name="undeploy-all">
+ <ant inheritAll="false" dir="./another_ejb" target="custom-undeploy" />
+ <ant inheritAll="false" dir="./another_servlet" target="custom-undeploy" />
+ </target>
- <target name="report-success">
- <echo message="Test passed"/>
- </target>
+ <target name="report-success">
+ <echo message="Test passed" />
+ </target>
- <target name="report-failure">
- <echo message="Test failed"/>
- </target>
+ <target name="report-failure">
+ <echo message="Test failed" />
+ </target>
</project>
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 f2b852b..64f32eb 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-jbi-component-su,assemble-client,deploy-client"/>
+ <target name="setup"
+ depends="assemble-web, deploy-jbi-component-su,assemble-client,deploy-client"
+ />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <echo message="classes dir = ${build.classes.dir}"/>
- <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- <!-- Add META-INF/jbi.xml to .war file -->
- <mkdir dir="${build.classes.dir}/tmp/META-INF"/>
- <echo message="created dir = ${build.classes.dir}/tmp/META-INF"/>
- <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml" tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"/>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp">
- <include name="META-INF/jbi.xml"/>
- </fileset>
- </jar>
- <!-- Copy the JavaEE app to the service assembly -->
- <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly"/>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client-web/webservice/AddNumberService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client-web/webservice/AddNumberService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <echo message="classes dir = ${build.classes.dir}" />
+ <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war" />
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ <!-- Add META-INF/jbi.xml to .war file -->
+ <mkdir dir="${build.classes.dir}/tmp/META-INF" />
+ <echo message="created dir = ${build.classes.dir}/tmp/META-INF" />
+ <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml"
+ tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"
+ />
+ <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
+ <fileset dir="${build.classes.dir}/tmp">
+ <include name="META-INF/jbi.xml" />
+ </fileset>
+ </jar>
+ <!-- Copy the JavaEE app to the service assembly -->
+ <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly" />
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <antcall target="undeploy-jbi-component-su"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client-web/webservice/AddNumberService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client-web/webservice/AddNumberService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ <antcall target="undeploy-jbi-component-su" />
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#AddNumber"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#AddNumber" />
+ </antcall>
+ </target>
</project>
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 a243147..a4a4f4f 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-app, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="assemble-app, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-app" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="deploy-app" depends="init-common">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}-web"/>
- </antcall>
- <antcall target="configure-webservice-management"/>
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.applications.web-module.${appname}-web.web-service-endpoint.Calculator.jbi-enabled=false"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${build.classes.dir}/webclient/META-INF"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client-web/webservice/CalculatorService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client-web/webservice/CalculatorService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${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"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <copy file="./jbi.xml" tofile="${build.classes.dir}/webclient/META-INF/jbi.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="init-common">
- <mkdir dir="./temp"/>
- <copy file="${assemble.dir}/wsclient.war" todir="./temp"/>
- <antcall target="deploy-jbi-component-su"/>
- </target>
+ <target name="assemble-app" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <antcall target="undeploy-jbi-component-su"/>
- </target>
+ <target name="deploy-app" depends="init-common">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}-web" />
+ </antcall>
+ <antcall target="configure-webservice-management" />
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="set" />
+ <param name="operand.props"
+ value="server.applications.web-module.${appname}-web.web-service-endpoint.Calculator.jbi-enabled=false"
+ />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${build.classes.dir}/webclient/META-INF" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/jsr208-integration-web-client-web/webservice/CalculatorService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/jsr208-integration-web-client-web/webservice/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <copy file="./jbi.xml" tofile="${build.classes.dir}/webclient/META-INF/jbi.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="init-common">
+ <mkdir dir="./temp" />
+ <copy file="${assemble.dir}/wsclient.war" todir="./temp" />
+ <antcall target="deploy-jbi-component-su" />
+ </target>
+
+ <target name="undeploy-client" depends="init-common">
+ <antcall target="undeploy-jbi-component-su" />
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
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 9c55b6f..c321cf4 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-jbi-component-su,assemble-client,deploy-client"/>
+ <target name="setup"
+ depends="assemble-web, deploy-jbi-component-su,assemble-client,deploy-client"
+ />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <echo message="classes dir = ${build.classes.dir}"/>
- <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- <!-- Add META-INF/jbi.xml to .war file -->
- <mkdir dir="${build.classes.dir}/tmp/META-INF"/>
- <echo message="created dir = ${build.classes.dir}/tmp/META-INF"/>
- <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml" tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"/>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp">
- <include name="META-INF/jbi.xml"/>
- </fileset>
- </jar>
- <!-- Copy the JavaEE app to the service assembly -->
- <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly"/>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client-web/webservice/EndpointMappingService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client-web/webservice/EndpointMappingService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <echo message="classes dir = ${build.classes.dir}" />
+ <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war" />
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ <!-- Add META-INF/jbi.xml to .war file -->
+ <mkdir dir="${build.classes.dir}/tmp/META-INF" />
+ <echo message="created dir = ${build.classes.dir}/tmp/META-INF" />
+ <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml"
+ tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"
+ />
+ <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
+ <fileset dir="${build.classes.dir}/tmp">
+ <include name="META-INF/jbi.xml" />
+ </fileset>
+ </jar>
+ <!-- Copy the JavaEE app to the service assembly -->
+ <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly" />
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <antcall target="undeploy-jbi-component-su"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client-web/webservice/EndpointMappingService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client-web/webservice/EndpointMappingService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ <antcall target="undeploy-jbi-component-su" />
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#EndpointMapping"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#EndpointMapping" />
+ </antcall>
+ </target>
</project>
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 6c6d910..9ff27cb 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-app, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="assemble-app, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-app" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="deploy-app" depends="init-common">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}-web"/>
- </antcall>
- <antcall target="configure-webservice-management"/>
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.applications.web-module.${appname}-web.web-service-endpoint.EndpointMappingConsumer.jbi-enabled=false"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${build.classes.dir}/webclient/META-INF"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes ./webclient/client/wsdl/EndpointMappingConsumerService.wsdl" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes ./webclient/client/wsdl/EndpointMappingConsumerService.wsdl"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${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"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <copy file="./jbi.xml" tofile="${build.classes.dir}/webclient/META-INF/jbi.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="init-common">
- <mkdir dir="./temp"/>
- <copy file="${assemble.dir}/wsclient.war" todir="./temp"/>
- <antcall target="deploy-jbi-component-su"/>
- </target>
+ <target name="assemble-app" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <antcall target="undeploy-jbi-component-su"/>
- </target>
+ <target name="deploy-app" depends="init-common">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}-web" />
+ </antcall>
+ <antcall target="configure-webservice-management" />
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="set" />
+ <param name="operand.props"
+ value="server.applications.web-module.${appname}-web.web-service-endpoint.EndpointMappingConsumer.jbi-enabled=false"
+ />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${build.classes.dir}/webclient/META-INF" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes ./webclient/client/wsdl/EndpointMappingConsumerService.wsdl"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes ./webclient/client/wsdl/EndpointMappingConsumerService.wsdl"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <copy file="./jbi.xml" tofile="${build.classes.dir}/webclient/META-INF/jbi.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#EndpointMappingConsumer"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="init-common">
+ <mkdir dir="./temp" />
+ <copy file="${assemble.dir}/wsclient.war" todir="./temp" />
+ <antcall target="deploy-jbi-component-su" />
+ </target>
+
+ <target name="undeploy-client" depends="init-common">
+ <antcall target="undeploy-jbi-component-su" />
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#EndpointMappingConsumer" />
+ </antcall>
+ </target>
</project>
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 cb08385..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project default="-deploy-ant" basedir=".">
- <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
- <property file="${deploy.ant.properties.file}" />
- <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
- <available file="${deploy.ant.resource.dir}" property="has.setup"/>
- <tempfile prefix="sjsas" property="sjsas.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <echo message="AS_ADMIN_PASSWORD=${sjsas.password}" file="${sjsas.password.file}"/>
- </target>
-
- <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
- <tempfile prefix="sjsas" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
- <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
- <!-- The doctype triggers resolution which can fail -->
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
- <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
- </replace>
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
- <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
- </replace>
- <xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
- <delete file="${temp.sun.web}"/>
- <property name="deploy.ant.client.url" value="${sjsas.url}${sun-web-app.context-root}"/>
- </target>
- <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
- <tempfile prefix="sjsas" property="sjsas.resources.dir" destdir="${java.io.tmpdir}"/>
- <mkdir dir="${sjsas.resources.dir}"/>
- <mkdir dir="${sjsas.resources.dir}/META-INF"/>
- <property name="sjsas.resources.file" value="${sjsas.resources.dir}/META-INF/sun-resources.xml"/>
- <property name="lefty" value="<"/>
-
- <property name="righty" value=">"/>
- <concat destfile="${sjsas.resources.file}">${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}
- </concat>
- <concat append="true" destfile="${sjsas.resources.file}">
- <fileset dir="${deploy.ant.resource.dir}"/>
- </concat>
- <replace file="${sjsas.resources.file}" value="">
- <replacetoken><![CDATA[</resources>
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>]]></replacetoken>
- </replace>
- <replace file="${sjsas.resources.file}" value="">
- <replacetoken><![CDATA[</resources>
- <?xml version="1.0" encoding="UTF-8"?>
-<resources>]]></replacetoken>
- </replace>
- <replace file="${sjsas.resources.file}" value="">
- <replacetoken><![CDATA[transaction-isolation-level="JDBC Driver Default"]]></replacetoken>
- </replace>
- <!-- work-around 434 and its variants -->
- <replace file="${sjsas.resources.file}" value="">
- <replacetoken><![CDATA[<description/>]]></replacetoken>
- </replace>
- <!-- do the right thing for Topics and Queues.
- Need fix for TopicConnectionFactory and QueueConnectionfactory -->
- <replace file="${sjsas.resources.file}">
- <replacetoken><![CDATA[<jms-resource ]]></replacetoken>
- <replacevalue><![CDATA[<admin-object-resource res-adapter="jmsra" ]]></replacevalue>
- </replace>
- <replace file="${sjsas.resources.file}">
- <replacetoken><![CDATA[</jms-resource>]]></replacetoken>
- <replacevalue><![CDATA[</admin-object-resource>]]></replacevalue>
- </replace>
- <jar destfile="${deploy.ant.archive}" update="true">
- <fileset dir="${sjsas.resources.dir}"/>
- </jar>
- <delete dir="${sjsas.resources.dir}"/>
- </target>
- <target name="-deploy-ant" depends="-parse-sun-web,-add-resources" if="deploy.ant.enabled">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <taskdef name="sun-appserv-deploy" classname="org.apache.tools.ant.taskdefs.optional.sun.appserv.DeployTask"
- classpath="${sjsas.root}/lib/sun-appserv-ant.jar" />
- <sun-appserv-deploy user="${sjsas.username}"
- passwordfile="${sjsas.password.file}"
- host="${sjsas.host}" port="${sjsas.port}"
- file="${deploy.ant.archive}" asinstalldir="${sjsas.root}"/>
- <delete file="${sjsas.password.file}"/>
- </target>
- <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
- <taskdef name="sun-appserv-undeploy" classname="org.apache.tools.ant.taskdefs.optional.sun.appserv.UndeployTask"
- classpath="${sjsas.root}/lib/sun-appserv-ant.jar" />
- <sun-appserv-undeploy user="${sjsas.username}"
- passwordfile="${sjsas.password.file}"
- host="${sjsas.host}" port="${sjsas.port}"
- file="${deploy.ant.archive}" asinstalldir="${sjsas.root}"/>
- <delete file="${sjsas.password.file}"/>
- </target>
-</project>
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 4128528..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT ***
-*** EDIT ../build.xml INSTEAD ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
- - initialization
- - compilation
- - dist
- - execution
- - debugging
- - javadoc
- - cleanup
-
- -->
-<project name="EntApp-ejb-impl" default="build" basedir=".." xmlns:ejbjarproject3="http://www.netbeans.org/ns/j2ee-ejbjarproject/3" xmlns:ejbjarproject2="http://www.netbeans.org/ns/j2ee-ejbjarproject/2" xmlns:ejbjarproject1="http://www.netbeans.org/ns/j2ee-ejbjarproject/1" xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1">
- <import file="ant-deploy.xml"/>
- <target name="default" depends="dist,javadoc" description="Build whole project."/>
- <!--
- INITIALIZATION SECTION
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-init-private" depends="-pre-init">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target name="-init-userdir" depends="-pre-init,-init-private">
- <property name="user.properties.file" location="${netbeans.user}/build.properties"/>
- </target>
- <target name="-init-user" depends="-pre-init,-init-private,-init-userdir">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target name="-init-project" depends="-pre-init,-init-private,-init-userdir,-init-user">
- <property file="nbproject/project.properties"/>
- </target>
- <target name="-do-init" depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-init-macrodef-property">
- <!-- Ensure configuration directory exists. -->
- <mkdir dir="${meta.inf}"/>
- <property name="runmain.jvmargs" value=""/>
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <available file="${meta.inf}/MANIFEST.MF" property="has.custom.manifest"/>
- <condition property="classes.dir" value="${build.ear.classes.dir}">
- <isset property="dist.ear.dir"/>
- </condition>
- <property name="classes.dir" value="${build.classes.dir}"/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <condition property="no.dist.ear.dir">
- <not>
- <isset property="dist.ear.dir"/>
- </not>
- </condition>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-init-check" depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="build.generated.dir">Must set build.generated.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.jar">Must set dist.jar</fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-javac">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/2">
- <attribute name="srcdir" default="${src.dir}"/>
- <attribute name="destdir" default="${build.classes.dir}"/>
- <attribute name="classpath" default="${javac.classpath}:${j2ee.platform.classpath}"/>
- <attribute name="debug" default="${javac.debug}"/>
- <element name="customize" optional="true"/>
- <sequential>
- <property name="javac.compilerargs" value=""/>
- <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/2">
- <attribute name="includes" default="**/*Test.java"/>
- <sequential>
- <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" includes="@{includes}"/>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}"/>
- <path path="${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper type="glob" from="test-sys-prop.*" to="*"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/3">
- <attribute name="classname" default="${main.class}"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java fork="true" classname="@{classname}">
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="${build.classes.dir}:${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper type="glob" from="run-sys-prop.*" to="*"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/1">
- <attribute name="name" default="${main.class}"/>
- <attribute name="classpath" default="${debug.classpath}"/>
- <sequential>
- <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="@{name}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/1">
- <attribute name="dir" default="${build.classes.dir}"/>
- <sequential>
- <nbjpdareload>
- <fileset includes="${fix.includes}*.class" dir="@{dir}"/>
- </nbjpdareload>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none" else="-Xdebug">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- </target>
- <target name="-init-macrodef-debug" depends="-init-debug-args">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/j2ee-ejbjarproject/1">
- <attribute name="classname" default="${main.class}"/>
- <attribute name="classpath" default="${debug.classpath}"/>
- <attribute name="args" default="${application.args}"/>
- <sequential>
- <java fork="true" classname="@{classname}">
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <arg line="@{args}"/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="init" depends="-pre-init,-init-private,-init-userdir,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-debug"/>
- <!--
- COMPILATION SECTION
- -->
- <target name="-deps-module-jar" depends="init" if="no.dist.ear.dir" unless="no.deps"/>
- <target name="-deps-ear-jar" depends="init" if="dist.ear.dir" unless="no.deps"/>
- <target name="deps-jar" depends="init, -deps-module-jar, -deps-ear-jar"/>
- <target name="wsgen-init" depends="init">
- <mkdir dir="${build.generated.dir}/wsgen/service"/>
- <mkdir dir="${classes.dir}"/>
- <taskdef name="wsgen" classname="com.sun.tools.ws.ant.WsGen">
- <classpath path="${j2ee.platform.wsgen.classpath}"/>
- </taskdef>
- </target>
- <target name="wsgen-HelloEJB" depends="wsgen-init, compile">
- <wsgen sourcedestdir="${build.generated.dir}/wsgen/service" resourcedestdir="${build.generated.dir}/wsgen/service" keep="false" genwsdl="true" sei="entapp.ejb.HelloEJB">
- <classpath path="${classes.dir}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
- </wsgen>
- </target>
- <target name="wsgen-generate" depends="wsgen-HelloEJB"/>
- <target name="-pre-pre-compile" depends="init,deps-jar">
- <mkdir dir="${build.classes.dir}"/>
- <mkdir dir="${build.ear.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="library-inclusion-in-archive" depends="compile"/>
- <target name="library-inclusion-in-manifest" depends="compile">
- <manifest file="${build.ear.classes.dir}/META-INF/MANIFEST.MF" mode="update"/>
- </target>
- <target name="-copy-meta-inf">
- <copy todir="${classes.dir}">
- <fileset dir="${meta.inf}" includes="**/*.dbschema"/>
- </copy>
- <copy todir="${classes.dir}/META-INF">
- <fileset dir="${meta.inf}" excludes="**/*.dbschema **/xml-resources/** ${meta.inf.excludes}"/>
- </copy>
- </target>
- <target name="-do-compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile,-copy-meta-inf" if="have.sources">
- <ejbjarproject2:javac destdir="${classes.dir}"/>
- <copy todir="${classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project."/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-compile-single" depends="init,deps-jar,-pre-pre-compile">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <ejbjarproject2:javac>
- <customize>
- <include name="${javac.includes}"/>
- </customize>
- </ejbjarproject2:javac>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile-single" depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single"/>
- <!--
- DIST BUILDING SECTION
- -->
- <target name="-pre-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-dist-with-manifest" depends="init,compile,-pre-dist,library-inclusion-in-archive" if="has.custom.manifest">
- <dirname property="dist.jar.dir" file="${dist.jar}"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar jarfile="${dist.jar}" compress="${jar.compress}" manifest="${build.classes.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.classes.dir}"/>
- </jar>
- </target>
- <target name="-do-dist-without-manifest" depends="init,compile,-pre-dist,library-inclusion-in-archive" unless="has.custom.manifest">
- <dirname property="dist.jar.dir" file="${dist.jar}"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar jarfile="${dist.jar}" compress="${jar.compress}">
- <fileset dir="${build.classes.dir}"/>
- </jar>
- </target>
- <target name="-do-dist" depends="init,compile,-pre-dist,library-inclusion-in-archive, -do-dist-without-manifest, -do-dist-with-manifest"/>
- <target name="-do-ear-dist" depends="init,compile,-pre-dist,library-inclusion-in-manifest">
- <dirname property="dist.jar.dir" file="${dist.ear.jar}"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar jarfile="${dist.ear.jar}" compress="${jar.compress}" manifest="${build.ear.classes.dir}/META-INF/MANIFEST.MF">
- <fileset dir="${build.ear.classes.dir}"/>
- </jar>
- </target>
- <target name="-post-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="dist" depends="init,compile,-pre-dist,-do-dist,-post-dist" description="Build distribution (JAR)."/>
- <target name="dist-ear" depends="init,compile,-pre-dist,-do-ear-dist,-post-dist" description="Build distribution (JAR) to be packaged into an EAR."/>
- <!--
- EXECUTION SECTION
- -->
- <target name="run" depends="run-deploy" description="Deploy to server."/>
- <target name="-init-deploy">
- <property name="include.jar.manifest" value=""/>
- </target>
- <target name="pre-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="post-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-pre-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
- </target>
- <target name="-post-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
- </target>
- <target name="-run-deploy-am">
- <!-- Task to deploy to the Access Manager runtime. -->
- </target>
- <target name="run-deploy" depends="init,-init-deploy,compile,library-inclusion-in-archive,dist,pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,post-run-deploy"/>
- <target name="-run-deploy-nb" if="netbeans.home">
- <nbdeploy debugmode="false" forceRedeploy="${forceRedeploy}"/>
- </target>
- <target name="-init-deploy-ant" unless="netbeans.home">
- <property name="deploy.ant.archive" value="${dist.jar}"/>
- <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
- <property name="deploy.ant.enabled" value="true"/>
- </target>
- <target name="run-undeploy" depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant"/>
- <target name="-run-undeploy-nb" if="netbeans.home">
- <fail message="Undeploy is not supported from within the IDE"/>
- </target>
- <target name="verify" depends="dist">
- <nbverify file="${dist.jar}"/>
- </target>
- <target name="run-main" depends="init,compile-single">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <ejbjarproject3:java classname="${run.class}"/>
- </target>
- <!--
- DEBUGGING SECTION
- -->
- <target name="debug" description="Debug project in IDE." depends="init,compile,dist" if="netbeans.home">
- <nbdeploy debugmode="true"/>
- <antcall target="connect-debugger"/>
- </target>
- <target name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect name="${name}" host="${jpda.host}" address="${jpda.address}" transport="${jpda.transport}">
- <classpath>
- <path path="${debug.classpath}"/>
- </classpath>
- <sourcepath>
- <path path="${web.docbase.dir}"/>
- </sourcepath>
- </nbjpdaconnect>
- </target>
- <target name="-debug-start-debugger" if="netbeans.home" depends="init">
- <ejbjarproject1:nbjpdastart/>
- </target>
- <target name="-debug-start-debuggee-single" if="netbeans.home" depends="init,compile-single">
- <fail unless="main.class">Must select one file in the IDE or set main.class</fail>
- <ejbjarproject1:debug/>
- </target>
- <target name="debug-single-main" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single"/>
- <target name="-pre-debug-fix" depends="init">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target name="-do-debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,compile-single">
- <ejbjarproject1:nbjpdareload/>
- </target>
- <target name="debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix"/>
- <!--
- JAVADOC SECTION
- -->
- <target name="javadoc-build" depends="init">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true">
- <classpath>
- <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <sourcepath>
- <pathelement location="${src.dir}"/>
- </sourcepath>
- <packageset dir="${src.dir}" includes="*/**"/>
- <fileset dir="${src.dir}" includes="*.java"/>
- </javadoc>
- </target>
- <target name="javadoc-browse" if="netbeans.home" unless="no.javadoc.preview" depends="init,javadoc-build">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target name="javadoc" depends="init,javadoc-build,javadoc-browse" description="Build Javadoc."/>
- <!--
- JUNIT COMPILATION SECTION
- -->
- <target name="-pre-pre-compile-test" if="have.tests" depends="init,compile">
- <mkdir dir="${build.test.classes.dir}"/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-compile-test" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test">
- <ejbjarproject2:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}:${j2ee.platform.classpath}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="**/*.java"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile-test" depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-compile-test-single" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <ejbjarproject2:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}:${j2ee.platform.classpath}">
- <customize>
- <patternset includes="${javac.includes}"/>
- </customize>
- </ejbjarproject2:javac>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile-test-single" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single"/>
- <!--
- JUNIT EXECUTION SECTION
- -->
- <target name="-pre-test-run" if="have.tests" depends="init">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target name="-do-test-run" if="have.tests" depends="init,compile-test,-pre-test-run">
- <ejbjarproject2:junit/>
- </target>
- <target name="-post-test-run" if="have.tests" depends="init,compile-test,-pre-test-run,-do-test-run">
- <fail if="tests.failed">Some tests failed; see details above.</fail>
- </target>
- <target name="test-report" if="have.tests" depends="init"/>
- <target name="-test-browse" if="netbeans.home+have.tests" depends="init"/>
- <target name="test" depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests."/>
- <target name="-pre-test-run-single" if="have.tests" depends="init">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target name="-do-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <ejbjarproject2:junit includes="${test.includes}"/>
- </target>
- <target name="-post-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single">
- <fail if="tests.failed">Some tests failed; see details above.</fail>
- </target>
- <target name="test-single" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test."/>
- <!--
- JUNIT DEBUGGING SECTION
- -->
- <target name="-debug-start-debuggee-test" if="have.tests" depends="init,compile-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <ejbjarproject1:debug classname="junit.textui.TestRunner" classpath="${debug.test.classpath}" args="${test.class}"/>
- </target>
- <target name="-debug-start-debugger-test" if="netbeans.home+have.tests" depends="init,compile-test">
- <ejbjarproject1:nbjpdastart name="${test.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target name="debug-test" depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test"/>
- <target name="-do-debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,compile-test-single">
- <ejbjarproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target name="debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix-test"/>
- <!--
- CLEANUP SECTION
- -->
- <target name="deps-clean" depends="init" if="no.dist.ear.dir" unless="no.deps"/>
- <target name="-do-clean" depends="init">
- <delete dir="${build.dir}"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="clean" depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products."/>
- <target name="clean-ear" depends="clean"/>
-</project>
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 2e75d09..0000000
--- 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 2eb3b7b..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<jax-ws xmlns="http://www.netbeans.org/ns/jax-ws/1">
- <services>
- <service name="HelloEJB">
- <implementation-class>entapp.ejb.HelloEJB</implementation-class>
- </service>
- </services>
- <clients/>
-</jax-ws>
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 1df9f9e..0000000
--- 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 bc91159..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>
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 ac01e9b..0000000
--- 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 680f973..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.j2ee.ejbjarproject</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/j2ee-ejbjarproject/3">
- <name>EntApp-ejb</name>
- <minimum-ant-version>1.6</minimum-ant-version>
- <source-roots>
- <root id="src.dir" name="Source Packages"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir" name="Test Packages"/>
- </test-roots>
- </data>
- </configuration>
-</project>
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 cb08385..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project default="-deploy-ant" basedir=".">
- <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
- <property file="${deploy.ant.properties.file}" />
- <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
- <available file="${deploy.ant.resource.dir}" property="has.setup"/>
- <tempfile prefix="sjsas" property="sjsas.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <echo message="AS_ADMIN_PASSWORD=${sjsas.password}" file="${sjsas.password.file}"/>
- </target>
-
- <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
- <tempfile prefix="sjsas" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
- <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
- <!-- The doctype triggers resolution which can fail -->
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
- <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
- </replace>
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
- <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
- </replace>
- <xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
- <delete file="${temp.sun.web}"/>
- <property name="deploy.ant.client.url" value="${sjsas.url}${sun-web-app.context-root}"/>
- </target>
- <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
- <tempfile prefix="sjsas" property="sjsas.resources.dir" destdir="${java.io.tmpdir}"/>
- <mkdir dir="${sjsas.resources.dir}"/>
- <mkdir dir="${sjsas.resources.dir}/META-INF"/>
- <property name="sjsas.resources.file" value="${sjsas.resources.dir}/META-INF/sun-resources.xml"/>
- <property name="lefty" value="<"/>
-
- <property name="righty" value=">"/>
- <concat destfile="${sjsas.resources.file}">${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}
- </concat>
- <concat append="true" destfile="${sjsas.resources.file}">
- <fileset dir="${deploy.ant.resource.dir}"/>
- </concat>
- <replace file="${sjsas.resources.file}" value="">
- <replacetoken><![CDATA[</resources>
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>]]></replacetoken>
- </replace>
- <replace file="${sjsas.resources.file}" value="">
- <replacetoken><![CDATA[</resources>
- <?xml version="1.0" encoding="UTF-8"?>
-<resources>]]></replacetoken>
- </replace>
- <replace file="${sjsas.resources.file}" value="">
- <replacetoken><![CDATA[transaction-isolation-level="JDBC Driver Default"]]></replacetoken>
- </replace>
- <!-- work-around 434 and its variants -->
- <replace file="${sjsas.resources.file}" value="">
- <replacetoken><![CDATA[<description/>]]></replacetoken>
- </replace>
- <!-- do the right thing for Topics and Queues.
- Need fix for TopicConnectionFactory and QueueConnectionfactory -->
- <replace file="${sjsas.resources.file}">
- <replacetoken><![CDATA[<jms-resource ]]></replacetoken>
- <replacevalue><![CDATA[<admin-object-resource res-adapter="jmsra" ]]></replacevalue>
- </replace>
- <replace file="${sjsas.resources.file}">
- <replacetoken><![CDATA[</jms-resource>]]></replacetoken>
- <replacevalue><![CDATA[</admin-object-resource>]]></replacevalue>
- </replace>
- <jar destfile="${deploy.ant.archive}" update="true">
- <fileset dir="${sjsas.resources.dir}"/>
- </jar>
- <delete dir="${sjsas.resources.dir}"/>
- </target>
- <target name="-deploy-ant" depends="-parse-sun-web,-add-resources" if="deploy.ant.enabled">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <taskdef name="sun-appserv-deploy" classname="org.apache.tools.ant.taskdefs.optional.sun.appserv.DeployTask"
- classpath="${sjsas.root}/lib/sun-appserv-ant.jar" />
- <sun-appserv-deploy user="${sjsas.username}"
- passwordfile="${sjsas.password.file}"
- host="${sjsas.host}" port="${sjsas.port}"
- file="${deploy.ant.archive}" asinstalldir="${sjsas.root}"/>
- <delete file="${sjsas.password.file}"/>
- </target>
- <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
- <taskdef name="sun-appserv-undeploy" classname="org.apache.tools.ant.taskdefs.optional.sun.appserv.UndeployTask"
- classpath="${sjsas.root}/lib/sun-appserv-ant.jar" />
- <sun-appserv-undeploy user="${sjsas.username}"
- passwordfile="${sjsas.password.file}"
- host="${sjsas.host}" port="${sjsas.port}"
- file="${deploy.ant.archive}" asinstalldir="${sjsas.root}"/>
- <delete file="${sjsas.password.file}"/>
- </target>
-</project>
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 7fe97b1..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!--
- *** GENERATED FROM project.xml - DO NOT EDIT ***
- *** EDIT ../build.xml INSTEAD ***
-
- For the purpose of easier reading the script
- is divided into following sections:
- - initialization
- - compilation
- - dist
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - cleanup
-
- -->
-<project name="EntApp-war-impl" default="build" basedir=".." xmlns:webproject3="http://www.netbeans.org/ns/web-project/3" xmlns:webproject2="http://www.netbeans.org/ns/web-project/2" xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1" xmlns:webproject1="http://www.netbeans.org/ns/web-project/1">
- <import file="ant-deploy.xml"/>
- <target name="default" depends="dist,javadoc" description="Build whole project."/>
- <!--
- INITIALIZATION SECTION
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-init-private" depends="-pre-init">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target name="-init-user" depends="-pre-init,-init-private">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target name="-init-project" depends="-pre-init,-init-private,-init-user">
- <property file="nbproject/project.properties"/>
- </target>
- <target name="-do-ear-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property" if="dist.ear.dir">
- <property value="${build.ear.web.dir}/META-INF" name="build.meta.inf.dir"/>
- <property name="build.classes.dir.real" value="${build.ear.classes.dir}"/>
- <property name="build.web.dir.real" value="${build.ear.web.dir}"/>
- </target>
- <target name="-do-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property,-do-ear-init">
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="javac.compilerargs" value=""/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <condition property="no.dist.ear.dir">
- <not>
- <isset property="dist.ear.dir"/>
- </not>
- </condition>
- <property name="build.web.excludes" value="${build.classes.excludes}"/>
- <condition property="do.compile.jsps">
- <istrue value="${compile.jsps}"/>
- </condition>
- <condition property="do.display.browser">
- <istrue value="${display.browser}"/>
- </condition>
- <available file="${conf.dir}/MANIFEST.MF" property="has.custom.manifest"/>
- <available file="${conf.dir}/persistence.xml" property="has.persistence.xml"/>
- <condition property="do.war.package.with.custom.manifest">
- <and>
- <istrue value="${war.package}"/>
- <isset property="has.custom.manifest"/>
- </and>
- </condition>
- <condition property="do.war.package.without.custom.manifest">
- <and>
- <istrue value="${war.package}"/>
- <not>
- <isset property="has.custom.manifest"/>
- </not>
- </and>
- </condition>
- <property value="${build.web.dir}/META-INF" name="build.meta.inf.dir"/>
- <property name="build.classes.dir.real" value="${build.classes.dir}"/>
- <property name="build.web.dir.real" value="${build.web.dir}"/>
- <condition property="application.args.param" value="${application.args}" else="">
- <and>
- <isset property="application.args"/>
- <not>
- <equals arg1="${application.args}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-init-check" depends="-pre-init,-init-private,-init-user,-init-project,-do-init">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="build.web.dir">Must set build.web.dir</fail>
- <fail unless="build.generated.dir">Must set build.generated.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.war">Must set dist.war</fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-javac">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute name="srcdir" default="${src.dir}"/>
- <attribute name="destdir" default="${build.classes.dir.real}"/>
- <attribute name="classpath" default="${javac.classpath}:${j2ee.platform.classpath}"/>
- <attribute name="debug" default="${javac.debug}"/>
- <element name="customize" optional="true"/>
- <sequential>
- <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/web-project/2">
- <attribute name="includes" default="**/*Test.java"/>
- <sequential>
- <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" includes="@{includes}"/>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper type="glob" from="test-sys-prop.*" to="*"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="classname" default="${main.class}"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java fork="true" classname="@{classname}">
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="${build.classes.dir.real}:${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper type="glob" from="run-sys-prop.*" to="*"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="name" default="${main.class}"/>
- <attribute name="classpath" default="${debug.classpath}"/>
- <sequential>
- <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="@{name}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="dir" default="${build.classes.dir.real}"/>
- <sequential>
- <nbjpdareload>
- <fileset includes="${fix.includes}*.class" dir="@{dir}"/>
- </nbjpdareload>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none" else="-Xdebug">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- </target>
- <target name="-init-macrodef-debug" depends="-init-debug-args">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/web-project/1">
- <attribute name="classname" default="${main.class}"/>
- <attribute name="classpath" default="${debug.classpath}"/>
- <attribute name="args" default="${application.args.param}"/>
- <sequential>
- <java fork="true" classname="@{classname}">
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
- <jvmarg line="${runmain.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper type="glob" from="run-sys-prop.*" to="*"/>
- </syspropertyset>
- <arg line="@{args}"/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-copy-ear-war">
- <macrodef name="copy-ear-war">
- <attribute name="file"/>
- <attribute name="propname"/>
- <sequential>
- <basename property="base_@{propname}" file="@{file}"/>
- <zipfileset id="tld.files_@{propname}" src="@{file}" includes="META-INF/*.tld META-INF/tlds/*.tld"/>
- <pathconvert property="tld.files.path_@{propname}" refid="tld.files_@{propname}"/>
- <condition value="yes" property="hastlds_@{propname}">
- <contains string="${tld.files.path_@{propname}}" substring=".tld" casesensitive="false"/>
- </condition>
- <condition value="${build.web.dir.real}/WEB-INF/lib" property="copy.to.dir_@{propname}">
- <isset property="hastlds_@{propname}"/>
- </condition>
- <condition value="${dist.ear.dir}" property="copy.to.dir_@{propname}">
- <not>
- <isset property="hastlds_@{propname}"/>
- </not>
- </condition>
- <copy file="@{file}" todir="${copy.to.dir_@{propname}}"/>
- <condition value="${base_@{propname}}" property="@{propname}">
- <not>
- <isset property="hastlds_@{propname}"/>
- </not>
- </condition>
- <condition value="" property="@{propname}">
- <isset property="hastlds_@{propname}"/>
- </condition>
- </sequential>
- </macrodef>
- </target>
- <target name="init" depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-java,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-copy-ear-war"/>
- <!--
- COMPILATION SECTION
- -->
- <target name="deps-module-jar" depends="init" if="no.dist.ear.dir" unless="no.deps">
- <ant target="dist" inheritall="false" antfile="${project.EntApp-ejb}/build.xml"/>
- </target>
- <target name="deps-ear-jar" depends="init" if="dist.ear.dir" unless="no.deps">
- <ant target="dist-ear" inheritall="false" antfile="${project.EntApp-ejb}/build.xml">
- <property name="dist.ear.dir" location="${build.dir}"/>
- </ant>
- </target>
- <target name="deps-jar" depends="init, deps-module-jar, deps-ear-jar" unless="no.deps"/>
- <target name="wsgen-init" depends="init">
- <mkdir dir="${build.generated.dir}/wsgen/service"/>
- <mkdir dir="${build.classes.dir.real}"/>
- <taskdef name="wsgen" classname="com.sun.tools.ws.ant.WsGen">
- <classpath path="${j2ee.platform.wsgen.classpath}"/>
- </taskdef>
- </target>
- <target name="wsgen-HelloWeb" depends="wsgen-init, compile">
- <wsgen sourcedestdir="${build.generated.dir}/wsgen/service" resourcedestdir="${build.generated.dir}/wsgen/service" keep="false" genwsdl="true" sei="entapp.web.HelloWeb">
- <classpath path="${java.home}/../lib/tools.jar:${build.classes.dir.real}:${j2ee.platform.wsgen.classpath}:${javac.classpath}"/>
- </wsgen>
- </target>
- <target name="wsgen-generate" depends="wsgen-HelloWeb"/>
- <target name="-pre-pre-compile" depends="init,deps-jar">
- <mkdir dir="${build.classes.dir.real}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-copy-webdir">
- <copy todir="${build.web.dir.real}">
- <fileset excludes="${build.web.excludes}" dir="${web.docbase.dir}"/>
- </copy>
- <copy todir="${build.web.dir.real}/WEB-INF">
- <fileset excludes="${build.web.excludes}" dir="${webinf.dir}"/>
- </copy>
- </target>
- <target name="-init-rest" if="rest.support.on">
- <taskdef name="restapt" classname="com.sun.ws.rest.tools.ant.RestBeansProcessorTask">
- <classpath>
- <path path="${j2ee.platform.classpath}"/>
- </classpath>
- </taskdef>
- </target>
- <target name="-rest-pre-compile" depends="-init-rest" if="rest.support.on">
- <mkdir dir="${build.generated.dir}/rest-gen"/>
- <restapt fork="true" xEndorsed="true" sourcePath="${src.dir}" nocompile="false" destdir="${build.classes.dir.real}" sourcedestdir="${build.generated.dir}/rest-gen">
- <classpath>
- <path path="${javac.classpath}"/>
- <path path="${libs.jaxws20.classpath}"/>
- <path path="${j2ee.platform.classpath}"/>
- <pathelement location="${build.web.dir}/WEB-INF/classes"/>
- </classpath>
- <source dir="${src.dir}">
- <include name="**/*.java"/>
- </source>
- </restapt>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="**/*.java"/>
- </copy>
- </target>
- <target name="-do-compile" depends="init, deps-jar, -pre-pre-compile, -pre-compile, -rest-pre-compile, -copy-manifest, -copy-persistence-xml, -copy-webdir, library-inclusion-in-archive,library-inclusion-in-manifest" if="have.sources">
- <webproject2:javac destdir="${build.classes.dir.real}"/>
- <copy todir="${build.classes.dir.real}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
- </copy>
- </target>
- <target name="-copy-manifest" if="has.custom.manifest">
- <mkdir dir="${build.meta.inf.dir}"/>
- <copy todir="${build.meta.inf.dir}">
- <fileset dir="${conf.dir}" includes="MANIFEST.MF"/>
- </copy>
- </target>
- <target name="-copy-persistence-xml" if="has.persistence.xml">
- <mkdir dir="${build.web.dir.real}/WEB-INF/classes/META-INF"/>
- <copy todir="${build.web.dir.real}/WEB-INF/classes/META-INF">
- <fileset dir="${conf.dir}" includes="persistence.xml"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project."/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-compile-single" depends="init,deps-jar,-pre-pre-compile">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac>
- <customize>
- <patternset includes="${javac.includes}"/>
- </customize>
- </webproject2:javac>
- <copy todir="${build.classes.dir.real}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
- </copy>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile-single" depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single"/>
- <target name="compile-jsps" depends="compile" if="do.compile.jsps" description="Test compile JSP pages to expose compilation errors.">
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspC" fork="true" failonerror="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir.real}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <classpath path="${java.home}/../lib/tools.jar:${copyfiles.classpath}:${jspcompilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac srcdir="${build.generated.dir}/src" destdir="${build.generated.dir}/classes" classpath="${j2ee.platform.classpath}:${build.classes.dir.real}:${jspcompilation.classpath}"/>
- </target>
- <target name="-do-compile-single-jsp" depends="compile" if="jsp.includes">
- <fail unless="javac.jsp.includes">Must select some files in the IDE or set javac.jsp.includes</fail>
- <mkdir dir="${build.generated.dir}/src"/>
- <java classname="org.netbeans.modules.web.project.ant.JspCSingle" fork="true" failonerror="true">
- <arg value="-uriroot"/>
- <arg file="${basedir}/${build.web.dir.real}"/>
- <arg value="-d"/>
- <arg file="${basedir}/${build.generated.dir}/src"/>
- <arg value="-die1"/>
- <arg value="-jspc.files"/>
- <arg path="${jsp.includes}"/>
- <classpath path="${java.home}/../lib/tools.jar:${copyfiles.classpath}:${jspcompilation.classpath}"/>
- </java>
- <mkdir dir="${build.generated.dir}/classes"/>
- <webproject2:javac srcdir="${build.generated.dir}/src" destdir="${build.generated.dir}/classes" classpath="${j2ee.platform.classpath}:${build.classes.dir.real}:${jspcompilation.classpath}">
- <customize>
- <patternset includes="${javac.jsp.includes}"/>
- </customize>
- </webproject2:javac>
- </target>
- <target name="compile-single-jsp">
- <fail unless="jsp.includes">Must select a file in the IDE or set jsp.includes</fail>
- <antcall target="-do-compile-single-jsp"/>
- </target>
- <!--
- DIST BUILDING SECTION
- -->
- <target name="-pre-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-dist-without-manifest" if="do.war.package.without.custom.manifest" depends="init,compile,compile-jsps,-pre-dist">
- <dirname property="dist.jar.dir" file="${dist.war}"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar jarfile="${dist.war}" compress="${jar.compress}">
- <fileset dir="${build.web.dir.real}"/>
- </jar>
- </target>
- <target name="-do-dist-with-manifest" if="do.war.package.with.custom.manifest" depends="init,compile,compile-jsps,-pre-dist">
- <dirname property="dist.jar.dir" file="${dist.war}"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar manifest="${build.meta.inf.dir}/MANIFEST.MF" jarfile="${dist.war}" compress="${jar.compress}">
- <fileset dir="${build.web.dir.real}"/>
- </jar>
- </target>
- <target name="do-dist" depends="init,compile,compile-jsps,-pre-dist,-do-dist-with-manifest,-do-dist-without-manifest"/>
- <target name="library-inclusion-in-manifest" depends="init" if="dist.ear.dir">
- <basename property="included.lib.reference.EntApp-ejb.dist" file="${reference.EntApp-ejb.dist}"/>
- <copy-ear-war file="${reference.EntApp-ejb.dist}" propname="included.lib.reference.EntApp-ejb.dist.X"/>
- <mkdir dir="${build.web.dir.real}/META-INF"/>
- <manifest file="${build.web.dir.real}/META-INF/MANIFEST.MF" mode="update">
- <attribute name="Class-Path" value="${included.lib.reference.EntApp-ejb.dist} "/>
- </manifest>
- <delete dir="${dist.ear.dir}/temp"/>
- </target>
- <target name="library-inclusion-in-archive" depends="init" unless="dist.ear.dir">
- <copy file="${reference.EntApp-ejb.dist}" todir="${build.web.dir.real}/WEB-INF/lib"/>
- </target>
- <target name="do-ear-dist" depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest">
- <dirname property="dist.jar.dir" file="${dist.ear.war}"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar jarfile="${dist.ear.war}" compress="${jar.compress}" manifest="${build.web.dir.real}/META-INF/MANIFEST.MF">
- <fileset dir="${build.web.dir.real}"/>
- </jar>
- </target>
- <target name="-post-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="dist" depends="init,compile,-pre-dist,do-dist,-post-dist" description="Build distribution (WAR)."/>
- <target name="dist-ear" depends="init,compile,-pre-dist,do-ear-dist,-post-dist" description="Build distribution (WAR) to be packaged into an EAR."/>
- <!--
- EXECUTION SECTION
- -->
- <target name="run" depends="run-deploy,run-display-browser" description="Deploy to server and show in browser."/>
- <target name="-pre-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-post-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-pre-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
- </target>
- <target name="-post-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
- </target>
- <target name="-run-deploy-am">
- <!-- Task to deploy to the Access Manager runtime. -->
- </target>
- <target name="run-deploy" depends="init,compile,compile-jsps,-do-compile-single-jsp,dist,-pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,-post-run-deploy"/>
- <target name="-run-deploy-nb" if="netbeans.home">
- <nbdeploy debugmode="false" clientUrlPart="${client.urlPart}" forceRedeploy="${forceRedeploy}"/>
- </target>
- <target name="-init-deploy-ant" unless="netbeans.home">
- <property name="deploy.ant.archive" value="${dist.war}"/>
- <property name="deploy.ant.docbase.dir" value="${web.docbase.dir}"/>
- <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
- <property name="deploy.ant.enabled" value="true"/>
- </target>
- <target name="run-undeploy" depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant"/>
- <target name="-run-undeploy-nb" if="netbeans.home">
- <fail message="Undeploy is not supported from within the IDE"/>
- </target>
- <target name="verify" depends="init,dist">
- <nbverify file="${dist.war}"/>
- </target>
- <target name="run-display-browser" depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl"/>
- <target name="-init-display-browser" if="do.display.browser">
- <condition property="do.display.browser.nb">
- <isset property="netbeans.home"/>
- </condition>
- <condition property="do.display.browser.cl">
- <isset property="deploy.ant.enabled"/>
- </condition>
- </target>
- <target name="-display-browser-nb" if="do.display.browser.nb">
- <nbbrowse url="${client.url}"/>
- </target>
- <target name="-get-browser" if="do.display.browser.cl" unless="browser">
- <condition property="browser" value="rundll32">
- <os family="windows"/>
- </condition>
- <condition property="browser.args" value="url.dll,FileProtocolHandler" else="">
- <os family="windows"/>
- </condition>
- <condition property="browser" value="/usr/bin/open">
- <os family="mac"/>
- </condition>
- <property environment="env"/>
- <condition property="browser" value="${env.BROWSER}">
- <isset property="env.BROWSER"/>
- </condition>
- <condition property="browser" value="/usr/bin/firefox">
- <available file="/usr/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/local/firefox/firefox">
- <available file="/usr/local/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/usr/bin/mozilla">
- <available file="/usr/bin/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/local/mozilla/mozilla">
- <available file="/usr/local/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
- <available file="/usr/sfw/lib/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/firefox">
- <available file="/opt/csw/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
- <available file="/usr/sfw/lib/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/mozilla">
- <available file="/opt/csw/bin/mozilla"/>
- </condition>
- </target>
- <target name="-display-browser-cl" depends="-get-browser" if="do.display.browser.cl">
- <fail unless="browser">
- Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
- </fail>
- <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
- <echo>Launching ${browse.url}</echo>
- <exec executable="${browser}" spawn="true">
- <arg line="${browser.args} ${browse.url}"/>
- </exec>
- </target>
- <target name="run-main" depends="init,compile-single">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <webproject1:java classname="${run.class}"/>
- </target>
- <target name="test-restbeans" depends="run-deploy,-init-display-browser">
- <replace file="${restbeans.test.file}" token="${base.url.token}" value="${client.url}"/>
- <nbbrowse url="${restbeans.test.url}"/>
- </target>
- <!--
- DEBUGGING SECTION
- -->
- <target name="debug" description="Debug project in IDE." depends="init,compile,compile-jsps,-do-compile-single-jsp,dist" if="netbeans.home">
- <nbdeploy debugmode="true" clientUrlPart="${client.urlPart}"/>
- <antcall target="connect-debugger"/>
- <antcall target="debug-display-browser"/>
- </target>
- <target name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect name="${name}" host="${jpda.host}" address="${jpda.address}" transport="${jpda.transport}">
- <classpath>
- <path path="${debug.classpath}:${ws.debug.classpaths}"/>
- </classpath>
- <sourcepath>
- <path path="${web.docbase.dir}:${ws.web.docbase.dirs}"/>
- </sourcepath>
- </nbjpdaconnect>
- </target>
- <target name="debug-display-browser" if="do.display.browser">
- <nbbrowse url="${client.url}"/>
- </target>
- <target name="debug-single" if="netbeans.home" depends="init,compile,compile-jsps,-do-compile-single-jsp,debug"/>
- <target name="-debug-start-debugger" if="netbeans.home" depends="init">
- <webproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target name="-debug-start-debuggee-single" if="netbeans.home" depends="init,compile-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <webproject1:debug classname="${debug.class}"/>
- </target>
- <target name="debug-single-main" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single"/>
- <target name="-pre-debug-fix" depends="init">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target name="-do-debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,compile-single">
- <webproject1:nbjpdareload/>
- </target>
- <target name="debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix"/>
- <!--
- JAVADOC SECTION
- -->
- <target name="javadoc-build" depends="init">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true">
- <classpath>
- <path path="${javac.classpath}:${j2ee.platform.classpath}"/>
- </classpath>
- <sourcepath>
- <pathelement location="${src.dir}"/>
- </sourcepath>
- <packageset dir="${src.dir}" includes="*/**"/>
- <fileset dir="${src.dir}" includes="*.java"/>
- </javadoc>
- </target>
- <target name="javadoc-browse" if="netbeans.home" unless="no.javadoc.preview" depends="init,javadoc-build">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target name="javadoc" depends="init,javadoc-build,javadoc-browse" description="Build Javadoc."/>
- <!--
-
- JUNIT COMPILATION SECTION
- -->
- <target name="-pre-pre-compile-test" if="have.tests" depends="init,compile">
- <mkdir dir="${build.test.classes.dir}"/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-compile-test" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test">
- <webproject2:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}:${j2ee.platform.classpath}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="**/*.java"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile-test" depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-compile-test-single" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <webproject2:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}:${j2ee.platform.classpath}">
- <customize>
- <patternset includes="${javac.includes}"/>
- </customize>
- </webproject2:javac>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="**/*.java"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile-test-single" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single"/>
- <!--
-
- JUNIT EXECUTION SECTION
- -->
- <target name="-pre-test-run" if="have.tests" depends="init">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target name="-do-test-run" if="have.tests" depends="init,compile-test,-pre-test-run">
- <webproject2:junit/>
- </target>
- <target name="-post-test-run" if="have.tests" depends="init,compile-test,-pre-test-run,-do-test-run">
- <fail if="tests.failed">Some tests failed; see details above.</fail>
- </target>
- <target name="test-report" if="have.tests" depends="init"/>
- <target name="-test-browse" if="netbeans.home+have.tests" depends="init"/>
- <target name="test" depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests."/>
- <target name="-pre-test-run-single" if="have.tests" depends="init">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target name="-do-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <webproject2:junit includes="${test.includes}"/>
- </target>
- <target name="-post-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single">
- <fail if="tests.failed">Some tests failed; see details above.</fail>
- </target>
- <target name="test-single" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test."/>
- <!--
-
- JUNIT DEBUGGING SECTION
- -->
- <target name="-debug-start-debuggee-test" if="have.tests" depends="init,compile-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <webproject1:debug classname="junit.textui.TestRunner" classpath="${debug.test.classpath}" args="${test.class}"/>
- </target>
- <target name="-debug-start-debugger-test" if="netbeans.home+have.tests" depends="init,compile-test">
- <webproject1:nbjpdastart name="${test.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target name="debug-test" depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test"/>
- <target name="-do-debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,compile-test-single">
- <webproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target name="debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix-test"/>
- <!--
-
- CLEANUP SECTION
- -->
- <target name="deps-clean" depends="init" if="no.dist.ear.dir" unless="no.deps">
- <ant target="clean" inheritall="false" antfile="${project.EntApp-ejb}/build.xml"/>
- </target>
- <target name="do-clean" depends="init">
- <condition value="${build.web.dir.real}" property="build.dir.to.clean">
- <isset property="dist.ear.dir"/>
- </condition>
- <property value="${build.web.dir.real}" name="build.dir.to.clean"/>
- <delete includeEmptyDirs="true" quiet="true">
- <fileset dir="${build.dir.to.clean}/WEB-INF/lib"/>
- </delete>
- <delete dir="${build.dir}"/>
- <available file="${build.dir.to.clean}/WEB-INF/lib" type="dir" property="status.clean-failed"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target name="check-clean" depends="do-clean" if="status.clean-failed">
- <echo message="Warning: unable to delete some files in ${build.web.dir.real}/WEB-INF/lib - they are probably locked by the J2EE server. "/>
- <echo level="info" message="To delete all files undeploy the module from Server Registry in Runtime tab and then use Clean again."/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="clean" depends="init,deps-clean,do-clean,check-clean,-post-clean" description="Clean build products."/>
- <target name="clean-ear" depends="clean" description="Clean build products."/>
-</project>
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 c812bbe..0000000
--- 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 2bfa333..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<jax-ws xmlns="http://www.netbeans.org/ns/jax-ws/1">
- <services>
- <service name="HelloWeb">
- <implementation-class>entapp.web.HelloWeb</implementation-class>
- </service>
- </services>
- <clients/>
-</jax-ws>
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 9af888c..0000000
--- 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 bc91159..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>
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 c6c1769..0000000
--- 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 4392f3a..0000000
--- 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.web.project</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/web-project/3">
- <name>EntApp-war</name>
- <minimum-ant-version>1.6</minimum-ant-version>
- <web-module-libraries>
- <library files="1">
- <file>${reference.EntApp-ejb.dist}</file>
- <path-in-war>WEB-INF/lib</path-in-war>
- </library>
- </web-module-libraries>
- <web-module-additional-libraries/>
- <source-roots>
- <root id="src.dir" name="Source Packages"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir" name="Test Packages"/>
- </test-roots>
- </data>
- <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
- <reference>
- <foreign-project>EntApp-ejb</foreign-project>
- <artifact-type>jar</artifact-type>
- <script>build.xml</script>
- <target>dist</target>
- <clean-target>clean</clean-target>
- <id>dist</id>
- </reference>
- </references>
- </configuration>
-</project>
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 cb08385..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/ant-deploy.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project default="-deploy-ant" basedir=".">
- <target name="-init-cl-deployment-env" if="deploy.ant.enabled">
- <property file="${deploy.ant.properties.file}" />
- <available file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" property="sun.web.present"/>
- <available file="${deploy.ant.resource.dir}" property="has.setup"/>
- <tempfile prefix="sjsas" property="sjsas.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
- <echo message="AS_ADMIN_PASSWORD=${sjsas.password}" file="${sjsas.password.file}"/>
- </target>
-
- <target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
- <tempfile prefix="sjsas" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
- <copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
- <!-- The doctype triggers resolution which can fail -->
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<!DOCTYPE]]></replacetoken>
- <replacevalue><![CDATA[<!-- <!DOCTYPE]]></replacevalue>
- </replace>
- <replace file="${temp.sun.web}">
- <replacetoken><![CDATA[<sun-web-app]]></replacetoken>
- <replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
- </replace>
- <xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
- <delete file="${temp.sun.web}"/>
- <property name="deploy.ant.client.url" value="${sjsas.url}${sun-web-app.context-root}"/>
- </target>
- <target name="-add-resources" depends="-init-cl-deployment-env" if="has.setup">
- <tempfile prefix="sjsas" property="sjsas.resources.dir" destdir="${java.io.tmpdir}"/>
- <mkdir dir="${sjsas.resources.dir}"/>
- <mkdir dir="${sjsas.resources.dir}/META-INF"/>
- <property name="sjsas.resources.file" value="${sjsas.resources.dir}/META-INF/sun-resources.xml"/>
- <property name="lefty" value="<"/>
-
- <property name="righty" value=">"/>
- <concat destfile="${sjsas.resources.file}">${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}
- </concat>
- <concat append="true" destfile="${sjsas.resources.file}">
- <fileset dir="${deploy.ant.resource.dir}"/>
- </concat>
- <replace file="${sjsas.resources.file}" value="">
- <replacetoken><![CDATA[</resources>
-<?xml version="1.0" encoding="UTF-8"?>
-<resources>]]></replacetoken>
- </replace>
- <replace file="${sjsas.resources.file}" value="">
- <replacetoken><![CDATA[</resources>
- <?xml version="1.0" encoding="UTF-8"?>
-<resources>]]></replacetoken>
- </replace>
- <replace file="${sjsas.resources.file}" value="">
- <replacetoken><![CDATA[transaction-isolation-level="JDBC Driver Default"]]></replacetoken>
- </replace>
- <!-- work-around 434 and its variants -->
- <replace file="${sjsas.resources.file}" value="">
- <replacetoken><![CDATA[<description/>]]></replacetoken>
- </replace>
- <!-- do the right thing for Topics and Queues.
- Need fix for TopicConnectionFactory and QueueConnectionfactory -->
- <replace file="${sjsas.resources.file}">
- <replacetoken><![CDATA[<jms-resource ]]></replacetoken>
- <replacevalue><![CDATA[<admin-object-resource res-adapter="jmsra" ]]></replacevalue>
- </replace>
- <replace file="${sjsas.resources.file}">
- <replacetoken><![CDATA[</jms-resource>]]></replacetoken>
- <replacevalue><![CDATA[</admin-object-resource>]]></replacevalue>
- </replace>
- <jar destfile="${deploy.ant.archive}" update="true">
- <fileset dir="${sjsas.resources.dir}"/>
- </jar>
- <delete dir="${sjsas.resources.dir}"/>
- </target>
- <target name="-deploy-ant" depends="-parse-sun-web,-add-resources" if="deploy.ant.enabled">
- <echo message="Deploying ${deploy.ant.archive}"/>
- <taskdef name="sun-appserv-deploy" classname="org.apache.tools.ant.taskdefs.optional.sun.appserv.DeployTask"
- classpath="${sjsas.root}/lib/sun-appserv-ant.jar" />
- <sun-appserv-deploy user="${sjsas.username}"
- passwordfile="${sjsas.password.file}"
- host="${sjsas.host}" port="${sjsas.port}"
- file="${deploy.ant.archive}" asinstalldir="${sjsas.root}"/>
- <delete file="${sjsas.password.file}"/>
- </target>
- <target name="-undeploy-ant" depends="-init-cl-deployment-env" if="deploy.ant.enabled">
- <taskdef name="sun-appserv-undeploy" classname="org.apache.tools.ant.taskdefs.optional.sun.appserv.UndeployTask"
- classpath="${sjsas.root}/lib/sun-appserv-ant.jar" />
- <sun-appserv-undeploy user="${sjsas.username}"
- passwordfile="${sjsas.password.file}"
- host="${sjsas.host}" port="${sjsas.port}"
- file="${deploy.ant.archive}" asinstalldir="${sjsas.root}"/>
- <delete file="${sjsas.password.file}"/>
- </target>
-</project>
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 6917e5b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/build-impl.xml
+++ /dev/null
@@ -1,375 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT ***
-*** EDIT ../build.xml INSTEAD ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
- - initialization
- - compilation
- - dist
- - execution
- - debugging
- - cleanup
-
--->
-<project name="EntApp-impl" default="build" basedir=".." xmlns:ear2="http://www.netbeans.org/ns/j2ee-earproject/2">
- <import file="ant-deploy.xml"/>
- <target name="default" depends="dist" description="Build whole project."/>
- <!--
- INITIALIZATION SECTION
- -->
- <target name="pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="init-private" depends="pre-init">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target name="init-userdir" depends="pre-init,init-private">
- <property name="user.properties.file" location="${netbeans.user}/build.properties"/>
- </target>
- <target name="init-user" depends="pre-init,init-private,init-userdir">
- <property file="${user.properties.file}"/>
- </target>
- <target name="init-project" depends="pre-init,init-private,init-userdir,init-user">
- <property file="nbproject/project.properties"/>
- </target>
- <target name="do-init" depends="pre-init,init-private,init-userdir,init-user,init-project">
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- <condition property="do.compile.jsps">
- <istrue value="${compile.jsps}"/>
- </condition>
- <condition property="do.display.browser">
- <and>
- <istrue value="${display.browser}"/>
- <contains string="${client.module.uri}" substring=".war"/>
- </and>
- </condition>
- <available property="has.custom.manifest" file="${meta.inf}/MANIFEST.MF"/>
- <condition property="j2ee.appclient.mainclass.tool.param" value="-mainclass ${main.class}" else="">
- <and>
- <isset property="main.class"/>
- <not>
- <equals arg1="${main.class}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <condition property="j2ee.appclient.jvmoptions.param" value="${j2ee.appclient.jvmoptions}" else="">
- <and>
- <isset property="j2ee.appclient.jvmoptions"/>
- <not>
- <equals arg1="${j2ee.appclient.jvmoptions}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <condition property="application.args.param" value="${application.args}" else="">
- <and>
- <isset property="application.args"/>
- <not>
- <equals arg1="${application.args}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <condition property="can.debug.appclient">
- <and>
- <isset property="netbeans.home"/>
- <isset property="app.client"/>
- </and>
- </condition>
- </target>
- <target name="post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="init-check" depends="pre-init,init-private,init-userdir,init-user,init-project,do-init">
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="build.generated.dir">Must set build.generated.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.jar">Must set dist.jar</fail>
- </target>
- <target name="init" depends="pre-init,init-private,init-userdir,init-user,init-project,do-init,post-init,init-check"/>
- <!--
- COMPILATION SECTION
- -->
- <target name="deps-jar" depends="init" unless="no.deps"/>
- <target name="deps-j2ee-archive" depends="init" unless="no.deps">
- <ant target="dist-ear" inheritall="false" antfile="${project.EntApp-ejb}/build.xml">
- <property name="dist.ear.dir" location="${build.dir}"/>
- </ant>
- <ant target="dist-ear" inheritall="false" antfile="${project.EntApp-war}/build.xml">
- <property name="dist.ear.dir" location="${build.dir}"/>
- </ant>
- </target>
- <target name="pre-pre-compile" depends="init,deps-jar,deps-j2ee-archive"/>
- <target name="pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="do-compile" depends="init,deps-jar,pre-pre-compile,pre-compile">
- <copy todir="${build.dir}/META-INF">
- <fileset dir="${meta.inf}"/>
- </copy>
- <copy file="${reference.EntApp-ejb.dist-ear}" todir="${build.dir}//"/>
- <copy file="${reference.EntApp-war.dist-ear}" todir="${build.dir}//"/>
- </target>
- <target name="post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile" depends="init,deps-jar,pre-pre-compile,pre-compile,do-compile,post-compile" description="Compile project."/>
- <!--
- DIST BUILDING SECTION
- -->
- <target name="pre-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="do-dist-without-manifest" depends="init,compile,pre-dist" unless="has.custom.manifest">
- <dirname property="dist.jar.dir" file="${dist.jar}"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar jarfile="${dist.jar}" compress="${jar.compress}">
- <fileset dir="${build.dir}"/>
- </jar>
- </target>
- <target name="do-dist-with-manifest" depends="init,compile,pre-dist" if="has.custom.manifest">
- <dirname property="dist.jar.dir" file="${dist.jar}"/>
- <mkdir dir="${dist.jar.dir}"/>
- <jar jarfile="${dist.jar}" compress="${jar.compress}" manifest="${meta.inf}/MANIFEST.MF">
- <fileset dir="${build.dir}"/>
- </jar>
- </target>
- <target name="post-dist">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="dist" depends="init,compile,pre-dist,do-dist-without-manifest,do-dist-with-manifest,post-dist" description="Build distribution (JAR)."/>
- <!--
- EXECUTION SECTION
- -->
- <target name="run" depends="run-deploy,run-display-browser,run-ac" description="Deploy to server."/>
- <target name="pre-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="post-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-pre-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -pre-run-deploy task instead. -->
- </target>
- <target name="-post-nbmodule-run-deploy">
- <!-- Empty placeholder for easier customization. -->
- <!-- This target can be overriden by NetBeans modules. Don't override it directly, use -post-run-deploy task instead. -->
- </target>
- <target name="-run-deploy-am" unless="no.deps">
- <!-- Task to deploy to the Access Manager runtime. -->
- <ant target="-run-deploy-am" inheritall="false" antfile="${project.EntApp-ejb}/build.xml"/>
- <ant target="-run-deploy-am" inheritall="false" antfile="${project.EntApp-war}/build.xml"/>
- </target>
- <target name="run-deploy" depends="dist,pre-run-deploy,-pre-nbmodule-run-deploy,-run-deploy-nb,-init-deploy-ant,-deploy-ant,-run-deploy-am,-post-nbmodule-run-deploy,post-run-deploy"/>
- <target name="-run-deploy-nb" if="netbeans.home">
- <nbdeploy debugmode="false" forceRedeploy="${forceRedeploy}" clientUrlPart="${client.urlPart}" clientModuleUri="${client.module.uri}"/>
- </target>
- <target name="-init-deploy-ant" unless="netbeans.home">
- <property name="deploy.ant.archive" value="${dist.jar}"/>
- <property name="deploy.ant.resource.dir" value="${resource.dir}"/>
- <property name="deploy.ant.enabled" value="true"/>
- </target>
- <target name="run-undeploy" depends="dist,-run-undeploy-nb,-init-deploy-ant,-undeploy-ant"/>
- <target name="-run-undeploy-nb" if="netbeans.home">
- <fail message="Undeploy is not supported from within the IDE"/>
- </target>
- <target name="verify" depends="dist">
- <nbverify file="${dist.jar}"/>
- </target>
- <target name="run-display-browser" depends="run-deploy,-init-display-browser,-display-browser-nb,-display-browser-cl"/>
- <target name="-init-display-browser" if="do.display.browser">
- <condition property="do.display.browser.nb">
- <isset property="netbeans.home"/>
- </condition>
- <condition property="do.display.browser.cl">
- <and>
- <isset property="deploy.ant.enabled"/>
- <isset property="deploy.ant.client.url"/>
- </and>
- </condition>
- </target>
- <target name="-display-browser-nb" if="do.display.browser.nb">
- <nbbrowse url="${client.url}"/>
- </target>
- <target name="-get-browser" if="do.display.browser.cl" unless="browser">
- <condition property="browser" value="rundll32">
- <os family="windows"/>
- </condition>
- <condition property="browser.args" value="url.dll,FileProtocolHandler" else="">
- <os family="windows"/>
- </condition>
- <condition property="browser" value="/usr/bin/open">
- <os family="mac"/>
- </condition>
- <property environment="env"/>
- <condition property="browser" value="${env.BROWSER}">
- <isset property="env.BROWSER"/>
- </condition>
- <condition property="browser" value="/usr/bin/firefox">
- <available file="/usr/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/local/firefox/firefox">
- <available file="/usr/local/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/usr/bin/mozilla">
- <available file="/usr/bin/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/local/mozilla/mozilla">
- <available file="/usr/local/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/firefox/firefox">
- <available file="/usr/sfw/lib/firefox/firefox"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/firefox">
- <available file="/opt/csw/bin/firefox"/>
- </condition>
- <condition property="browser" value="/usr/sfw/lib/mozilla/mozilla">
- <available file="/usr/sfw/lib/mozilla/mozilla"/>
- </condition>
- <condition property="browser" value="/opt/csw/bin/mozilla">
- <available file="/opt/csw/bin/mozilla"/>
- </condition>
- </target>
- <target name="-display-browser-cl" depends="-get-browser" if="do.display.browser.cl">
- <fail unless="browser">
- Browser not found, cannot launch the deployed application. Try to set the BROWSER environment variable.
- </fail>
- <property name="browse.url" value="${deploy.ant.client.url}${client.urlPart}"/>
- <echo>Launching ${browse.url}</echo>
- <exec executable="${browser}" spawn="true">
- <arg line="${browser.args} ${browse.url}"/>
- </exec>
- </target>
- <target name="run-ac" depends="init" if="app.client">
- <antcall target="run-${app.client}"/>
- </target>
- <target name="-as-retrieve-option-workaround" if="j2ee.appclient.mainclass.args" unless="j2ee.clientName">
- <property name="client.jar" value="${dist.dir}/EntAppClient.jar"/>
- <sleep seconds="3"/>
- <copy file="${wa.copy.client.jar.from}/EntApp/EntAppClient.jar" todir="${dist.dir}"/>
- </target>
- <!--
- DEBUGGING SECTION
- -->
- <target name="debug" depends="run-debug,run-display-browser,run-debug-appclient" description="Deploy to server."/>
- <target name="run-debug" description="Debug project in IDE." depends="dist" if="netbeans.home" unless="app.client">
- <nbdeploy debugmode="true" clientUrlPart="${client.urlPart}" clientModuleUri="${client.module.uri}"/>
- <antcall target="connect-debugger"/>
- </target>
- <target name="connect-debugger" unless="is.debugged">
- <nbjpdaconnect name="${name}" host="${jpda.host}" address="${jpda.address}" transport="${jpda.transport}">
- <classpath>
- <path path="${debug.classpath}"/>
- </classpath>
- <sourcepath>
- <path path="${ear.docbase.dirs}"/>
- </sourcepath>
- </nbjpdaconnect>
- </target>
- <target name="-init-debug-args">
- <property name="version-output" value="java version "${ant.java.version}"/>
- <condition property="have-jdk-older-than-1.4">
- <or>
- <contains string="${version-output}" substring="java version "1.0"/>
- <contains string="${version-output}" substring="java version "1.1"/>
- <contains string="${version-output}" substring="java version "1.2"/>
- <contains string="${version-output}" substring="java version "1.3"/>
- </or>
- </condition>
- <condition property="debug-args-line" value="-Xdebug -Xnoagent -Djava.compiler=none" else="-Xdebug">
- <istrue value="${have-jdk-older-than-1.4}"/>
- </condition>
- </target>
- <target name="run-debug-appclient" depends="init,-init-debug-args" if="can.debug.appclient">
- <macrodef name="debug-appclient" uri="http://www.netbeans.org/ns/j2ee-earproject/2">
- <attribute name="mainclass"/>
- <attribute name="classpath" default="${debug.classpath}"/>
- <element name="customize" optional="true"/>
- <attribute name="args" default="${application.args.param}"/>
- <sequential>
- <parallel>
- <java fork="true" classname="@{mainclass}">
- <jvmarg line="${j2ee.appclient.tool.jvmoptions}"/>
- <jvmarg line="${debug-args-line}"/>
- <jvmarg value="-Xrunjdwp:transport=${jpda.transport},server=y,address=${jpda.address},suspend=y"/>
- <jvmarg line="${j2ee.appclient.jvmoptions.param}"/>
- <arg line="@{args}"/>
- <classpath>
- <path path="${j2ee.platform.classpath}:${j2ee.appclient.tool.runtime}"/>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper type="glob" from="run-sys-prop.*" to="*"/>
- </syspropertyset>
- <customize/>
- </java>
- <nbjpdaconnect name="${name}" host="${jpda.host}" address="${jpda.address}" transport="${jpda.transport}">
- <classpath>
- <path path="${j2ee.platform.classpath}:${j2ee.appclient.tool.runtime}"/>
- <path path="@{classpath}"/>
- </classpath>
- <sourcepath>
- <path path="${src.dir}"/>
- </sourcepath>
- </nbjpdaconnect>
- </parallel>
- </sequential>
- </macrodef>
- <nbdeploy debugmode="false" clientUrlPart="${client.urlPart}" clientModuleUri="${client.module.uri}"/>
- <antcall target="debug-${app.client}"/>
- </target>
- <!--
- CLEANUP SECTION
- -->
- <target name="deps-clean" depends="init" unless="no.deps">
- <ant target="clean-ear" inheritall="false" antfile="${project.EntApp-ejb}/build.xml">
- <property name="dist.ear.dir" location="${build.dir}"/>
- </ant>
- <ant target="clean-ear" inheritall="false" antfile="${project.EntApp-war}/build.xml">
- <property name="dist.ear.dir" location="${build.dir}"/>
- </ant>
- </target>
- <target name="do-clean" depends="init">
- <delete dir="${build.dir}"/>
- <delete dir="${dist.dir}"/>
- <delete dir="${build.dir}"/>
- </target>
- <target name="post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="clean" depends="init,deps-clean,do-clean,post-clean" description="Clean build products."/>
-</project>
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 9c84b25..0000000
--- 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 13b860e..0000000
--- 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 038980a..0000000
--- 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 710ca1e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/project.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.j2ee.earproject</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/j2ee-earproject/2">
- <name>EntApp</name>
- <minimum-ant-version>1.6</minimum-ant-version>
- <web-module-libraries/>
- <web-module-additional-libraries>
- <library files="1">
- <file>${reference.EntApp-ejb.dist-ear}</file>
- <path-in-war>/</path-in-war>
- </library>
- <library files="1">
- <file>${reference.EntApp-war.dist-ear}</file>
- <path-in-war>/</path-in-war>
- </library>
- </web-module-additional-libraries>
- </data>
- <references xmlns="http://www.netbeans.org/ns/ant-project-references/1">
- <reference>
- <foreign-project>EntApp-ejb</foreign-project>
- <artifact-type>j2ee_ear_archive</artifact-type>
- <script>build.xml</script>
- <target>dist-ear</target>
- <clean-target>clean-ear</clean-target>
- <id>dist-ear</id>
- </reference>
- <reference>
- <foreign-project>EntApp-war</foreign-project>
- <artifact-type>j2ee_ear_archive</artifact-type>
- <script>build.xml</script>
- <target>dist-ear</target>
- <clean-target>clean-ear</clean-target>
- <id>dist-ear</id>
- </reference>
- </references>
- </configuration>
-</project>
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 1dfb07e..8fc4607 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 @@
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 bb98f0f..f52e674 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/CalculatorService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/CalculatorService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${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"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- <antcall target="configure-webservice-management"/>
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.applications.web-module.${appname}-web.web-service-endpoint.Calculator.jbi-enabled=false"/>
- </antcall>
- <antcall target="deploy-jbi-component-su"/>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <antcall target="undeploy-jbi-component-su"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client/webservice/CalculatorService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client/webservice/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ <antcall target="configure-webservice-management" />
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="set" />
+ <param name="operand.props"
+ value="server.applications.web-module.${appname}-web.web-service-endpoint.Calculator.jbi-enabled=false"
+ />
+ </antcall>
+ <antcall target="deploy-jbi-component-su" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ <antcall target="undeploy-jbi-component-su" />
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
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 d251b75..5d79bbd 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/CalculatorService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/CalculatorService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${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"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- <!--<antcall target="configure-webservice-management"/>
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.applications.web-module.${appname}-web.web-service-endpoint.Calculator.jbi-enabled=false"/>
- </antcall>
- <antcall target="deploy-jbi-component-su"/>-->
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <!--<antcall target="undeploy-jbi-component-su"/>-->
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client/webservice/CalculatorService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client/webservice/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
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 157e540..140bbee 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;
- <target name="all" depends="clean, setup-server, setup-client, deploy-provider-su, deploy-consumer-su, runtest, cleanup-client, cleanup-server"/>
+ <target name="all"
+ depends="clean, setup-server, setup-client, deploy-provider-su, deploy-consumer-su, runtest, cleanup-client, cleanup-server"
+ />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-server" depends="assemble-web, deploy-app, start-consumer-jms-binding"/>
+ <target name="setup-server" depends="assemble-web, deploy-app, start-consumer-jms-binding" />
- <target name="setup-client" depends="assemble-client,deploy-client, start-provider-jms-binding"/>
+ <target name="setup-client" depends="assemble-client,deploy-client, start-provider-jms-binding" />
- <target name="cleanup-server" depends="undeploy-app, undeploy-consumer-su,stop-consumer-jms-binding"/>
- <target name="cleanup-client" depends="undeploy-client, undeploy-provider-su,stop-provider-jms-binding"/>
+ <target name="cleanup-server"
+ depends="undeploy-app, undeploy-consumer-su,stop-consumer-jms-binding"
+ />
+ <target name="cleanup-client"
+ depends="undeploy-client, undeploy-provider-su,stop-provider-jms-binding"
+ />
- <target name="assemble-web" depends="init-common, compile">
- <echo message="Assembling web service module"/>
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <echo message="Assembling web service module" />
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="provider/endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="provider/endpoint" />
+ </antcall>
+ </target>
- <target name="deploy-app">
- <echo message="Deploying the web service"/>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <echo message="Deploying the web service" />
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
- <target name="deploy-consumer-su" depends="init-common">
- <echo message="Creating QueueConnectionFactory for JMS Binding acting as a web service consumer"/>
- <antcall target="create-jms-connection-factory">
- <param name="jms.cf.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <antcall target="create-jms-resource">
- <param name="domain.admin.port" value="${admin.port}"/>
- <param name="jms.res.type" value="${QueueConnectionFactory}"/>
- <param name="jms.res.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <echo message="deploying JMS Binding's consumer deployment "/>
- <antcall target="deploy-jbi-component-su">
- <param name="jbi-component-su-assembly" value="${jms-consumer-assembly}"/>
- <param name="jbi-component-su" value="${jms-consumer-su}"/>
- <param name="jbi-component-su-dir" value="${jms-consumer-su-dir}"/>
- </antcall>
- </target>
+ <target name="deploy-consumer-su" depends="init-common">
+ <echo message="Creating QueueConnectionFactory for JMS Binding acting as a web service consumer"
+ />
+ <antcall target="create-jms-connection-factory">
+ <param name="jms.cf.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <antcall target="create-jms-resource">
+ <param name="domain.admin.port" value="${admin.port}" />
+ <param name="jms.res.type" value="${QueueConnectionFactory}" />
+ <param name="jms.res.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <echo message="deploying JMS Binding's consumer deployment " />
+ <antcall target="deploy-jbi-component-su">
+ <param name="jbi-component-su-assembly" value="${jms-consumer-assembly}" />
+ <param name="jbi-component-su" value="${jms-consumer-su}" />
+ <param name="jbi-component-su-dir" value="${jms-consumer-su-dir}" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <echo message="Assembling web client"/>
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client/CalculatorServicei?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client/CalculatorService?WSDL"/>
- </antcall>
- <javac srcdir="consumer" destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${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"
- includes="webclient/**"/>
- <copy file="./consumer/client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./consumer/client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <echo message="Assembling web client" />
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/jsr208-integration-web-client/CalculatorServicei?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/jsr208-integration-web-client/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="consumer"
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./consumer/client-web.xml"
+ tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"
+ />
+ <copy file="./consumer/client-sun-web.xml"
+ tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"
+ />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <echo message="Deploying the client application"/>
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--port ${domain2.admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <echo message="Deploying the client application" />
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--port ${domain2.admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="deploy-provider-su" depends="init-common">
- <echo message="Creating physical destinations - queues : - provideroutgoingqueue and temporary_queue"/>
- <antcall target="create-physical-queue">
- <param name="queue.name" value="provideroutgoingqueue"/>
- </antcall>
- <antcall target="create-physical-queue">
- <param name="queue.name" value="temporary_queue"/>
- </antcall>
- <echo message="Create QueueConnectionFactory for JMS Binding which is acting as a provider"/>
- <antcall target="create-jms-connection-factory">
- <param name="jms.cf.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <antcall target="create-jms-resource">
- <param name="domain.admin.port" value="${domain2.admin.port}"/>
- <param name="jms.res.type" value="${QueueConnectionFactory}"/>
- <param name="jms.res.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <echo message="Create JMS resource for provideroutgoingqueue and temporary_queue"/>
- <antcall target="create-jms-queue">
- <param name="jms.queue.name" value="provideroutgoingqueue"/>
- <param name="queue.name" value="provideroutgoingqueue"/>
- </antcall>
- <antcall target="create-jms-queue">
- <param name="jms.queue.name" value="temporary_queue"/>
- <param name="queue.name" value="temporary_queue"/>
- </antcall>
- <echo message="Deploy JMS Binding provider deployment"/>
- <antcall target="deploy-jbi-component-su">
- <param name="jbi-component-su-assembly" value="${jms-provider-assembly}"/>
- <param name="jbi-component-su" value="${jms-provider-su}"/>
- <param name="jbi-component-su-dir" value="${jms-provider-su-dir}"/>
- <param name="jmx.port" value="${domain2.jmx.port}"/>
- </antcall>
- </target>
+ <target name="deploy-provider-su" depends="init-common">
+ <echo message="Creating physical destinations - queues : - provideroutgoingqueue and temporary_queue"
+ />
+ <antcall target="create-physical-queue">
+ <param name="queue.name" value="provideroutgoingqueue" />
+ </antcall>
+ <antcall target="create-physical-queue">
+ <param name="queue.name" value="temporary_queue" />
+ </antcall>
+ <echo message="Create QueueConnectionFactory for JMS Binding which is acting as a provider" />
+ <antcall target="create-jms-connection-factory">
+ <param name="jms.cf.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <antcall target="create-jms-resource">
+ <param name="domain.admin.port" value="${domain2.admin.port}" />
+ <param name="jms.res.type" value="${QueueConnectionFactory}" />
+ <param name="jms.res.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <echo message="Create JMS resource for provideroutgoingqueue and temporary_queue" />
+ <antcall target="create-jms-queue">
+ <param name="jms.queue.name" value="provideroutgoingqueue" />
+ <param name="queue.name" value="provideroutgoingqueue" />
+ </antcall>
+ <antcall target="create-jms-queue">
+ <param name="jms.queue.name" value="temporary_queue" />
+ <param name="queue.name" value="temporary_queue" />
+ </antcall>
+ <echo message="Deploy JMS Binding provider deployment" />
+ <antcall target="deploy-jbi-component-su">
+ <param name="jbi-component-su-assembly" value="${jms-provider-assembly}" />
+ <param name="jbi-component-su" value="${jms-provider-su}" />
+ <param name="jbi-component-su-dir" value="${jms-provider-su-dir}" />
+ <param name="jmx.port" value="${domain2.jmx.port}" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <echo message="Undeploying client application"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${domain2.admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <echo message="Undeploying client application" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${domain2.admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <target name="undeploy-app" depends="init-common">
- <echo message="Undeploying web service"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-web"/>
- </exec>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <echo message="Undeploying web service" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-web" />
+ </exec>
+ </target>
- <target name="runtest" depends="init-common">
- <echo message="Running the test client"/>
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="consumer/client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${domain2.instance.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
+ <target name="runtest" depends="init-common">
+ <echo message="Running the test client" />
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="consumer/client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${domain2.instance.port}/wsclient/webclient/RequestProcessor"
+ />
+ </java>
+ </target>
- <target name="undeploy-consumer-su" depends="init-common">
- <echo message="Undeploying JMS resource : MyQueueConnectionFactory"/>
- <antcall target="delete-appserver-jms-resource">
- <param name="domain.admin.port" value="${admin.port}"/>
- <param name="jms.res.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <!--<antcall target="delete-jms-resource">
+ <target name="undeploy-consumer-su" depends="init-common">
+ <echo message="Undeploying JMS resource : MyQueueConnectionFactory" />
+ <antcall target="delete-appserver-jms-resource">
+ <param name="domain.admin.port" value="${admin.port}" />
+ <param name="jms.res.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <!--<antcall target="delete-jms-resource">
<param name="jms.resource.name" value="MyQueueConnectionFactory"/>
</antcall>-->
- <echo message="Undeploying JMS Binding consumer deployment"/>
- <antcall target="undeploy-jbi-component-su">
- <param name="jbi-component-su-assembly" value="${jms-consumer-assembly}"/>
- </antcall>
- </target>
+ <echo message="Undeploying JMS Binding consumer deployment" />
+ <antcall target="undeploy-jbi-component-su">
+ <param name="jbi-component-su-assembly" value="${jms-consumer-assembly}" />
+ </antcall>
+ </target>
- <target name="undeploy-provider-su" depends="init-common">
- <echo message="Undeploying JMS Resource :- provideroutgoingqueue and temporary_queue"/>
- <antcall target="delete-jms-resource">
- <param name="jms.resource.name" value="provideroutgoingqueue"/>
- </antcall>
- <antcall target="delete-jms-resource">
- <param name="jms.resource.name" value="temporary_queue"/>
- </antcall>
- <echo message="Undeploying JMS resource : MyQueueConnectionFactory"/>
- <antcall target="delete-appserver-jms-resource">
- <param name="domain.admin.port" value="${domain2.admin.port}"/>
- <param name="jms.res.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <antcall target="delete-jms-resource">
- <param name="jms.resource.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <echo message="Deleting physical queues : provideroutgoingqueue , temporary_queue"/>
- <antcall target="delete-physical-queue">
- <param name="queue.name" value="provideroutgoingqueue"/>
- </antcall>
- <antcall target="delete-physical-queue">
- <param name="queue.name" value="temporary_queue"/>
- </antcall>
- <echo message="Undeploying JMS Binding's provider deployment"/>
- <antcall target="undeploy-jbi-component-su">
- <param name="jbi-component-su-assembly" value="${jms-provider-assembly}"/>
- <param name="jmx.port" value="${domain2.jmx.port}"/>
- </antcall>
- </target>
+ <target name="undeploy-provider-su" depends="init-common">
+ <echo message="Undeploying JMS Resource :- provideroutgoingqueue and temporary_queue" />
+ <antcall target="delete-jms-resource">
+ <param name="jms.resource.name" value="provideroutgoingqueue" />
+ </antcall>
+ <antcall target="delete-jms-resource">
+ <param name="jms.resource.name" value="temporary_queue" />
+ </antcall>
+ <echo message="Undeploying JMS resource : MyQueueConnectionFactory" />
+ <antcall target="delete-appserver-jms-resource">
+ <param name="domain.admin.port" value="${domain2.admin.port}" />
+ <param name="jms.res.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <antcall target="delete-jms-resource">
+ <param name="jms.resource.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <echo message="Deleting physical queues : provideroutgoingqueue , temporary_queue" />
+ <antcall target="delete-physical-queue">
+ <param name="queue.name" value="provideroutgoingqueue" />
+ </antcall>
+ <antcall target="delete-physical-queue">
+ <param name="queue.name" value="temporary_queue" />
+ </antcall>
+ <echo message="Undeploying JMS Binding's provider deployment" />
+ <antcall target="undeploy-jbi-component-su">
+ <param name="jbi-component-su-assembly" value="${jms-provider-assembly}" />
+ <param name="jmx.port" value="${domain2.jmx.port}" />
+ </antcall>
+ </target>
- <target name="create-domain2" depends="init-common">
- <property name="admin.command" value="create-domain"/>
- <property name="operand.props" value="--adminport ${domain2.admin.port} --adminuser admin --passwordfile ${admin.password.file} --instanceport ${domain2.instance.port} --savemasterpassword=true --domainproperties domain.jmxPort=${domain2.jmx.port}:jms.port=${domain2.jms.port}:orb.listner.port=${domain2.orb.listner.port}:http.ssl.port=${domain2.http.ssl.port}:orb.mutualauth.port=${domain2.orb.mutualauth.port} ${domain.name}"/>
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="${admin.command} ${operand.props}" />
+ <target name="create-domain2" depends="init-common">
+ <property name="admin.command" value="create-domain" />
+ <property name="operand.props"
+ value="--adminport ${domain2.admin.port} --adminuser admin --passwordfile ${admin.password.file} --instanceport ${domain2.instance.port} --savemasterpassword=true --domainproperties domain.jmxPort=${domain2.jmx.port}:jms.port=${domain2.jms.port}:orb.listner.port=${domain2.orb.listner.port}:http.ssl.port=${domain2.http.ssl.port}:orb.mutualauth.port=${domain2.orb.mutualauth.port} ${domain.name}"
+ />
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="${admin.command} ${operand.props}" />
</exec>
- </target>
+ </target>
- <target name="start-domain2" depends="init-common">
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="start-domain --user ${admin.user} ${domain.name}"/>
- </exec>
- </target>
+ <target name="start-domain2" depends="init-common">
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="start-domain --user ${admin.user} ${domain.name}" />
+ </exec>
+ </target>
- <target name="create-physical-queue" depends="init-common">
- <exec executable="${env.S1AS_HOME}/imq/bin/imqcmd" failonerror="false">
- <arg line="create dst -n ${queue.name} -t q -u admin -passfile ${broker.password.file} -b localhost:${imq.broker.port}"/>
- </exec>
- </target>
+ <target name="create-physical-queue" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqcmd" failonerror="false">
+ <arg line="create dst -n ${queue.name} -t q -u admin -passfile ${broker.password.file} -b localhost:${imq.broker.port}"
+ />
+ </exec>
+ </target>
- <target name="create-jms-resource" depends="init-common">
- <exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="false">
- <arg line="create-jms-resource --user ${admin.user} --passwordfile ${admin.password.file} --port ${domain.admin.port} --restype ${jms.res.type} ${jms.res.name}"/>
- </exec>
- </target>
- <target name="create-jms-queue" depends="init-common">
- <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="false">
- <arg line="add -l "${jms.queue.name}" -t q -o "imqDestinationName=${queue.name}" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""/>
- </exec>
- </target>
+ <target name="create-jms-resource" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="false">
+ <arg line="create-jms-resource --user ${admin.user} --passwordfile ${admin.password.file} --port ${domain.admin.port} --restype ${jms.res.type} ${jms.res.name}"
+ />
+ </exec>
+ </target>
+ <target name="create-jms-queue" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="false">
+ <arg line="add -l "${jms.queue.name}" -t q -o "imqDestinationName=${queue.name}" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""
+ />
+ </exec>
+ </target>
- <target name="create-jms-connection-factory" depends="init-common">
- <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="true">
- <arg line="add -f -l "${jms.cf.name}" -t qf -o "imqAddressList=mq://localhost:${imq.broker.port}/jms" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""/>
- </exec>
- </target>
+ <target name="create-jms-connection-factory" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="true">
+ <arg line="add -f -l "${jms.cf.name}" -t qf -o "imqAddressList=mq://localhost:${imq.broker.port}/jms" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""
+ />
+ </exec>
+ </target>
- <target name="delete-physical-queue" depends="init-common" >
- <exec executable="${env.S1AS_HOME}/imq/bin/imqcmd" failonerror="false">
- <arg line="destroy dst -f -n ${queue.name} -t q -passfile ${broker.password.file} -u admin -b localhost:${imq.broker.port}" />
- </exec>
- </target>
+ <target name="delete-physical-queue" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqcmd" failonerror="false">
+ <arg line="destroy dst -f -n ${queue.name} -t q -passfile ${broker.password.file} -u admin -b localhost:${imq.broker.port}"
+ />
+ </exec>
+ </target>
- <target name="delete-jms-resource" depends="init-common">
- <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="false">
- <arg line="delete -f -l "${jms.resource.name}" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""/>
- </exec>
- </target>
- <target name="delete-appserver-jms-resource" depends="init-common">
- <exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="false">
- <arg line="delete-jms-resource --user ${admin.user} --passwordfile ${admin.password.file} --port ${domain.admin.port} ${jms.res.name}"/>
- </exec>
- </target>
+ <target name="delete-jms-resource" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="false">
+ <arg line="delete -f -l "${jms.resource.name}" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""
+ />
+ </exec>
+ </target>
+ <target name="delete-appserver-jms-resource" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="false">
+ <arg line="delete-jms-resource --user ${admin.user} --passwordfile ${admin.password.file} --port ${domain.admin.port} ${jms.res.name}"
+ />
+ </exec>
+ </target>
- <target name="delete-domain2" depends="init-common">
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="delete-domain domain2 " />
- </exec>
- </target>
- <target name="stop-provider-jms-binding" depends="init-common">
- <antcall target="stop-binding">
- <param name="jmx.port" value="${domain2.jmx.port}"/>
- <param name="jbi.component.name" value="SunJMSBinding"/>
- </antcall>
- </target>
- <target name="start-provider-jms-binding" depends="init-common">
- <antcall target="start-binding">
- <param name="jmx.port" value="${domain2.jmx.port}"/>
- <param name="jbi.component.name" value="SunJMSBinding"/>
- </antcall>
- </target>
- <target name="stop-consumer-jms-binding" depends="init-common">
- <antcall target="stop-binding">
- <param name="jbi.component.name" value="SunJMSBinding"/>
- </antcall>
- </target>
- <target name="start-consumer-jms-binding" depends="init-common">
- <antcall target="start-binding">
- <param name="jbi.component.name" value="SunJMSBinding"/>
- </antcall>
- </target>
+ <target name="delete-domain2" depends="init-common">
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="delete-domain domain2 " />
+ </exec>
+ </target>
+ <target name="stop-provider-jms-binding" depends="init-common">
+ <antcall target="stop-binding">
+ <param name="jmx.port" value="${domain2.jmx.port}" />
+ <param name="jbi.component.name" value="SunJMSBinding" />
+ </antcall>
+ </target>
+ <target name="start-provider-jms-binding" depends="init-common">
+ <antcall target="start-binding">
+ <param name="jmx.port" value="${domain2.jmx.port}" />
+ <param name="jbi.component.name" value="SunJMSBinding" />
+ </antcall>
+ </target>
+ <target name="stop-consumer-jms-binding" depends="init-common">
+ <antcall target="stop-binding">
+ <param name="jbi.component.name" value="SunJMSBinding" />
+ </antcall>
+ </target>
+ <target name="start-consumer-jms-binding" depends="init-common">
+ <antcall target="start-binding">
+ <param name="jbi.component.name" value="SunJMSBinding" />
+ </antcall>
+ </target>
</project>
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 fe23a88..d6039b3 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client/webservice/CalculatorService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client/webservice/CalculatorService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${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"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <!--<antcall target="undeploy-jbi-component-su"/>-->
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/jsr208-integration-web-client/webservice/CalculatorService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/jsr208-integration-web-client/webservice/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-web"/>
- <param name="wsName" value="Calculator"/>
- <param name="module" value="web-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ <!--<antcall target="undeploy-jbi-component-su"/>-->
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-web" />
+ <param name="wsName" value="Calculator" />
+ <param name="module" value="web-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
</project>
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 05ecd1e..56b6bc5 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client"/>
+ <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="assemble-ejb" depends="init-common, compile">
- <echo message="Assembling web service module"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**">
- </jar>
- </target>
+ <target name="assemble-ejb" depends="init-common, compile">
+ <echo message="Assembling web service module" />
+ <mkdir dir="${assemble.dir}" />
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ >
+ </jar>
+ </target>
- <target name="assemble-client" depends="init-common">
- <echo message="Assembling web client"/>
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${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"
- debug="on"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <echo message="Assembling web client" />
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ debug="on"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="deploy-app">
- <echo message="Deploying the web service"/>
- <antcall target="deploy-jar-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
+ <target name="deploy-app">
+ <echo message="Deploying the web service" />
+ <antcall target="deploy-jar-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-ejb"/>
- <param name="wsName" value="HelloEJB"/>
- <param name="module" value="ejb-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-ejb" />
+ <param name="wsName" value="HelloEJB" />
+ <param name="module" value="ejb-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-app"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-app" />
+ <antcall target="undeploy-client" />
+ </target>
- <target name="undeploy-client" depends="init-common">
- <echo message="Undeploying client application"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <echo message="Undeploying client application" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <target name="undeploy-app" depends="init-common">
- <echo message="Undeploying web service"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-ejb"/>
- </exec>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <echo message="Undeploying web service" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-ejb" />
+ </exec>
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
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 05ecd1e..56b6bc5 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client"/>
+ <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="assemble-ejb" depends="init-common, compile">
- <echo message="Assembling web service module"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**">
- </jar>
- </target>
+ <target name="assemble-ejb" depends="init-common, compile">
+ <echo message="Assembling web service module" />
+ <mkdir dir="${assemble.dir}" />
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ >
+ </jar>
+ </target>
- <target name="assemble-client" depends="init-common">
- <echo message="Assembling web client"/>
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${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"
- debug="on"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <echo message="Assembling web client" />
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ debug="on"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="deploy-app">
- <echo message="Deploying the web service"/>
- <antcall target="deploy-jar-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
+ <target name="deploy-app">
+ <echo message="Deploying the web service" />
+ <antcall target="deploy-jar-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-ejb"/>
- <param name="wsName" value="HelloEJB"/>
- <param name="module" value="ejb-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-ejb" />
+ <param name="wsName" value="HelloEJB" />
+ <param name="module" value="ejb-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-app"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-app" />
+ <antcall target="undeploy-client" />
+ </target>
- <target name="undeploy-client" depends="init-common">
- <echo message="Undeploying client application"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <echo message="Undeploying client application" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <target name="undeploy-app" depends="init-common">
- <echo message="Undeploying web service"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-ejb"/>
- </exec>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <echo message="Undeploying web service" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-ejb" />
+ </exec>
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
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 05ecd1e..56b6bc5 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client"/>
+ <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="assemble-ejb" depends="init-common, compile">
- <echo message="Assembling web service module"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**">
- </jar>
- </target>
+ <target name="assemble-ejb" depends="init-common, compile">
+ <echo message="Assembling web service module" />
+ <mkdir dir="${assemble.dir}" />
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ >
+ </jar>
+ </target>
- <target name="assemble-client" depends="init-common">
- <echo message="Assembling web client"/>
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${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"
- debug="on"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <echo message="Assembling web client" />
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ debug="on"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="deploy-app">
- <echo message="Deploying the web service"/>
- <antcall target="deploy-jar-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
+ <target name="deploy-app">
+ <echo message="Deploying the web service" />
+ <antcall target="deploy-jar-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-ejb"/>
- <param name="wsName" value="HelloEJB"/>
- <param name="module" value="ejb-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-ejb" />
+ <param name="wsName" value="HelloEJB" />
+ <param name="module" value="ejb-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-app"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-app" />
+ <antcall target="undeploy-client" />
+ </target>
- <target name="undeploy-client" depends="init-common">
- <echo message="Undeploying client application"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <echo message="Undeploying client application" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <target name="undeploy-app" depends="init-common">
- <echo message="Undeploying web service"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-ejb"/>
- </exec>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <echo message="Undeploying web service" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-ejb" />
+ </exec>
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
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 05ecd1e..56b6bc5 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;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client"/>
+ <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="assemble-ejb" depends="init-common, compile">
- <echo message="Assembling web service module"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**">
- </jar>
- </target>
+ <target name="assemble-ejb" depends="init-common, compile">
+ <echo message="Assembling web service module" />
+ <mkdir dir="${assemble.dir}" />
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ >
+ </jar>
+ </target>
- <target name="assemble-client" depends="init-common">
- <echo message="Assembling web client"/>
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${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"
- debug="on"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <echo message="Assembling web client" />
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ debug="on"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="deploy-app">
- <echo message="Deploying the web service"/>
- <antcall target="deploy-jar-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
+ <target name="deploy-app">
+ <echo message="Deploying the web service" />
+ <antcall target="deploy-jar-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-ejb"/>
- <param name="wsName" value="HelloEJB"/>
- <param name="module" value="ejb-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-ejb" />
+ <param name="wsName" value="HelloEJB" />
+ <param name="module" value="ejb-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-app"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-app" />
+ <antcall target="undeploy-client" />
+ </target>
- <target name="undeploy-client" depends="init-common">
- <echo message="Undeploying client application"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <echo message="Undeploying client application" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <target name="undeploy-app" depends="init-common">
- <echo message="Undeploying web service"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-ejb"/>
- </exec>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <echo message="Undeploying web service" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-ejb" />
+ </exec>
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
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 56a6149..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.properties
+++ /dev/null
@@ -1,33 +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
-
--->
-
-
-<property name="module" value="signature"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
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 1473001..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.xml
+++ /dev/null
@@ -1,132 +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
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="xsd test" default="usage" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
-
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
- <target name="compile" depends="">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- </target>
-
- <target name="build" depends="init-common, clean">
- <antcall target="wscompile-ejb"/>
- <antcall target="wscompile-appclient"/>
- <antcall target="assemble"/>
- </target>
-
- <target name="wscompile-appclient" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . -mapping SignatureMapping_appclient.xml -Xprintstacktrace -Xdebugmodel:appclient.model.txt wscompile_config_appclient.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/signature">
- <fileset dir="output/signature"
- includes="SignatureTestService.class, SignatureTest.class, MyDateValueType.class, MySecondDateValueType.class"/>
- </copy>
-<!--
- <delete dir="output"/>
--->
- </target>
-
- <target name="wscompile-ejb" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="signatureejb"/>
- </antcall>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -classpath ${build.classes.dir} -mapping SignatureMapping_ejb.xml -Xprintstacktrace -Xdebugmodel:ejb.model.txt wscompile_config_ejb.xml"/>
- </antcall>
- </target>
-
- <target name="assemble" depends="init-common, compile">
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="SignatureTestService.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="SignatureMapping_appclient.xml"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="SignatureMapping_appclient.xml,META-INF/wsdl/**,signature/*.class" />
-
- </antcall>
- <copy todir="${build.classes.dir}"
- file="SignatureMapping_ejb.xml"/>
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
- value="SignatureMapping_ejb.xml,META-INF/wsdl/**,signatureejb/*.class" />
-
- </antcall>
- <antcall target="ear-common" />
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete dir="output"/>
- <delete dir="signature"/>
- <delete file="SignatureMapping_ejb.xml"/>
- <delete file="SignatureMapping_appclient.xml"/>
- <delete file="SignatureTestService.wsdl"/>
- <delete file="jaxrpc.log"/>
- <delete file="ejb.model.txt"/>
- <delete file="appclient.model.txt"/>
- </target>
-
- <target name="run" depends="init-common">
- <exec executable="${APPCLIENT}" failonerror="false">
- <arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
- <arg line="http://${http.host}:${http.port}/signatureejb/SignatureTest"/>
- </exec>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- </echo>
- </target>
-</project>
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 a9447aa..0000000
--- 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 2ab99b6..0000000
--- 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 38b8d74..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <j2eeMappingFile
- location="SignatureMapping_ejb.xml"
- wsdlLocation="SignatureTestService.wsdl"/>
-</configuration>
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 dffacb6..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application-client.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my signature app client</description>
- <display-name>signatureClient</display-name>
- <service-ref>
- <description>signature service ref</description>
- <service-ref-name>service/signature</service-ref-name>
- <service-interface>signature.SignatureTestService</service-interface>
- <wsdl-file>META-INF/wsdl/SignatureTestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SignatureMapping_appclient.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="http://signature.org/wsdl">servicens:SignatureTestService
- </service-qname>
- </service-ref>
-</application-client>
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 0732035..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>SignatureApp</display-name>
- <module>
- <java>signature-client.jar</java>
- </module>
- <module>
- <ejb>signature-ejb.jar</ejb>
- </module>
-</application>
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 41935d7..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>SignatureEjb</ejb-name>
- <service-endpoint>signatureejb.SignatureTest</service-endpoint>
- <ejb-class>signatureejb.SignatureEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>SignatureEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
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 8b0c0a1..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/signature</service-ref-name>
- <port-info>
- <service-endpoint-interface>signature.SignatureTest</service-endpoint-interface>
- </port-info>
- <service-qname>
- <namespaceURI>urn:SignatureTestService</namespaceURI>
- <localpart>SignatureTestService</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
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 aae303d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>SignatureEjb</ejb-name>
- <jndi-name>SignatureEjb</jndi-name>
- <pass-by-reference>false</pass-by-reference>
- <is-read-only-bean>false</is-read-only-bean>
- <refresh-period-in-seconds>-1</refresh-period-in-seconds>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>SignatureTestPort</port-component-name>
- <endpoint-address-uri>signatureejb/SignatureTest</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 5b94905..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/webservices.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>SignatureWebServiceEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/SignatureTestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SignatureMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>SignatureTestPort</port-component-name>
- <wsdl-port xmlns:signaturens="http://signature.org/wsdl">signaturens:SignatureTestPort</wsdl-port>
- <service-endpoint-interface>signatureejb.SignatureTest</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>SignatureEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 5c864da..0000000
--- 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 7b3f63a..0000000
--- 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 78e834c..0000000
--- 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 d890e27..0000000
--- 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 cc694df..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_appclient.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="SignatureTestService.wsdl"
- packageName="signature"/>
-</configuration>
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 771ca5b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_ejb.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service name="SignatureTestService"
- targetNamespace="http://signature.org/wsdl"
- typeNamespace="http://signature.org/types"
- packageName="signatureejb">
- <interface name="signatureejb.SignatureTest"/>
- </service>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/build.xml b/appserver/tests/appserv-tests/devtests/webservice/security/build.xml
index ab34c01..e1deff7 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 @@
<target name="setup" depends="init-common, check-nss">
<echo message="Creating the valid certificate in kestore.jks"/>
- <exec executable="${java.home}/bin/keytool" failonerror="false">
+ <exec executable="${java.home}/bin/keytool" failonerror="false"><!-- Could be already imported -->
<arg value="-genkey"/>
+ <arg value="-keyalg" />
+ <arg value="RSA" />
<arg value="-alias"/>
<arg value="s1astester"/>
<arg value="-keypass"/>
@@ -65,8 +67,10 @@
<arg value="cn=Duke Smith, ou=Purchasing, o=BlueSoft, c=US"/>
</exec>
<echo message="Creating the invalid certificate in invalid_kestore.jks"/>
- <exec executable="${java.home}/bin/keytool" failonerror="false">
+ <exec executable="${java.home}/bin/keytool" failonerror="false"><!-- Could be already imported -->
<arg value="-genkey"/>
+ <arg value="-keyalg" />
+ <arg value="RSA" />
<arg value="-alias"/>
<arg value="s1astester"/>
<arg value="-keypass"/>
@@ -89,7 +93,7 @@
<arg line="-export -alias s1as -keystore ${env.S1AS_HOME}/domains/${admin.domain}/config/keystore.jks -storepass ${ssl.password} -file appserver.cer"/>
</exec>
<echo message="Importing the Appserver certificate"/>
- <exec executable="${java.home}/bin/keytool" failonerror="true">
+ <exec executable="${java.home}/bin/keytool" failonerror="false"><!-- Could be already imported -->
<arg line="-import -noprompt -alias s1as -keystore cacerts.jks -storepass ${ssl.password} -file appserver.cer"/>
</exec>
<echo message="Extracting tester public key"/>
@@ -97,7 +101,7 @@
<arg line="-export -alias s1astester -keystore keystore.jks -storepass ${ssl.password} -file client.cer"/>
</exec>
<echo message="Importing tester public key in appserver trusted certificates"/>
- <exec executable="${java.home}/bin/keytool" failonerror="true">
+ <exec executable="${java.home}/bin/keytool" failonerror="false">
<arg line="-import -noprompt -alias s1astester -keystore ${env.S1AS_HOME}/domains/${admin.domain}/config/cacerts.jks -storepass ${ssl.password} -file client.cer"/>
</exec>
<antcall target="restart-pe-server"/>
@@ -176,7 +180,6 @@
<target name="all">
<antcall target="setup"/>
- <ant dir="ejb_ssl_cacert" target="all"/>
<ant dir="ejb3_ssl_cacert" target="all"/>
<antcall target="unsetup"/>
</target>
@@ -185,15 +188,12 @@
<fileset dir="${basedir}"
includes="**.output, count.txt"/>
</delete>
- <ant dir="ejb_ssl_cacert" target="clean"/>
</target>
<target name="usage">
<echo>
Usage:
ant all (Executes all the webservice security tests)
-
- ant ejb_ssl_cacert (Executes the client certificate ejb ssl endpoint test)
</echo>
</target>
</project>
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 1418c5c..86baf5a 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 @@
<target name="test-deploy" depends="test-build">
<basename file="${src-name}" property="server" suffix=".java"/>
<basename file="${server}" property="port" suffix="EJB"/>
+ <!-- FIXME: Reproducer for the following exception:
+java.lang.NullPointerException
+at java.base/java.io.File.<init>(File.java:361)
+at org.glassfish.webservices.WebServicesDeployer.doWebServicesDeployment(WebServicesDeployer.java:612)
+at org.glassfish.webservices.WebServicesDeployer.prepare(WebServicesDeployer.java:167)
+at com.sun.enterprise.v3.server.ApplicationLifecycle.prepareModule(ApplicationLifecycle.java:929)
+at com.sun.enterprise.v3.server.ApplicationLifecycle.deploy(ApplicationLifecycle.java:414)
+at com.sun.enterprise.v3.server.ApplicationLifecycle.deploy(ApplicationLifecycle.java:199)
+at org.glassfish.deployment.admin.DeployCommand.execute(DeployCommand.java:467)
+ -->
<exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="true">
<arg line="deploy --port ${admin.port} --user ${admin.user} --passwordfile ${admin.password.file} ${env.APS_HOME}/build/module/archive/${server}.jar"/>
</exec>
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 e68c05b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.properties
+++ /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
-
--->
-
-
-<property name="module" value="ws"/>
-<property name="appname" value="${module}-ejbtaxcal"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="com.sun.s1peqe.webservices.ejb.taxcal.client.TaxCalClient"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<!--property name="sun-application.xml" value="descriptor/sun-application.xml"/-->
-<property name="ejb-jar.xml" value="descriptor/ejb/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/ejb/sun-ejb-jar.xml"/>
-<property name="application-client.xml" value="descriptor/client/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/client/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
-<property name="wsdl-file" value="wsdl/TaxCalEjbService.wsdl"/>
-<property name="client-mapping.xml" value="TaxCalClientMapping.xml"/>
-<property name="ejb-mapping.xml" value="TaxCalMapping.xml"/>
-<property name="webservices.xml" value="descriptor/ejb/webservices.xml"/>
-<property name="wsdlfile.location" value="wsdl"/>
-
-<!--- servlet based endpoint params -->
-<!--property name="mappingfile.location" value=""/-->
-<property name="wsdlfile.name" value="TaxCalculator.wsdl"/>
-<property name="wsdlfile.location" value="wsdl"/>
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 663d467..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../config/common.xml">
-<!ENTITY commonSecurity SYSTEM "file:./../common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="EjbBasedWebService" default="usage" basedir=".">
-
- &commonSetup;
- &commonBuild;
- &commonSecurity;
- &testproperties;
-
- <target name="all"
- depends="clean, build, deploy, run, undeploy"/>
- <target name="run-test" depends="clean, build, deploy, run, undeploy"/>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="compile" depends="init-common,clean-common, generate-artifacts">
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- </target>
-
- <target name="generate-artifacts">
- <antcall target="import-wsdl">
- <param name="mapping.file"
- value="${ejb-mapping.xml}"/>
- <param name="config-wsdl.file"
- value="config/config-ejb.xml"/>
- </antcall>
- <antcall target="import-wsdl">
- <param name="mapping.file"
- value="${client-mapping.xml}"/>
- <param name="config-wsdl.file"
- value="config/config-client.xml"/>
- </antcall>
- </target>
- <target name="ws-package-appclientjar-common">
- <mkdir dir="${assemble.dir}"/>
- <delete file="${appclient.jar}" failonerror="false"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${application-client.xml}"
- tofile="${build.classes.dir}/META-INF/application-client.xml"/>
- <copy file="${sun-application-client.xml}"
- tofile="${build.classes.dir}/META-INF/sun-application-client.xml"/>
- <copy file="${wsdl-file}"
- tofile="${build.classes.dir}/META-INF/${wsdl-file}"/>
- <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
- update="true" includes="${appclientjar.classes}"
- manifest="./client/MANIFEST.MF">
-
- <fileset dir="${build.classes.dir}" includes="${client-mapping.xml}"/>
- <metainf dir="${build.classes.dir}/META-INF">
- <include name="application-client.xml"/>
- <include name="sun-application-client.xml"/>
- <include name="${wsdl-file}"/>
- </metainf>
- </jar>
- <delete dir="${build.classes.dir}/META-INF" failonerror="false"/>
- </target>
-
- <target name="ws-package-ejb-jar-common" depends="init-common">
- <mkdir dir="${assemble.dir}"/>
- <delete file="${ejb.jar}" failonerror="false"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${ejb-jar.xml}"
- tofile="${build.classes.dir}/META-INF/ejb-jar.xml"/>
- <copy file="${sun-ejb-jar.xml}"
- tofile="${build.classes.dir}/META-INF/sun-ejb-jar.xml"/>
- <copy file="${webservices.xml}"
- tofile="${build.classes.dir}/META-INF/webservices.xml"/>
- <copy file="${sun-cmp-mappings.xml}"
- tofile="${build.classes.dir}/META-INF/sun-cmp-mappings.xml"
- failonerror="false"/>
- <copy file="${wsdl-file}"
- tofile="${build.classes.dir}/META-INF/${wsdl-file}"
- failonerror="false"/>
- <copy file="${dbschema}" todir="${build.classes.dir}" failonerror="false"/>
- <jar jarfile="${ejb.jar}" basedir="${ejbjar.files}" update="true"
- includes ="${ejbjar.classes}">
-
- <fileset dir="${build.classes.dir}" includes="${ejb-mapping.xml}"/>
- <metainf dir="${build.classes.dir}/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="sun-ejb-jar.xml"/>
- <include name="sun-cmp-mappings.xml"/>
- <include name="webservices.xml"/>
- <include name="${wsdl-file}"/>
- <!--<include name="${dbschema}"/>-->
- </metainf>
- </jar>
- <delete dir="${build.classes.dir}/META-INF"
- failonerror="false"/>
- </target>
-
- <target name="build" depends="init-common,compile">
- <antcall target="ws-package-ejb-jar-common">
- <param name="ejbjar.classes"
- value="com/sun/s1peqe/webservices/ejb/taxcal/*.class" />
- <param name="ejbjar.files" value="${build.classes.dir}"/>
- <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
- </antcall>
- <antcall target="ws-package-appclientjar-common">
- <param name="appclientjar.classes"
- value="com/sun/s1peqe/webservices/ejb/taxcal/client/*.class" />
- <param name="appclientjar.files"
- value="${build.classes.dir}"/>
- <param name="appclient.jar"
- value="${assemble.dir}/${appname}-client.jar"/>
- </antcall>
-
- <antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
- depends="init-common, reconfig-common">
- <antcall target="deploy-common"/>
- </target>
-
-
- <target name="run" depends="init-common">
- <property name="statetax-ejb-endpoint-url"
- value="https://${http.host}:${https.port}/statetaxejb"/>
- <property name="fedtax-ejb-endpoint-url"
- value="https://${http.host}:${https.port}/fedtaxejb"/>
-
- <echo message="property statetax-ejb-endpoint-url is set to: ${statetax-ejb-endpoint-url}"/>
- <echo message="property fedtax-ejb-endpoint-url is set to: ${fedtax-ejb-endpoint-url}"/>
-
- <antcall target="runclient-secure">
- <param name="appclient.application.args"
- value="${statetax-ejb-endpoint-url} ${fedtax-ejb-endpoint-url} True True"/>
- </antcall>
- <antcall target="runclient-invalid-secure">
- <param name="appclient.application.args"
- value="${statetax-ejb-endpoint-url} ${fedtax-ejb-endpoint-url} False True"/>
- </antcall>
- <antcall target="runclient-common">
- <param name="appclient.application.args"
- value="${statetax-ejb-endpoint-url} ${fedtax-ejb-endpoint-url} False False"/>
- </antcall>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
-
- <!--
- =======================================================
- User Defined specific targets
- =======================================================
- -->
-</project>
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 65b3bd4..0000000
--- 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 798e262..0000000
--- 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 e55096d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="wsdl/TaxCalEjbService.wsdl"
- packageName="com.sun.s1peqe.webservices.ejb.taxcal.client"/>
-</configuration>
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 9df53d2..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml.save
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="wsdl/TaxCalEjbService.wsdl"
- packageName="com.sun.s1peqe.webservices.ejb.taxcal.client"/>
-</configuration>
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 2afdcaa..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-ejb.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="wsdl/TaxCalEjbService.wsdl"
- packageName="com.sun.s1peqe.webservices.ejb.taxcal"/>
-</configuration>
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 da00336..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-sei.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service name="TaxCalEjbService"
- targetNamespace="http://tax.org/wsdl"
- typeNamespace="http://tax.org/types"
- packageName="com.sun.s1peqe.webservices.ejb.taxcal">
- <interface name="com.sun.s1peqe.webservices.ejb.taxcal.FedTaxIF"
- servantName="com.sun.s1peqe.webservices.ejb.taxcal.FedTaxEjb"/>
- <interface name="com.sun.s1peqe.webservices.ejb.taxcal.StateTaxIF"
- servantName="com.sun.s1peqe.webservices.ejb.taxcal.StateTaxEjb">
- </interface>
- </service>
-</configuration>
-
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 b1a0453..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
-<!--
-
- 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
-
--->
-
-<application>
- <display-name>TaxCalculatorApp</display-name>
- <module>
- <ejb>ws-ejbtaxcal-ejb.jar</ejb>
- </module>
- <module>
- <java>ws-ejbtaxcal-client.jar</java>
- </module>
-</application>
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 e6a5aa9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/client/application-client.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>app client dd for taxcalculator</description>
- <display-name>ws-ejbtaxcalClient</display-name>
- <service-ref>
- <description>taxcal service ref</description>
- <service-ref-name>service/TaxCalEjbService</service-ref-name>
- <service-interface>com.sun.s1peqe.webservices.ejb.taxcal.client.TaxCalEjbService</service-interface>
- <wsdl-file>META-INF/wsdl/TaxCalEjbService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>TaxCalClientMapping.xml</jaxrpc-mapping-file>
- </service-ref>
-</application-client>
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 cd48c1f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/client/sun-application-client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/TaxCalEjbService</service-ref-name>
- </service-ref>
-</sun-application-client>
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 6aa66a0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/ejb-jar.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <display-name>TaxCalEjb</display-name>
- <ejb-name>StateTaxEjb</ejb-name>
- <service-endpoint>com.sun.s1peqe.webservices.ejb.taxcal.StateTaxIF</service-endpoint>
- <ejb-class>com.sun.s1peqe.webservices.ejb.taxcal.StateTaxEjb</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- <session>
- <display-name>TaxCalEjb</display-name>
- <ejb-name>FedTaxEjb</ejb-name>
- <service-endpoint>com.sun.s1peqe.webservices.ejb.taxcal.FedTaxIF</service-endpoint>
- <ejb-class>com.sun.s1peqe.webservices.ejb.taxcal.FedTaxEjb</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>StateTaxEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <method>
- <ejb-name>FedTaxEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
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 ae28a32..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/sun-ejb-jar.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <name>ws-taxcal-ejb.jar</name>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>StateTaxEjb</ejb-name>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>StateTaxIFPort</port-component-name>
- <endpoint-address-uri>statetaxejb</endpoint-address-uri>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- <login-config>
- <auth-method>CLIENT-CERT</auth-method>
- </login-config>
- </webservice-endpoint>
- </ejb>
- <ejb>
- <ejb-name>FedTaxEjb</ejb-name>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>FedTaxIFPort</port-component-name>
- <endpoint-address-uri>fedtaxejb</endpoint-address-uri>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 3b66b4f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/webservices.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>TaxcalculatorEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/TaxCalEjbService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>TaxCalMapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>StateTaxIFPort</port-component-name>
- <wsdl-port xmlns:taxns="http://tax.org/wsdl">taxns:StateTaxIFPort
- </wsdl-port>
- <service-endpoint-interface>com.sun.s1peqe.webservices.ejb.taxcal.StateTaxIF
- </service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>StateTaxEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- <port-component>
- <description>port component description</description>
- <port-component-name>FedTaxIFPort</port-component-name>
- <wsdl-port xmlns:taxns="http://tax.org/wsdl">taxns:FedTaxIFPort
- </wsdl-port>
- <service-endpoint-interface>com.sun.s1peqe.webservices.ejb.taxcal.FedTaxIF
- </service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>FedTaxEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 19eecca..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/sun-application.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 J2EE Application 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application_1_4-1.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application>
- <unique-id>0</unique-id>
- <security-role-mapping>
- <role-name>users</role-name>
- <principal-name>dilbert</principal-name>
- <principal-name>
- CN=Dilbert, OU=Comic Division, O=Sun Solarsystems Inc, C=US
- </principal-name>
- </security-role-mapping>
-</sun-application>
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 48a86b3..0000000
--- 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 3a099d5..0000000
--- 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 d99c7f9..0000000
--- 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 38a1531..0000000
--- 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 62dbdf8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/wsdl/TaxCalEjbService.wsdl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<definitions name="TaxCalEjbService" targetNamespace="http://tax.org/wsdl" xmlns:tns="http://tax.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types/>
- <message name="FedTaxIF_getFedTax">
- <part name="double_1" type="xsd:double"/>
- <part name="double_2" type="xsd:double"/></message>
- <message name="FedTaxIF_getFedTaxResponse">
- <part name="result" type="xsd:double"/></message>
- <message name="StateTaxIF_getStateTax">
- <part name="double_1" type="xsd:double"/>
- <part name="double_2" type="xsd:double"/></message>
- <message name="StateTaxIF_getStateTaxResponse">
- <part name="result" type="xsd:double"/></message>
- <portType name="FedTaxIF">
- <operation name="getFedTax" parameterOrder="double_1 double_2">
- <input message="tns:FedTaxIF_getFedTax"/>
- <output message="tns:FedTaxIF_getFedTaxResponse"/></operation></portType>
- <portType name="StateTaxIF">
- <operation name="getStateTax" parameterOrder="double_1 double_2">
- <input message="tns:StateTaxIF_getStateTax"/>
- <output message="tns:StateTaxIF_getStateTaxResponse"/></operation></portType>
- <binding name="FedTaxIFBinding" type="tns:FedTaxIF">
- <operation name="getFedTax">
- <input>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://tax.org/wsdl"/></input>
- <output>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://tax.org/wsdl"/></output>
- <soap:operation soapAction=""/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/></binding>
- <binding name="StateTaxIFBinding" type="tns:StateTaxIF">
- <operation name="getStateTax">
- <input>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://tax.org/wsdl"/></input>
- <output>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://tax.org/wsdl"/></output>
- <soap:operation soapAction=""/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/></binding>
- <service name="TaxCalEjbService">
- <port name="FedTaxIFPort" binding="tns:FedTaxIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/></port>
- <port name="StateTaxIFPort" binding="tns:StateTaxIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/></port></service></definitions>
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 389b69b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.properties
+++ /dev/null
@@ -1,37 +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
-
--->
-
-
-<property name="module" value="simpleservlethandler"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
-<property name="app.type" value="application"/>
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 3d01eba..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.xml
+++ /dev/null
@@ -1,109 +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
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="Simple Soap fault test" default="all" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
-<!-- NOTE. the simple mapping test and full mapping test can
- only be run one at a time, I didn't want to set up two
- tests for this. -->
-
- <target name="all" depends="clean, assemble, deploy, run, undeploy"/>
-
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="servlet"/>
- </antcall>
- </target>
-
- <target name="gen-servlet-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/WEB-INF/wsdl"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/SimpleHandlerMapping_servlet.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/WEB-INF/wsdl config-interface.xml"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile, gen-servlet-wsdl">
- <antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
- <param name="mappingfile.location" value="${build.classes.dir}"/>
- <param name="mappingfile.name" value="SimpleHandlerMapping_servlet.xml"/>
- <param name="wsdlfile.location" value="${build.classes.dir}/WEB-INF/wsdl"/>
- <param name="wsdlfile.name" value="SimpleHandlerServlet.wsdl"/>
- <param name="webwar.classes" value="servlet/*.class"/>
- </antcall>
- </target>
-
- <target name="assemble" depends="assemble-web, assemble-client"/>
-
- <target name="assemble-client" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <copy file="${build.classes.dir}/WEB-INF/wsdl/SimpleHandlerServlet.wsdl" todir="${build.classes.dir}/META-INF/wsdl"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar"
- dest="${build.classes.dir}"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="SimpleHandlerMapping_servlet.xml,META-INF/wsdl/**,simplehandler/**,servlet/SimpleServer.class,com/**" />
- </antcall>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/ServletHandlerTest/ServletHandlerTest"/>
- </antcall>
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="ServletHandlerTest"/>
- </antcall>
- <antcall target="deploy-client-common"/>
- <move file="${assemble.dir}/${appname}-clientClient.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client-common"/>
- </target>
-
-</project>
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 e9d91ec..0000000
--- 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 5085a53..0000000
--- 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 4b08059..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SimpleHandlerServlet"
- targetNamespace="urn:HandlerTest"
- typeNamespace="urn:HandlerTest"
- packageName="handlertest">
- <interface name="servlet.SimpleServer"/>
- </service>
-</configuration>
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 d2d8301..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/application-client.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my handler app client</description>
- <display-name>handlerClient</display-name>
- <service-ref>
- <description>simple handler service ref</description>
- <service-ref-name>service/simplehandler</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/SimpleHandlerServlet.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SimpleHandlerMapping_servlet.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:HandlerTest">servicens:SimpleHandlerServlet</service-qname>
- <port-component-ref>
- <service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-</application-client>
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 a4ce49f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/simplehandler</service-ref-name>
- <port-info>
- <service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- <stub-property>
- <name>com.sun.enterprise.webservice.client.transport.log</name>
- <value>file:jaxrpc.log</value>
- </stub-property>
- </port-info>
- <service-qname>
- <namespaceURI>urn:HandlerTest</namespaceURI>
- <localpart>SimpleHandlerServer</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
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 f96bc1b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/sun-web.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_5-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <context-root>ServletHandlerTest</context-root>
- <servlet>
- <servlet-name>ServletHandlerTest</servlet-name>
- <webservice-endpoint>
- <port-component-name>SimpleServerPort</port-component-name>
- <debugging-enabled>true</debugging-enabled>
- <property name="prop1" value="value1"/>
- <property name="prop2" value="value2"/>
- </webservice-endpoint>
- </servlet>
- </sun-web-app>
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 7649ec2..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/web.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <servlet>
- <servlet-name>ServletHandlerTest</servlet-name>
- <servlet-class>servlet.ServletHandlerTestImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>ServletHandlerTest</servlet-name>
- <url-pattern>/ServletHandlerTest</url-pattern>
- </servlet-mapping>
-</web-app>
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 7f873e1..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/webservices.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>SimpleHandlerServlet</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/SimpleHandlerServlet.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SimpleHandlerMapping_servlet.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>SimpleServerPort</port-component-name>
- <wsdl-port xmlns:servicens="urn:HandlerTest">servicens:SimpleServerPort</wsdl-port>
- <service-endpoint-interface>servlet.SimpleServer</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>ServletHandlerTest</servlet-link>
- </service-impl-bean>
- <handler>
- <handler-name>SimpleHandler</handler-name>
- <handler-class>servlet.SimpleHandler</handler-class>
- </handler>
- </port-component>
- </webservice-description>
-</webservices>
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 1ac4e4f..0000000
--- 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 891d555..0000000
--- 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 c985152..0000000
--- 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 0675cd2..0000000
--- 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 c511855..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceServletTest.wsdl
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<definitions name="WebServiceServletTest" targetNamespace="urn:WebServiceTest" xmlns:tns="urn:WebServiceTest" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <schema targetNamespace="urn:WebServiceTest" xmlns:tns="urn:WebServiceTest" xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://www.w3.org/2001/XMLSchema">
- <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
- <complexType name="ArrayOfstring">
- <complexContent>
- <restriction base="soap11-enc:Array">
- <attribute ref="soap11-enc:arrayType" wsdl:arrayType="string[]"/></restriction></complexContent></complexType></schema></types>
- <message name="WebServiceTest_doTest">
- <part name="arrayOfString_1" type="tns:ArrayOfstring"/></message>
- <message name="WebServiceTest_doTestResponse">
- <part name="result" type="xsd:string"/></message>
- <portType name="WebServiceTest">
- <operation name="doTest" parameterOrder="arrayOfString_1">
- <input message="tns:WebServiceTest_doTest"/>
- <output message="tns:WebServiceTest_doTestResponse"/></operation></portType>
- <binding name="WebServiceTestBinding" type="tns:WebServiceTest">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
- <operation name="doTest">
- <soap:operation soapAction=""/>
- <input>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="urn:WebServiceTest"/></input>
- <output>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="urn:WebServiceTest"/></output></operation></binding>
- <service name="WebServiceServletTest">
- <port name="WebServiceTestPort" binding="tns:WebServiceTestBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/></port></service></definitions>
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 1c74d61..0000000
--- 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 965eeac..0000000
--- 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 21c84b0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="WebServiceServletTest"
- targetNamespace="urn:WebServiceTest"
- typeNamespace="urn:WebServiceTest"
- packageName="test.webservice">
- <interface name="test.webservice.WebServiceTest"/>
- </service>
-</configuration>
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 3f3b49e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/webservices.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices version="1.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd">
-<webservice-description>
-<webservice-description-name>WebServiceServletTest</webservice-description-name>
-<wsdl-file>WEB-INF/wsdl/WebServiceServletTest.wsdl</wsdl-file>
-<jaxrpc-mapping-file>WebServiceTestMapping.xml</jaxrpc-mapping-file>
-<port-component>
-<port-component-name>Port</port-component-name>
-<wsdl-port xmlns:tns="urn:WebServiceTest">tns:WebServiceTestPort</wsdl-port>
-<service-endpoint-interface>test.webservice.WebServiceTest</service-endpoint-interface>
-<service-impl-bean>
-<servlet-link>WebServiceTestServlet</servlet-link>
-</service-impl-bean>
-</port-component>
-</webservice-description>
-</webservices>
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 f62be9f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.properties
+++ /dev/null
@@ -1,37 +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
-
--->
-
-
-<property name="module" value="simplesoapfault"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
-<property name="app.type" value="application"/>
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 9933ebe..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.xml
+++ /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
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="Simple Soap fault test" default="all" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
-<!-- NOTE. the simple mapping test and full mapping test can
- only be run one at a time, I didn't want to set up two
- tests for this. -->
-<!--
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
--->
-
- <target name="all" depends="assemble, deploy, run, undeploy"/>
-
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- </target>
-
- <target name="gen-ejb-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/SoapFaultMapping_ejb.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/META-INF/wsdl config-interface.xml"/>
- </antcall>
- </target>
-
- <target name="assemble-ejb" depends="init-common, compile, gen-ejb-wsdl">
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="SoapFaultMapping_ejb.xml,META-INF/wsdl/**,soapfault/ejb/*.class"/>
- </antcall>
- </target>
-
- <target name="assemble" depends="assemble-ejb, assemble-client"/>
-
- <target name="assemble-client" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="gen-ejb-wsdl"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar"
- dest="${build.classes.dir}"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="SoapFaultMapping_ejb.xml,META-INF/wsdl/**,soapfault/**,com/**" />
- </antcall>
- <antcall target="deploy-client-common"/>
- <move file="${assemble.dir}/${appname}-clientClient.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/soapfault/SimpleSoapFault"/>
- </antcall>
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-jar-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-jar-common"/>
- <antcall target="undeploy-client-common"/>
- </target>
-
-</project>
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 b232739..0000000
--- 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 ff21673..0000000
--- 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 8bef265..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SoapFaultService"
- targetNamespace="urn:SoapFaultTest"
- typeNamespace="urn:SoapFaultTest"
- packageName="soapfault">
- <interface name="soapfault.ejb.SimpleSoapFaultSEI"/>
- </service>
-</configuration>
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 87ba024..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/application-client.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my soapfaults app client</description>
- <display-name>soapfaultsClient</display-name>
- <service-ref>
- <description>simple soapfault service ref</description>
- <service-ref-name>service/soapfault</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/SoapFaultService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SoapFaultMapping_ejb.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:SoapFaultTest">servicens:SoapFaultService</service-qname>
- <port-component-ref>
- <service-endpoint-interface>soapfault.ejb.SimpleSoapFaultSEI</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-</application-client>
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 8bea6aa..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>SimpleSoapFaultEJB</ejb-name>
- <service-endpoint>soapfault.ejb.SimpleSoapFaultSEI</service-endpoint>
- <ejb-class>soapfault.ejb.SimpleSoapFaultImpl</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
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 fc41541..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/soapfault</service-ref-name>
- <port-info>
- <service-endpoint-interface>soapfault.ejb.SimpleSoapFaultSEI</service-endpoint-interface>
- <stub-property>
- <name>com.sun.enterprise.webservice.client.transport.log</name>
- <value>file:jaxrpc.log</value>
- </stub-property>
- </port-info>
- <service-qname>
- <namespaceURI>urn:SoapFaultTest</namespaceURI>
- <localpart>SoapFaultService</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
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 8f7d0ab..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <ejb>
- <ejb-name>SimpleSoapFaultEJB</ejb-name>
- <jndi-name>SimpleSoapFaultEJB</jndi-name>
- <webservice-endpoint>
- <port-component-name>SimpleSoapFaultSEIPort</port-component-name>
- <endpoint-address-uri>soapfault/SimpleSoapFault</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 11c892a..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/webservices.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>SoapFaultService</webservice-description-name>
- <wsdl-file>META-INF/wsdl/SoapFaultService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SoapFaultMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>SimpleSoapFaultSEIPort</port-component-name>
- <wsdl-port xmlns:servicens="urn:SoapFaultTest">servicens:SimpleSoapFaultSEIPort</wsdl-port>
- <service-endpoint-interface>soapfault.ejb.SimpleSoapFaultSEI</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>SimpleSoapFaultEJB</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 0c58545..0000000
--- 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 1b4ebc7..0000000
--- 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 113d8f1..0000000
--- 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 5bddbff..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.properties
+++ /dev/null
@@ -1,33 +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
-
--->
-
-
-<property name="module" value="soapfaults"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
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 90c19d0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.xml
+++ /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
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="xsd test" default="usage" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
-
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
- <target name="compile" depends="">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- </target>
-
- <target name="build" depends="init-common, clean">
- <antcall target="gen-mapping-appclient"/>
- <antcall target="gen-mapping-ejb"/>
- <antcall target="wscompile-appclient"/>
- <antcall target="wscompile-ejb"/>
- <antcall target="assemble"/>
- </target>
-
- <target name="wscompile-appclient" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . -f:explicitcontext wscompile_config_appclient.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/soapfaults">
- <fileset dir="output/soapfaults"
- includes="TestService.class, Test.class, Test1RequestType.class, Test2RequestType.class, Test1ResponseType.class, FaultOne.class, FaultTwo.class, FaultThree.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="wscompile-ejb" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . -f:explicitcontext wscompile_config_ejb.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/soapfaultsejb">
- <fileset dir="output/soapfaultsejb"
- includes="TestService.class, Test.class, Test1RequestType.class, Test2RequestType.class, Test1ResponseType.class, FaultOne.class, FaultTwo.class, FaultThree.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="assemble" depends="init-common, compile">
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="soapfaults.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="mapping_appclient.xml"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="mapping_appclient.xml,META-INF/wsdl/**,soapfaults/*.class" />
-
- </antcall>
- <copy todir="${build.classes.dir}"
- file="mapping_ejb.xml"/>
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
- value="mapping_ejb.xml,META-INF/wsdl/**,soapfaultsejb/*.class" />
-
- </antcall>
- <antcall target="ear-common" />
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete dir="out"/>
- <delete dir="output"/>
- <delete dir="soapfaults"/>
- <delete dir="soapfaultsejb"/>
- <delete file="mapping.xml"/>
- <delete file="mapping_ejb.xml"/>
- <delete file="mapping_appclient.xml"/>
- <delete file="jaxrpc.log"/>
- <delete file="good.debugModel.txt"/>
- <delete file="bad.debugModel.txt"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/soapfaultsejb/SoapFaultsTest"/>
- </antcall>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="gen-mapping-appclient" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -cp . -mapping mapping_appclient.xml -f:explicitcontext wscompile_config_appclient.xml"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-ejb" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -cp . -mapping mapping_ejb.xml -f:explicitcontext wscompile_config_ejb.xml"/>
- </antcall>
- </target>
-
- <target name="mapping" depends="init-common">
- <delete dir="out"/>
- <mkdir dir="out"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -cp . -keep -d out -Xprintstacktrace -Xdebugmodel:good.debugModel.txt -mapping mapping.xml -f:explicitcontext wscompile_config_ejb.xml"/>
- </antcall>
- </target>
-
- <target name="genall" depends="init-common, mapping">
- <delete dir="out"/>
- <mkdir dir="out"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen:both -cp . -keep -d out -Xprintstacktrace -Xdebugmodel:bad.debugModel.txt -f:explicitcontext config.xml"/>
- </antcall>
- </target>
-
-
- <target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- </echo>
- </target>
-</project>
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 bce2079..0000000
--- 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 6eea9a6..0000000
--- 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 b8e05e2..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <j2eeMappingFile
- location="mapping.xml"
- wsdlLocation="soapfaults.wsdl"/>
-</configuration>
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 9ec3319..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application-client.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my soapfaults app client</description>
- <display-name>soapfaultsClient</display-name>
- <service-ref>
- <description>soapfaults service ref</description>
- <service-ref-name>service/soapfaults</service-ref-name>
- <service-interface>soapfaults.TestService</service-interface>
- <wsdl-file>META-INF/wsdl/soapfaults.wsdl</wsdl-file>
- <jaxrpc-mapping-file>mapping_appclient.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:test">servicens:TestService
- </service-qname>
- </service-ref>
-</application-client>
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 33626f9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>App</display-name>
- <module>
- <java>soapfaults-client.jar</java>
- </module>
- <module>
- <ejb>soapfaults-ejb.jar</ejb>
- </module>
-</application>
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 a93c3c0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>SoapFaultsEjb</ejb-name>
- <service-endpoint>soapfaultsejb.Test</service-endpoint>
- <ejb-class>soapfaultsejb.SoapFaultsEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>SoapFaultsEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
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 0dc6db9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/soapfaults</service-ref-name>
- <port-info>
- <service-endpoint-interface>soapfaults.Test</service-endpoint-interface>
- <stub-property>
- <name>com.sun.enterprise.webservice.client.transport.log</name>
- <value>file:jaxrpc.log</value>
- </stub-property>
- </port-info>
- <service-qname>
- <namespaceURI>urn:TestService</namespaceURI>
- <localpart>TestService</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
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 3d93db3..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>SoapFaultsEjb</ejb-name>
- <jndi-name>SoapFaultsEjb</jndi-name>
- <pass-by-reference>false</pass-by-reference>
- <is-read-only-bean>false</is-read-only-bean>
- <refresh-period-in-seconds>-1</refresh-period-in-seconds>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>TestPort</port-component-name>
- <endpoint-address-uri>soapfaultsejb/SoapFaultsTest</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 e74d8dc..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/webservices.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>SoapFaultsWebServiceEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/soapfaults.wsdl</wsdl-file>
- <jaxrpc-mapping-file>mapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>TestPort</port-component-name>
- <wsdl-port xmlns:myns="urn:test">myns:TestPort</wsdl-port>
- <service-endpoint-interface>soapfaultsejb.Test</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>SoapFaultsEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 77c5ed2..0000000
--- 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 8ad5e8a..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/soapfaults.wsdl
+++ /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
-
--->
-
-<definitions
- name="HelloTest"
- targetNamespace="urn:test"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:ttns="urn:test:types"
- xmlns:tns="urn:test">
-
- <types>
- <xsd:schema targetNamespace="urn:test:types">
-
- <xsd:element name="Test1Request" type="ttns:Test1RequestType"/>
- <xsd:complexType name="Test1RequestType">
- <xsd:sequence>
- <xsd:element name="test1RequestParamA" type="xsd:string"/>
- <xsd:element name="test1RequestParamB" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="Test2Request" type="ttns:Test2RequestType"/>
- <xsd:complexType name="Test2RequestType">
- <xsd:sequence>
- <xsd:element name="test2RequestParamA" type="xsd:string"/>
- <xsd:element name="test2RequestParamB" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="Test1Response" type="ttns:Test1ResponseType"/>
- <xsd:complexType name="Test1ResponseType">
- <xsd:sequence>
- <xsd:element name="test1ResponseParamA" type="xsd:int"/>
- <xsd:element name="test1ResponseParamB" type="xsd:int"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="FaultOneReason" type="ttns:FaultOne"/>
- <xsd:complexType name="FaultOne">
- <xsd:sequence>
- <xsd:element name="messageID1" type="xsd:string"/>
- <xsd:element name="message1" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="FaultTwoReason" type="ttns:FaultTwo"/>
- <xsd:complexType name="FaultTwo">
- <xsd:sequence>
- <xsd:element name="messageID2" type="xsd:string"/>
- <xsd:element name="message2" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="FaultThreeReason" type="ttns:FaultThree"/>
- <xsd:complexType name="FaultThree">
- <xsd:sequence>
- <xsd:element name="messageID3" type="xsd:string"/>
- <xsd:element name="message3" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-
- </xsd:schema>
-
- </types>
-
- <message name="Test1Request">
- <part name="params1" element="ttns:Test1Request"/>
- </message>
-
- <message name="Test2Request">
- <part name="params2" element="ttns:Test2Request"/>
- </message>
-
- <message name="Test1Response">
- <part name="result" element="ttns:Test1Response"/>
- </message>
-
- <message name="FaultOne">
- <part name="reason1" element="ttns:FaultOneReason"/>
- <part name="reason3" element="ttns:FaultThreeReason"/>
- </message>
-
- <message name="FaultTwo">
- <part name="reason" element="ttns:FaultTwoReason"/>
- </message>
-
-
- <portType name="Test">
- <operation name="test1">
- <input message="tns:Test1Request"/>
- <output message="tns:Test1Response"/>
- <fault name="FaultTwo" message="tns:FaultTwo"/>
- </operation>
- </portType>
-
- <binding name="TestBinding" type="tns:Test">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="test1">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal" part="params1"/>
- <soap:header message="tns:Test2Request" part="params2" use="literal">
- <soap:headerfault message="tns:FaultOne" part="reason1" use="literal"/>
- <soap:headerfault message="tns:FaultOne" part="reason3" use="literal"/>
- </soap:header>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- <fault name="FaultTwo">
- <soap:fault name="FaultTwo" use="literal"/>
- </fault>
- </operation>
- </binding>
-
- <service name="TestService">
- <port name="TestPort" binding="tns:TestBinding">
- <soap:address location="http://test.org/test"/>
- </port>
- </service>
-
-</definitions>
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 20a2fdf..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_appclient.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="soapfaults.wsdl"
- packageName="soapfaults"/>
-</configuration>
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 bb3634b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_ejb.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="soapfaults.wsdl"
- packageName="soapfaultsejb"/>
-</configuration>
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 ffdf922..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.properties
+++ /dev/null
@@ -1,37 +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
-
--->
-
-
-<property name="module" value="stubproperties"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="webservices.xml" value="webservices.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
-<property name="app.type" value="application"/>
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 48f3172..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.xml
+++ /dev/null
@@ -1,148 +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
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="JAXRPC Stub Properties test" default="all" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
-<!-- NOTE. the simple mapping test and full mapping test can
- only be run one at a time, I didn't want to set up two
- tests for this. -->
-<!--
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
--->
-
- <target name="all" depends="assemble, deploy, run, undeploy"/>
-
- <target name="compile" depends="compile-web">
- <antcall target="compile-common">
- <param name="src" value="stubprops"/>
- </antcall>
- </target>
-
- <target name="gen-ejb-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/SayHelloMapping_ejb.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/META-INF/wsdl config-interface.xml"/>
- </antcall>
- </target>
-
- <target name="assemble-ejb" depends="init-common, compile, gen-ejb-wsdl">
- <mkdir dir="${build.classes.dir}/WEB-INF/wsdl"/>
- <copy todir="${build.classes.dir}/WEB-INF/wsdl"
- file="${build.classes.dir}/META-INF/wsdl/SayHelloService.wsdl"/>
- <copy todir="." file="descriptor/webservices.xml"/>
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="SayHelloMapping_ejb.xml,META-INF/wsdl/**,stubprops/Simple*.class"/>
- </antcall>
- <delete file="webservices.xml"/>
- </target>
-
-
- <target name="assemble-web" depends="init-common, compile, gen-web-wsdl">
- <copy todir="." file="../shared/war/webservices.xml"/>
- <copy todir="${build.classes.dir}/WEB-INF" file="${sun-web.xml}"/>
- <replace file="${build.classes.dir}/WEB-INF/sun-web.xml" token="@webHost@" value="${http.host}"/>
- <replace file="${build.classes.dir}/WEB-INF/sun-web.xml" token="@webPort@" value="${http.port}"/>
- <antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
- <param name="sun-web.xml" value="${build.classes.dir}/WEB-INF/sun-web.xml"/>
- <param name="mappingfile.location" value="${build.classes.dir}"/>
- <param name="mappingfile.name" value="WebServiceTestMapping.xml"/>
- <param name="wsdlfile.location" value="${build.classes.dir}"/>
- <param name="wsdlfile.name" value="WebServiceServletTest.wsdl"/>
- <param name="webwar.classes" value="SayHelloMapping_ejb.xml,WebServiceTestMapping.xml,WEB-INF/wsdl/**,stubprops/TestServlet.class, test/*.class"/>
- </antcall>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}" casesensitive="yes">
- <include name="WEB-INF/wsdl/SayHelloService.wsdl"/>
- <include name="SayHelloMapping_ejb.xml"/>
- </fileset>
- </jar>
- <delete file="webservices.xml"/>
- </target>
-
- <target name="compile-web" depends="">
- <antcall target="compile-common">
- <param name="src" value="../shared/war"/>
- </antcall>
- </target>
-
- <target name="gen-web-wsdl" depends="init-common">
- <!--<mkdir dir="${build.classes.dir}/WEB-INF/wsdl"/> -->
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/WebServiceTestMapping.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir} ../shared/war/config.xml"/>
- </antcall>
- </target>
-
- <target name="assemble" depends="assemble-ejb, assemble-web, assemble-client"/>
-
- <target name="assemble-client" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <unjar src="${env.APS_HOME}/lib/reporter.jar"
- dest="${build.classes.dir}"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="Client.class, test/**,com/**" />
- </antcall>
- <move file="${assemble.dir}/${appname}-client.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/WebServiceTestServlet/WebServiceTestService"/>
- </antcall>
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-jar-common"/>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="WebServiceTestServlet"/>
- </antcall>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-jar-common"/>
- </target>
-
-</project>
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 11a1660..0000000
--- 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 cc0dbf6..0000000
--- 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 5c9ef91..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SayHelloService"
- targetNamespace="urn:WebServiceTest"
- typeNamespace="urn:WebServiceTest"
- packageName="stubprops">
- <interface name="stubprops.SimpleServer"/>
- </service>
-</configuration>
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 7171984..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/application-client.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my web stub properties test app client</description>
- <display-name>WebStubProperties</display-name>
-</application-client>
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 b2bbfeb..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>SayHelloEJB</ejb-name>
- <service-endpoint>stubprops.SimpleServer</service-endpoint>
- <ejb-class>stubprops.SimpleServerImpl</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
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 6fe5532..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <ejb>
- <ejb-name>SayHelloEJB</ejb-name>
- <jndi-name>SayHelloEJB</jndi-name>
- <webservice-endpoint>
- <port-component-name>SimpleServerPort</port-component-name>
- <endpoint-address-uri>simpleserver/SimpleServer</endpoint-address-uri>
- <debugging-enabled>true</debugging-enabled>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 36605da..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-web.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- 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
-
--->
-
-<sun-web-app>
- <context-root>WebServiceTestServlet</context-root>
- <servlet>
- <servlet-name>test.webservice.WebServiceTestImpl</servlet-name>
- <webservice-endpoint>
- <port-component-name>Port</port-component-name>
- <debugging-enabled>true</debugging-enabled>
- </webservice-endpoint>
- </servlet>
- <service-ref>
- <service-ref-name>service/SimpleServiceReference</service-ref-name>
- <port-info>
- <service-endpoint-interface>stubprops.SimpleServer</service-endpoint-interface>
- <stub-property>
- <name>javax.xml.rpc.service.endpoint.address</name>
- <value>http://@webHost@:@webPort@/simpleserver/SimpleServer </value>
- </stub-property>
- </port-info>
- </service-ref>
-</sun-web-app>
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 283ad48..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/web.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <context-param>
- <param-name>testclassname</param-name>
- <param-value>stubprops.TestServlet</param-value>
- </context-param>
- <servlet>
- <servlet-name>test.webservice.WebServiceTestImpl</servlet-name>
- <servlet-class>test.webservice.WebServiceTestImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>test.webservice.WebServiceTestImpl</servlet-name>
- <url-pattern>/WebServiceTestService</url-pattern>
- </servlet-mapping>
- <service-ref>
- <description>service ref for ejb endpoint</description>
- <service-ref-name>service/SimpleServiceReference</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/SayHelloService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SayHelloMapping_ejb.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:WebServiceTest">servicens:SayHelloService</service-qname>
- <port-component-ref>
- <service-endpoint-interface>stubprops.SimpleServer</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-</web-app>
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 680e350..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/webservices.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>SayHelloService</webservice-description-name>
- <wsdl-file>META-INF/wsdl/SayHelloService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SayHelloMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>SimpleServerPort</port-component-name>
- <wsdl-port xmlns:servicens="urn:WebServiceTest">servicens:SimpleServerPort</wsdl-port>
- <service-endpoint-interface>stubprops.SimpleServer</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>SayHelloEJB</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 1ac4e4f..0000000
--- 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 8c189bc..0000000
--- 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 21e33bb..0000000
--- 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 94706ff..0000000
--- 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 348af5c..10b344b 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;
- <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar"/>
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar" />
- <target name="assemble-ejb" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
+ <target name="assemble-ejb" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
- <antcall target="pkg-ejb-jar">
- <param name="jar.classes" value="endpoint"/>
- <param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar"/>
- </antcall>
+ <antcall target="pkg-ejb-jar">
+ <param name="jar.classes" value="endpoint" />
+ <param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar" />
+ </antcall>
- </target>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/${appname}/service?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -p wls_dd.service_endpoint_address.client -d ${build.classes.dir}/client http://${http.host}:${http.port}/${appname}/service?WSDL"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${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"
- includes="client/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/${appname}/service?WSDL" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -p wls_dd.service_endpoint_address.client -d ${build.classes.dir}/client http://${http.host}:${http.port}/${appname}/service?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="client/**"
+ />
+ </target>
- <target name="deploy-ejb-jar">
- <antcall target="deploy-jar-common"/>
- </target>
+ <target name="deploy-ejb-jar">
+ <antcall target="deploy-jar-common" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-jar-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-jar-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="wls_dd.service_endpoint_address.client.Client"/>
- <param name="other-args" value="async-ejb-test"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="wls_dd.service_endpoint_address.client.Client" />
+ <param name="other-args" value="async-ejb-test" />
+ </antcall>
+ </target>
</project>
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 78d64b5..11fb537 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;
- <target name="all" depends="clean, setup, runclient, undeploy"/>
+ <target name="all" depends="clean, setup, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app, assemble-client"/>
+ <target name="setup" depends="assemble-web, deploy-app, assemble-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="assemble-web" depends="init-common, compile">
+ <target name="assemble-web" depends="init-common, compile">
- <copy file="weblogic-webservices.xml.template" tofile="weblogic-webservices.xml"/>
- <property name="localwsdldir" value="${build.classes.dir}/client" />
- <replace file="${basedir}/weblogic-webservices.xml">
- <replacefilter token="%TOKEN%" value="${localwsdldir}"/>
- </replace>
+ <copy file="weblogic-webservices.xml.template" tofile="weblogic-webservices.xml" />
+ <property name="localwsdldir" value="${build.classes.dir}/client" />
+ <replace file="${basedir}/weblogic-webservices.xml">
+ <replacefilter token="%TOKEN%" value="${localwsdldir}" />
+ </replace>
- <antcall target="pkg-war">
- <param name="wsdlfile.location" value="${basedir}"/>
- <param name="wsdlfile.name" value="AddNumbersService.wsdl"/>
- <param name="schemafile.location" value="${basedir}"/>
- <param name="schemafile.name" value="schema1.xsd"/>
+ <antcall target="pkg-war">
+ <param name="wsdlfile.location" value="${basedir}" />
+ <param name="wsdlfile.name" value="AddNumbersService.wsdl" />
+ <param name="schemafile.location" value="${basedir}" />
+ <param name="schemafile.name" value="schema1.xsd" />
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/${appname}/service?WSDL"/>
- <property name="localwsdldir" value="${build.classes.dir}/client" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -p wls_dd.${ant.project.name}.client -d ${build.classes.dir}/client ${localwsdldir}/AddNumbersService.wsdl"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${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"
- includes="client/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/${appname}/service?WSDL" />
+ <property name="localwsdldir" value="${build.classes.dir}/client" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -p wls_dd.${ant.project.name}.client -d ${build.classes.dir}/client ${localwsdldir}/AddNumbersService.wsdl"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="client/**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ </target>
- <target name="runclient">
- <!--property name="endpoint.address" value="http://${http.host}:${http.port}/${appname}/service"/-->
- <antcall target="run-client">
- <param name="client-class" value="wls_dd.${ant.project.name}.client.Client"/>
- <param name="other-args" value="async-web-svc-test"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="wls_dd.${ant.project.name}.client.Client" />
+ <param name="other-args" value="async-web-svc-test" />
+ </antcall>
+ </target>
</project>
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 07e7f94..0000000
--- 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 34fd60d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.properties
+++ /dev/null
@@ -1,33 +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
-
--->
-
-
-<property name="module" value="faultcode"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
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 f3ad3d4..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.xml
+++ /dev/null
@@ -1,149 +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
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="faultcode test" default="usage" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
-
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
- <target name="compile" depends="">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- </target>
-
- <target name="build" depends="init-common, clean">
- <antcall target="gen-mapping-appclient"/>
- <antcall target="gen-mapping-ejb"/>
- <antcall target="wscompile-appclient"/>
- <antcall target="wscompile-ejb"/>
- <antcall target="assemble"/>
- </target>
-
- <target name="wscompile-appclient" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . wscompile_config_appclient.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/faultcode">
- <fileset dir="output/faultcode"
- includes="SimpleTestService.class, SimpleTest.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="wscompile-ejb" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . wscompile_config_ejb.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/faultcodeejb">
- <fileset dir="output/faultcodeejb"
- includes="SimpleTestService.class, SimpleTest.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="assemble" depends="init-common, compile">
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="faultcode.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="FaultCodeMapping_appclient.xml"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="FaultCodeMapping_appclient.xml,META-INF/wsdl/**,faultcode/*.class" />
-
- </antcall>
- <copy todir="${build.classes.dir}"
- file="FaultCodeMapping_ejb.xml"/>
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
- value="FaultCodeMapping_ejb.xml,META-INF/wsdl/**,faultcodeejb/*.class" />
-
- </antcall>
- <antcall target="ear-common" />
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete dir="output"/>
- <delete dir="faultcode"/>
- <delete dir="faultcodeejb"/>
- <delete file="FaultCodeMapping_ejb.xml"/>
- <delete file="FaultCodeMapping_appclient.xml"/>
- <delete file="jaxrpc.log"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/faultcodeejb/FaultCodeTest"/>
- </antcall>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="gen-mapping-appclient" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping FaultCodeMapping_appclient.xml wscompile_config_appclient.xml"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-ejb" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping FaultCodeMapping_ejb.xml wscompile_config_ejb.xml"/>
- </antcall>
- </target>
-
- <target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- </echo>
- </target>
-</project>
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 4db8f10..0000000
--- 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 cb2a281..0000000
--- 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 2bfe80e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <j2eeMappingFile
- location="XsdAnyMapping_ejb.xml"
- wsdlLocation="xsdany.wsdl"/>
-</configuration>
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 1ccab9c..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application-client.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my faultcode app client</description>
- <display-name>faultcodeClient</display-name>
- <service-ref>
- <description>faultcode service ref</description>
- <service-ref-name>service/faultcode</service-ref-name>
- <service-interface>faultcode.TestService</service-interface>
- <wsdl-file>META-INF/wsdl/faultcode.wsdl</wsdl-file>
- <jaxrpc-mapping-file>FaultCodeMapping_appclient.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:test">servicens:TestService
- </service-qname>
- </service-ref>
-</application-client>
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 645b137..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>FaultCodeApp</display-name>
- <module>
- <java>faultcode-client.jar</java>
- </module>
- <module>
- <ejb>faultcode-ejb.jar</ejb>
- </module>
-</application>
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 0717702..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>FaultCodeEjb</ejb-name>
- <service-endpoint>faultcodeejb.Test</service-endpoint>
- <ejb-class>faultcodeejb.FaultCodeEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>FaultCodeEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
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 5a9d210..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/faultcode</service-ref-name>
- <port-info>
- <service-endpoint-interface>faultcode.Test</service-endpoint-interface>
- <stub-property>
- <name>com.sun.enterprise.webservice.client.transport.log</name>
- <value>file:jaxrpc.log</value>
- </stub-property>
- </port-info>
- <service-qname>
- <namespaceURI>urn:TestService</namespaceURI>
- <localpart>TestService</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
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 01e36b6..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>FaultCodeEjb</ejb-name>
- <jndi-name>FaultCodeEjb</jndi-name>
- <pass-by-reference>false</pass-by-reference>
- <is-read-only-bean>false</is-read-only-bean>
- <refresh-period-in-seconds>-1</refresh-period-in-seconds>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>TestPort</port-component-name>
- <endpoint-address-uri>faultcode/FaultCodeTest</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 a796148..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/webservices.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>FaultCodeWebServiceEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/faultcode.wsdl</wsdl-file>
- <jaxrpc-mapping-file>FaultCodeMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>TestPort</port-component-name>
- <wsdl-port xmlns:faultcodens="urn:test">faultcodens:TestPort</wsdl-port>
- <service-endpoint-interface>faultcodeejb.Test</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>FaultCodeEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 55734c9..0000000
--- 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 c04d055..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/faultcode.wsdl
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.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
-
--->
-
-<definitions name="urn:SimpleTest"
- targetNamespace="urn:SimpleTest"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:tns="urn:SimpleTest"
- xmlns:s="http://SimpleTest.org/xsd"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
- <types/>
-
- <message name="echoString">
- <part name="body" type="xsd:string"/>
- </message>
- <message name="echoStringResponse">
- <part name="return" type="xsd:string"/>
- </message>
-
- <portType name="SimpleTest">
- <operation name="echoString" parameterOrder="body" >
- <input message="tns:echoString"/>
- <output message="tns:echoStringResponse"/>
- </operation>
- </portType>
-
- <binding name="SimpleTestBinding" type="tns:SimpleTest">
- <soap:binding style="rpc"
- transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="echoString">
- <soap:operation soapAction="http://SimpleTest.org/"/>
- <input> <soap:body use="literal" namespace="http://SimpleTest.org/xsd"/> </input>
- <output> <soap:body use="literal" namespace="http://SimpleTest.org/xsd"/> </output>
- </operation>
- </binding>
-
- <service name="SimpleTestService">
- <port name="SimpleTest" binding="tns:SimpleTestBinding">
- <soap:address location="http://localhost:1024/rpclit/SimpleTest"/>
- </port>
- </service>
-</definitions>
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 1dde122..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_appclient.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="faultcode.wsdl"
- packageName="faultcode"/>
-</configuration>
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 af5e53f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_ejb.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="faultcode.wsdl"
- packageName="faultcodeejb"/>
-</configuration>
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 458c819..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.properties
+++ /dev/null
@@ -1,33 +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
-
--->
-
-
-<property name="module" value="xsdany"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
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 fc34f06..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.xml
+++ /dev/null
@@ -1,149 +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
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="xsd test" default="usage" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
-
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
- <target name="compile" depends="">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- </target>
-
- <target name="build" depends="init-common, clean">
- <antcall target="gen-mapping-appclient"/>
- <antcall target="gen-mapping-ejb"/>
- <antcall target="wscompile-appclient"/>
- <antcall target="wscompile-ejb"/>
- <antcall target="assemble"/>
- </target>
-
- <target name="wscompile-appclient" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . wscompile_config_appclient.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/xsdany">
- <fileset dir="output/xsdany"
- includes="TestService.class, Test.class, SingleWildcardType.class, RepeatedWildcardType.class, Test1RequestType.class, Test1ResponseType.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="wscompile-ejb" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . wscompile_config_ejb.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/xsdanyejb">
- <fileset dir="output/xsdanyejb"
- includes="TestService.class, Test.class, SingleWildcardType.class, RepeatedWildcardType.class, Test1RequestType.class, Test1ResponseType.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="assemble" depends="init-common, compile">
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="xsdany.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="XsdAnyMapping_appclient.xml"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="XsdAnyMapping_appclient.xml,META-INF/wsdl/**,xsdany/*.class" />
-
- </antcall>
- <copy todir="${build.classes.dir}"
- file="XsdAnyMapping_ejb.xml"/>
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
- value="XsdAnyMapping_ejb.xml,META-INF/wsdl/**,xsdanyejb/*.class" />
-
- </antcall>
- <antcall target="ear-common" />
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete dir="output"/>
- <delete dir="xsdany"/>
- <delete dir="xsdanyejb"/>
- <delete file="XsdAnyMapping_ejb.xml"/>
- <delete file="XsdAnyMapping_appclient.xml"/>
- <delete file="jaxrpc.log"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/xsdanyejb/XsdAnyTest"/>
- </antcall>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="gen-mapping-appclient" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping XsdAnyMapping_appclient.xml wscompile_config_appclient.xml"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-ejb" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping XsdAnyMapping_ejb.xml wscompile_config_ejb.xml"/>
- </antcall>
- </target>
-
- <target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- </echo>
- </target>
-</project>
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 696658d..0000000
--- 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 cb2a281..0000000
--- 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 2bfe80e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <j2eeMappingFile
- location="XsdAnyMapping_ejb.xml"
- wsdlLocation="xsdany.wsdl"/>
-</configuration>
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 f018ec8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application-client.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my xsdany app client</description>
- <display-name>xsdanyClient</display-name>
- <service-ref>
- <description>xsdany service ref</description>
- <service-ref-name>service/xsdany</service-ref-name>
- <service-interface>xsdany.TestService</service-interface>
- <wsdl-file>META-INF/wsdl/xsdany.wsdl</wsdl-file>
- <jaxrpc-mapping-file>XsdAnyMapping_appclient.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:test">servicens:TestService
- </service-qname>
- </service-ref>
-</application-client>
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 9329a49..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>XsdAnyApp</display-name>
- <module>
- <java>xsdany-client.jar</java>
- </module>
- <module>
- <ejb>xsdany-ejb.jar</ejb>
- </module>
-</application>
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 e09a41c..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>XsdAnyEjb</ejb-name>
- <service-endpoint>xsdanyejb.Test</service-endpoint>
- <ejb-class>xsdanyejb.XsdAnyEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>XsdAnyEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
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 6c87a9d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/xsdany</service-ref-name>
- <port-info>
- <service-endpoint-interface>xsdany.Test</service-endpoint-interface>
- </port-info>
- <service-qname>
- <namespaceURI>urn:TestService</namespaceURI>
- <localpart>TestService</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
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 33e357f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- 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
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>XsdAnyEjb</ejb-name>
- <jndi-name>XsdAnyEjb</jndi-name>
- <pass-by-reference>false</pass-by-reference>
- <is-read-only-bean>false</is-read-only-bean>
- <refresh-period-in-seconds>-1</refresh-period-in-seconds>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>TestPort</port-component-name>
- <endpoint-address-uri>xsdanyejb/XsdAnyTest</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
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 121427a..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/webservices.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>XsdAnyWebServiceEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/xsdany.wsdl</wsdl-file>
- <jaxrpc-mapping-file>XsdAnyMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>TestPort</port-component-name>
- <wsdl-port xmlns:xsdanyns="urn:test">xsdanyns:TestPort</wsdl-port>
- <service-endpoint-interface>xsdanyejb.Test</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>XsdAnyEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
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 9488540..0000000
--- 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 bcb953b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_appclient.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="xsdany.wsdl"
- packageName="xsdany"/>
-</configuration>
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 cc2b737..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_ejb.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="xsdany.wsdl"
- packageName="xsdanyejb"/>
-</configuration>
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 6f44fc6..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/xsdany.wsdl
+++ /dev/null
@@ -1,116 +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
-
--->
-
-<definitions
- name="HelloTest"
- targetNamespace="urn:test"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:ttns="urn:test:types"
- xmlns:tns="urn:test">
-
- <types>
- <xsd:schema targetNamespace="urn:test:types">
-
- <xsd:element name="Test1Request" type="ttns:Test1RequestType"/>
- <xsd:complexType name="Test1RequestType">
- <xsd:sequence>
- <xsd:element name="a" type="xsd:int"/>
-<!-- XXX BUG. Can't handle this
- <xsd:element name="b" type="ttns:ComplexTypeSimpleContentType"/>
--->
- <xsd:element name="c" type="ttns:SingleWildcardType"/>
- <xsd:element name="d" type="ttns:RepeatedWildcardType"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="Test1Response" type="ttns:Test1ResponseType"/>
- <xsd:complexType name="Test1ResponseType">
- <xsd:sequence>
- <xsd:element name="a" type="xsd:int"/>
- </xsd:sequence>
- </xsd:complexType>
-
-<!-- XXX BUG. Can't handle this.
- <xsd:complexType name="ComplexTypeSimpleContentType">
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:attribute name="foo" type="xsd:int"/>
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
--->
-
- <xsd:complexType name="SingleWildcardType">
- <xsd:sequence>
- <xsd:element name="foo" type="xsd:int"/>
- <xsd:element name="bar" type="xsd:string"/>
- <xsd:element name="voo" type="xsd:string"/>
-<!-- XXX BUG. How to write the client??
- <xsd:any namespace="##other" processContents="lax"/>
--->
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="RepeatedWildcardType">
- <xsd:sequence>
- <xsd:element name="foo" type="xsd:int"/>
- <xsd:element name="bar" type="xsd:string"/>
- <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
- </xsd:sequence>
- </xsd:complexType>
-
- </xsd:schema>
- </types>
-
- <message name="Test1Request">
- <part name="params" element="ttns:Test1Request"/>
- </message>
-
- <message name="Test1Response">
- <part name="result" element="ttns:Test1Response"/>
- </message>
-
- <portType name="Test">
- <operation name="test1">
- <input message="tns:Test1Request"/>
- <output message="tns:Test1Response"/>
- </operation>
- </portType>
-
- <binding name="TestBinding" type="tns:Test">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="test1">
- <soap:operation soapAction="urn:test:hello"/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
-
- <service name="TestService">
- <port name="TestPort" binding="tns:TestBinding">
- <soap:address location="http://test.org/test"/>
- </port>
- </service>
-
-</definitions>
diff --git a/appserver/tests/gftest.sh b/appserver/tests/gftest.sh
index b364a84..7957205 100755
--- a/appserver/tests/gftest.sh
+++ b/appserver/tests/gftest.sh
@@ -49,11 +49,17 @@
# 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
"$@"
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 b7ec457..0000000
--- a/appserver/tests/quicklook/cluster/clustersetup/nbproject/project.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.ant.freeform</type>
- <configuration>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
- <!-- Do not use Project Properties customizer when editing this file manually. -->
- <name>cluster-setup</name>
- <properties/>
- <folders>
- <source-folder>
- <label>C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java</label>
- <location>C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java</location>
- </source-folder>
- <source-folder>
- <label>src</label>
- <type>java</type>
- <location>src</location>
- </source-folder>
- </folders>
- <ide-actions>
- <action name="build">
- <target>build</target>
- </action>
- <action name="clean">
- <target>clean</target>
- </action>
- <action name="run">
- <target>all</target>
- </action>
- <action name="test">
- <target>runtest</target>
- </action>
- <action name="rebuild">
- <target>clean</target>
- <target>build</target>
- </action>
- </ide-actions>
- <view>
- <items>
- <source-folder style="packages">
- <label>src</label>
- <location>src</location>
- </source-folder>
- <source-file>
- <location>build.xml</location>
- </source-file>
- </items>
- <context-menu>
- <ide-action name="build"/>
- <ide-action name="rebuild"/>
- <ide-action name="clean"/>
- <ide-action name="run"/>
- <ide-action name="test"/>
- </context-menu>
- </view>
- <subprojects/>
- </general-data>
- <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
- <compilation-unit>
- <package-root>src</package-root>
- <classpath mode="compile">../../classes/test:/.m2/repository/org/testng/testng/5.6/testng-5.6-jdk15.jar</classpath>
- <source-level>1.5</source-level>
- </compilation-unit>
- </java-data>
- </configuration>
-</project>
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 f1c3088..0000000
--- a/appserver/tests/quicklook/cluster/clusterteardown/nbproject/project.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.ant.freeform</type>
- <configuration>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
- <!-- Do not use Project Properties customizer when editing this file manually. -->
- <name>cluster-teardown</name>
- <properties/>
- <folders>
- <source-folder>
- <label>C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java</label>
- <location>C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java</location>
- </source-folder>
- <source-folder>
- <label>src</label>
- <type>java</type>
- <location>src</location>
- </source-folder>
- </folders>
- <ide-actions>
- <action name="build">
- <target>build</target>
- </action>
- <action name="clean">
- <target>clean</target>
- </action>
- <action name="run">
- <target>all</target>
- </action>
- <action name="test">
- <target>runtest</target>
- </action>
- <action name="rebuild">
- <target>clean</target>
- <target>build</target>
- </action>
- </ide-actions>
- <view>
- <items>
- <source-folder style="packages">
- <label>src</label>
- <location>src</location>
- </source-folder>
- <source-file>
- <location>build.xml</location>
- </source-file>
- </items>
- <context-menu>
- <ide-action name="build"/>
- <ide-action name="rebuild"/>
- <ide-action name="clean"/>
- <ide-action name="run"/>
- <ide-action name="test"/>
- </context-menu>
- </view>
- <subprojects/>
- </general-data>
- <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
- <compilation-unit>
- <package-root>src</package-root>
- <classpath mode="compile">../../classes/test:/.m2/repository/org/testng/testng/5.6/testng-5.6-jdk15.jar</classpath>
- <source-level>1.5</source-level>
- </compilation-unit>
- </java-data>
- </configuration>
-</project>
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 dfe5168..0000000
--- a/appserver/tests/quicklook/cluster/helloworld/nbproject/project.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2010, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.ant.freeform</type>
- <configuration>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
- <!-- Do not use Project Properties customizer when editing this file manually. -->
- <name>cluster-helloworld</name>
- <properties/>
- <folders>
- <source-folder>
- <label>C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java</label>
- <location>C:\gf\v2\appserv-tests\util\reportbuilder\src\main\java</location>
- </source-folder>
- <source-folder>
- <label>src</label>
- <type>java</type>
- <location>src</location>
- </source-folder>
- </folders>
- <ide-actions>
- <action name="build">
- <target>build</target>
- </action>
- <action name="clean">
- <target>clean</target>
- </action>
- <action name="run">
- <target>all</target>
- </action>
- <action name="test">
- <target>runtest</target>
- </action>
- <action name="rebuild">
- <target>clean</target>
- <target>build</target>
- </action>
- </ide-actions>
- <view>
- <items>
- <source-folder style="packages">
- <label>src</label>
- <location>src</location>
- </source-folder>
- <source-file>
- <location>build.xml</location>
- </source-file>
- </items>
- <context-menu>
- <ide-action name="build"/>
- <ide-action name="rebuild"/>
- <ide-action name="clean"/>
- <ide-action name="run"/>
- <ide-action name="test"/>
- </context-menu>
- </view>
- <subprojects/>
- </general-data>
- <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
- <compilation-unit>
- <package-root>src</package-root>
- <classpath mode="compile">../../classes/test:/.m2/repository/org/testng/testng/5.6/testng-5.6-jdk15.jar</classpath>
- <source-level>1.5</source-level>
- </compilation-unit>
- </java-data>
- </configuration>
-</project>
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 d98fde4..0000000
--- a/appserver/tests/v2-tests/appserv-tests/community/nbproject/private/private.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
- <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>
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 63aa223..0000000
--- a/appserver/tests/v2-tests/appserv-tests/community/nbproject/project.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.ant.freeform</type>
- <configuration>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
- <!-- Do not use Project Properties customizer when editing this file manually. -->
- <name>gf-community</name>
- <properties/>
- <ide-actions>
- <action name="build">
- <target>build</target>
- </action>
- <action name="run">
- <target>run</target>
- </action>
- <action name="test">
- <target>compile-tests</target>
- </action>
- </ide-actions>
- <view>
- <items>
- <source-file>
- <location>build.xml</location>
- </source-file>
- </items>
- <context-menu>
- <ide-action name="build"/>
- <ide-action name="run"/>
- <ide-action name="test"/>
- </context-menu>
- </view>
- </general-data>
- <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1"/>
- </configuration>
-</project>
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 6578df0..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/admin/debug/JmxUtils/nbproject/build-impl.xml
+++ /dev/null
@@ -1,559 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT ***
-*** EDIT ../build.xml INSTEAD ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
- - initialization
- - compilation
- - jar
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - applet
- - cleanup
-
--->
-<project name="JmxUtils-impl" default="default" basedir=".." xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1">
- <target name="default" depends="test,jar,javadoc" description="Build and test whole project."/>
- <!--
- ======================
- INITIALIZATION SECTION
- ======================
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-init-private" depends="-pre-init">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target name="-init-user" depends="-pre-init,-init-private">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target name="-init-project" depends="-pre-init,-init-private,-init-user">
- <property file="nbproject/project.properties"/>
- </target>
- <target name="-do-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property">
- <available file="${manifest.file}" property="manifest.available"/>
- <condition property="manifest.available+main.class">
- <and>
- <isset property="manifest.available"/>
- <isset property="main.class"/>
- <not>
- <equals arg1="${main.class}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <condition property="manifest.available+main.class+mkdist.available">
- <and>
- <istrue value="${manifest.available+main.class}"/>
- <isset property="libs.CopyLibs.classpath"/>
- </and>
- </condition>
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="run.jvmargs" value=""/>
- <property name="javac.compilerargs" value=""/>
- <property name="work.dir" value="${basedir}"/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <property name="javac.debug" value="true"/>
- <property name="javadoc.preview" value="true"/>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-init-check" depends="-pre-init,-init-private,-init-user,-init-project,-do-init">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.jar">Must set dist.jar</fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-javac">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute name="srcdir" default="${src.dir}"/>
- <attribute name="destdir" default="${build.classes.dir}"/>
- <attribute name="classpath" default="${javac.classpath}"/>
- <attribute name="debug" default="${javac.debug}"/>
- <element name="customize" optional="true"/>
- <sequential>
- <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute name="includes" default="**/*Test.java"/>
- <sequential>
- <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" includes="@{includes}"/>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper type="glob" from="test-sys-prop.*" to="*"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- <jvmarg line="${run.jvmargs}"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
- <attribute name="name" default="${main.class}"/>
- <attribute name="classpath" default="${debug.classpath}"/>
- <attribute name="stopclassname" default=""/>
- <sequential>
- <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
- <attribute name="dir" default="${build.classes.dir}"/>
- <sequential>
- <nbjpdareload>
- <fileset includes="${fix.includes}*.class" dir="@{dir}"/>
- </nbjpdareload>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute name="classname" default="${main.class}"/>
- <attribute name="classpath" default="${debug.classpath}"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java fork="true" classname="@{classname}" dir="${work.dir}">
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xnoagent"/>
- <jvmarg value="-Djava.compiler=none"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
- <jvmarg line="${run.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper type="glob" from="run-sys-prop.*" to="*"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
- <attribute name="classname" default="${main.class}"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java fork="true" classname="@{classname}" dir="${work.dir}">
- <jvmarg line="${run.jvmargs}"/>
- <classpath>
- <path path="${run.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper type="glob" from="run-sys-prop.*" to="*"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-presetdef-jar">
- <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
- <jar jarfile="${dist.jar}" compress="${jar.compress}">
- <j2seproject1:fileset dir="${build.classes.dir}"/>
- </jar>
- </presetdef>
- </target>
- <target name="init" depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar"/>
- <!--
- ===================
- COMPILATION SECTION
- ===================
- -->
- <target name="deps-jar" depends="init" unless="no.deps"/>
- <target name="-pre-pre-compile" depends="init,deps-jar">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources">
- <j2seproject3:javac/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project."/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-compile-single" depends="init,deps-jar,-pre-pre-compile">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <j2seproject3:javac>
- <customize>
- <patternset includes="${javac.includes}"/>
- </customize>
- </j2seproject3:javac>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile-single" depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single"/>
- <!--
- ====================
- JAR BUILDING SECTION
- ====================
- -->
- <target name="-pre-pre-jar" depends="init">
- <dirname property="dist.jar.dir" file="${dist.jar}"/>
- <mkdir dir="${dist.jar.dir}"/>
- </target>
- <target name="-pre-jar">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-jar-without-manifest" depends="init,compile,-pre-pre-jar,-pre-jar" unless="manifest.available">
- <j2seproject1:jar/>
- </target>
- <target name="-do-jar-with-manifest" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" unless="manifest.available+main.class">
- <j2seproject1:jar manifest="${manifest.file}"/>
- </target>
- <target name="-do-jar-with-mainclass" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" unless="manifest.available+main.class+mkdist.available">
- <j2seproject1:jar manifest="${manifest.file}">
- <j2seproject1:manifest>
- <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
- </j2seproject1:manifest>
- </j2seproject1:jar>
- <echo>To run this application from the command line without Ant, try:</echo>
- <property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
- <property name="dist.jar.resolved" location="${dist.jar}"/>
- <pathconvert property="run.classpath.with.dist.jar">
- <path path="${run.classpath}"/>
- <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
- </pathconvert>
- <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
- </target>
- <target name="-do-jar-with-libraries" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available">
- <property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
- <pathconvert property="run.classpath.without.build.classes.dir">
- <path path="${run.classpath}"/>
- <map from="${build.classes.dir.resolved}" to=""/>
- </pathconvert>
- <pathconvert property="jar.classpath" pathsep=" ">
- <path path="${run.classpath.without.build.classes.dir}"/>
- <chainedmapper>
- <flattenmapper/>
- <globmapper from="*" to="lib/*"/>
- </chainedmapper>
- </pathconvert>
- <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" name="copylibs" classpath="${libs.CopyLibs.classpath}"/>
- <copylibs manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}" jarfile="${dist.jar}" compress="${jar.compress}">
- <fileset dir="${build.classes.dir}"/>
- <manifest>
- <attribute name="Main-Class" value="${main.class}"/>
- <attribute name="Class-Path" value="${jar.classpath}"/>
- </manifest>
- </copylibs>
- <echo>To run this application from the command line without Ant, try:</echo>
- <property name="dist.jar.resolved" location="${dist.jar}"/>
- <echo>java -jar "${dist.jar.resolved}"</echo>
- </target>
- <target name="-post-jar">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="jar" depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR."/>
- <!--
- =================
- EXECUTION SECTION
- =================
- -->
- <target name="run" depends="init,compile" description="Run a main class.">
- <j2seproject1:java>
- <customize>
- <arg line="${application.args}"/>
- </customize>
- </j2seproject1:java>
- </target>
- <target name="run-single" depends="init,compile-single">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <j2seproject1:java classname="${run.class}"/>
- </target>
- <!--
- =================
- DEBUGGING SECTION
- =================
- -->
- <target name="-debug-start-debugger" if="netbeans.home" depends="init">
- <j2seproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target name="-debug-start-debuggee" depends="init,compile">
- <j2seproject3:debug>
- <customize>
- <arg line="${application.args}"/>
- </customize>
- </j2seproject3:debug>
- </target>
- <target name="debug" if="netbeans.home" depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE."/>
- <target name="-debug-start-debugger-stepinto" if="netbeans.home" depends="init">
- <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
- </target>
- <target name="debug-stepinto" if="netbeans.home" depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee"/>
- <target name="-debug-start-debuggee-single" if="netbeans.home" depends="init,compile-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <j2seproject3:debug classname="${debug.class}"/>
- </target>
- <target name="debug-single" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single"/>
- <target name="-pre-debug-fix" depends="init">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target name="-do-debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,compile-single">
- <j2seproject1:nbjpdareload/>
- </target>
- <target name="debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix"/>
- <!--
- ===============
- JAVADOC SECTION
- ===============
- -->
- <target name="-javadoc-build" depends="init">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true">
- <classpath>
- <path path="${javac.classpath}"/>
- </classpath>
- <sourcepath>
- <pathelement location="${src.dir}"/>
- </sourcepath>
- <packageset dir="${src.dir}" includes="*/**"/>
- <fileset dir="${src.dir}" includes="*.java"/>
- </javadoc>
- </target>
- <target name="-javadoc-browse" if="netbeans.home" unless="no.javadoc.preview" depends="init,-javadoc-build">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target name="javadoc" depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc."/>
- <!--
- =========================
- JUNIT COMPILATION SECTION
- =========================
- -->
- <target name="-pre-pre-compile-test" if="have.tests" depends="init,compile">
- <mkdir dir="${build.test.classes.dir}"/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-compile-test" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test">
- <j2seproject3:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="**/*.java"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile-test" depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-compile-test-single" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <j2seproject3:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}">
- <customize>
- <patternset includes="${javac.includes}"/>
- </customize>
- </j2seproject3:javac>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="**/*.java"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile-test-single" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single"/>
- <!--
- =======================
- JUNIT EXECUTION SECTION
- =======================
- -->
- <target name="-pre-test-run" if="have.tests" depends="init">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target name="-do-test-run" if="have.tests" depends="init,compile-test,-pre-test-run">
- <j2seproject3:junit/>
- </target>
- <target name="-post-test-run" if="have.tests" depends="init,compile-test,-pre-test-run,-do-test-run">
- <fail if="tests.failed">Some tests failed; see details above.</fail>
- </target>
- <target name="test-report" if="have.tests" depends="init"/>
- <target name="-test-browse" if="netbeans.home+have.tests" depends="init"/>
- <target name="test" depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests."/>
- <target name="-pre-test-run-single" if="have.tests" depends="init">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target name="-do-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <j2seproject3:junit includes="${test.includes}"/>
- </target>
- <target name="-post-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single">
- <fail if="tests.failed">Some tests failed; see details above.</fail>
- </target>
- <target name="test-single" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test."/>
- <!--
- =======================
- JUNIT DEBUGGING SECTION
- =======================
- -->
- <target name="-debug-start-debuggee-test" if="have.tests" depends="init,compile-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <j2seproject3:debug classname="junit.textui.TestRunner" classpath="${debug.test.classpath}">
- <customize>
- <arg line="${test.class}"/>
- </customize>
- </j2seproject3:debug>
- </target>
- <target name="-debug-start-debugger-test" if="netbeans.home+have.tests" depends="init,compile-test">
- <j2seproject1:nbjpdastart name="${test.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target name="debug-test" depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test"/>
- <target name="-do-debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,compile-test-single">
- <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target name="debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix-test"/>
- <!--
- =========================
- APPLET EXECUTION SECTION
- =========================
- -->
- <target name="run-applet" depends="init,compile-single">
- <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
- <j2seproject1:java classname="sun.applet.AppletViewer">
- <customize>
- <arg value="${applet.url}"/>
- </customize>
- </j2seproject1:java>
- </target>
- <!--
- =========================
- APPLET DEBUGGING SECTION
- =========================
- -->
- <target name="-debug-start-debuggee-applet" if="netbeans.home" depends="init,compile-single">
- <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
- <j2seproject3:debug classname="sun.applet.AppletViewer">
- <customize>
- <arg value="${applet.url}"/>
- </customize>
- </j2seproject3:debug>
- </target>
- <target name="debug-applet" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet"/>
- <!--
- ===============
- CLEANUP SECTION
- ===============
- -->
- <target name="deps-clean" depends="init" unless="no.deps"/>
- <target name="-do-clean" depends="init">
- <delete dir="${build.dir}"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="clean" depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products."/>
-</project>
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 a9ba634..0000000
--- 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 c493646..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/admin/debug/JmxUtils/nbproject/project.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.java.j2seproject</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
- <name>JmxUtils</name>
- <minimum-ant-version>1.6.5</minimum-ant-version>
- <source-roots>
- <root id="src.dir"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir"/>
- </test-roots>
- </data>
- </configuration>
-</project>
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 8fd69bb..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/build-impl.xml
+++ /dev/null
@@ -1,559 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<!--
-*** GENERATED FROM project.xml - DO NOT EDIT ***
-*** EDIT ../build.xml INSTEAD ***
-
-For the purpose of easier reading the script
-is divided into following sections:
-
- - initialization
- - compilation
- - jar
- - execution
- - debugging
- - javadoc
- - junit compilation
- - junit execution
- - junit debugging
- - applet
- - cleanup
-
--->
-<project name="ConfigViewer-impl" default="default" basedir=".." xmlns:j2seproject3="http://www.netbeans.org/ns/j2se-project/3" xmlns:j2seproject2="http://www.netbeans.org/ns/j2se-project/2" xmlns:j2seproject1="http://www.netbeans.org/ns/j2se-project/1">
- <target name="default" depends="test,jar,javadoc" description="Build and test whole project."/>
- <!--
- ======================
- INITIALIZATION SECTION
- ======================
- -->
- <target name="-pre-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-init-private" depends="-pre-init">
- <property file="nbproject/private/private.properties"/>
- </target>
- <target name="-init-user" depends="-pre-init,-init-private">
- <property file="${user.properties.file}"/>
- <!-- The two properties below are usually overridden -->
- <!-- by the active platform. Just a fallback. -->
- <property name="default.javac.source" value="1.4"/>
- <property name="default.javac.target" value="1.4"/>
- </target>
- <target name="-init-project" depends="-pre-init,-init-private,-init-user">
- <property file="nbproject/project.properties"/>
- </target>
- <target name="-do-init" depends="-pre-init,-init-private,-init-user,-init-project,-init-macrodef-property">
- <available file="${manifest.file}" property="manifest.available"/>
- <condition property="manifest.available+main.class">
- <and>
- <isset property="manifest.available"/>
- <isset property="main.class"/>
- <not>
- <equals arg1="${main.class}" arg2="" trim="true"/>
- </not>
- </and>
- </condition>
- <condition property="manifest.available+main.class+mkdist.available">
- <and>
- <istrue value="${manifest.available+main.class}"/>
- <isset property="libs.CopyLibs.classpath"/>
- </and>
- </condition>
- <condition property="have.tests">
- <or>
- <available file="${test.src.dir}"/>
- </or>
- </condition>
- <condition property="have.sources">
- <or>
- <available file="${src.dir}"/>
- </or>
- </condition>
- <condition property="netbeans.home+have.tests">
- <and>
- <isset property="netbeans.home"/>
- <isset property="have.tests"/>
- </and>
- </condition>
- <condition property="no.javadoc.preview">
- <isfalse value="${javadoc.preview}"/>
- </condition>
- <property name="run.jvmargs" value=""/>
- <property name="javac.compilerargs" value=""/>
- <property name="work.dir" value="${basedir}"/>
- <condition property="no.deps">
- <and>
- <istrue value="${no.dependencies}"/>
- </and>
- </condition>
- <property name="javac.debug" value="true"/>
- <property name="javadoc.preview" value="true"/>
- </target>
- <target name="-post-init">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-init-check" depends="-pre-init,-init-private,-init-user,-init-project,-do-init">
- <fail unless="src.dir">Must set src.dir</fail>
- <fail unless="test.src.dir">Must set test.src.dir</fail>
- <fail unless="build.dir">Must set build.dir</fail>
- <fail unless="dist.dir">Must set dist.dir</fail>
- <fail unless="build.classes.dir">Must set build.classes.dir</fail>
- <fail unless="dist.javadoc.dir">Must set dist.javadoc.dir</fail>
- <fail unless="build.test.classes.dir">Must set build.test.classes.dir</fail>
- <fail unless="build.test.results.dir">Must set build.test.results.dir</fail>
- <fail unless="build.classes.excludes">Must set build.classes.excludes</fail>
- <fail unless="dist.jar">Must set dist.jar</fail>
- </target>
- <target name="-init-macrodef-property">
- <macrodef name="property" uri="http://www.netbeans.org/ns/j2se-project/1">
- <attribute name="name"/>
- <attribute name="value"/>
- <sequential>
- <property name="@{name}" value="${@{value}}"/>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-javac">
- <macrodef name="javac" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute name="srcdir" default="${src.dir}"/>
- <attribute name="destdir" default="${build.classes.dir}"/>
- <attribute name="classpath" default="${javac.classpath}"/>
- <attribute name="debug" default="${javac.debug}"/>
- <element name="customize" optional="true"/>
- <sequential>
- <javac srcdir="@{srcdir}" destdir="@{destdir}" debug="@{debug}" deprecation="${javac.deprecation}" source="${javac.source}" target="${javac.target}" includeantruntime="false">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <compilerarg line="${javac.compilerargs}"/>
- <customize/>
- </javac>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-junit">
- <macrodef name="junit" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute name="includes" default="**/*Test.java"/>
- <sequential>
- <junit showoutput="true" fork="true" dir="${basedir}" failureproperty="tests.failed" errorproperty="tests.failed">
- <batchtest todir="${build.test.results.dir}">
- <fileset dir="${test.src.dir}" includes="@{includes}"/>
- </batchtest>
- <classpath>
- <path path="${run.test.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="test-sys-prop."/>
- <mapper type="glob" from="test-sys-prop.*" to="*"/>
- </syspropertyset>
- <formatter type="brief" usefile="false"/>
- <formatter type="xml"/>
- <jvmarg line="${run.jvmargs}"/>
- </junit>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-nbjpda">
- <macrodef name="nbjpdastart" uri="http://www.netbeans.org/ns/j2se-project/1">
- <attribute name="name" default="${main.class}"/>
- <attribute name="classpath" default="${debug.classpath}"/>
- <attribute name="stopclassname" default=""/>
- <sequential>
- <nbjpdastart transport="dt_socket" addressproperty="jpda.address" name="@{name}" stopclassname="@{stopclassname}">
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- </nbjpdastart>
- </sequential>
- </macrodef>
- <macrodef name="nbjpdareload" uri="http://www.netbeans.org/ns/j2se-project/1">
- <attribute name="dir" default="${build.classes.dir}"/>
- <sequential>
- <nbjpdareload>
- <fileset includes="${fix.includes}*.class" dir="@{dir}"/>
- </nbjpdareload>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-debug">
- <macrodef name="debug" uri="http://www.netbeans.org/ns/j2se-project/3">
- <attribute name="classname" default="${main.class}"/>
- <attribute name="classpath" default="${debug.classpath}"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java fork="true" classname="@{classname}" dir="${work.dir}">
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xnoagent"/>
- <jvmarg value="-Djava.compiler=none"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=${jpda.address}"/>
- <jvmarg line="${run.jvmargs}"/>
- <classpath>
- <path path="@{classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper type="glob" from="run-sys-prop.*" to="*"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-macrodef-java">
- <macrodef name="java" uri="http://www.netbeans.org/ns/j2se-project/1">
- <attribute name="classname" default="${main.class}"/>
- <element name="customize" optional="true"/>
- <sequential>
- <java fork="true" classname="@{classname}" dir="${work.dir}">
- <jvmarg line="${run.jvmargs}"/>
- <classpath>
- <path path="${run.classpath}"/>
- </classpath>
- <syspropertyset>
- <propertyref prefix="run-sys-prop."/>
- <mapper type="glob" from="run-sys-prop.*" to="*"/>
- </syspropertyset>
- <customize/>
- </java>
- </sequential>
- </macrodef>
- </target>
- <target name="-init-presetdef-jar">
- <presetdef name="jar" uri="http://www.netbeans.org/ns/j2se-project/1">
- <jar jarfile="${dist.jar}" compress="${jar.compress}">
- <j2seproject1:fileset dir="${build.classes.dir}"/>
- </jar>
- </presetdef>
- </target>
- <target name="init" depends="-pre-init,-init-private,-init-user,-init-project,-do-init,-post-init,-init-check,-init-macrodef-property,-init-macrodef-javac,-init-macrodef-junit,-init-macrodef-nbjpda,-init-macrodef-debug,-init-macrodef-java,-init-presetdef-jar"/>
- <!--
- ===================
- COMPILATION SECTION
- ===================
- -->
- <target name="deps-jar" depends="init" unless="no.deps"/>
- <target name="-pre-pre-compile" depends="init,deps-jar">
- <mkdir dir="${build.classes.dir}"/>
- </target>
- <target name="-pre-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile" if="have.sources">
- <j2seproject3:javac/>
- <copy todir="${build.classes.dir}">
- <fileset dir="${src.dir}" excludes="${build.classes.excludes}"/>
- </copy>
- </target>
- <target name="-post-compile">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile" depends="init,deps-jar,-pre-pre-compile,-pre-compile,-do-compile,-post-compile" description="Compile project."/>
- <target name="-pre-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-compile-single" depends="init,deps-jar,-pre-pre-compile">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <j2seproject3:javac>
- <customize>
- <patternset includes="${javac.includes}"/>
- </customize>
- </j2seproject3:javac>
- </target>
- <target name="-post-compile-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile-single" depends="init,deps-jar,-pre-pre-compile,-pre-compile-single,-do-compile-single,-post-compile-single"/>
- <!--
- ====================
- JAR BUILDING SECTION
- ====================
- -->
- <target name="-pre-pre-jar" depends="init">
- <dirname property="dist.jar.dir" file="${dist.jar}"/>
- <mkdir dir="${dist.jar.dir}"/>
- </target>
- <target name="-pre-jar">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-jar-without-manifest" depends="init,compile,-pre-pre-jar,-pre-jar" unless="manifest.available">
- <j2seproject1:jar/>
- </target>
- <target name="-do-jar-with-manifest" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available" unless="manifest.available+main.class">
- <j2seproject1:jar manifest="${manifest.file}"/>
- </target>
- <target name="-do-jar-with-mainclass" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class" unless="manifest.available+main.class+mkdist.available">
- <j2seproject1:jar manifest="${manifest.file}">
- <j2seproject1:manifest>
- <j2seproject1:attribute name="Main-Class" value="${main.class}"/>
- </j2seproject1:manifest>
- </j2seproject1:jar>
- <echo>To run this application from the command line without Ant, try:</echo>
- <property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
- <property name="dist.jar.resolved" location="${dist.jar}"/>
- <pathconvert property="run.classpath.with.dist.jar">
- <path path="${run.classpath}"/>
- <map from="${build.classes.dir.resolved}" to="${dist.jar.resolved}"/>
- </pathconvert>
- <echo>java -cp "${run.classpath.with.dist.jar}" ${main.class}</echo>
- </target>
- <target name="-do-jar-with-libraries" depends="init,compile,-pre-pre-jar,-pre-jar" if="manifest.available+main.class+mkdist.available">
- <property name="build.classes.dir.resolved" location="${build.classes.dir}"/>
- <pathconvert property="run.classpath.without.build.classes.dir">
- <path path="${run.classpath}"/>
- <map from="${build.classes.dir.resolved}" to=""/>
- </pathconvert>
- <pathconvert property="jar.classpath" pathsep=" ">
- <path path="${run.classpath.without.build.classes.dir}"/>
- <chainedmapper>
- <flattenmapper/>
- <globmapper from="*" to="lib/*"/>
- </chainedmapper>
- </pathconvert>
- <taskdef classname="org.netbeans.modules.java.j2seproject.copylibstask.CopyLibs" name="copylibs" classpath="${libs.CopyLibs.classpath}"/>
- <copylibs manifest="${manifest.file}" runtimeclasspath="${run.classpath.without.build.classes.dir}" jarfile="${dist.jar}" compress="${jar.compress}">
- <fileset dir="${build.classes.dir}"/>
- <manifest>
- <attribute name="Main-Class" value="${main.class}"/>
- <attribute name="Class-Path" value="${jar.classpath}"/>
- </manifest>
- </copylibs>
- <echo>To run this application from the command line without Ant, try:</echo>
- <property name="dist.jar.resolved" location="${dist.jar}"/>
- <echo>java -jar "${dist.jar.resolved}"</echo>
- </target>
- <target name="-post-jar">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="jar" depends="init,compile,-pre-jar,-do-jar-with-manifest,-do-jar-without-manifest,-do-jar-with-mainclass,-do-jar-with-libraries,-post-jar" description="Build JAR."/>
- <!--
- =================
- EXECUTION SECTION
- =================
- -->
- <target name="run" depends="init,compile" description="Run a main class.">
- <j2seproject1:java>
- <customize>
- <arg line="${application.args}"/>
- </customize>
- </j2seproject1:java>
- </target>
- <target name="run-single" depends="init,compile-single">
- <fail unless="run.class">Must select one file in the IDE or set run.class</fail>
- <j2seproject1:java classname="${run.class}"/>
- </target>
- <!--
- =================
- DEBUGGING SECTION
- =================
- -->
- <target name="-debug-start-debugger" if="netbeans.home" depends="init">
- <j2seproject1:nbjpdastart name="${debug.class}"/>
- </target>
- <target name="-debug-start-debuggee" depends="init,compile">
- <j2seproject3:debug>
- <customize>
- <arg line="${application.args}"/>
- </customize>
- </j2seproject3:debug>
- </target>
- <target name="debug" if="netbeans.home" depends="init,compile,-debug-start-debugger,-debug-start-debuggee" description="Debug project in IDE."/>
- <target name="-debug-start-debugger-stepinto" if="netbeans.home" depends="init">
- <j2seproject1:nbjpdastart stopclassname="${main.class}"/>
- </target>
- <target name="debug-stepinto" if="netbeans.home" depends="init,compile,-debug-start-debugger-stepinto,-debug-start-debuggee"/>
- <target name="-debug-start-debuggee-single" if="netbeans.home" depends="init,compile-single">
- <fail unless="debug.class">Must select one file in the IDE or set debug.class</fail>
- <j2seproject3:debug classname="${debug.class}"/>
- </target>
- <target name="debug-single" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-single"/>
- <target name="-pre-debug-fix" depends="init">
- <fail unless="fix.includes">Must set fix.includes</fail>
- <property name="javac.includes" value="${fix.includes}.java"/>
- </target>
- <target name="-do-debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,compile-single">
- <j2seproject1:nbjpdareload/>
- </target>
- <target name="debug-fix" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix"/>
- <!--
- ===============
- JAVADOC SECTION
- ===============
- -->
- <target name="-javadoc-build" depends="init">
- <mkdir dir="${dist.javadoc.dir}"/>
- <javadoc destdir="${dist.javadoc.dir}" source="${javac.source}" notree="${javadoc.notree}" use="${javadoc.use}" nonavbar="${javadoc.nonavbar}" noindex="${javadoc.noindex}" splitindex="${javadoc.splitindex}" author="${javadoc.author}" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}" private="${javadoc.private}" additionalparam="${javadoc.additionalparam}" failonerror="true" useexternalfile="true">
- <classpath>
- <path path="${javac.classpath}"/>
- </classpath>
- <sourcepath>
- <pathelement location="${src.dir}"/>
- </sourcepath>
- <packageset dir="${src.dir}" includes="*/**"/>
- <fileset dir="${src.dir}" includes="*.java"/>
- </javadoc>
- </target>
- <target name="-javadoc-browse" if="netbeans.home" unless="no.javadoc.preview" depends="init,-javadoc-build">
- <nbbrowse file="${dist.javadoc.dir}/index.html"/>
- </target>
- <target name="javadoc" depends="init,-javadoc-build,-javadoc-browse" description="Build Javadoc."/>
- <!--
- =========================
- JUNIT COMPILATION SECTION
- =========================
- -->
- <target name="-pre-pre-compile-test" if="have.tests" depends="init,compile">
- <mkdir dir="${build.test.classes.dir}"/>
- </target>
- <target name="-pre-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-compile-test" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test">
- <j2seproject3:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}"/>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="**/*.java"/>
- </copy>
- </target>
- <target name="-post-compile-test">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile-test" depends="init,compile,-pre-pre-compile-test,-pre-compile-test,-do-compile-test,-post-compile-test"/>
- <target name="-pre-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="-do-compile-test-single" if="have.tests" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single">
- <fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
- <j2seproject3:javac srcdir="${test.src.dir}" destdir="${build.test.classes.dir}" debug="true" classpath="${javac.test.classpath}">
- <customize>
- <patternset includes="${javac.includes}"/>
- </customize>
- </j2seproject3:javac>
- <copy todir="${build.test.classes.dir}">
- <fileset dir="${test.src.dir}" excludes="**/*.java"/>
- </copy>
- </target>
- <target name="-post-compile-test-single">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="compile-test-single" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single"/>
- <!--
- =======================
- JUNIT EXECUTION SECTION
- =======================
- -->
- <target name="-pre-test-run" if="have.tests" depends="init">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target name="-do-test-run" if="have.tests" depends="init,compile-test,-pre-test-run">
- <j2seproject3:junit/>
- </target>
- <target name="-post-test-run" if="have.tests" depends="init,compile-test,-pre-test-run,-do-test-run">
- <fail if="tests.failed">Some tests failed; see details above.</fail>
- </target>
- <target name="test-report" if="have.tests" depends="init"/>
- <target name="-test-browse" if="netbeans.home+have.tests" depends="init"/>
- <target name="test" depends="init,compile-test,-pre-test-run,-do-test-run,test-report,-post-test-run,-test-browse" description="Run unit tests."/>
- <target name="-pre-test-run-single" if="have.tests" depends="init">
- <mkdir dir="${build.test.results.dir}"/>
- </target>
- <target name="-do-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single">
- <fail unless="test.includes">Must select some files in the IDE or set test.includes</fail>
- <j2seproject3:junit includes="${test.includes}"/>
- </target>
- <target name="-post-test-run-single" if="have.tests" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single">
- <fail if="tests.failed">Some tests failed; see details above.</fail>
- </target>
- <target name="test-single" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test."/>
- <!--
- =======================
- JUNIT DEBUGGING SECTION
- =======================
- -->
- <target name="-debug-start-debuggee-test" if="have.tests" depends="init,compile-test">
- <fail unless="test.class">Must select one file in the IDE or set test.class</fail>
- <j2seproject3:debug classname="junit.textui.TestRunner" classpath="${debug.test.classpath}">
- <customize>
- <arg line="${test.class}"/>
- </customize>
- </j2seproject3:debug>
- </target>
- <target name="-debug-start-debugger-test" if="netbeans.home+have.tests" depends="init,compile-test">
- <j2seproject1:nbjpdastart name="${test.class}" classpath="${debug.test.classpath}"/>
- </target>
- <target name="debug-test" depends="init,compile-test,-debug-start-debugger-test,-debug-start-debuggee-test"/>
- <target name="-do-debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,compile-test-single">
- <j2seproject1:nbjpdareload dir="${build.test.classes.dir}"/>
- </target>
- <target name="debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix-test"/>
- <!--
- =========================
- APPLET EXECUTION SECTION
- =========================
- -->
- <target name="run-applet" depends="init,compile-single">
- <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
- <j2seproject1:java classname="sun.applet.AppletViewer">
- <customize>
- <arg value="${applet.url}"/>
- </customize>
- </j2seproject1:java>
- </target>
- <!--
- =========================
- APPLET DEBUGGING SECTION
- =========================
- -->
- <target name="-debug-start-debuggee-applet" if="netbeans.home" depends="init,compile-single">
- <fail unless="applet.url">Must select one file in the IDE or set applet.url</fail>
- <j2seproject3:debug classname="sun.applet.AppletViewer">
- <customize>
- <arg value="${applet.url}"/>
- </customize>
- </j2seproject3:debug>
- </target>
- <target name="debug-applet" if="netbeans.home" depends="init,compile-single,-debug-start-debugger,-debug-start-debuggee-applet"/>
- <!--
- ===============
- CLEANUP SECTION
- ===============
- -->
- <target name="deps-clean" depends="init" unless="no.deps"/>
- <target name="-do-clean" depends="init">
- <delete dir="${build.dir}"/>
- <delete dir="${dist.dir}"/>
- </target>
- <target name="-post-clean">
- <!-- Empty placeholder for easier customization. -->
- <!-- You can override this target in the ../build.xml file. -->
- </target>
- <target name="clean" depends="init,deps-clean,-do-clean,-post-clean" description="Clean build products."/>
-</project>
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 362f80e..0000000
--- 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 ac25acf..0000000
--- 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 59e18f4..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/admin/offlineconfig/ConfigViewer/nbproject/project.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.java.j2seproject</type>
- <configuration>
- <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
- <name>ConfigViewer</name>
- <minimum-ant-version>1.6.5</minimum-ant-version>
- <source-roots>
- <root id="src.dir"/>
- </source-roots>
- <test-roots>
- <root id="test.src.dir"/>
- </test-roots>
- </data>
- </configuration>
-</project>
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 d73d1f0..0000000
--- a/appserver/tests/v2-tests/appserv-tests/devtests/admin/pe/nbproject/project.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.ant.freeform</type>
- <configuration>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
- <!--Do not use Project Properties customizer when editing this file manually.-->
- <name>Admin Infrastructure Devtests</name>
- <properties>
- <property-file>PATH TO YOUR GF_SOURCES/bootstrap/project.properties</property-file>
- <property name="reporter.jar">../../../lib/reporter.jar</property>
- </properties>
- <folders>
- <source-folder>
- <label>JavaSources</label>
- <type>java</type>
- <location>src</location>
- </source-folder>
- </folders>
- <ide-actions>
- <action name="build">
- <target>build</target>
- </action>
- <action name="clean">
- <target>clean</target>
- </action>
- <action name="rebuild">
- <target>clean</target>
- <target>build</target>
- </action>
- </ide-actions>
- <export>
- <type>folder</type>
- <location>classes</location>
- <build-target>build</build-target>
- </export>
- <view>
- <items>
- <source-folder style="packages">
- <label>JavaSources</label>
- <location>src</location>
- </source-folder>
- <source-file>
- <location>build.xml</location>
- </source-file>
- </items>
- <context-menu>
- <ide-action name="build"/>
- <ide-action name="clean"/>
- <ide-action name="rebuild"/>
- </context-menu>
- </view>
- <subprojects/>
- </general-data>
- <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
- <compilation-unit>
- <package-root>src/java</package-root>
- <classpath mode="compile">$appserv-ext.jar};${appserv-deployment-client.jar};../../../lib/reporter.jar;${appserv-rt.jar};${appserv-admin.jar};${j2ee.jar};../../../lib/testng.jar</classpath>
- <built-to>classes</built-to>
- <source-level>1.5</source-level>
- </compilation-unit>
- </java-data>
- </configuration>
-</project>
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 2f8482c..0000000
--- a/appserver/tests/v2-tests/appserv-tests/sqetests/admin/nbproject/project.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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
-
--->
-
-<project xmlns="http://www.netbeans.org/ns/project/1">
- <type>org.netbeans.modules.ant.freeform</type>
- <configuration>
- <general-data xmlns="http://www.netbeans.org/ns/freeform-project/1">
- <!--Do not use Project Properties customizer when editing this file manually.-->
- <name>Admin Infrastructure Quicklook</name>
- <properties>
- <property-file>../../../bootstrap/project.properties</property-file>
- <property name="reporter.jar">../../lib/reporter.jar</property>
- </properties>
- <folders>
- <source-folder>
- <label>JavaSources</label>
- <type>java</type>
- <location>src</location>
- </source-folder>
- </folders>
- <ide-actions>
- <action name="build">
- <target>build</target>
- </action>
- <action name="clean">
- <target>clean</target>
- </action>
- <action name="rebuild">
- <target>clean</target>
- <target>build</target>
- </action>
- </ide-actions>
- <view>
- <items>
- <source-folder style="packages">
- <label>JavaSources</label>
- <location>src</location>
- </source-folder>
- <source-file>
- <location>build.xml</location>
- </source-file>
- </items>
- <context-menu>
- <ide-action name="build"/>
- <ide-action name="clean"/>
- <ide-action name="rebuild"/>
- </context-menu>
- </view>
- <subprojects/>
- </general-data>
- <java-data xmlns="http://www.netbeans.org/ns/freeform-project-java/1">
- <compilation-unit>
- <package-root>src/java</package-root>
- <classpath mode="compile">${reporter.jar}:${appserv-rt.jar}:${appserv-admin.jar};${j2ee.jar}</classpath>
- <source-level>1.5</source-level>
- </compilation-unit>
- </java-data>
- </configuration>
-</project>
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 b66bd1a..acf1112 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 @@
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 ff1a85f..3f650e4 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 @@
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/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 3e16bee..15975d0 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 @@
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 @@
*/
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 @@
* 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 @@
}
}
- if (wsdlDocument == null)
+ if (wsdlDocument == null) {
return null;
+ }
OutputStream outputStream = null;
try {
@@ -357,8 +363,9 @@
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 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 @@
* 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 @@
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 @@
}
URL wsdl = desc.getWsdlFileUrl();
- String wsdlPath = wsdl.getPath().trim();
- if (!wsdlPath.contains(WebServiceEndpoint.PUBLISHING_SUBCONTEXT))
+ if (wsdl == null) {
return null;
+ }
+ String wsdlPath = wsdl.getPath().trim();
+ if (!wsdlPath.contains(WebServiceEndpoint.PUBLISHING_SUBCONTEXT)) {
+ return null;
+ }
/*
* WsdlPath indeed contains the WebServiceEndpoint.PUBLISHING_SUBCONTEXT,
@@ -486,16 +498,20 @@
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 @@
* If these are present use the
* Service(url,wsdl,features) constructor
*/
- ArrayList<WebServiceFeature> wsFeatures = new ArrayList<WebServiceFeature>();
+ ArrayList<WebServiceFeature> wsFeatures = new ArrayList<>();
if (desc.isMtomEnabled()) {
wsFeatures.add( new MTOMFeature(true,desc.getMtomThreshold())) ;
}
@@ -548,14 +564,13 @@
}
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 @@
//
// 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
diff --git a/nucleus/admin/template/src/main/resources/config/domain.xml b/nucleus/admin/template/src/main/resources/config/domain.xml
index 45e7f0b..55e5f53 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 @@
<!-- End of OSGi bundle configurations -->
<jvm-options>-XX:NewRatio=2</jvm-options>
<jvm-options>-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar</jvm-options>
- <jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
- <jvm-options>--add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED</jvm-options>
+ <jvm-options>--add-opens=java.base/java.io=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=java.base/java.lang=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=java.base/java.util=ALL-UNNAMED</jvm-options>
- <jvm-options>--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED</jvm-options>
+ <jvm-options>--add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=java.naming/javax.naming.spi=ALL-UNNAMED</jvm-options>
+ <jvm-options>--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED</jvm-options>
+ <jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED</jvm-options>
</java-config>
<network-config>
@@ -324,12 +325,13 @@
<jvm-options>-Dorg.glassfish.gmbal.no.multipleUpperBoundsException=true</jvm-options>
<jvm-options>-Xbootclasspath/a:${com.sun.aas.installRoot}/lib/grizzly-npn-api.jar</jvm-options>
- <jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
- <jvm-options>--add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED</jvm-options>
+ <jvm-options>--add-opens=java.base/java.io=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=java.base/java.lang=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=java.base/java.util=ALL-UNNAMED</jvm-options>
- <jvm-options>--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED</jvm-options>
+ <jvm-options>--add-opens=java.base/sun.net.www.protocol.jrt=ALL-UNNAMED</jvm-options>
<jvm-options>--add-opens=java.naming/javax.naming.spi=ALL-UNNAMED</jvm-options>
+ <jvm-options>--add-opens=java.rmi/sun.rmi.transport=ALL-UNNAMED</jvm-options>
+ <jvm-options>--add-opens=jdk.management/com.sun.management.internal=ALL-UNNAMED</jvm-options>
<jvm-options>--add-exports=java.naming/com.sun.jndi.ldap=ALL-UNNAMED</jvm-options>
</java-config>
<availability-service/>
diff --git a/runtests.sh b/runtests.sh
index 4fe8e3f..b5b6205 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 @@
####################################
-export GF_VERSION="$1"
-export JACOCO_ENABLED="true"
-test="${2}"
+trap 'catch $? $LINENO' EXIT
-# uncomment and edit this line if your system uses another version.
-export JAVA_HOME=/usr/lib/jvm/jdk11
+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";
-if [ -z "${GF_VERSION}" ]
- then echo "No version supplied."
+echo "If you need to use a different JAVA_HOME than is used by your system, export it or edit this script.";
+echo "";
+
+
+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}/glassfish7/javadb"
-export APS_HOME="$(pwd)/appserver/tests/appserv-tests"
-export S1AS_HOME="${WORKSPACE}/glassfish7/glassfish"
-export PORT_ADMIN="4848"
-export PORT_HTTP="8080"
-export PORT_HTTPS="8181"
-install_glassfish;
+export GLASSFISH_HOME="${WORKSPACE}/glassfish7"
+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}"
