[maven-scm] copy for tag geronimo-3.0-M1
git-svn-id: https://svn.apache.org/repos/asf/geronimo/server/tags/geronimo-3.0-M1@952520 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/framework/modules/geronimo-config-groovy-transformer/pom.xml b/framework/modules/geronimo-config-groovy-transformer/pom.xml
deleted file mode 100644
index 09f1c75..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev: 690859 $ $Date: 2008-09-01 16:30:25 +1000 (Mon, 01 Sep 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>modules</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>geronimo-config-groovy-transformer</artifactId>
- <packaging>bundle</packaging>
- <name>Geronimo Framework, Modules :: Config Groovy Transformer</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.codehaus.groovy</groupId>
- <artifactId>groovy-all</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.testsupport</groupId>
- <artifactId>testsupport-common</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.gmaven</groupId>
- <artifactId>gmaven-plugin</artifactId>
- <!--<executions>-->
- <!--<execution>-->
- <!--<goals>-->
- <!--<goal>generateStubs</goal>-->
- <!--<goal>compile</goal>-->
- <!--<goal>generateTestStubs</goal>-->
- <!--<goal>testCompile</goal>-->
- <!--</goals>-->
- <!--</execution>-->
- <!--</executions>-->
- </plugin>
- </plugins>
- </build>
-
-</project>
-
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/ConfigurationDataBuilder.groovy b/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/ConfigurationDataBuilder.groovy
deleted file mode 100644
index 9d81a4a..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/ConfigurationDataBuilder.groovy
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.kernel.config.transformer
-
-import org.apache.geronimo.kernel.Jsr77Naming
-import org.apache.geronimo.gbean.GBeanInfo
-import org.apache.geronimo.gbean.GBeanData
-import org.apache.geronimo.gbean.GBeanData
-import org.apache.geronimo.kernel.repository.Version
-import org.apache.geronimo.kernel.config.ConfigurationData
-import org.apache.geronimo.kernel.repository.ImportType
-import org.apache.geronimo.kernel.repository.Artifact
-import org.apache.geronimo.kernel.repository.Dependency
-
-
-/**
- *
- * @version $Rev:$ $Date:$
- */
-class ConfigurationDataBuilder {
- private final ConfigurationData configurationData
-
- ConfigurationDataBuilder(ConfigurationData configurationData) {
- assert null != configurationData : 'configurationData is required'
- this.configurationData = configurationData
- }
-
- def configure (Closure closure) {
- closure.delegate = this
- closure()
- }
-
- def addDependency(Map dependencyDeclaration) throws GroovyScriptException {
- def throwUsage = {
- throw new GroovyScriptException('addDependency usage: addDependency(groupId: group, artifactId: artifact, version: X, type: type, importType: ImportType.X)')
- }
-
- ensureNotNull(dependencyDeclaration.groupId, throwUsage)
- ensureNotNull(dependencyDeclaration.artifactId, throwUsage)
-
- if (!dependencyDeclaration.type) {
- dependencyDeclaration.type = 'jar'
- }
-
- def artifact = buildArtifact(dependencyDeclaration)
-
- def importType = dependencyDeclaration.importType
- if (!importType) {
- importType = ImportType.ALL
- }
-
- configurationData.environment.addDependency(artifact, importType)
- }
-
- def removeDependency(Map dependencyFilter) throws GroovyScriptException {
- def throwUsage = {
- throw new GroovyScriptException('removeDependency usage: removeDependency(groupId: group, artifactId: artifact, version: X, type: type)')
- }
-
- def filteredArtifact = buildArtifact(dependencyFilter)
- def filteredDependencies = configurationData.environment.dependencies.findAll { dependency ->
- !filteredArtifact.matches(dependency.artifact)
- }
-
- configurationData.environment.dependencies = filteredDependencies
- }
-
- protected def buildArtifact(dependencyDeclaration) throws GroovyScriptException {
- def groupId = dependencyDeclaration.groupId
- def artifactId = dependencyDeclaration.artifactId
- def version = dependencyDeclaration.version
- def type = dependencyDeclaration.type
-
- new Artifact(groupId, artifactId, (String) version, type)
- }
-
- protected def ensureNotNull(value, throwUsage) throws GroovyScriptException {
- if (!value) {
- throwUsage()
- }
- }
-
-}
\ No newline at end of file
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/GBeanAttributeAndReferenceBuilder.groovy b/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/GBeanAttributeAndReferenceBuilder.groovy
deleted file mode 100644
index 0a44815..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/GBeanAttributeAndReferenceBuilder.groovy
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.kernel.config.transformer
-
-import org.apache.geronimo.gbean.GBeanInfo
-import org.apache.geronimo.gbean.GBeanData
-import org.apache.geronimo.gbean.GBeanData
-import org.apache.geronimo.kernel.repository.Version
-import org.apache.geronimo.kernel.config.ConfigurationData
-import org.apache.geronimo.kernel.repository.ImportType
-import org.apache.geronimo.kernel.repository.Artifact
-import org.apache.geronimo.kernel.repository.Dependency
-
-
-/**
- *
- * @version $Rev:$ $Date:$
- */
-class GBeanAttributeAndReferenceBuilder {
- private final def configurationData
- private final def gbeanData
-
- GBeanAttributeAndReferenceBuilder(configurationData, gbeanData) {
- assert null != configurationData : 'configurationData is required'
- assert null != gbeanData : 'gbeanData is required'
- this.configurationData = configurationData
- this.gbeanData = gbeanData
- }
-
- def attribute(Map attributeInfo) {
- def throwUsage = {
- throw new GroovyScriptException('attribute usage: attribute(attributeName: attributeValue)')
- }
-
- def mapIter = attributeInfo.entrySet().iterator()
- if (!mapIter.hasNext()) {
- throwUsage()
- }
-
- def entry = mapIter.next()
- def key = entry.key
- def value = entry.value
- gbeanData.setAttribute(key, value)
- }
-
- def reference(Object[] referenceInfo) {
- def throwUsage = {
- throw new GroovyScriptException('reference usage: reference(referenceName) {pattern(patternValue)}')
- }
-
- if (2 != referenceInfo.length) {
- throwUsage()
- }
-
- def name = referenceInfo[0]
- if (!(name instanceof String)) {
- throwUsage()
- }
-
- def referenceDeclarationClosure = referenceInfo[1]
- if (!(referenceDeclarationClosure instanceof Closure)) {
- throwUsage()
- }
-
- def referenceBuilder = new ReferenceBuilder()
- referenceDeclarationClosure.delegate = referenceBuilder
- referenceDeclarationClosure()
-
- gbeanData.setReferencePatterns(name, referenceBuilder.references)
- }
-
-}
\ No newline at end of file
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/GBeanDataBuilder.groovy b/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/GBeanDataBuilder.groovy
deleted file mode 100644
index a3bab56..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/GBeanDataBuilder.groovy
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.kernel.config.transformer
-
-import org.apache.geronimo.gbean.GBeanData
-import org.apache.geronimo.kernel.repository.Version
-import org.apache.geronimo.kernel.config.ConfigurationData
-import org.apache.geronimo.kernel.repository.ImportType
-import org.apache.geronimo.kernel.repository.Artifact
-import org.apache.geronimo.kernel.repository.Dependency
-
-
-/**
- *
- * @version $Rev:$ $Date:$
- */
-class GBeanDataBuilder {
- private final def configurationData
- private final def gbeanDatas
-
- GBeanDataBuilder(configurationData, gbeanDatas) {
- assert null != configurationData : 'configurationData is required'
- assert null != gbeanDatas : 'gbeanDatas is required'
- this.configurationData = configurationData
- this.gbeanDatas = gbeanDatas
- }
-
- def configure (Closure closure) {
- closure.delegate = this
- closure()
- }
-
- def addGBean(Map gbeanDeclaration, Closure gbeanClosure) {
- def throwUsage = {
- throw new GroovyScriptException('addGBean usage: addGBean(name: gbeanName, gbean: gbeanClass, type: gbeanType)')
- }
-
- if (!gbeanDeclaration.name) {
- throwUsage()
- } else if (!gbeanDeclaration.gbean) {
- throwUsage()
- }
-
- def gbeanName = buildGBeanName(gbeanDeclaration)
- def gbean = gbeanDeclaration.gbean
- def gbeanData = new GBeanData(gbeanName, gbean)
-
- gbeanClosure.delegate = new GBeanAttributeAndReferenceBuilder(configurationData, gbeanData)
- gbeanClosure()
-
- gbeanDatas.push(gbeanData)
- }
-
- protected def buildGBeanName(gbeanDeclaration) throws GroovyScriptException {
- def name = gbeanDeclaration.name
-
- def type = gbeanDeclaration.type
- if (!type) {
- type = 'GBean'
- }
-
- def naming = configurationData.naming
- naming.createRootName(configurationData.environment.configId, name, type)
- }
-
-}
\ No newline at end of file
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/ReferenceBuilder.groovy b/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/ReferenceBuilder.groovy
deleted file mode 100644
index 607b4f1..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/main/groovy/org/apache/geronimo/kernel/config/transformer/ReferenceBuilder.groovy
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.kernel.config.transformer
-
-import org.apache.geronimo.gbean.AbstractNameQuery
-import org.apache.geronimo.gbean.GBeanInfo
-import org.apache.geronimo.gbean.GBeanData
-import org.apache.geronimo.gbean.GBeanData
-import org.apache.geronimo.kernel.repository.Version
-import org.apache.geronimo.kernel.config.ConfigurationData
-import org.apache.geronimo.kernel.repository.ImportType
-import org.apache.geronimo.kernel.repository.Artifact
-import org.apache.geronimo.kernel.repository.Dependency
-
-
-/**
- *
- * @version $Rev:$ $Date:$
- */
-class ReferenceBuilder {
- Set references
-
- ReferenceBuilder() {
- references = []
- }
-
- def pattern(String pattern) {
- try {
- references.add(new AbstractNameQuery(new URI(pattern)))
- } catch (Exception e) {
- throw new GroovyScriptException('pattern usage: pattern(patternValue)')
- }
- }
-
-}
\ No newline at end of file
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/transformer/CollocatedWithConfigInfoLocater.java b/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/transformer/CollocatedWithConfigInfoLocater.java
deleted file mode 100644
index 3c6e8e6..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/transformer/CollocatedWithConfigInfoLocater.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.kernel.config.transformer;
-
-import java.io.File;
-
-import org.apache.geronimo.kernel.config.ConfigurationData;
-
-/**
- *
- * @version $Rev:$ $Date:$
- */
-public class CollocatedWithConfigInfoLocater implements ScriptLocater {
-
- public File locate(ConfigurationData configurationData) {
- return configurationData.getConfigurationDir();
- }
-
-}
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/transformer/GroovyScriptException.java b/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/transformer/GroovyScriptException.java
deleted file mode 100644
index d530df9..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/transformer/GroovyScriptException.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.kernel.config.transformer;
-
-import org.apache.geronimo.kernel.config.InvalidConfigException;
-
-/**
- *
- * @version $Rev:$ $Date:$
- */
-public class GroovyScriptException extends InvalidConfigException {
-
- public GroovyScriptException() {
- }
-
- public GroovyScriptException(String message, Throwable cause) {
- super(message, cause);
- }
-
- public GroovyScriptException(String message) {
- super(message);
- }
-
- public GroovyScriptException(Throwable cause) {
- super(cause);
- }
-
-}
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/transformer/GroovyTransformer.java b/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/transformer/GroovyTransformer.java
deleted file mode 100644
index 8728cce..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/transformer/GroovyTransformer.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.kernel.config.transformer;
-
-import groovy.lang.Binding;
-import groovy.lang.GroovyShell;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.kernel.config.ConfigurationData;
-import org.apache.geronimo.kernel.config.ConfigurationDataTransformer;
-import org.apache.geronimo.kernel.config.InvalidConfigException;
-import org.apache.geronimo.kernel.repository.Artifact;
-
-
-/**
- *
- * @version $Rev:$ $Date:$
- */
-public class GroovyTransformer implements ConfigurationDataTransformer {
- private static final String BINDING_CONFIGURATION_DATA = "configurationData";
- private static final String BINDING_CONFIGURATION_DATA_BUILDER = "configurationDataBuilder";
- private static final Pattern PATTERN_DEPENDENCIES_FILE = Pattern.compile("Dependencies(.*).groovy");
-
- private static final String BINDING_GBEAN_DATAS = "gbeanDatas";
- private static final String BINDING_GBEAN_DATAS_BUILDER = "gbeanDataBuilder";
- private static final Pattern PATTERN_GBEANS_FILE = Pattern.compile("GBeans(.*).groovy");
-
- private final ScriptLocater scriptLocater;
-
- public GroovyTransformer() {
- scriptLocater = newScriptLocater();
- }
-
- public void transformDependencies(ConfigurationData configurationData) throws InvalidConfigException {
- configurationData.setConfigurationDataTransformer(this);
-
- File scriptDir = scriptLocater.locate(configurationData);
-
- Map<String, Object> bindings = new HashMap<String, Object>();
- bindings.put(BINDING_CONFIGURATION_DATA, configurationData);
- bindings.put(BINDING_CONFIGURATION_DATA_BUILDER, new ConfigurationDataBuilder(configurationData));
- Binding binding = new Binding(bindings);
- GroovyShell shell = new GroovyShell(binding);
-
- executeScripts(shell, scriptDir, PATTERN_DEPENDENCIES_FILE);
- }
-
- public List<GBeanData> transformGBeans(ClassLoader classLoader,
- ConfigurationData configurationData,
- List<GBeanData> gbeanDatas) throws InvalidConfigException {
- gbeanDatas = new ArrayList<GBeanData>(gbeanDatas);
-
- File scriptDir = scriptLocater.locate(configurationData);
-
- Map<String, Object> bindings = new HashMap<String, Object>();
- bindings.put(BINDING_CONFIGURATION_DATA, configurationData);
- bindings.put(BINDING_GBEAN_DATAS, gbeanDatas);
- bindings.put(BINDING_GBEAN_DATAS_BUILDER, new GBeanDataBuilder(configurationData, gbeanDatas));
- Binding binding = new Binding(bindings);
- GroovyShell shell = new GroovyShell(classLoader, binding);
-
- executeScripts(shell, scriptDir, PATTERN_GBEANS_FILE);
-
- return gbeanDatas;
- }
-
- public void remove(Artifact configId) {
- }
-
- protected ScriptLocater newScriptLocater() {
- return new CollocatedWithConfigInfoLocater();
- }
-
- protected void executeScripts(GroovyShell shell, File scriptDir, Pattern pattern) throws InvalidConfigException {
- File[] scripts = scriptDir.listFiles(new PatternFilter(pattern));
- executeScripts(shell, scripts);
- }
-
- protected void executeScripts(GroovyShell shell, File[] scripts) throws InvalidConfigException {
- for (File script : scripts) {
- try {
- shell.evaluate(script);
- } catch (Exception e) {
- if (e instanceof InvalidConfigException) {
- throw (InvalidConfigException) e;
- }
- throw new GroovyScriptException("Error while evaluating [" + script.getAbsolutePath() + "]", e);
- }
- }
- }
-
-}
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/transformer/PatternFilter.java b/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/transformer/PatternFilter.java
deleted file mode 100644
index 5b91516..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/transformer/PatternFilter.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.kernel.config.transformer;
-
-import java.io.File;
-import java.io.FileFilter;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- *
- * @version $Rev:$ $Date:$
- */
-public class PatternFilter implements FileFilter {
-
- private final Pattern pattern;
-
- public PatternFilter(Pattern pattern) {
- if (null == pattern) {
- throw new IllegalArgumentException("pattern is required");
- }
- this.pattern = pattern;
- }
-
- public boolean accept(File pathname) {
- Matcher matcher = pattern.matcher(pathname.getName());
- return matcher.matches();
- }
-
-}
\ No newline at end of file
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/transformer/ScriptLocater.java b/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/transformer/ScriptLocater.java
deleted file mode 100644
index 3c5a676..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/main/java/org/apache/geronimo/kernel/config/transformer/ScriptLocater.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.kernel.config.transformer;
-
-import java.io.File;
-
-import org.apache.geronimo.kernel.config.ConfigurationData;
-
-/**
- *
- * @version $Rev:$ $Date:$
- */
-public interface ScriptLocater {
- File locate(ConfigurationData configurationData);
-}
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/geronimo/kernel/config/transformer/ConfigurationDataBuilderTest.groovy b/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/geronimo/kernel/config/transformer/ConfigurationDataBuilderTest.groovy
deleted file mode 100644
index 16b47c0..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/geronimo/kernel/config/transformer/ConfigurationDataBuilderTest.groovy
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.kernel.config.transformer
-
-import org.apache.geronimo.kernel.config.transformer.ConfigurationDataBuilder
-import org.apache.geronimo.kernel.repository.ImportType
-import org.apache.geronimo.kernel.config.ConfigurationData
-import org.apache.geronimo.kernel.Jsr77Naming
-import org.apache.geronimo.kernel.repository.Artifact
-import org.apache.geronimo.kernel.config.transformer.GroovyScriptException
-
-/**
- *
- * @version $Rev:$ $Date:$
- */
-class ConfigurationDataBuilderTest extends GroovyTestCase {
- def builder
- def configurationData
-
- protected void setUp() {
- def artifact = new Artifact('groupId', 'artifactId', '1,0', 'car')
- configurationData = new ConfigurationData(artifact, new Jsr77Naming())
- builder = new ConfigurationDataBuilder(configurationData)
- }
-
- void testAddDependency() {
- def addedArtifact = new Artifact('group', 'artifact', '1,0', 'tar')
-
- builder.addDependency(groupId: addedArtifact.groupId,
- artifactId: addedArtifact.artifactId,
- version: addedArtifact.version,
- type: addedArtifact.type,
- importType: ImportType.SERVICES)
-
- def dependencies = configurationData.environment.dependencies
- assertEquals(1, dependencies.size())
- def dependency = dependencies[0]
- assertEquals(addedArtifact, dependency.artifact)
- assertEquals(ImportType.SERVICES, dependency.importType)
- }
-
- void testAddDependencyOnlyWithGroupAndArtifact() {
- def group = 'group'
- def artifact = 'artifact'
-
- builder.addDependency(groupId: group, artifactId: artifact)
-
- def dependencies = configurationData.environment.dependencies
- assertEquals(1, dependencies.size())
- def dependency = dependencies[0]
- def depArtifact = dependency.artifact
- assertEquals(group, depArtifact.groupId)
- assertEquals(artifact, depArtifact.artifactId)
- assertEquals('jar', depArtifact.type)
- assertEquals(ImportType.ALL, dependency.importType)
- }
-
- void testAddDependencyThrowsGSEIfGroupIsMissing() {
- def addedArtifact = new Artifact(null, 'artifact', '1.0', 'jar')
-
- shouldFail(GroovyScriptException) {
- builder.addDependency(groupId: addedArtifact.groupId,
- artifactId: addedArtifact.artifactId,
- version: addedArtifact.version,
- type: addedArtifact.type,
- importType: ImportType.SERVICES)
- }
- }
-
- void testRemoveDependency() {
- def addedArtifact = new Artifact('group', 'artifact', '1,0', 'tar')
-
- builder.addDependency(groupId: addedArtifact.groupId,
- artifactId: addedArtifact.artifactId,
- version: addedArtifact.version,
- type: addedArtifact.type,
- importType: ImportType.SERVICES)
-
- builder.removeDependency(artifactId: addedArtifact.artifactId)
-
- def dependencies = configurationData.environment.dependencies
- assertTrue(dependencies.empty)
- }
-
- }
\ No newline at end of file
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/geronimo/kernel/config/transformer/GBeanAttributeAndReferenceBuilderTest.groovy b/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/geronimo/kernel/config/transformer/GBeanAttributeAndReferenceBuilderTest.groovy
deleted file mode 100644
index 528b5c7..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/geronimo/kernel/config/transformer/GBeanAttributeAndReferenceBuilderTest.groovy
+++ /dev/null
Binary files differ
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/geronimo/kernel/config/transformer/GBeanDataBuilderTest.groovy b/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/geronimo/kernel/config/transformer/GBeanDataBuilderTest.groovy
deleted file mode 100644
index 69e3996..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/geronimo/kernel/config/transformer/GBeanDataBuilderTest.groovy
+++ /dev/null
Binary files differ
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/geronimo/kernel/config/transformer/ReferenceBuilderTest.groovy b/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/geronimo/kernel/config/transformer/ReferenceBuilderTest.groovy
deleted file mode 100644
index 8975374..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/test/groovy/org/apache/geronimo/kernel/config/transformer/ReferenceBuilderTest.groovy
+++ /dev/null
Binary files differ
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/test/java/org/apache/geronimo/kernel/config/transformer/CollocatedWithConfigInfoLocaterTest.java b/framework/modules/geronimo-config-groovy-transformer/src/test/java/org/apache/geronimo/kernel/config/transformer/CollocatedWithConfigInfoLocaterTest.java
deleted file mode 100644
index 60774a5..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/test/java/org/apache/geronimo/kernel/config/transformer/CollocatedWithConfigInfoLocaterTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.kernel.config.transformer;
-
-import java.io.File;
-
-import org.apache.geronimo.kernel.Jsr77Naming;
-import org.apache.geronimo.kernel.config.ConfigurationData;
-import org.apache.geronimo.kernel.repository.Artifact;
-
-import junit.framework.TestCase;
-
-/**
- *
- * @version $Rev:$ $Date:$
- */
-public class CollocatedWithConfigInfoLocaterTest extends TestCase {
-
- public void testLocate() throws Exception {
- CollocatedWithConfigInfoLocater locater = new CollocatedWithConfigInfoLocater();
- ConfigurationData configurationData = new ConfigurationData(new Artifact("group", "artifact", "1.0", "car"),
- new Jsr77Naming());
- File expectedLocation = new File("dir");
- configurationData.setConfigurationDir(expectedLocation);
- assertSame(expectedLocation, locater.locate(configurationData));
- }
-
-}
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/test/java/org/apache/geronimo/kernel/config/transformer/DummyGBean.java b/framework/modules/geronimo-config-groovy-transformer/src/test/java/org/apache/geronimo/kernel/config/transformer/DummyGBean.java
deleted file mode 100644
index 501398b..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/test/java/org/apache/geronimo/kernel/config/transformer/DummyGBean.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.kernel.config.transformer;
-
-import org.apache.geronimo.gbean.annotation.ParamAttribute;
-import org.apache.geronimo.gbean.annotation.ParamReference;
-
-
-/**
- *
- * @version $Rev:$ $Date:$
- */
-public class DummyGBean {
-
- public DummyGBean(@ParamAttribute(name = "name") String name,
- @ParamReference(name = "reference") Runnable runnable) {
- }
-
-}
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/test/java/org/apache/geronimo/kernel/config/transformer/GroovyTransformerTest.java b/framework/modules/geronimo-config-groovy-transformer/src/test/java/org/apache/geronimo/kernel/config/transformer/GroovyTransformerTest.java
deleted file mode 100644
index b15b2ef..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/test/java/org/apache/geronimo/kernel/config/transformer/GroovyTransformerTest.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.kernel.config.transformer;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.gbean.GBeanData;
-import org.apache.geronimo.gbean.ReferencePatterns;
-import org.apache.geronimo.kernel.Jsr77Naming;
-import org.apache.geronimo.kernel.config.ConfigurationData;
-import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.Dependency;
-import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.kernel.repository.ImportType;
-import org.apache.geronimo.testsupport.RMockTestSupport;
-
-/**
- *
- * @version $Rev:$ $Date:$
- */
-public class GroovyTransformerTest extends RMockTestSupport {
-
- private GroovyTransformer transformer;
- private ConfigurationData configurationData;
-
- @Override
- protected void setUp() throws Exception {
- final ScriptLocater scriptLocater = (ScriptLocater) mock(ScriptLocater.class);
- transformer = new GroovyTransformer() {
- @Override
- protected ScriptLocater newScriptLocater() {
- return scriptLocater;
- }
- };
-
- Artifact configArtifact = new Artifact("group", "configArtifact", "1.0", "car");
- configurationData = new ConfigurationData(configArtifact , new Jsr77Naming());
-
- scriptLocater.locate(configurationData);
- modify().returnValue(resolveFile("src/test/resources/configurationDir"));
- }
-
- public void testTransformDependencies() throws Exception {
- startVerification();
-
- Environment environment = configurationData.getEnvironment();
- environment.addDependency(new Dependency(new Artifact("group", "artifactToRemove", "1.0", "jar"), ImportType.ALL));
-
- transformer.transformDependencies(configurationData);
-
- List<Dependency> newDependencies = environment.getDependencies();
- assertEquals(1, newDependencies.size());
- Dependency newDependency = newDependencies.get(0);
- assertEquals(new Artifact("group", "artifactToAdd", "1.0", "jar"), newDependency.getArtifact());
- assertSame(ImportType.SERVICES, newDependency.getImportType());
-
- assertSame(transformer, configurationData.getConfigurationDataTransformer());
- }
-
- public void testTransformGBeans() throws Exception {
- startVerification();
-
- GBeanData existingGBean = new GBeanData(DummyGBean.class);
- List gbeans = Collections.singletonList(existingGBean);
- List<GBeanData> newGBeans = transformer.transformGBeans(getClass().getClassLoader(), configurationData, gbeans);
- assertEquals(2, newGBeans.size());
- assertSame(existingGBean, newGBeans.get(0));
-
- GBeanData addedGBean = newGBeans.get(1);
- assertEquals(DummyGBean.class.getName(), addedGBean.getGBeanInfo().getClassName());
- assertEquals("value", addedGBean.getAttribute("attributeName"));
- ReferencePatterns patterns = addedGBean.getReferencePatterns("referenceName");
- Set<AbstractNameQuery> nameQueries = patterns.getPatterns();
- assertEquals(2, nameQueries.size());
- }
-
-}
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/test/java/org/apache/geronimo/kernel/config/transformer/PatternFilterTest.java b/framework/modules/geronimo-config-groovy-transformer/src/test/java/org/apache/geronimo/kernel/config/transformer/PatternFilterTest.java
deleted file mode 100644
index 47f182a..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/test/java/org/apache/geronimo/kernel/config/transformer/PatternFilterTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.kernel.config.transformer;
-
-import java.io.File;
-import java.util.regex.Pattern;
-
-import junit.framework.TestCase;
-
-/**
- *
- * @version $Rev:$ $Date:$
- */
-public class PatternFilterTest extends TestCase {
-
- private PatternFilter filter;
-
- @Override
- protected void setUp() throws Exception {
- Pattern pattern = Pattern.compile("prefix-(.*).groovy");
- filter = new PatternFilter(pattern);
- }
-
- public void testMatchingFileReturnsTrue() throws Exception {
- assertTrue(filter.accept(new File("mock/dir/prefix-123.groovy")));
- }
-
- public void testNotMatchingFileReturnsFalse() throws Exception {
- assertFalse(filter.accept(new File("mock/dir/undefined-123.groovy")));
- }
-
-}
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/test/resources/configurationDir/DependenciesTest.groovy b/framework/modules/geronimo-config-groovy-transformer/src/test/resources/configurationDir/DependenciesTest.groovy
deleted file mode 100644
index 50baff6..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/test/resources/configurationDir/DependenciesTest.groovy
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import org.apache.geronimo.kernel.repository.ImportType
-
-assert null != configurationData : 'property configurationData is not exported'
-assert null != configurationDataBuilder : 'property configurationDataBuilder is not exported'
-
-configurationDataBuilder.configure {
- addDependency(groupId: "group", artifactId: "artifactToAdd", version: "1.0", type: "jar", importType: ImportType.SERVICES)
- removeDependency(groupId: "group", artifactId: "artifactToRemove", version: "1.0")
-}
diff --git a/framework/modules/geronimo-config-groovy-transformer/src/test/resources/configurationDir/GBeansTest.groovy b/framework/modules/geronimo-config-groovy-transformer/src/test/resources/configurationDir/GBeansTest.groovy
deleted file mode 100644
index 82862ae..0000000
--- a/framework/modules/geronimo-config-groovy-transformer/src/test/resources/configurationDir/GBeansTest.groovy
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-import org.apache.geronimo.kernel.config.transformer.DummyGBean
-
-assert null != configurationData : 'property configurationData is not exported'
-assert null != gbeanDatas : 'property gbeanDatas is not exported'
-assert null != gbeanDataBuilder : 'property gbeanDataBuilder is not exported'
-
-gbeanDataBuilder.configure {
- addGBean(name: 'name', gbean: DummyGBean) {
- attribute(attributeName: 'value')
- reference('referenceName') {
- pattern('group/artifact//?name=name')
- pattern('group/artifact//?name=name2')
- }
- }
-}
diff --git a/framework/modules/pom.xml b/framework/modules/pom.xml
index 983ac23..d8984a4 100644
--- a/framework/modules/pom.xml
+++ b/framework/modules/pom.xml
@@ -86,7 +86,6 @@
<module>geronimo-interceptor</module>
<module>geronimo-jdbc</module>
<module>geronimo-jmx-remoting</module>
- <!-- <module>geronimo-config-groovy-transformer</module> -->
<module>geronimo-management</module>
<module>geronimo-naming</module>
<module>geronimo-security</module>
diff --git a/plugingroups/clustering-jetty/pom.xml b/plugingroups/clustering-jetty/pom.xml
deleted file mode 100644
index 78c7a1c..0000000
--- a/plugingroups/clustering-jetty/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!-- @version $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>plugingroups</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>clustering-jetty</artifactId>
- <packaging>car</packaging>
- <name>Geronimo Plugin Group :: WADI Clustering Jetty</name>
-
- <description>
- This plugin group provides WADI Clustering functionality for Jetty.
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>farming</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>wadi-clustering</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-clustering-builder-wadi</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>${jetty}-clustering-builder-wadi</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <category>Geronimo Plugin Group</category>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/plugingroups/clustering-jetty/src/main/history/dependencies.xml b/plugingroups/clustering-jetty/src/main/history/dependencies.xml
deleted file mode 100644
index 33f2f4f..0000000
--- a/plugingroups/clustering-jetty/src/main/history/dependencies.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
- <module-id>
- <groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>clustering-jetty</artifactId>
- <version>3.0-SNAPSHOT</version>
- <type>car</type>
- </module-id>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>farming</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jetty8-clustering-builder-wadi</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-clustering-builder-wadi</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>wadi-clustering</artifactId>
- <type>car</type>
- </dependency>
-</plugin-artifact>
diff --git a/plugingroups/clustering-tomcat/pom.xml b/plugingroups/clustering-tomcat/pom.xml
deleted file mode 100644
index 5a051dd..0000000
--- a/plugingroups/clustering-tomcat/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!-- @version $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>plugingroups</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>clustering-tomcat</artifactId>
- <packaging>car</packaging>
- <name>Geronimo Plugin Group :: WADI Clustering Tomcat</name>
-
- <description>
- This plugin group provides WADI Clustering functionality for Tomcat.
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>farming</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>wadi-clustering</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-clustering-builder-wadi</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat7-clustering-builder-wadi</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <category>Geronimo Plugin Group</category>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/plugingroups/clustering-tomcat/src/main/history/dependencies.xml b/plugingroups/clustering-tomcat/src/main/history/dependencies.xml
deleted file mode 100644
index fc2f47c..0000000
--- a/plugingroups/clustering-tomcat/src/main/history/dependencies.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
- <module-id>
- <groupId>org.apache.geronimo.plugingroups</groupId>
- <artifactId>clustering-tomcat</artifactId>
- <version>3.0-SNAPSHOT</version>
- <type>car</type>
- </module-id>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>farming</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb-clustering-builder-wadi</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat6-clustering-builder-wadi</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>wadi-clustering</artifactId>
- <type>car</type>
- </dependency>
-</plugin-artifact>
diff --git a/plugins/aries/geronimo-aries-shell/pom.xml b/plugins/aries/geronimo-aries-shell/pom.xml
deleted file mode 100644
index c4c2d0e..0000000
--- a/plugins/aries/geronimo-aries-shell/pom.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>aries</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-aries-shell</artifactId>
- <packaging>bundle</packaging>
- <name>Geronimo Plugins, Aries :: Shell</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.aries.application</groupId>
- <artifactId>org.apache.aries.application.utils</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix.karaf.shell</groupId>
- <artifactId>org.apache.felix.karaf.shell.console</artifactId>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ApplicationCommandSupport.java b/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ApplicationCommandSupport.java
deleted file mode 100644
index 5906213..0000000
--- a/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ApplicationCommandSupport.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.aries.shell;
-
-import java.util.Set;
-
-import org.apache.aries.application.management.AriesApplicationContext;
-import org.apache.aries.application.management.AriesApplicationContextManager;
-import org.apache.aries.application.management.AriesApplicationManager;
-import org.apache.felix.karaf.shell.console.OsgiCommandSupport;
-import org.osgi.framework.ServiceReference;
-
-/**
- * @version $Rev$ $Date$
- */
-public abstract class ApplicationCommandSupport extends OsgiCommandSupport {
-
- protected AriesApplicationContextManager getApplicationContextManager() {
- ServiceReference ref =
- bundleContext.getServiceReference(AriesApplicationContextManager.class.getName());
- return getService(AriesApplicationContextManager.class, ref);
- }
-
- protected AriesApplicationManager getAriesApplicationManager() {
- ServiceReference ref =
- bundleContext.getServiceReference(AriesApplicationManager.class.getName());
- return getService(AriesApplicationManager.class, ref);
- }
-
- protected AriesApplicationContext findApplicationContext(AriesApplicationContextManager manager, String appName) {
- Set<AriesApplicationContext> contexts = manager.getApplicationContexts();
- for (AriesApplicationContext context : contexts) {
- String name = context.getApplication().getApplicationMetadata().getApplicationScope();
- if (appName.equals(name)) {
- return context;
- }
- }
- return null;
- }
-}
diff --git a/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/InstallApplication.java b/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/InstallApplication.java
deleted file mode 100644
index e63badd..0000000
--- a/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/InstallApplication.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.aries.shell;
-
-import java.io.File;
-
-import org.apache.aries.application.management.AriesApplication;
-import org.apache.aries.application.management.AriesApplicationContext;
-import org.apache.aries.application.management.AriesApplicationManager;
-import org.apache.aries.application.utils.filesystem.FileSystem;
-import org.apache.felix.gogo.commands.Argument;
-import org.apache.felix.gogo.commands.Command;
-
-/**
- * @version $Rev$ $Date$
- */
-@Command(scope = "eba", name = "install", description = "Install Application")
-public class InstallApplication extends ApplicationCommandSupport {
-
- @Argument(required = true, description = "Application location")
- String applicationPath;
-
- @Override
- protected Object doExecute() throws Exception {
- AriesApplicationManager manager = getAriesApplicationManager();
- AriesApplication application = manager.createApplication(FileSystem.getFSRoot(new File(applicationPath)));
- AriesApplicationContext context = manager.install(application);
- System.out.println("Installed EBA: " + context.getApplication().getApplicationMetadata().getApplicationScope());
- return null;
- }
-
-}
diff --git a/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ListApplication.java b/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ListApplication.java
deleted file mode 100644
index 492056f..0000000
--- a/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/ListApplication.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.aries.shell;
-
-import java.util.Set;
-
-import org.apache.aries.application.management.AriesApplicationContext;
-import org.apache.aries.application.management.AriesApplicationContextManager;
-import org.apache.felix.gogo.commands.Argument;
-import org.apache.felix.gogo.commands.Command;
-
-/**
- * @version $Rev$ $Date$
- */
-@Command(scope = "eba", name = "list", description = "List Applications")
-public class ListApplication extends ApplicationCommandSupport {
-
- @Argument(required = false, description = "Application name")
- String applicationName;
-
- @Override
- protected Object doExecute() throws Exception {
- AriesApplicationContextManager contextManager = getApplicationContextManager();
- if (applicationName == null) {
- System.out.println("EBA Applications:");
- Set<AriesApplicationContext> contexts = contextManager.getApplicationContexts();
- for (AriesApplicationContext context : contexts) {
- System.out.println(context.getApplication().getApplicationMetadata().getApplicationScope() + "\t" + context.getApplicationState());
- }
- } else {
- AriesApplicationContext context = findApplicationContext(contextManager, applicationName);
- if (context == null) {
- System.out.println("EBA " + applicationName + " not found");
- } else {
- System.out.println("EBA: " + applicationName);
- System.out.println("Bundles : " + context.getApplicationContent());
- System.out.println("State : " + context.getApplicationState());
- }
- }
- return null;
- }
-
-}
diff --git a/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/StartApplication.java b/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/StartApplication.java
deleted file mode 100644
index 9a08c24..0000000
--- a/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/StartApplication.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.aries.shell;
-
-import org.apache.aries.application.management.AriesApplicationContext;
-import org.apache.aries.application.management.AriesApplicationContextManager;
-import org.apache.felix.gogo.commands.Argument;
-import org.apache.felix.gogo.commands.Command;
-
-/**
- * @version $Rev$ $Date$
- */
-@Command(scope = "eba", name = "start", description = "Start Application")
-public class StartApplication extends ApplicationCommandSupport {
-
- @Argument(required = true, description = "Application name")
- String applicationName;
-
- @Override
- protected Object doExecute() throws Exception {
- AriesApplicationContextManager contextManager = getApplicationContextManager();
- AriesApplicationContext context = findApplicationContext(contextManager, applicationName);
- if (context == null) {
- System.out.println("EBA " + applicationName + " not found");
- } else {
- context.start();
- }
- return null;
- }
-
-
-}
diff --git a/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/StopApplication.java b/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/StopApplication.java
deleted file mode 100644
index f01faa0..0000000
--- a/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/StopApplication.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.aries.shell;
-
-import org.apache.aries.application.management.AriesApplicationContext;
-import org.apache.aries.application.management.AriesApplicationContextManager;
-import org.apache.felix.gogo.commands.Argument;
-import org.apache.felix.gogo.commands.Command;
-
-/**
- * @version $Rev$ $Date$
- */
-@Command(scope = "eba", name = "stop", description = "Stop Application")
-public class StopApplication extends ApplicationCommandSupport {
-
- @Argument(required = true, description = "Application name")
- String applicationName;
-
- @Override
- protected Object doExecute() throws Exception {
- AriesApplicationContextManager contextManager = getApplicationContextManager();
- AriesApplicationContext context = findApplicationContext(contextManager, applicationName);
- if (context == null) {
- System.out.println("EBA " + applicationName + " not found");
- } else {
- context.stop();
- }
- return null;
- }
-
-}
diff --git a/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/UninstallApplication.java b/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/UninstallApplication.java
deleted file mode 100644
index 60ac95b..0000000
--- a/plugins/aries/geronimo-aries-shell/src/main/java/org/apache/geronimo/aries/shell/UninstallApplication.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.aries.shell;
-
-import org.apache.aries.application.management.AriesApplicationContext;
-import org.apache.aries.application.management.AriesApplicationContextManager;
-import org.apache.aries.application.management.AriesApplicationManager;
-import org.apache.felix.gogo.commands.Argument;
-import org.apache.felix.gogo.commands.Command;
-
-/**
- * @version $Rev$ $Date$
- */
-@Command(scope = "eba", name = "uninstall", description = "Uninstall Application")
-public class UninstallApplication extends ApplicationCommandSupport {
-
- @Argument(required = true, description = "Application name")
- String applicationName;
-
- @Override
- protected Object doExecute() throws Exception {
- AriesApplicationContextManager contextManager = getApplicationContextManager();
- AriesApplicationContext context = findApplicationContext(contextManager, applicationName);
- if (context == null) {
- System.out.println("EBA " + applicationName + " not found");
- } else {
- AriesApplicationManager manager = getAriesApplicationManager();
- manager.uninstall(context);
- }
- return null;
- }
-
-}
diff --git a/plugins/aries/geronimo-aries-shell/src/main/resources/OSGI-INF/blueprint/shell-eba.xml b/plugins/aries/geronimo-aries-shell/src/main/resources/OSGI-INF/blueprint/shell-eba.xml
deleted file mode 100644
index f0c4384..0000000
--- a/plugins/aries/geronimo-aries-shell/src/main/resources/OSGI-INF/blueprint/shell-eba.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
--->
-<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- default-activation="lazy">
-
- <command-bundle xmlns="http://felix.apache.org/karaf/xmlns/shell/v1.0.0">
- <command name="eba/install">
- <action class="org.apache.geronimo.aries.shell.InstallApplication"></action>
- </command>
- <command name="eba/uninstall">
- <action class="org.apache.geronimo.aries.shell.UninstallApplication"></action>
- </command>
- <command name="eba/list">
- <action class="org.apache.geronimo.aries.shell.ListApplication"></action>
- </command>
- <command name="eba/start">
- <action class="org.apache.geronimo.aries.shell.StartApplication"></action>
- </command>
- <command name="eba/stop">
- <action class="org.apache.geronimo.aries.shell.StopApplication"></action>
- </command>
- </command-bundle>
-
-</blueprint>
diff --git a/plugins/aries/pom.xml b/plugins/aries/pom.xml
index 259dfd5..1bde4c4 100644
--- a/plugins/aries/pom.xml
+++ b/plugins/aries/pom.xml
@@ -39,9 +39,6 @@
<modules>
<module>geronimo-aries-builder</module>
<module>geronimo-aries-resolver</module>
-<!--
- <module>geronimo-aries-shell</module>
--->
<module>aries-deployer</module>
</modules>
diff --git a/plugins/j2ee/jsr88-jar-configurer/pom.xml b/plugins/j2ee/jsr88-jar-configurer/pom.xml
deleted file mode 100644
index 6d8584e..0000000
--- a/plugins/j2ee/jsr88-jar-configurer/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>j2ee</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jsr88-jar-configurer</artifactId>
- <name>Geronimo Plugins, J2EE :: JSR-88 JAR Configurer</name>
- <packaging>car</packaging>
-
- <dependencies>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.framework</groupId>-->
- <!--<artifactId>jsr88-cli</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--<type>car</type>-->
- <!--</dependency>-->
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client-builder</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <warnOnDependencyChange>true</warnOnDependencyChange>
- <dependencies>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.framework</groupId>-->
- <!--<artifactId>jsr88-cli</artifactId>-->
- <!--<type>car</type>-->
- <!--<import>classes</import>-->
- <!--</dependency>-->
- </dependencies>
- <category>Deployment</category>
- <instance>
- <plugin-artifact>
- <config-xml-content server="jsr88" />
- </plugin-artifact>
- </instance>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml b/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml
deleted file mode 100644
index 57236bf..0000000
--- a/plugins/j2ee/jsr88-jar-configurer/src/main/history/dependencies.xml
+++ /dev/null
@@ -1,244 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
- <module-id>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jsr88-jar-configurer</artifactId>
- <version>3.0-SNAPSHOT</version>
- <type>car</type>
- </module-id>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.osgi.core</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>asm-commons</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-connector</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.components</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-core</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-config</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deployment</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-management</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-naming</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-security</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-service-builder</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-system</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>jee-specs</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-client-builder</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-1_6</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder-1_6</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-builder</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-schema</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming-builder</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-security-builder</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction-1_6</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.schema</groupId>
- <artifactId>geronimo-schema-j2ee_1.4</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.schema</groupId>
- <artifactId>geronimo-schema-jee_5</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-connector_1.6_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-j2ee-management_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jacc_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaspic_1.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-javaee-deployment_1.1MR3_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.saaj-api-1.3</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.specs</groupId>
- <artifactId>org.apache.servicemix.specs.stax-api-1.0</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-finder</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-naming</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.xbean</groupId>
- <artifactId>xbean-reflect</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.xmlbeans</groupId>
- <artifactId>xmlbeans</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.objectweb.howl</groupId>
- <artifactId>howl</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <type>jar</type>
- </dependency>
-</plugin-artifact>
diff --git a/plugins/j2ee/jsr88-jar-configurer/src/main/plan/plan.xml b/plugins/j2ee/jsr88-jar-configurer/src/main/plan/plan.xml
deleted file mode 100644
index 61ae58a..0000000
--- a/plugins/j2ee/jsr88-jar-configurer/src/main/plan/plan.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-
- <gbean name="ClientConfigurer" class="org.apache.geronimo.client.builder.jsr88.ClientConfigurer"/>
-
-</module>
diff --git a/plugins/j2ee/jsr88-rar-configurer/pom.xml b/plugins/j2ee/jsr88-rar-configurer/pom.xml
deleted file mode 100644
index a0ffde3..0000000
--- a/plugins/j2ee/jsr88-rar-configurer/pom.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>j2ee</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jsr88-rar-configurer</artifactId>
- <name>Geronimo Plugins, J2EE :: JSR-88 RAR Configurer</name>
- <packaging>car</packaging>
-
- <dependencies>
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.framework</groupId>-->
- <!--<artifactId>jsr88-cli</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--<type>car</type>-->
- <!--</dependency>-->
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>connector-deployer</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--<type>car</type>-->
- <!--</dependency>-->
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-connector-builder-1_6</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <warnOnDependencyChange>true</warnOnDependencyChange>
- <dependencies>
- <!-- should this be the connector-deployer jar??? -->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.configs</groupId>-->
- <!--<artifactId>connector-deployer</artifactId>-->
- <!--<type>car</type>-->
- <!--<import>classes</import>-->
- <!--</dependency>-->
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.framework</groupId>-->
- <!--<artifactId>jsr88-cli</artifactId>-->
- <!--<type>car</type>-->
- <!--<import>classes</import>-->
- <!--</dependency>-->
- </dependencies>
- <category>Deployment</category>
- <instance>
- <plugin-artifact>
- <config-xml-content server="jsr88" />
- </plugin-artifact>
- </instance>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml b/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml
deleted file mode 100644
index c759253..0000000
--- a/plugins/j2ee/jsr88-rar-configurer/src/main/history/dependencies.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
- <module-id>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jsr88-rar-configurer</artifactId>
- <version>3.0-SNAPSHOT</version>
- <type>car</type>
- </module-id>
- <dependency start="true">
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer-1_6</artifactId>
- <type>car</type>
- </dependency>
-</plugin-artifact>
diff --git a/plugins/j2ee/jsr88-rar-configurer/src/main/plan/plan.xml b/plugins/j2ee/jsr88-rar-configurer/src/main/plan/plan.xml
deleted file mode 100644
index 6f77a26..0000000
--- a/plugins/j2ee/jsr88-rar-configurer/src/main/plan/plan.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-
- <gbean name="RARConfigurer" class="org.apache.geronimo.connector.deployment.RARConfigurer"/>
-
-</module>
diff --git a/plugins/j2ee/pom.xml b/plugins/j2ee/pom.xml
index 9c679cc..7b1bce0 100644
--- a/plugins/j2ee/pom.xml
+++ b/plugins/j2ee/pom.xml
@@ -46,8 +46,6 @@
<module>geronimo-web-2.5-builder</module>
<module>j2ee-server</module>
<module>jsr88-ear-configurer</module>
- <!--<module>jsr88-jar-configurer</module>-->
- <!--<module>jsr88-rar-configurer</module>-->
<module>jsr88-war-configurer</module>
</modules>
diff --git a/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml b/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
deleted file mode 100644
index 88a5f4a..0000000
--- a/plugins/jaxws/geronimo-jaxws-sun-tools/pom.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>jaxws</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jaxws-sun-tools</artifactId>
- <packaging>bundle</packaging>
- <name>Geronimo Plugins, JAXWS :: Sun JAX-WS Tools</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jaxws-builder</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-command-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.gshell</groupId>
- <artifactId>gshell-maven-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>descriptor</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/filtered-resources/gsh-wsgen.properties b/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/filtered-resources/gsh-wsgen.properties
deleted file mode 100644
index e14a8d3..0000000
--- a/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/filtered-resources/gsh-wsgen.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one
-## or more contributor license agreements. See the NOTICE file
-## distributed with this work for additional information
-## regarding copyright ownership. The ASF licenses this file
-## to you under the Apache License, Version 2.0 (the
-## "License"); you may not use this file except in compliance
-## with the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing,
-## software distributed under the License is distributed on an
-## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-## KIND, either express or implied. See the License for the
-## specific language governing permissions and limitations
-## under the License.
-##
-
-classworldsRegExTest = .*${artifactId}.*
-classworldsEntry = load ${gshell.home}/lib/${artifactId}-*.jar
-layout = addCommand wsgen ${artifactId}:wsgen jaxws, addCommand wsimport ${artifactId}:wsimport jaxws
diff --git a/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java b/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java
deleted file mode 100644
index efda495..0000000
--- a/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java
+++ /dev/null
@@ -1,222 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.jaxws.sun.tools;
-
-import java.io.File;
-import java.io.OutputStream;
-import java.lang.reflect.Method;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.SortedSet;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.geronimo.kernel.classloader.TemporaryClassLoader;
-import org.apache.geronimo.kernel.config.Os;
-import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.ListableRepository;
-import org.apache.geronimo.kernel.repository.Repository;
-import org.apache.geronimo.kernel.repository.Version;
-
-public class JAXWSTools {
-
- private static final Logger LOG = LoggerFactory.getLogger(JAXWSTools.class);
-
- private final static String [][] LIBS =
- {
- { "org.apache.geronimo.specs", "geronimo-jaxws_2.2_spec" },
- { "org.apache.geronimo.specs", "geronimo-saaj_1.3_spec" },
- { "org.apache.geronimo.specs", "geronimo-jaxb_2.1_spec" },
- { "com.sun.xml.bind", "jaxb-impl" },
- { "com.sun.xml.bind", "jaxb-xjc" },
- { "com.sun.xml.ws", "jaxws-tools" },
- { "com.sun.xml.ws", "jaxws-rt" },
- { "com.sun.xml.stream.buffer", "streambuffer" },
- { "org.jvnet.staxex", "stax-ex" },
- { "org.apache.geronimo.javamail", "geronimo-javamail_1.4_mail"},
- { "org.apache.geronimo.specs", "geronimo-activation_1.1_spec"},
- { "org.apache.geronimo.specs", "geronimo-annotation_1.0_spec"},
- { "org.apache.geronimo.specs", "geronimo-ws-metadata_2.0_spec"},
- { "org.apache.geronimo.specs", "geronimo-ejb_3.1_spec"},
- { "org.apache.geronimo.specs", "geronimo-interceptor_3.0_spec"},
- { "org.apache.geronimo.specs", "geronimo-stax-api_1.0_spec"},
- { "org.apache.geronimo.specs", "geronimo-jpa_2.0_spec"},
- { "org.apache.geronimo.specs", "geronimo-j2ee-connector_1.6_spec"},
- { "org.apache.geronimo.specs", "geronimo-jms_1.1_spec"},
- { "org.apache.geronimo.specs", "geronimo-jta_1.1_spec"},
- { "org.apache.geronimo.specs", "geronimo-j2ee-management_1.1_spec"},
- { "org.codehaus.woodstox", "wstx-asl" },
- { "org.apache.geronimo.modules", "geronimo-webservices" },
- };
-
- private final static Artifact SUN_SAAJ_IMPL_ARTIFACT = new Artifact("com.sun.xml.messaging.saaj","saaj-impl", (Version)null, "jar");
- private final static Artifact AXIS2_SAAJ_IMPL_ARTIFACT = new Artifact("org.apache.axis2","axis2-saaj", (Version)null, "jar");
- private final static String TOOLS = "tools.jar";
-
- private Artifact saajImpl;
- private boolean overrideContextClassLoader;
- private ClassLoader parentClassLoader;
-
- public JAXWSTools() {
- }
-
- public void setUseSunSAAJ() {
- this.saajImpl = SUN_SAAJ_IMPL_ARTIFACT;
- }
-
- public void setUseAxis2SAAJ() {
- this.saajImpl = AXIS2_SAAJ_IMPL_ARTIFACT;
- }
-
- public void setOverrideContextClassLoader(boolean overrideContextClassLoader) {
- this.overrideContextClassLoader = overrideContextClassLoader;
- }
-
- public boolean getOverrideContextClassLoader() {
- return this.overrideContextClassLoader;
- }
-
- public void setParentClassLoader(ClassLoader parentClassLoader) {
- this.parentClassLoader = parentClassLoader;
- }
-
- public ClassLoader getParentClassLoader() {
- return this.parentClassLoader;
- }
-
- public static URL[] toURL(File[] jars) throws MalformedURLException {
- URL [] urls = new URL[jars.length];
- for (int i = 0; i < jars.length; i++) {
- urls[i] = jars[i].toURI().toURL();
- }
- return urls;
- }
-
- public static String toString(File [] jars) {
- StringBuffer buf = new StringBuffer();
- for (int i = 0; i < jars.length; i++) {
- buf.append(jars[i].getAbsolutePath());
- if (i+1 < jars.length) {
- buf.append(File.pathSeparatorChar);
- }
- }
- return buf.toString();
- }
-
- public File[] getClasspath(Collection<? extends Repository> repositories) throws Exception {
- ArrayList<File> jars = new ArrayList<File>();
- for (String[] lib : LIBS) {
- Artifact artifact = new Artifact(lib[0], lib[1], (Version)null, "jar");
- jars.add(getLocation(repositories, artifact));
- }
- if (this.saajImpl != null) {
- jars.add(getLocation(repositories, this.saajImpl));
- }
- // add tools.jar to classpath except on Mac OS. On Mac OS there is classes.jar with the
- // same contents as tools.jar and is automatically included in the classpath.
- if (!Os.isFamily(Os.FAMILY_MAC)) {
- addToolsJarLocation(jars);
- }
-
- return jars.toArray(new File[jars.size()]);
- }
-
- private static File getLocation(Collection<? extends Repository> repositories, Artifact artifactQuery) throws Exception {
- File file = null;
-
- for (Repository arepository : repositories) {
- if (arepository instanceof ListableRepository) {
- ListableRepository repository = (ListableRepository) arepository;
- SortedSet artifactSet = repository.list(artifactQuery);
- // if we have exactly one artifact found
- if (artifactSet.size() == 1) {
- file = repository.getLocation((Artifact) artifactSet.first());
- return file.getAbsoluteFile();
- } else if (artifactSet.size() > 1) {// if we have more than 1 artifacts found use the latest one.
- file = repository.getLocation((Artifact) artifactSet.last());
- return file.getAbsoluteFile();
- }
- }
- }
-
- throw new Exception("Missing artifact in repositories: " + artifactQuery.toString());
- }
-
- private static void addToolsJarLocation(ArrayList<File> jars) {
- //create a new File then check exists()
- String jreHomePath = System.getProperty("java.home");
- String javaHomePath = "";
- int jreHomePathLength = jreHomePath.length();
- if (jreHomePathLength > 0) {
- int i = jreHomePath.substring(0, jreHomePathLength -1).lastIndexOf(java.io.File.separator);
- javaHomePath = jreHomePath.substring(0, i);
- }
- File jdkhomelib = new File(javaHomePath, "lib");
- if (!jdkhomelib.exists()) {
- LOG.warn("Missing " + jdkhomelib.getAbsolutePath()
- + ". This may be required for wsgen to run. ");
- }
- else {
- File tools = new File(jdkhomelib, TOOLS);
- if (!tools.exists()) {
- LOG.warn("Missing tools.jar in" + jdkhomelib.getAbsolutePath()
- + ". This may be required for wsgen to run. ");
- } else {
- jars.add(tools.getAbsoluteFile());
- }
- }
- }
-
- public boolean invokeWsgen(URL[] jars, OutputStream os, String[] arguments) throws Exception {
- return invoke("wsgen", jars, os, arguments);
-
- }
- public boolean invokeWsimport(URL[] jars, OutputStream os, String[] arguments) throws Exception {
- return invoke("wsimport", jars, os, arguments);
- }
-
- private boolean invoke(String toolName, URL[] jars, OutputStream os, String[] arguments) throws Exception {
- TemporaryClassLoader loader = new TemporaryClassLoader(jars, ClassLoader.getSystemClassLoader());
- if (this.overrideContextClassLoader) {
- ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader(loader);
- try {
- return invoke(toolName, loader, os, arguments);
- } finally {
- Thread.currentThread().setContextClassLoader(oldClassLoader);
- }
- } else {
- return invoke(toolName, loader, os, arguments);
- }
- }
-
- private boolean invoke(String toolName, ClassLoader loader, OutputStream os, String[] arguments) throws Exception {
- LOG.debug("Invoking " + toolName);
- Class clazz = loader.loadClass("com.sun.tools.ws.spi.WSToolsObjectFactory");
- Method method = clazz.getMethod("newInstance");
- Object factory = method.invoke(null);
- Method method2 = clazz.getMethod(toolName, OutputStream.class, String[].class);
-
- Boolean result = (Boolean) method2.invoke(factory, os, arguments);
-
- return result;
- }
-
-}
diff --git a/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSToolsCLI.java b/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSToolsCLI.java
deleted file mode 100644
index b23e4eb..0000000
--- a/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSToolsCLI.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.jaxws.sun.tools;
-
-import java.io.File;
-import java.io.OutputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.net.JarURLConnection;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-
-import org.apache.geronimo.kernel.repository.ListableRepository;
-import org.apache.geronimo.kernel.repository.Maven2Repository;
-
-public class JAXWSToolsCLI {
-
- enum Command { WSGEN, WSIMPORT };
-
- private static final String USAGE_MSG =
- "Usage: jaxws-tools <toolName> <tool options>\n\n" +
- "where <toolName> is:\n" +
- " wsgen - generate portable artifacts from class\n" +
- " wsimport - generate portable artifacts from WSDL\n";
-
- public static void main(String[] args) throws Throwable {
- if (args.length == 0) {
- System.err.println(USAGE_MSG);
- System.exit(1);
- }
-
- Command cmd = null;
- if (args[0].equalsIgnoreCase("wsgen")) {
- cmd = Command.WSGEN;
- } else if (args[0].equalsIgnoreCase("wsimport")) {
- cmd = Command.WSIMPORT;
- } else {
- System.err.println("Error: Unsupported toolName [" + args[0] + "].");
- System.err.println();
- System.err.println(USAGE_MSG);
- System.exit(1);
- }
-
- String geroninoHome = getGeronimoHome();
- String[] arguments = getCmdArguments(args);
- boolean rs = run(cmd, geroninoHome, arguments, System.out);
- System.exit( (rs) ? 0 : 1 );
- }
-
- static boolean run(Command cmd, String geronimoHome, String[] args, OutputStream out) throws Exception {
- String repository = System.getProperty("Xorg.apache.geronimo.repository.boot.path", "repository");
- Maven2Repository mavenRepository = new Maven2Repository((new File(geronimoHome, repository)).getCanonicalFile());
- ArrayList<ListableRepository> repositories = new ArrayList<ListableRepository>(1);
- repositories.add(mavenRepository);
-
- JAXWSTools tools = new JAXWSTools();
- tools.setUseSunSAAJ();
- tools.setOverrideContextClassLoader(true);
-
- File [] jars;
- try {
- jars = tools.getClasspath(repositories);
- } catch (Exception e) {
- //if we cannot find SUN's SAAJ impl, try Axis2's.
- tools.setUseAxis2SAAJ();
- jars = tools.getClasspath(repositories);
- }
-
- URL[] jarUrls = JAXWSTools.toURL(jars);
-
- String javaClassPath = System.getProperty("java.class.path");
- System.setProperty("java.class.path", JAXWSTools.toString(jars));
-
- try {
- if (cmd.equals(Command.WSGEN)) {
- return tools.invokeWsgen(jarUrls, out, args);
- } else if (cmd.equals(Command.WSIMPORT)) {
- return tools.invokeWsimport(jarUrls, out, args);
- } else {
- throw new IllegalArgumentException("Invalid command: " + cmd);
- }
- } catch (InvocationTargetException e) {
- Throwable exception = e.getTargetException();
- if (exception instanceof Exception) {
- throw (Exception)exception;
- } else {
- throw e;
- }
- } finally {
- System.setProperty("java.class.path", javaClassPath);
- }
- }
-
- private static String[] getCmdArguments(String[] args) {
- String [] cmdArgs = new String[args.length - 1];
- System.arraycopy(args, 1, cmdArgs, 0, args.length - 1);
- return cmdArgs;
- }
-
- private static String getGeronimoHome() {
- String geronimoHome = System.getProperty("org.apache.geronimo.home.dir");
- if (geronimoHome != null) {
- return geronimoHome;
- }
-
- // guess from the location of the jar
- URL url = JAXWSToolsCLI.class.getClassLoader().getResource("META-INF/startup-jar");
- if (url != null) {
- try {
- JarURLConnection jarConnection = (JarURLConnection) url.openConnection();
- url = jarConnection.getJarFileURL();
-
- URI baseURI = new URI(url.toString()).resolve("..");
- File dir = new File(baseURI);
- return dir.getAbsolutePath();
- } catch (Exception ignored) {
- // ignore
- }
- }
-
- // cannot determine the directory, return parent directory
- return "..";
- }
-
-}
diff --git a/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/SunWsdlGenerator.java b/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/SunWsdlGenerator.java
deleted file mode 100644
index 6131dd3..0000000
--- a/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/SunWsdlGenerator.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.jaxws.sun.tools;
-
-import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
-import org.apache.geronimo.j2ee.deployment.Module;
-import org.apache.geronimo.jaxws.builder.wsdl.WsdlGeneratorOptions;
-
-public class SunWsdlGenerator implements org.apache.geronimo.jaxws.builder.wsdl.WsdlGenerator {
-
- public String generateWsdl(Module module,
- String serviceClass,
- DeploymentContext context,
- WsdlGeneratorOptions options) throws DeploymentException {
- WsdlGenerator generator = new WsdlGenerator(options);
- return generator.generateWsdl(module, serviceClass, context, null);
- }
-
- public static final GBeanInfo GBEAN_INFO;
-
- static {
- GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(SunWsdlGenerator.class, GBeanInfoBuilder.DEFAULT_J2EE_TYPE);
- infoBuilder.addInterface(org.apache.geronimo.jaxws.builder.wsdl.WsdlGenerator.class);
- GBEAN_INFO = infoBuilder.getBeanInfo();
- }
-
- public static GBeanInfo getGBeanInfo() {
- return GBEAN_INFO;
- }
-
-}
diff --git a/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsdlGenerator.java b/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsdlGenerator.java
deleted file mode 100644
index e398e6c..0000000
--- a/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsdlGenerator.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.jaxws.sun.tools;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.IOException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-
-import javax.xml.namespace.QName;
-
-import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.deployment.DeploymentConfigurationManager;
-import org.apache.geronimo.deployment.DeploymentContext;
-import org.apache.geronimo.j2ee.deployment.Module;
-import org.apache.geronimo.jaxws.PortInfo;
-import org.apache.geronimo.jaxws.builder.wsdl.WsdlGeneratorOptions;
-import org.apache.geronimo.jaxws.builder.wsdl.WsdlGeneratorUtils;
-import org.apache.geronimo.kernel.repository.Repository;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class WsdlGenerator {
-
- private static final Logger LOG = LoggerFactory.getLogger(WsdlGenerator.class);
-
- private JAXWSTools jaxwsTools;
- private WsdlGeneratorOptions options;
-
- public WsdlGenerator(WsdlGeneratorOptions options) {
- this.options = options;
- this.jaxwsTools = new JAXWSTools();
- this.jaxwsTools.setOverrideContextClassLoader(true);
-
- if (options.getSAAJ() == WsdlGeneratorOptions.SAAJ.SUN) {
- this.jaxwsTools.setUseSunSAAJ();
- } else if (options.getSAAJ() == WsdlGeneratorOptions.SAAJ.Axis2) {
- this.jaxwsTools.setUseAxis2SAAJ();
- }
- }
-
- private URL[] getWsgenClasspath(DeploymentContext context) throws Exception {
- DeploymentConfigurationManager cm = (DeploymentConfigurationManager)context.getConfigurationManager();
- Collection<? extends Repository> repositories = cm.getRepositories();
- File[] jars = this.jaxwsTools.getClasspath(repositories);
- return JAXWSTools.toURL(jars);
- }
-
- private String[] buildArguments(String sei, String classPath, File moduleBaseDir, PortInfo portInfo) {
- List<String> arguments = new ArrayList<String>();
-
- arguments.add("-cp");
- arguments.add(classPath);
- arguments.add("-keep");
- arguments.add("-wsdl");
- arguments.add("-d");
- arguments.add(moduleBaseDir.getAbsolutePath());
-
- QName serviceName = this.options.getWsdlService();
- if (serviceName != null) {
- arguments.add("-servicename");
- arguments.add(serviceName.toString());
- }
-
- QName portName = this.options.getWsdlPort();
- if (portName != null) {
- arguments.add("-portname");
- arguments.add(portName.toString());
- }
-
- arguments.add(sei);
-
- return arguments.toArray(new String[]{});
- }
-
- private File findWsdlFile(File baseDir, PortInfo portInfo) {
- QName serviceQName = this.options.getWsdlService();
- String serviceName = (serviceQName == null) ? null : serviceQName.getLocalPart();
- return WsdlGeneratorUtils.findWsdlFile(baseDir, serviceName);
- }
-
- public String generateWsdl(Module module,
- String serviceClass,
- DeploymentContext context,
- PortInfo portInfo) throws DeploymentException {
- //call wsgen tool to generate the wsdl file based on the bindingtype.
- //let's set the outputDir as the module base directory in server repository.
- File moduleBase = module.getEarContext().getInPlaceConfigurationDir();
- if (moduleBase == null) {
- moduleBase = module.getEarContext().getBaseDir();
- }
- File moduleBaseDir = (moduleBase.isFile()) ? moduleBase.getParentFile() : moduleBase;
- File baseDir;
-
- try {
- baseDir = WsdlGeneratorUtils.createTempDirectory(moduleBaseDir);
- } catch (IOException e) {
- throw new DeploymentException(e);
- }
-
- URL[] urls;
- StringBuilder classPath = new StringBuilder();
- //let's figure out the classpath for wsgen tools
- try {
- urls = getWsgenClasspath(context);
- } catch (Exception e) {
- throw new DeploymentException("Failed to generate the wsdl file using wsgen: unable to get the location of the required artifact(s).", e);
- }
- //let's figure out the classpath string for the module and wsgen tools.
- if (urls != null && urls.length > 0) {
- for (URL url : urls) {
- classPath.append(WsdlGeneratorUtils.toFile(url).getAbsolutePath()).append(File.pathSeparator);
- }
- }
- try {
- WsdlGeneratorUtils.getModuleClasspath(module, context, classPath);
- } catch (Exception e) {
- throw new DeploymentException("WSDL generation failed: unable to determine module classpath", e);
- }
-
- //create arguments;
- String[] arguments = buildArguments(serviceClass, classPath.toString(), baseDir, portInfo);
-
- try {
- boolean result = false;
-
- if (this.options.getFork()) {
- result = forkWsgen(classPath, arguments);
- } else {
- result = invokeWsgen(urls, arguments);
- }
-
- if (result) {
- //check to see if the file is created.
- File wsdlFile = findWsdlFile(baseDir, portInfo);
- if (wsdlFile == null) {
- throw new DeploymentException("Unable to find the service wsdl file");
- }
- if (this.options.getAddToClassPath()) {
-// TODO: This isn't available on configuraitons any more...need to figure out if/how this gets replaced.
-// context.getConfiguration().addToClassPath(baseDir.getName());
- }
- return WsdlGeneratorUtils.getRelativeNameOrURL(moduleBase, wsdlFile);
- } else {
- throw new DeploymentException("WSDL generation failed");
- }
-
- } catch (DeploymentException e) {
- throw e;
- } catch (Exception e) {
- throw new DeploymentException("Unable to generate the wsdl file using wsgen.", e);
- }
- }
-
- private boolean invokeWsgen(URL[] jars, String[] arguments) throws Exception {
- ByteArrayOutputStream os = new ByteArrayOutputStream();
- boolean rs = this.jaxwsTools.invokeWsgen(jars, os, arguments);
- os.close();
-
- if (!rs) {
- LOG.error("WSDL generator failed: {}", getOutput(os));
- } else if (LOG.isDebugEnabled()) {
- LOG.debug("WSDL generator output: {}", getOutput(os));
- }
-
- return rs;
- }
-
- private static String getOutput(ByteArrayOutputStream os) {
- byte [] arr = os.toByteArray();
- return new String(arr, 0, arr.length);
- }
-
- private boolean forkWsgen(StringBuilder classPath, String[] arguments) throws Exception {
- List<String> cmd = new ArrayList<String>();
- cmd.add("-classpath");
- cmd.add(classPath.toString());
- cmd.add("com.sun.tools.ws.WsGen");
- cmd.addAll(Arrays.asList(arguments));
-
- try {
- return WsdlGeneratorUtils.execJava(cmd, this.options.getForkTimeout());
- } catch (Exception e) {
- throw new DeploymentException("WSDL generation failed", e);
- }
- }
-}
diff --git a/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsgenCommand.java b/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsgenCommand.java
deleted file mode 100644
index 6eb8fe0..0000000
--- a/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsgenCommand.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.sun.tools;
-
-import org.apache.geronimo.gshell.command.CommandContext;
-import org.apache.geronimo.gshell.command.CommandSupport;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
-import org.apache.geronimo.gshell.command.annotation.Requirement;
-import org.apache.geronimo.gshell.shell.ShellInfo;
-
-/**
- * GShell command for wsgen tool.
- *
- * @version $Rev: 595889 $ $Date: 2007-11-16 20:13:06 -0500 (Fri, 16 Nov 2007) $
- */
-@CommandComponent(id="geronimo-jaxws-sun-tools:wsgen", description="Generate JAX-WS artifacts from class")
-public class WsgenCommand extends CommandSupport {
-
- @Requirement
- ShellInfo shellInfo;
-
- @Override
- public Object execute(final CommandContext context, final Object... args) throws Exception {
- init(context);
-
- String[] arguments = toString(args);
- return JAXWSToolsCLI.run(JAXWSToolsCLI.Command.WSGEN,
- shellInfo.getHomeDir().getAbsolutePath(),
- arguments,
- System.out); // should use io.out instead of System.out?
- }
-
- @Override
- protected Object doExecute() throws Exception {
- return null;
- }
-
- private static String[] toString(Object [] args) {
- String [] a = new String[args.length];
- for (int i=0; i<a.length; i++) {
- a[i] = args[i].toString();
- }
- return a;
- }
-
-}
diff --git a/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsimportCommand.java b/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsimportCommand.java
deleted file mode 100644
index 4e323e8..0000000
--- a/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsimportCommand.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.sun.tools;
-
-import org.apache.geronimo.gshell.command.CommandContext;
-import org.apache.geronimo.gshell.command.CommandSupport;
-import org.apache.geronimo.gshell.command.annotation.CommandComponent;
-import org.apache.geronimo.gshell.command.annotation.Requirement;
-import org.apache.geronimo.gshell.shell.ShellInfo;
-
-/**
- * GShell command for wsimport tool.
- *
- * @version $Rev: 595889 $ $Date: 2007-11-16 20:13:06 -0500 (Fri, 16 Nov 2007) $
- */
-@CommandComponent(id="geronimo-jaxws-sun-tools:wsimport", description="Generate JAX-WS artifacts from WSDL")
-public class WsimportCommand extends CommandSupport {
-
- @Requirement
- ShellInfo shellInfo;
-
- @Override
- public Object execute(final CommandContext context, final Object... args) throws Exception {
- init(context);
-
- String[] arguments = toString(args);
- return JAXWSToolsCLI.run(JAXWSToolsCLI.Command.WSIMPORT,
- shellInfo.getHomeDir().getAbsolutePath(),
- arguments,
- System.out); // should use io.out instead of System.out?
- }
-
- @Override
- protected Object doExecute() throws Exception {
- return null;
- }
-
- private static String[] toString(Object [] args) {
- String [] a = new String[args.length];
- for (int i=0; i<a.length; i++) {
- a[i] = args[i].toString();
- }
- return a;
- }
-
-}
diff --git a/plugins/jaxws/jaxws-sun-tools/pom.xml b/plugins/jaxws/jaxws-sun-tools/pom.xml
deleted file mode 100644
index edadb2c..0000000
--- a/plugins/jaxws/jaxws-sun-tools/pom.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>jaxws</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jaxws-sun-tools</artifactId>
- <name>Geronimo Plugins, JAXWS :: Sun Tools</name>
- <packaging>car</packaging>
-
- <description>JAX-WS command line tools</description>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jaxws-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jaxws-sun-tools</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <!-- Needed for generating wsdl -->
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-tools</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.stream.buffer</groupId>
- <artifactId>streambuffer</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.jvnet.staxex</groupId>
- <artifactId>stax-ex</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <archive>
- <manifestEntries>
- <Endorsed-Dirs>lib/endorsed</Endorsed-Dirs>
- <Extension-Dirs>lib/ext</Extension-Dirs>
- </manifestEntries>
- <manifest>
- <mainClass>org.apache.geronimo.jaxws.builder.JAXWSToolsCLI</mainClass>
- </manifest>
- </archive>
- <!--
- NOTE: This list of dependencies is non-transitive.
- -->
- <classpath>
- <element>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${project.version}</version>
- </element>
- <element>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jaxws-sun-tools</artifactId>
- <version>${project.version}</version>
- </element>
- <element>
- <groupId>cglib</groupId>
- <artifactId>cglib-nodep</artifactId>
- </element>
- <element>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </element>
- <element>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </element>
- <element>
- <groupId>org.slf4j</groupId>
- <artifactId>jcl-over-slf4j</artifactId>
- </element>
- <element>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </element>
- </classpath>
- <classpathPrefix>../lib</classpathPrefix>
-
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
- <category>Web Services</category>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/plugins/jaxws/jaxws-sun-tools/src/main/appended-resources/META-INF/NOTICE.vm b/plugins/jaxws/jaxws-sun-tools/src/main/appended-resources/META-INF/NOTICE.vm
deleted file mode 100644
index df5e5b2..0000000
--- a/plugins/jaxws/jaxws-sun-tools/src/main/appended-resources/META-INF/NOTICE.vm
+++ /dev/null
@@ -1,32 +0,0 @@
-##
-## Licensed to the Apache Software Foundation (ASF) under one
-## or more contributor license agreements. See the NOTICE file
-## distributed with this work for additional information
-## regarding copyright ownership. The ASF licenses this file
-## to you under the Apache License, Version 2.0 (the
-## "License"); you may not use this file except in compliance
-## with the License. You may obtain a copy of the License at
-##
-## http://www.apache.org/licenses/LICENSE-2.0
-##
-## Unless required by applicable law or agreed to in writing,
-## software distributed under the License is distributed on an
-## "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-## KIND, either express or implied. See the License for the
-## specific language governing permissions and limitations
-## under the License.
-##
-## $Rev: 651007 $ $Date: 2008-04-23 14:59:19 -0400 (Wed, 23 Apr 2008) $
-##
-
-This product includes software developed for the JAXB Reference
-Implementation project. (https://jaxb.dev.java.net/)
-
-This product includes software developed for Java API for XML Web Services
-project (JAX-WS) (https://jax-ws.dev.java.net/)
-
-This product includes software developed for StAX-Ex Project
-(https://stax-ex.dev.java.net/)
-
-This product includes software developed for XML Stream Buffer Project
-(https://xmlstreambuffer.dev.java.net/)
diff --git a/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml b/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml
deleted file mode 100644
index 5216f24..0000000
--- a/plugins/jaxws/jaxws-sun-tools/src/main/history/dependencies.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
- <module-id>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jaxws-sun-tools</artifactId>
- <version>3.0-SNAPSHOT</version>
- <type>car</type>
- </module-id>
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.stream.buffer</groupId>
- <artifactId>streambuffer</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-tools</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jaxws-deployer</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jaxws-sun-tools</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.jvnet.staxex</groupId>
- <artifactId>stax-ex</artifactId>
- <type>jar</type>
- </dependency>
-</plugin-artifact>
diff --git a/plugins/jaxws/jaxws-sun-tools/src/main/plan/plan.xml b/plugins/jaxws/jaxws-sun-tools/src/main/plan/plan.xml
deleted file mode 100644
index 3f51847..0000000
--- a/plugins/jaxws/jaxws-sun-tools/src/main/plan/plan.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-
- <gbean name="SunWsdlGenerator" class="org.apache.geronimo.jaxws.sun.tools.SunWsdlGenerator">
- </gbean>
-
-</module>
diff --git a/plugins/jaxws/jaxws-sun-tools/src/main/resources/META-INF/startup-jar b/plugins/jaxws/jaxws-sun-tools/src/main/resources/META-INF/startup-jar
deleted file mode 100644
index d275dbe..0000000
--- a/plugins/jaxws/jaxws-sun-tools/src/main/resources/META-INF/startup-jar
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-This file tells the Geronimo bootstrap where to look for its installation
-directory, which is ../ from wherever the jar containing this file lives.
\ No newline at end of file
diff --git a/plugins/jaxws/jaxws-tools/pom.xml b/plugins/jaxws/jaxws-tools/pom.xml
deleted file mode 100644
index 3cab988..0000000
--- a/plugins/jaxws/jaxws-tools/pom.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev: 607778 $ $Date: 2007-12-31 13:21:20 -0800 (Mon, 31 Dec 2007) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>jaxws</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jaxws-tools</artifactId>
- <name>Geronimo Plugins, JAXWS :: Tools</name>
- <packaging>car</packaging>
-
- <description>JAX-WS command line tools</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jaxws-sun-tools</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>install-underlay</id>
- <phase>process-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <mkdir dir="${project.build.outputDirectory}" />
- <copy todir="${project.build.outputDirectory}">
- <fileset dir="${project.build.directory}/${project.build.finalName}/${project.build.finalName}">
- <include name="**" />
- </fileset>
- </copy>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
- <category>Web Services</category>
- <instance>
- <plugin-artifact>
- <copy-file relative-to="geronimo" dest-dir="">contents/</copy-file>
- </plugin-artifact>
- </instance>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <executions>
- <execution>
- <id>bin</id>
- <phase>compile</phase>
- <goals>
- <goal>directory-inline</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}</outputDirectory>
- <appendAssemblyId>false</appendAssemblyId>
- <descriptors>
- <descriptor>${project.basedir}/src/main/assembly/bin.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/plugins/jaxws/jaxws-tools/src/main/assembly/bin.xml b/plugins/jaxws/jaxws-tools/src/main/assembly/bin.xml
deleted file mode 100644
index 4c22f64..0000000
--- a/plugins/jaxws/jaxws-tools/src/main/assembly/bin.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev: 594117 $ $Date: 2007-11-12 08:35:48 -0500 (Mon, 12 Nov 2007) $ -->
-
-<assembly>
- <id>bin</id>
-
- <dependencySets>
-
- <dependencySet>
- <outputDirectory>contents/lib</outputDirectory>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.apache.geronimo.modules:geronimo-jaxws-sun-tools</include>
- </includes>
- </dependencySet>
-
- <dependencySet>
- <outputDirectory>contents/bin</outputDirectory>
- <outputFileNameMapping>jaxws-tools.jar</outputFileNameMapping>
- <useStrictFiltering>true</useStrictFiltering>
- <includes>
- <include>org.apache.geronimo.configs:jaxws-sun-tools</include>
- </includes>
- </dependencySet>
-
- </dependencySets>
-
- <fileSets>
-
- <fileSet>
- <directory>src/main/resources/bin</directory>
- <outputDirectory>contents/bin</outputDirectory>
- <includes>
- <include>*</include>
- </includes>
- <excludes>
- <exclude>*.bat</exclude>
- <exclude>*.cmd</exclude>
- <exclude>*.txt</exclude>
- <exclude>*.jar</exclude>
- </excludes>
- <lineEnding>unix</lineEnding>
- <fileMode>0755</fileMode>
- </fileSet>
-
- <fileSet>
- <directory>src/main/resources/bin</directory>
- <outputDirectory>contents/bin</outputDirectory>
- <includes>
- <include>*.bat</include>
- <include>*.cmd</include>
- <include>*.txt</include>
- </includes>
- <lineEnding>dos</lineEnding>
- </fileSet>
-
- </fileSets>
-
-</assembly>
diff --git a/plugins/jaxws/jaxws-tools/src/main/history/dependencies.xml b/plugins/jaxws/jaxws-tools/src/main/history/dependencies.xml
deleted file mode 100644
index 7643eb9..0000000
--- a/plugins/jaxws/jaxws-tools/src/main/history/dependencies.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
- <module-id>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jaxws-tools</artifactId>
- <version>3.0-SNAPSHOT</version>
- <type>car</type>
- </module-id>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jaxws-sun-tools</artifactId>
- <type>car</type>
- </dependency>
-</plugin-artifact>
diff --git a/plugins/jaxws/jaxws-tools/src/main/plan/plan.xml b/plugins/jaxws/jaxws-tools/src/main/plan/plan.xml
deleted file mode 100644
index f5f7496..0000000
--- a/plugins/jaxws/jaxws-tools/src/main/plan/plan.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-</module>
diff --git a/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/jaxws-tools.bat b/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/jaxws-tools.bat
deleted file mode 100644
index 112dbc2..0000000
--- a/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/jaxws-tools.bat
+++ /dev/null
@@ -1,160 +0,0 @@
-@REM
-@REM Licensed to the Apache Software Foundation (ASF) under one or more
-@REM contributor license agreements. See the NOTICE file distributed with
-@REM this work for additional information regarding copyright ownership.
-@REM The ASF licenses this file to You under the Apache License, Version 2.0
-@REM (the "License"); you may not use this file except in compliance with
-@REM the License. You may obtain a copy of the License at
-@REM
-@REM http://www.apache.org/licenses/LICENSE-2.0
-@REM
-@REM Unless required by applicable law or agreed to in writing, software
-@REM distributed under the License is distributed on an "AS IS" BASIS,
-@REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@REM See the License for the specific language governing permissions and
-@REM limitations under the License.
-
-@REM --------------------------------------------------------------------
-@REM $Rev: 534454 $ $Date: 2007-05-02 09:39:49 -0400 (Wed, 02 May 2007) $
-@REM --------------------------------------------------------------------
-
-@REM ---------------------------------------------------------------------------
-@REM You should not have to edit this file. If you wish to have
-@REM environment variables set each time you run this batch file
-@REM refer to the information on the setenv.bat file below.
-@REM
-@REM Invocation Syntax:
-@REM
-@REM jaxws-tools [general options] command [command options]
-@REM
-@REM For detailed usage information, just run deploy without
-@REM arguments.
-@REM
-@REM Environment Variable Prequisites
-@REM
-@REM GERONIMO_HOME May point at your Geronimo top-level directory.
-@REM If not specified, this batch file will attempt to
-@REM discover it relative to the location of this file.
-@REM
-@REM GERONIMO_OPTS (Optional) Java runtime options (in addition to
-@REM those set in JAVA_OPTS).
-@REM
-@REM GERONIMO_TMPDIR (Optional) Directory path location of temporary directory
-@REM the JVM should use (java.io.tmpdir). Defaults to
-@REM var\temp (resolved to server instance directory).
-@REM
-@REM JAVA_HOME Points to your Java Development Kit installation.
-@REM JAVA_HOME doesn't need to be set if JRE_HOME is set.
-@REM It is mandatory either JAVA_HOME or JRE_HOME are set.
-@REM
-@REM JRE_HOME (Optional) Points to your Java Runtime Environment
-@REM Set this if you wish to run Geronimo using the JRE
-@REM instead of the JDK.
-@REM Defaults to JAVA_HOME if empty.
-@REM It is mandatory either JAVA_HOME or JRE_HOME are set.
-@REM
-@REM JAVA_OPTS (Optional) Java runtime options used.
-@REM Also see the GERONIMO_OPTS environment variable.
-@REM
-@REM Troubleshooting execution of this batch file:
-@REM
-@REM GERONIMO_BATCH_ECHO (Optional) Environment variable that when set to
-@REM "on" results in batch commands being echoed.
-@REM
-@REM GERONIMO_BATCH_PAUSE (Optional) Environment variable that when set to
-@REM "on" results in each batch file to pause at the
-@REM end of execution
-@REM
-@REM GERONIMO_ENV_INFO (Optional) Environment variable that when set to
-@REM "on" (the default) outputs the values of
-@REM GERONIMO_HOME, GERONIMO_TMPDIR,
-@REM JAVA_HOME and JRE_HOME before the command is
-@REM issued. Set to "off" if you do not want this
-@REM information displayed.
-@REM
-@REM Batch files called by this batch file:
-@REM
-@REM %GERONIMO_HOME%\bin\setenv.bat
-@REM (Optional) This batch file is called if it is present.
-@REM Its contents may set one or more of the above environment
-@REM variables. It is preferable (to simplify migration to
-@REM future Geronimo releases) to set environment variables
-@REM in this file rather than modifying Geronimo's batch files.
-@REM
-@REM %GERONIMO_HOME%\bin\setjavaenv.bat
-@REM This batch file is called to set environment variables
-@REM relating to the java or jdb exe file to call.
-@REM This file should not need to be modified.
-@REM
-@REM Exit Codes:
-@REM
-@REM 0 - Success
-@REM Non-zero - Error
-@REM ---------------------------------------------------------------------------
-@if "%GERONIMO_BATCH_ECHO%" == "on" echo on
-@if not "%GERONIMO_BATCH_ECHO%" == "on" echo off
-
-@setlocal enableextensions
-
-if not "%GERONIMO_HOME%" == "" goto resolveHome
-@REM %~dp0 is expanded pathname of the current script
-set GERONIMO_HOME=%~dp0..
-
-@REM resolve .. and remove any trailing slashes
-:resolveHome
-set CURRENT_DIR=%cd%
-cd /d %GERONIMO_HOME%
-set GERONIMO_HOME=%cd%
-cd /d %CURRENT_DIR%
-
-:gotHome
-if exist "%GERONIMO_HOME%\bin\deploy.bat" goto okHome
-echo The GERONIMO_HOME environment variable is not defined correctly
-echo This environment variable is needed to run this program
-cmd /c exit /b 1
-goto end
-:okHome
-
-@REM Get standard environment variables
-@REM Users can optionally create this file to set environment variables.
-if exist "%GERONIMO_HOME%\bin\setenv.bat" call "%GERONIMO_HOME%\bin\setenv.bat"
-if not %errorlevel% == 0 goto end
-
-@REM Get standard Java environment variables (based upon Tomcat's setclasspath.bat
-@REM but renamed since Deployer's classpath is set in the JAR manifest)
-if exist "%GERONIMO_HOME%\bin\setjavaenv.bat" goto okSetJavaEnv
-echo Cannot find %GERONIMO_HOME%\bin\setjavaenv.bat
-echo This file is needed to run this program
-cmd /c exit /b 1
-goto end
-:okSetJavaEnv
-set BASEDIR=%GERONIMO_HOME%
-call "%GERONIMO_HOME%\bin\setJavaEnv.bat"
-if not %errorlevel% == 0 goto end
-
-if not "%GERONIMO_TMPDIR%" == "" goto gotTmpdir
-set GERONIMO_TMPDIR=var\temp
-:gotTmpdir
-
-@REM ----- Execute The Requested Command ---------------------------------------
-@if "%GERONIMO_ENV_INFO%" == "off" goto skipEnvInfo
-echo Using GERONIMO_HOME: %GERONIMO_HOME%
-echo Using GERONIMO_TMPDIR: %GERONIMO_TMPDIR%
-if "%_REQUIRE_JDK%" == "1" echo Using JAVA_HOME: %JAVA_HOME%
-if "%_REQUIRE_JDK%" == "0" echo Using JRE_HOME: %JRE_HOME%
-
-:skipEnvInfo
-
-@REM Capture any passed in arguments
-set CMD_LINE_ARGS=%*
-set _JARFILE="%GERONIMO_HOME%"\bin\jaxws-tools.jar
-
-%_RUNJAVA% %JAVA_OPTS% %GERONIMO_OPTS% -Dorg.apache.geronimo.home.dir="%GERONIMO_HOME%" -Djava.io.tmpdir="%GERONIMO_TMPDIR%" -jar %_JARFILE% %CMD_LINE_ARGS%
-goto end
-
-:end
-echo.
-@REM pause the batch file if GERONIMO_BATCH_PAUSE is set to 'on'
-if "%GERONIMO_BATCH_PAUSE%" == "on" pause
-@endlocal
-cmd /c exit /b %errorlevel%
diff --git a/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/jaxws-tools.sh b/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/jaxws-tools.sh
deleted file mode 100755
index 5ce8aeb..0000000
--- a/plugins/jaxws/jaxws-tools/src/main/resources/contents/bin/jaxws-tools.sh
+++ /dev/null
@@ -1,185 +0,0 @@
-#!/bin/sh
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# --------------------------------------------------------------------
-# $Rev: 534454 $ $Date: 2007-05-02 09:39:49 -0400 (Wed, 02 May 2007) $
-# --------------------------------------------------------------------
-
-# -----------------------------------------------------------------------------
-# You should not have to edit this file. If you wish to have environment
-# variables set each time you run this script refer to the information
-# on the setenv.sh script that is called by this script below.
-#
-# Invocation Syntax:
-#
-# jaxws-tools.sh [general options] command [command options]
-#
-# For detailed command usage information, just run deploy.sh without any
-# arguments.
-#
-# Environment Variable Prequisites:
-#
-# GERONIMO_HOME (Optional) May point at your Geronimo top-level directory.
-# If not specified, it will default to the parent directory
-# of the location of this script.
-#
-# GERONIMO_OPTS (Optional) Java runtime options.
-#
-# GERONIMO_TMPDIR (Optional) Directory path location of temporary directory
-# the JVM should use (java.io.tmpdir). Defaults to var/temp
-# (resolved to server instance directory).
-#
-# JAVA_HOME Points to your Java Development Kit installation.
-# JAVA_HOME doesn't need to be set if JRE_HOME is set.
-# It is mandatory either JAVA_HOME or JRE_HOME are set.
-#
-# JRE_HOME Points to your Java Runtime Environment installation.
-# Set this if you wish to run Geronimo using the JRE
-# instead of the JDK. Defaults to JAVA_HOME if empty.
-# It is mandatory either JAVA_HOME or JRE_HOME are set.
-#
-# JAVA_OPTS (Optional) Java runtime options.
-#
-# Troubleshooting execution of this script file:
-#
-# GERONIMO_ENV_INFO (Optional) Environment variable that when set to
-# "on" (the default) outputs the
-# values of GERONIMO_HOME,
-# GERONIMO_TMPDIR, JAVA_HOME, JRE_HOME before
-# the command is issued. Set to "off" if you
-# do want to see this information.
-#
-# Scripts called by this script:
-#
-# $GERONIMO_HOME/bin/setenv.sh
-# (Optional) This script file is called if it is present.
-# Its contents may set one or more of the above environment
-# variables. It is preferable (to simplify migration to
-# future Geronimo releases) to set environment variables
-# in this file rather than modifying Geronimo's script files.
-#
-# $GERONIMO_HOME/bin/setjavaenv.sh
-# This batch file is called to set environment variables
-# relating to the java or jdb executable to invoke.
-# This file should not need to be modified.
-#
-# Exit Codes:
-#
-# 0 - Success
-# 1 - Error
-# -----------------------------------------------------------------------------
-
-# OS specific support. $var _must_ be set to either true or false.
-cygwin=false
-os400=false
-case "`uname`" in
-CYGWIN*) cygwin=true;;
-OS400*) os400=true;;
-esac
-
-# resolve links - $0 may be a softlink
-PRG="$0"
-
-while [ -h "$PRG" ]; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`/"$link"
- fi
-done
-
-# Get standard environment variables
-PRGDIR=`dirname "$PRG"`
-
-# Only set GERONIMO_HOME if not already set
-[ -z "$GERONIMO_HOME" ] && GERONIMO_HOME=`cd "$PRGDIR/.." ; pwd`
-
-if [ -r "$GERONIMO_HOME"/bin/setenv.sh ]; then
- . "$GERONIMO_HOME"/bin/setenv.sh
-fi
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched
-if $cygwin; then
- [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
- [ -n "$JRE_HOME" ] && JRE_HOME=`cygpath --unix "$JRE_HOME"`
- [ -n "$GERONIMO_HOME" ] && GERONIMO_HOME=`cygpath --unix "$GERONIMO_HOME"`
-fi
-
-# For OS400
-if $os400; then
- # Set job priority to standard for interactive (interactive - 6) by using
- # the interactive priority - 6, the helper threads that respond to requests
- # will be running at the same priority as interactive jobs.
- COMMAND='chgjob job('$JOBNAME') runpty(6)'
- system $COMMAND
-
- # Enable multi threading
- export QIBM_MULTI_THREADED=Y
-fi
-
-# Get standard Java environment variables
-# (based upon Tomcat's setclasspath.sh but renamed since Geronimo's classpath
-# is set in the JAR manifest)
-if $os400; then
- # -r will Only work on the os400 if the files are:
- # 1. owned by the user
- # 2. owned by the PRIMARY group of the user
- # this will not work if the user belongs in secondary groups
- BASEDIR="$GERONIMO_HOME"
- . "$GERONIMO_HOME"/bin/setjavaenv.sh
-else
- if [ -r "$GERONIMO_HOME"/bin/setjavaenv.sh ]; then
- BASEDIR="$GERONIMO_HOME"
- . "$GERONIMO_HOME"/bin/setjavaenv.sh
- else
- echo "Cannot find $GERONIMO_HOME/bin/setjavaenv.sh"
- echo "This file is needed to run this program"
- exit 1
- fi
-fi
-
-if [ -z "$GERONIMO_TMPDIR" ] ; then
- # Define the java.io.tmpdir to use for Geronimo
- GERONIMO_TMPDIR=var/temp
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin; then
- JAVA_HOME=`cygpath --absolute --windows "$JAVA_HOME"`
- JRE_HOME=`cygpath --absolute --windows "$JRE_HOME"`
- GERONIMO_HOME=`cygpath --absolute --windows "$GERONIMO_HOME"`
- GERONIMO_TMPDIR=`cygpath --absolute --windows "$GERONIMO_TMPDIR"`
-fi
-
-# ----- Execute The Requested Command -----------------------------------------
-if [ "$GERONIMO_ENV_INFO" != "off" ] ; then
- echo "Using GERONIMO_HOME: $GERONIMO_HOME"
- echo "Using GERONIMO_TMPDIR: $GERONIMO_TMPDIR"
- if [ "$1" = "debug" ] ; then
- echo "Using JAVA_HOME: $JAVA_HOME"
- echo "Using JDB_SRCPATH: $JDB_SRCPATH"
- else
- echo "Using JRE_HOME: $JRE_HOME"
- fi
-fi
-
-exec "$_RUNJAVA" $JAVA_OPTS $GERONIMO_OPTS \
- -Dorg.apache.geronimo.home.dir="$GERONIMO_HOME" \
- -Djava.io.tmpdir="$GERONIMO_TMPDIR" \
- -jar "$GERONIMO_HOME"/bin/jaxws-tools.jar "$@"
diff --git a/plugins/openejb/openejb-console-jetty/pom.xml b/plugins/openejb/openejb-console-jetty/pom.xml
deleted file mode 100644
index 8c24ee0..0000000
--- a/plugins/openejb/openejb-console-jetty/pom.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev: 617770 $ $Date: 2008-02-02 14:00:00 +0530 (Sat, 02 Feb 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>openejb</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>openejb-console-jetty</artifactId>
- <name>Geronimo Plugins, OpenEJB :: Jetty</name>
- <packaging>car</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>${jetty}-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>openejb-portlets</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-jetty</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>dojo-jetty</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>plugin</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <deploymentConfigs>
- <deploymentConfig>${gbeanDeployer}</deploymentConfig>
- <deploymentConfig>${j2eeDeployer}</deploymentConfig>
- <deploymentConfig>${jettyDeployer}</deploymentConfig>
- <deploymentConfig>${jasperDeployer}</deploymentConfig>
- </deploymentConfigs>
- <module>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>openejb-portlets</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </module>
- <category>Administration</category>
- <osiApproved>true</osiApproved>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml b/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml
deleted file mode 100644
index b19bd8e..0000000
--- a/plugins/openejb/openejb-console-jetty/src/main/history/dependencies.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
- <module-id>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>openejb-console-jetty</artifactId>
- <version>3.0-SNAPSHOT</version>
- <type>car</type>
- </module-id>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>dojo-jetty</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>plugin</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-jetty</artifactId>
- <type>car</type>
- </dependency>
-</plugin-artifact>
diff --git a/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml b/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml
deleted file mode 100644
index 65ea8c9..0000000
--- a/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
-
- <!-- This is where the files are accessed from. (aka - portletContext) -->
- <context-root>/openejb-server</context-root>
-
- <!-- i18n support -->
- <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
- <reference name="ConsoleResourceRegistry">
- <name>ConsoleResourceRegistry</name>
- </reference>
- </gbean>
-
- <security-realm-name>geronimo-admin</security-realm-name>
- <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
- <role-mappings>
- <role role-name="admin">
- <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" />
- </role>
- </role-mappings>
- </security>
-
- <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
- <gbean name="EJBServerACEGBean" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">1-11/Server/EJB Server</attribute>
- <attribute name="portletContext">/openejb-server</attribute>
- <attribute name="portletList">[EJBServerPortlet]</attribute>
- <attribute name="icon">/images/ico_beanjar_16x16.gif</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
-</web-app>
diff --git a/plugins/openejb/openejb-console-tomcat/pom.xml b/plugins/openejb/openejb-console-tomcat/pom.xml
deleted file mode 100644
index 3bbbaad..0000000
--- a/plugins/openejb/openejb-console-tomcat/pom.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev: 617770 $ $Date: 2008-02-02 14:00:00 +0530 (Sat, 02 Feb 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>openejb</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>openejb-console-tomcat</artifactId>
- <name>Geronimo Plugins, OpenEJB :: Tomcat</name>
- <packaging>car</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat7-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>openejb-portlets</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-tomcat</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>dojo-tomcat</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>plugin</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <deploymentConfigs>
- <deploymentConfig>${gbeanDeployer}</deploymentConfig>
- <deploymentConfig>${j2eeDeployer}</deploymentConfig>
- <deploymentConfig>${tomcatDeployer}</deploymentConfig>
- <deploymentConfig>${jasperDeployer}</deploymentConfig>
- </deploymentConfigs>
- <module>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>openejb-portlets</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </module>
- <category>Administration</category>
- <description>
- OpenEJB Server plugin for Tomcat
- </description>
- <osiApproved>true</osiApproved>
- <useMavenDependencies>
- <value>true</value>
- <includeVersion>true</includeVersion>
- </useMavenDependencies>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/plugins/openejb/openejb-console-tomcat/src/main/history/dependencies.xml b/plugins/openejb/openejb-console-tomcat/src/main/history/dependencies.xml
deleted file mode 100644
index 0166749..0000000
--- a/plugins/openejb/openejb-console-tomcat/src/main/history/dependencies.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
- <module-id>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>openejb-console-tomcat</artifactId>
- <version>3.0-SNAPSHOT</version>
- <type>car</type>
- </module-id>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>dojo-tomcat</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>openejb</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>plugin</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-tomcat</artifactId>
- <type>car</type>
- </dependency>
-</plugin-artifact>
diff --git a/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml b/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml
deleted file mode 100644
index 801633b..0000000
--- a/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
-
- <!-- This is where the files are accessed from. (aka - portletContext) -->
- <context-root>/openejb-server</context-root>
-
- <!-- required for pluto cross context dispatches -->
- <cross-context />
-
- <!-- i18n support -->
- <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
- <reference name="ConsoleResourceRegistry">
- <name>ConsoleResourceRegistry</name>
- </reference>
- </gbean>
-
- <security-realm-name>geronimo-admin</security-realm-name>
- <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
- <role-mappings>
- <role role-name="admin">
- <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" />
- </role>
- </role-mappings>
- </security>
-
- <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
- <gbean name="EJBServerACEGBean" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">1-11/Server/EJB Server</attribute>
- <attribute name="portletContext">/openejb-server</attribute>
- <attribute name="portletList">[EJBServerPortlet]</attribute>
- <attribute name="icon">/images/ico_beanjar_16x16.gif</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
-</web-app>
diff --git a/plugins/system-database/sysdb-console-jetty/pom.xml b/plugins/system-database/sysdb-console-jetty/pom.xml
deleted file mode 100644
index 1eaf627..0000000
--- a/plugins/system-database/sysdb-console-jetty/pom.xml
+++ /dev/null
@@ -1,276 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>system-database</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>sysdb-console-jetty</artifactId>
- <name>Geronimo Plugins, Console :: System Database (Jetty)</name>
- <packaging>car</packaging>
- <description>
- Geronimo Administration Console System Database Portlet Plugin allows users to view information about the internal database and run SQL scripts.
- </description>
-
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>${jetty}-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>sysdb-portlets</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-jetty</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>system-database</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer-1_6</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-converter</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>plugin</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-derby</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-test-ddbean</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-ra</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-db2-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-informix-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-mysql-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-mysql-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-rac-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-postgresql-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-postgresql-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2000-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>dwr</artifactId>
- </dependency>
-
- <!-- for jspc. why is this needed? -->
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <deploymentConfigs>
- <deploymentConfig>${gbeanDeployer}</deploymentConfig>
- <deploymentConfig>${j2eeDeployer}</deploymentConfig>
- <deploymentConfig>${jettyDeployer}</deploymentConfig>
- <deploymentConfig>${jasperDeployer}</deploymentConfig>
- </deploymentConfigs>
- <module>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>sysdb-portlets</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </module>
- <category>Administration</category>
- <osiApproved>true</osiApproved>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml b/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
deleted file mode 100644
index 625354a..0000000
--- a/plugins/system-database/sysdb-console-jetty/src/main/history/dependencies.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
- <module-id>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>sysdb-console-jetty</artifactId>
- <version>3.0-SNAPSHOT</version>
- <type>car</type>
- </module-id>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer-1_6</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>system-database</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>plugin</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-converter</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-test-ddbean</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-jetty</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.ant</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-db2-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-local</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-local</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-informix-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-mysql-local</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-mysql-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-local</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-rac-local</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-postgresql-local</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-postgresql-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-ra</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2000-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
- <type>rar</type>
- </dependency>
-</plugin-artifact>
diff --git a/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml b/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
deleted file mode 100644
index 5585c4a..0000000
--- a/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
+++ /dev/null
@@ -1,440 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
-
- <!-- This is where the files are accessed from. (aka - portletContext) -->
- <context-root>/system-database</context-root>
-
- <security-realm-name>geronimo-admin</security-realm-name>
- <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
- <role-mappings>
- <role role-name="admin">
- <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" />
- </role>
- </role-mappings>
- </security>
-
- <!-- i18n support -->
- <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
- <reference name="ConsoleResourceRegistry">
- <name>ConsoleResourceRegistry</name>
- </reference>
- </gbean>
-
- <gbean name="DBWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">2-3/Services/Database Pools</attribute>
- <attribute name="portletContext">/system-database</attribute>
- <attribute name="portletList">[DBWizard,RunSQLDS]</attribute>
- <attribute name="icon">/images/ico_db_16x16.gif</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
-
- <gbean name="InternalDB" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">6-1/Embedded DB/DB Info</attribute>
- <attribute name="portletContext">/system-database</attribute>
- <attribute name="portletList">[InternalDB]</attribute>
- <attribute name="icon">/images/ico_dbinfo_16x16.gif</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
-
- <gbean name="DBViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">6-2/Embedded DB/DB Manager</attribute>
- <attribute name="portletContext">/system-database</attribute>
- <attribute name="portletList">[DBViewer,RunSQL]</attribute>
- <attribute name="icon">/images/ico_dbmgr_16x16.gif</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
-
- <gbean name="DerbyLogViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">6-3/Embedded DB/Derby Logs</attribute>
- <attribute name="portletContext">/system-database</attribute>
- <attribute name="portletList">[DerbyLogViewer]</attribute>
- <attribute name="icon">/images/ico_look_16x16.gif</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
-
- <!-- database driver definitions -->
- <gbean name="Database0" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">DaffodilDB Embedded</attribute>
- <attribute name="URLPrototype">jdbc:daffodilDB_embedded:{Database}</attribute>
- <attribute name="driverClassName">in.co.daffodil.db.jdbc.DaffodilDBDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database1" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">DaffodilDB Server</attribute>
- <attribute name="URLPrototype">jdbc:daffodilDB://{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">in.co.daffodil.db.rmi.RmiDaffodilDBDriver</attribute>
- <attribute name="defaultPort">3456</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database2" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">DB2 XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-db2-xa//rar</attribute>
- </gbean>
- <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">DB2 (DataDirect)</attribute>
- <attribute name="URLPrototype">jdbc:datadirect:db2://{Host}:{Port};DatabaseName={Database}</attribute>
- <attribute name="driverClassName">com.ddtek.jdbc.db2.DB2Driver</attribute>
- <attribute name="defaultPort">50000</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database4" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Derby embedded</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-derby-embed-local//rar</attribute>
- <attribute name="dependencyFilterStrings">org.apache.geronimo.configs/system-database//car</attribute>
- </gbean>
- <gbean name="Database5" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Derby network</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-derby-client-local//rar</attribute>
- <attribute name="dependencyFilterStrings">org.apache.geronimo.configs/system-database//car</attribute>
- </gbean>
- <gbean name="Database6" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Derby embedded XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-derby-embed-xa//rar</attribute>
- <attribute name="dependencyFilterStrings">org.apache.geronimo.configs/system-database//car</attribute>
- </gbean>
- <gbean name="Database7" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Derby network XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-derby-client-xa//rar</attribute>
- <attribute name="dependencyFilterStrings">org.apache.geronimo.configs/system-database//car</attribute>
- </gbean>
- <gbean name="Database8" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">FrontBase</attribute>
- <attribute name="URLPrototype">jdbc:FrontBase://{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">com.frontbase.jdbc.FBJDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database9" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">HSQLDB embedded</attribute>
- <attribute name="URLPrototype">jdbc:hsqldb:{Database}</attribute>
- <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- <attribute name="dependencyFilterStrings">hsqldb///jar</attribute>
- </gbean>
- <gbean name="Database10" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">HSQLDB server</attribute>
- <attribute name="URLPrototype">jdbc:hsqldb:hsql://{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- <attribute name="dependencyFilterStrings">hsqldb/hsqldb//jar</attribute>
- </gbean>
- <gbean name="Database11" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Informix</attribute>
- <attribute name="URLPrototype">jdbc:informix-sqli://{Host}:{Port}/{Database}:informixserver={dbservername}</attribute>
- <attribute name="driverClassName">com.informix.jdbc.IfxDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database111" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Informix XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-informix-xa//rar</attribute>
- </gbean>
- <gbean name="Database12" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Informix (DataDirect)</attribute>
- <attribute name="URLPrototype">jdbc:datadirect:informix://{Host}:{Port};informixServer={dbservername};DatabaseName={Database}</attribute>
- <attribute name="driverClassName">com.ddtek.jdbc.informix.InformixDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database13" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">InterSystems Cache</attribute>
- <attribute name="URLPrototype">jdbc:Cache://{Host}:{Port}/{namespace}</attribute>
- <attribute name="driverClassName">com.intersys.jdbc.CacheDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database14" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">JDataStore</attribute>
- <attribute name="URLPrototype">jdbc:borland:dslocal:{file}</attribute>
- <attribute name="driverClassName">com.borland.datastore.jdbc.DataStoreDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database15" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">JDBC/ODBC Bridge</attribute>
- <attribute name="URLPrototype">jdbc:odbc:{datasource}</attribute>
- <attribute name="driverClassName">sun.jdbc.odbc.JdbcOdbcDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database16" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">McKoi embedded</attribute>
- <attribute name="URLPrototype">jdbc:mckoi:local://{ConfigPath}/{Schema}/</attribute>
- <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- <attribute name="dependencyFilterStrings">mckoi/mkjdbc//jar</attribute>
- </gbean>
- <gbean name="Database17" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">McKoi server</attribute>
- <attribute name="URLPrototype">jdbc:mckoi://{Host}:{Port}/{Schema}/</attribute>
- <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- <attribute name="dependencyFilterStrings">mckoi/mkjdbc//jar</attribute>
- </gbean>
- <gbean name="Database18" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Mimer</attribute>
- <attribute name="URLPrototype">jdbc:mimer://{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">com.mimer.jdbc.Driver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database19" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">MySQL</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-mysql-local//rar</attribute>
- <attribute name="dependencyFilterStrings">mysql/mysql-connector-java//jar</attribute>
- </gbean>
- <gbean name="Database19a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">MySQL-XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-mysql-xa//rar</attribute>
- <attribute name="dependencyFilterStrings">mysql/mysql-connector-java//jar</attribute>
- </gbean>
- <gbean name="Database20a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Oracle Local</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-oracle-local//rar</attribute>
- </gbean>
- <gbean name="Database20b" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Oracle XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-oracle-xa//rar</attribute>
- </gbean>
- <gbean name="Database20c" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Oracle RAC</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-oracle-rac-local//rar</attribute>
- </gbean>
- <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Oracle Thin</attribute>
- <attribute name="URLPrototype">jdbc:oracle:thin:@{Host}:{Port}:{SID}</attribute>
- <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
- <attribute name="defaultPort">1521</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database21" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Oracle OCI</attribute>
- <attribute name="URLPrototype">jdbc:oracle:oci:@{Host}:{Port}:{SID}</attribute>
- <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
- <attribute name="defaultPort">1521</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database22" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Oracle (DataDirect)</attribute>
- <attribute name="URLPrototype">jdbc:datadirect:oracle://{Host}:{Port};ServiceName={SID}</attribute>
- <attribute name="driverClassName">com.ddtek.jdbc.oracle.OracleDriver</attribute>
- <attribute name="defaultPort">1521</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database23" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Pervasive</attribute>
- <attribute name="URLPrototype">jdbc:pervasive://{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">com.pervasive.jdbc.v2.Driver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database24" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Pointbase server</attribute>
- <attribute name="URLPrototype">jdbc:pointbase:server://{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">com.pointbase.jdbc.jdbcUniversalDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database25" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">PostgreSQL Local</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-postgresql-local//rar</attribute>
- <attribute name="dependencyFilterStrings">postgresql///jar</attribute>
- </gbean>
- <gbean name="Database25a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">PostgreSQL XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-postgresql-xa//rar</attribute>
- <attribute name="dependencyFilterStrings">postgresql///jar</attribute>
- </gbean>
- <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Progress</attribute>
- <attribute name="URLPrototype">jdbc:jdbcProgress:T:{Host}:{Port}:{Database}</attribute>
- <attribute name="driverClassName">com.progress.sql.jdbc.JdbcProgressDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database27" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">MaxDB</attribute>
- <attribute name="URLPrototype">jdbc:sapdb://{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">com.sap.dbtech.jdbc.DriverSapDB</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- <attribute name="dependencyFilterStrings">maxdb/sapdbc//jar</attribute>
- </gbean>
- <gbean name="Database28" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">SQL Server</attribute>
- <attribute name="URLPrototype">jdbc:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
- <attribute name="driverClassName">com.microsoft.sqlserver.jdbc.SQLServerDriver</attribute>
- <attribute name="defaultPort">1433</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database281" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">SQL Server 2000 XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-sqlserver2000-xa//rar</attribute>
- </gbean>
- <gbean name="Database282" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">SQL Server 2005 XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-sqlserver2005-xa//rar</attribute>
- </gbean>
- <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">SQL Server (jTDS)</attribute>
- <attribute name="URLPrototype">jdbc:jtds:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
- <attribute name="driverClassName">net.sourceforge.jtds.jdbc.Driver</attribute>
- <attribute name="defaultPort">1433</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- <attribute name="dependencyFilterStrings">jtds/jtds//jar</attribute>
- </gbean>
- <gbean name="Database30" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">SQL Server (DataDirect)</attribute>
- <attribute name="URLPrototype">jdbc:datadirect:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
- <attribute name="driverClassName">com.ddtek.jdbc.sqlserver.SQLServerDriver</attribute>
- <attribute name="defaultPort">1433</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database31" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Sybase ASE</attribute>
- <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
- <attribute name="defaultPort">2048</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database32" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Sybase ASA</attribute>
- <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
- <attribute name="defaultPort">2638</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database33" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Sybase (DataDirect)</attribute>
- <attribute name="URLPrototype">jdbc:datadirect:sybase://{Host}:{Port};DatabaseName={Database}</attribute>
- <attribute name="driverClassName">com.ddtek.jdbc.sybase.SybaseDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database34" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Other</attribute>
- <attribute name="URLPrototype"></attribute>
- <attribute name="driverClassName"></attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
-
-</web-app>
diff --git a/plugins/system-database/sysdb-console-tomcat/pom.xml b/plugins/system-database/sysdb-console-tomcat/pom.xml
deleted file mode 100644
index 7fd5b0c..0000000
--- a/plugins/system-database/sysdb-console-tomcat/pom.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>system-database</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>sysdb-console-tomcat</artifactId>
- <name>Geronimo Plugins, Console :: System Database (Tomcat)</name>
- <packaging>car</packaging>
- <description>
- Geronimo Administration Console System Database Portlet Plugin allows users to view information about the internal database and run SQL scripts.
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>tomcat7-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jasper-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>sysdb-portlets</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-tomcat</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-core</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>system-database</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer-1_6</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-converter</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>plugin</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-derby</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-test-ddbean</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-ra</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-db2-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-informix-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-mysql-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-mysql-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-rac-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-postgresql-local</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-postgresql-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2000-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
- <type>rar</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>dwr</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>car-maven-plugin</artifactId>
- <configuration>
- <deploymentConfigs>
- <deploymentConfig>${gbeanDeployer}</deploymentConfig>
- <deploymentConfig>${j2eeDeployer}</deploymentConfig>
- <deploymentConfig>${tomcatDeployer}</deploymentConfig>
- <deploymentConfig>${jasperDeployer}</deploymentConfig>
- </deploymentConfigs>
- <module>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>sysdb-portlets</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </module>
- <category>Administration</category>
- <osiApproved>true</osiApproved>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml b/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
deleted file mode 100644
index 5b48874..0000000
--- a/plugins/system-database/sysdb-console-tomcat/src/main/history/dependencies.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
- <module-id>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>sysdb-console-tomcat</artifactId>
- <version>3.0-SNAPSHOT</version>
- <type>car</type>
- </module-id>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>connector-deployer-1_6</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>system-database</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-gbean-deployer</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>plugin</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-converter</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-test-ddbean</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-tomcat</artifactId>
- <type>car</type>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.ant</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-db2-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-local</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-client-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-local</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-derby-embed-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-informix-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-mysql-local</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-mysql-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-local</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-rac-local</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-oracle-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-postgresql-local</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-postgresql-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-ra</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2000-xa</artifactId>
- <type>rar</type>
- </dependency>
- <dependency>
- <groupId>org.tranql</groupId>
- <artifactId>tranql-connector-sqlserver2005-xa</artifactId>
- <type>rar</type>
- </dependency>
-</plugin-artifact>
diff --git a/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml b/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
deleted file mode 100644
index 758bad2..0000000
--- a/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
+++ /dev/null
@@ -1,441 +0,0 @@
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
-
- <!-- This is where the files are accessed from. (aka - portletContext) -->
- <context-root>/system-database</context-root>
-
- <security-realm-name>geronimo-admin</security-realm-name>
- <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
- <role-mappings>
- <role role-name="admin">
- <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" />
- </role>
- </role-mappings>
- </security>
- <cross-context/>
-
- <!-- i18n support -->
- <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean">
- <reference name="ConsoleResourceRegistry">
- <name>ConsoleResourceRegistry</name>
- </reference>
- </gbean>
-
- <gbean name="DBWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">2-3/Services/Database Pools</attribute>
- <attribute name="portletContext">/system-database</attribute>
- <attribute name="portletList">[DBWizard,RunSQLDS]</attribute>
- <attribute name="icon">/images/ico_db_16x16.gif</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
-
- <gbean name="InternalDB" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">6-1/Embedded DB/DB Info</attribute>
- <attribute name="portletContext">/system-database</attribute>
- <attribute name="portletList">[InternalDB]</attribute>
- <attribute name="icon">/images/ico_dbinfo_16x16.gif</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
-
- <gbean name="DBViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">6-2/Embedded DB/DB Manager</attribute>
- <attribute name="portletContext">/system-database</attribute>
- <attribute name="portletList">[DBViewer,RunSQL]</attribute>
- <attribute name="icon">/images/ico_dbmgr_16x16.gif</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
-
- <gbean name="DerbyLogViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">6-3/Embedded DB/Derby Logs</attribute>
- <attribute name="portletContext">/system-database</attribute>
- <attribute name="portletList">[DerbyLogViewer]</attribute>
- <attribute name="icon">/images/ico_look_16x16.gif</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
-
- <!-- database driver definitions -->
- <gbean name="Database0" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">DaffodilDB Embedded</attribute>
- <attribute name="URLPrototype">jdbc:daffodilDB_embedded:{Database}</attribute>
- <attribute name="driverClassName">in.co.daffodil.db.jdbc.DaffodilDBDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database1" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">DaffodilDB Server</attribute>
- <attribute name="URLPrototype">jdbc:daffodilDB://{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">in.co.daffodil.db.rmi.RmiDaffodilDBDriver</attribute>
- <attribute name="defaultPort">3456</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database2" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">DB2 XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-db2-xa//rar</attribute>
- </gbean>
- <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">DB2 (DataDirect)</attribute>
- <attribute name="URLPrototype">jdbc:datadirect:db2://{Host}:{Port};DatabaseName={Database}</attribute>
- <attribute name="driverClassName">com.ddtek.jdbc.db2.DB2Driver</attribute>
- <attribute name="defaultPort">50000</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database4" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Derby embedded</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-derby-embed-local//rar</attribute>
- <attribute name="dependencyFilterStrings">org.apache.geronimo.configs/system-database//car</attribute>
- </gbean>
- <gbean name="Database5" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Derby network</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-derby-client-local//rar</attribute>
- <attribute name="dependencyFilterStrings">org.apache.geronimo.configs/system-database//car</attribute>
- </gbean>
- <gbean name="Database6" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Derby embedded XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-derby-embed-xa//rar</attribute>
- <attribute name="dependencyFilterStrings">org.apache.geronimo.configs/system-database//car</attribute>
- </gbean>
- <gbean name="Database7" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Derby network XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-derby-client-xa//rar</attribute>
- <attribute name="dependencyFilterStrings">org.apache.geronimo.configs/system-database//car</attribute>
- </gbean>
- <gbean name="Database8" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">FrontBase</attribute>
- <attribute name="URLPrototype">jdbc:FrontBase://{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">com.frontbase.jdbc.FBJDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database9" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">HSQLDB embedded</attribute>
- <attribute name="URLPrototype">jdbc:hsqldb:{Database}</attribute>
- <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- <attribute name="dependencyFilterStrings">hsqldb///jar</attribute>
- </gbean>
- <gbean name="Database10" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">HSQLDB server</attribute>
- <attribute name="URLPrototype">jdbc:hsqldb:hsql://{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- <attribute name="dependencyFilterStrings">hsqldb/hsqldb//jar</attribute>
- </gbean>
- <gbean name="Database11" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Informix</attribute>
- <attribute name="URLPrototype">jdbc:informix-sqli://{Host}:{Port}/{Database}:informixserver={dbservername}</attribute>
- <attribute name="driverClassName">com.informix.jdbc.IfxDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database111" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Informix XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-informix-xa//rar</attribute>
- </gbean>
- <gbean name="Database12" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Informix (DataDirect)</attribute>
- <attribute name="URLPrototype">jdbc:datadirect:informix://{Host}:{Port};informixServer={dbservername};DatabaseName={Database}</attribute>
- <attribute name="driverClassName">com.ddtek.jdbc.informix.InformixDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database13" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">InterSystems Cache</attribute>
- <attribute name="URLPrototype">jdbc:Cache://{Host}:{Port}/{namespace}</attribute>
- <attribute name="driverClassName">com.intersys.jdbc.CacheDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database14" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">JDataStore</attribute>
- <attribute name="URLPrototype">jdbc:borland:dslocal:{file}</attribute>
- <attribute name="driverClassName">com.borland.datastore.jdbc.DataStoreDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database15" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">JDBC/ODBC Bridge</attribute>
- <attribute name="URLPrototype">jdbc:odbc:{datasource}</attribute>
- <attribute name="driverClassName">sun.jdbc.odbc.JdbcOdbcDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database16" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">McKoi embedded</attribute>
- <attribute name="URLPrototype">jdbc:mckoi:local://{ConfigPath}/{Schema}/</attribute>
- <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- <attribute name="dependencyFilterStrings">mckoi/mkjdbc//jar</attribute>
- </gbean>
- <gbean name="Database17" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">McKoi server</attribute>
- <attribute name="URLPrototype">jdbc:mckoi://{Host}:{Port}/{Schema}/</attribute>
- <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- <attribute name="dependencyFilterStrings">mckoi/mkjdbc//jar</attribute>
- </gbean>
- <gbean name="Database18" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Mimer</attribute>
- <attribute name="URLPrototype">jdbc:mimer://{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">com.mimer.jdbc.Driver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database19" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">MySQL</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-mysql-local//rar</attribute>
- <attribute name="dependencyFilterStrings">mysql/mysql-connector-java//jar</attribute>
- </gbean>
- <gbean name="Database19a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">MySQL-XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-mysql-xa//rar</attribute>
- <attribute name="dependencyFilterStrings">mysql/mysql-connector-java//jar</attribute>
- </gbean>
- <gbean name="Database20a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Oracle Local</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-oracle-local//rar</attribute>
- </gbean>
- <gbean name="Database20b" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Oracle XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-oracle-xa//rar</attribute>
- </gbean>
- <gbean name="Database20c" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Oracle RAC</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-oracle-rac-local//rar</attribute>
- </gbean>
- <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Oracle Thin</attribute>
- <attribute name="URLPrototype">jdbc:oracle:thin:@{Host}:{Port}:{SID}</attribute>
- <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
- <attribute name="defaultPort">1521</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database21" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Oracle OCI</attribute>
- <attribute name="URLPrototype">jdbc:oracle:oci:@{Host}:{Port}:{SID}</attribute>
- <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
- <attribute name="defaultPort">1521</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database22" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Oracle (DataDirect)</attribute>
- <attribute name="URLPrototype">jdbc:datadirect:oracle://{Host}:{Port};ServiceName={SID}</attribute>
- <attribute name="driverClassName">com.ddtek.jdbc.oracle.OracleDriver</attribute>
- <attribute name="defaultPort">1521</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database23" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Pervasive</attribute>
- <attribute name="URLPrototype">jdbc:pervasive://{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">com.pervasive.jdbc.v2.Driver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database24" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Pointbase server</attribute>
- <attribute name="URLPrototype">jdbc:pointbase:server://{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">com.pointbase.jdbc.jdbcUniversalDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database25" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">PostgreSQL Local</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-postgresql-local//rar</attribute>
- <attribute name="dependencyFilterStrings">postgresql///jar</attribute>
- </gbean>
- <gbean name="Database25a" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">PostgreSQL XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-postgresql-xa//rar</attribute>
- <attribute name="dependencyFilterStrings">postgresql///jar</attribute>
- </gbean>
- <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Progress</attribute>
- <attribute name="URLPrototype">jdbc:jdbcProgress:T:{Host}:{Port}:{Database}</attribute>
- <attribute name="driverClassName">com.progress.sql.jdbc.JdbcProgressDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database27" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">MaxDB</attribute>
- <attribute name="URLPrototype">jdbc:sapdb://{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">com.sap.dbtech.jdbc.DriverSapDB</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- <attribute name="dependencyFilterStrings">maxdb/sapdbc//jar</attribute>
- </gbean>
- <gbean name="Database28" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">SQL Server</attribute>
- <attribute name="URLPrototype">jdbc:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
- <attribute name="driverClassName">com.microsoft.sqlserver.jdbc.SQLServerDriver</attribute>
- <attribute name="defaultPort">1433</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database281" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">SQL Server 2000 XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-sqlserver2000-xa//rar</attribute>
- </gbean>
- <gbean name="Database282" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">SQL Server 2005 XA</attribute>
- <attribute name="URLPrototype">null</attribute>
- <attribute name="driverClassName">null</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">true</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-sqlserver2005-xa//rar</attribute>
- </gbean>
- <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">SQL Server (jTDS)</attribute>
- <attribute name="URLPrototype">jdbc:jtds:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
- <attribute name="driverClassName">net.sourceforge.jtds.jdbc.Driver</attribute>
- <attribute name="defaultPort">1433</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- <attribute name="dependencyFilterStrings">jtds/jtds//jar</attribute>
- </gbean>
- <gbean name="Database30" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">SQL Server (DataDirect)</attribute>
- <attribute name="URLPrototype">jdbc:datadirect:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
- <attribute name="driverClassName">com.ddtek.jdbc.sqlserver.SQLServerDriver</attribute>
- <attribute name="defaultPort">1433</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database31" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Sybase ASE</attribute>
- <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
- <attribute name="defaultPort">2048</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database32" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Sybase ASA</attribute>
- <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
- <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
- <attribute name="defaultPort">2638</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database33" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Sybase (DataDirect)</attribute>
- <attribute name="URLPrototype">jdbc:datadirect:sybase://{Host}:{Port};DatabaseName={Database}</attribute>
- <attribute name="driverClassName">com.ddtek.jdbc.sybase.SybaseDriver</attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
- <gbean name="Database34" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean">
- <attribute name="name">Other</attribute>
- <attribute name="URLPrototype"></attribute>
- <attribute name="driverClassName"></attribute>
- <attribute name="defaultPort">0</attribute>
- <attribute name="specific">false</attribute>
- <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
- </gbean>
-
-</web-app>
diff --git a/plugins/system-database/sysdb-portlets/pom.xml b/plugins/system-database/sysdb-portlets/pom.xml
deleted file mode 100644
index a29ff92..0000000
--- a/plugins/system-database/sysdb-portlets/pom.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>system-database</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>sysdb-portlets</artifactId>
- <name>Geronimo Plugins, System Database :: Portlets</name>
- <packaging>war</packaging>
-
- <dependencies>
- <!-- for jspc maven plugin -->
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>jstl</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!-- for jspc maven plugin -->
- <dependency>
- <groupId>org.apache.portals.pluto</groupId>
- <artifactId>pluto-taglib</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.plugins</groupId>
- <artifactId>console-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-converter</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-connector-builder</artifactId>-->
- <!--<version>${project.version}</version>-->
- <!--<scope>provided</scope>-->
- <!--</dependency>-->
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-derby</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-management</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.portals</groupId>
- <artifactId>portlet-api_2.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-deploy-jsr88</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.bundles</groupId>
- <artifactId>dwr</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <!--<dependency>-->
- <!--<groupId>commons-io</groupId>-->
- <!--<artifactId>commons-io</artifactId>-->
- <!--<scope>provided</scope>-->
- <!--</dependency>-->
-
- <dependency>
- <groupId>commons-fileupload</groupId>
- <artifactId>commons-fileupload</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.configs</groupId>
- <artifactId>jsr88-rar-configurer</artifactId>
- <version>${project.version}</version>
- <type>car</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-test-ddbean</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <phase>compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <copy overwrite="true" todir="target/classes">
- <fileset dir="src/main/i18n-resources">
- <include name="*_en.properties" />
- </fileset>
- <mapper type="glob" from="*_en.properties" to="*.properties" />
- </copy>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo.jspc</groupId>
- <artifactId>jspc-maven-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webXml>${project.build.directory}/jspweb.xml</webXml>
- <warSourceExcludes>**/*.jsp</warSourceExcludes>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>native2ascii-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_en.properties b/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_en.properties
deleted file mode 100644
index 757f064..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_en.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#=====================================================================
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=====================================================================
-
-DB\ Info = DB Info
-
-DB\ Manager = DB Manager
-
-DB\ Viewer = DB Viewer
-
-Database\ Pools = Database Pools
-
-Derby\ Log\ Viewer = Derby Log Viewer
-
-Embedded\ DB = Embedded DB
-
-Run\ SQL = Run SQL
-
-sysdb.errorMsg01 = An error encountered while creating database.
-sysdb.errorMsg02 = An error encountered while closing database connection.
-sysdb.errorMsg03 = An error encountered while shutting down database.
-sysdb.errorMsg04 = An error encountered while backing up database.
-sysdb.errorMsg05 = An error encountered while renaming database folder.
-sysdb.errorMsg06 = An error encountered while deleting database.
-sysdb.errorMsg07 = SQL command cannot be empty.
-sysdb.errorMsg08 = An error encountered while executing SQL command(s).
-sysdb.errorMsg09 = Unable to deploy: {0}.
-sysdb.errorMsg10 = Unable to load driver {0}.
-sysdb.errorMsg11 = The import operation failed!
-sysdb.infoMsg01 = Database created: <b>{0}</b>.
-sysdb.infoMsg02 = Database deleted: <b>{0}</b>.
-sysdb.infoMsg03 = SQL command(s) executed successfully.
-sysdb.infoMsg04 = Connected to {0}.
-sysdb.warnMsg01 = There are no database pools defined.
diff --git a/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_ja.properties b/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_ja.properties
deleted file mode 100644
index 364d672..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_ja.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#=====================================================================
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=====================================================================
-
-DB\ Info = DB 情報
-
-DB\ Manager = DB マネージャー
-
-DB\ Viewer = DB ビューアー
-
-Database\ Pools = データベース・プール
-
-Derby\ Log\ Viewer = Derby ログ・ビューアー
-
-Embedded\ DB = 組み込み DB
-
-Run\ SQL = SQL 実行
-
-sysdb.errorMsg01 = データベースの作成中にエラーが発生しました。
-sysdb.errorMsg02 = データベース接続のクローズ中にエラーが発生しました。
-sysdb.errorMsg03 = データベースのシャットダウン中にエラーが発生しました。
-sysdb.errorMsg04 = データベースのバックアップ中にエラーが発生しました。
-sysdb.errorMsg05 = データベース・フォルダーの名前変更中にエラーが発生しました。
-sysdb.errorMsg06 = データベースの削除中にエラーが発生しました。
-sysdb.errorMsg07 = SQL コマンドは空欄にできません。
-sysdb.errorMsg08 = SQL コマンドの実行中にエラーが発生しました。
-sysdb.errorMsg09 = デプロイできません: {0}。
-sysdb.errorMsg10 = ドライバー {0} をロードできません。
-sysdb.errorMsg11 = インポート操作が失敗しました!
-sysdb.infoMsg01 = データベースを作成しました: <b>{0}</b>。
-sysdb.infoMsg02 = データベースを削除しました: <b>{0}</b>。
-sysdb.infoMsg03 = SQL コマンドは正常に実行されました。
-sysdb.infoMsg04 = {0} に接続しました。
-sysdb.warnMsg01 = データベース・プールが定義されていません。
diff --git a/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_zh.properties b/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_zh.properties
deleted file mode 100644
index e19aebf..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/i18n-resources/portletinfo_zh.properties
+++ /dev/null
@@ -1,47 +0,0 @@
-#=====================================================================
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=====================================================================
-
-DB\ Info = 数据库信息
-
-DB\ Manager = 数据库管理
-
-DB\ Viewer = 数据库查看器
-
-Database\ Pools = 数据库连接池
-
-Derby\ Log\ Viewer = Derby 日志查看器
-
-Embedded\ DB = 内置数据库
-
-Run\ SQL = 运行 SQL
-
-sysdb.errorMsg01 = 创建数据库时遇到错误。
-sysdb.errorMsg02 = 关闭数据库连接时遇到错误。
-sysdb.errorMsg03 = 关闭数据库时遇到错误。
-sysdb.errorMsg04 = 备份数据库时遇到错误。
-sysdb.errorMsg05 = 重命名数据库文件夹时遇到错误。
-sysdb.errorMsg06 = 删除数据库时遇到错误。
-sysdb.errorMsg07 = 空 SQ L命令。
-sysdb.errorMsg08 = 执行 SQL 命令时遇到错误。
-sysdb.errorMsg09 = 无法部署:{0}。
-sysdb.errorMsg10 = 无法加载驱动{0}。
-sysdb.errorMsg11 = 导入连接池失败！
-sysdb.infoMsg01 = 已创建数据库：<b>{0}</b>。
-sysdb.infoMsg02 = 已删除数据库：<b>{0}</b>。
-sysdb.infoMsg03 = SQL 命令执行成功。
-sysdb.infoMsg04 = 连接到{0}。
-sysdb.warnMsg01 = 不存在预定义的数据库连接池。
diff --git a/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties b/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
deleted file mode 100644
index 9faaf55..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_en.properties
+++ /dev/null
@@ -1,451 +0,0 @@
-#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
-#=====================================================================
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=====================================================================
-
-dbwizard.basicParams.database = Database
-dbwizard.basicParams.driverConnectionProperties = Driver Connection Properties
-dbwizard.basicParams.host = Host
-dbwizard.basicParams.port = Port
-dbwizard.basicParams.propertyExp = A property used to connect to {0}. This property can be optional. See JDBC driver documentation.
-dbwizard.basicParams.seeDocumentation = See the JDBC documentation for your JDBC driver.
-dbwizard.basicParams.title = <b>Create Database Pool</b> -- Step 2: Select Driver, JAR, Parameters
-dbwizard.basicParams.typicalJDBCURL = Typical JDBC URL
-dbwizard.basicParams.unableToLoadDriver = Unable to load driver from selected JARs!
-dbwizard.common.DBPassword = DB Password
-dbwizard.common.DBPasswordExp = The password used to connect to the database
-dbwizard.common.DBUserName = DB User Name
-dbwizard.common.DBUserNameExp = The username used to connect to the database
-dbwizard.common.JDBCConnectURL = JDBC Connect URL
-dbwizard.common.JDBCDriverClass = JDBC Driver Class
-dbwizard.common.URLFits = Make sure the generated URL fits the syntax for your JDBC driver.
-dbwizard.common.actions = Actions
-dbwizard.common.blockingTimeout = Blocking Timeout
-dbwizard.common.cancel = Cancel
-dbwizard.common.configFile = Config File
-dbwizard.common.confirmAndDeploy = Confirm and Deploy
-dbwizard.common.confirmPassword = Confirm Password
-dbwizard.common.connectionPoolParameters = Connection Pool Parameters
-dbwizard.common.delete = Delete
-dbwizard.common.deploy = Deploy
-dbwizard.common.downloadDriver = Download a Driver
-dbwizard.common.driverJAR = Driver JAR
-dbwizard.common.driverJARExplanation = The JAR(s) required to make a connection to the database. Use CTRL-click or SHIFT-click to select multiple jars.<br>The JAR(s) should already be installed under GERONIMO/repository/ (or
-dbwizard.common.driverTransactionTypes = Type of transactions that this connection pool supports.
-dbwizard.common.edit = Edit
-dbwizard.common.editSettings = Edit Settings
-dbwizard.common.emptyText = The focussed field cannot be empty.
-dbwizard.common.finish = Finish
-dbwizard.common.idleTimeout = Idle Timeout
-dbwizard.common.import = {0} Import
-dbwizard.common.importFromJBoss = Import from JBoss 4
-dbwizard.common.importFromWebLogic = Import from WebLogic 8.1
-dbwizard.common.inMilliseconds = in milliseconds
-dbwizard.common.inMinutes = in minutes
-dbwizard.common.maxNoOfCon = The maximum number of connections in the pool. The default value is 10.
-dbwizard.common.name = Name
-dbwizard.common.next = Next
-dbwizard.common.passwordMismatch = Password does not match.
-dbwizard.common.poolMaxSize = Pool Max Size
-dbwizard.common.poolMinSize = Pool Min Size
-dbwizard.common.returnToList = Return To List
-dbwizard.common.save = Save
-dbwizard.common.showPlan = Show Plan
-dbwizard.common.skipRemainingPools = Skip Remaining Pools
-dbwizard.common.skipTestAndDeploy = Skip Test and Deploy
-dbwizard.common.skipTestAndShowPlan = Skip Test and Show Plan
-dbwizard.common.state = State
-dbwizard.common.testConnection = Test Connection
-dbwizard.common.transactionType = Transaction Type
-dbwizard.common.usingPoolWizard = Using the Geronimo database pool wizard
-dbwizard.confirmURL.blockingTimeoutExp = The length of time a caller will wait for a connection. Leave blank for default.
-dbwizard.confirmURL.driverStatus = Driver Status
-dbwizard.confirmURL.idleTimeoutExp = How long a connection can be idle before being closed. Leave blank for default.
-dbwizard.confirmURL.loadedSuccessfully = Loaded Successfully
-dbwizard.confirmURL.maxNoOfCon = The maximum number of connections in the pool. Leave blank for default.
-dbwizard.confirmURL.minimumNoOfCon = The minimum number of connections in the pool. Leave blank for default.
-dbwizard.confirmURL.title = <b>Create Database Pool</b> -- Step 3: Final Pool Configuration
-dbwizard.downloadStatus.summary = This page shows the driver download progress.
-dbwizard.downloadStatus.title = <b>Create Database Pool</b> -- Driver Download
-dbwizard.edit.basicConProperties = Basic Connection Properties
-dbwizard.edit.blockingTimeoutExp = The length of time a caller will wait for a connection. The default is 5000.
-dbwizard.edit.errorMsg01 = Min pool size must be a number. Default value is 0.
-dbwizard.edit.errorMsg02 = Min pool size must be non-negative. Default value is 0.
-dbwizard.edit.errorMsg03 = Max pool size must be a number. Default value is 10.
-dbwizard.edit.errorMsg04 = Max pool size must be greater than zero. Default value is 10.
-dbwizard.edit.errorMsg05 = Max pool size must be greater than Min pool size.
-dbwizard.edit.idleTimeoutExp = How long a connection can be idle before being closed. The default is 15.
-dbwizard.edit.maxNoOfCon = The maximum number of connections in the pool. The default is 10.
-dbwizard.edit.minimumNoOfCon = The minimum number of connections in the pool. The default is 0.
-dbwizard.edit.poolName = Pool Name
-dbwizard.edit.poolNameExp = A name that is different than the name for any other database pools in the server. Do not type spaces in the pool name.
-dbwizard.edit.poolType = Pool Type
-dbwizard.edit.seeDocumentation = See the JDBC documentation for your JDBC driver.
-dbwizard.edit.seeLog = See the log for details
-dbwizard.edit.summary = This page edits an existing database pool.
-dbwizard.edit.unableToLoadDriver = Unable to load driver from selected JARs!
-dbwizard.importStatus.currentPools = Current Pools in Server
-dbwizard.importStatus.importFailed = The import failed or did not discover any usable database pools!
-dbwizard.importStatus.importMessages = Import Messages
-dbwizard.importStatus.importStatus = Import Status
-dbwizard.importStatus.originalJNDI = Original JNDI
-dbwizard.importStatus.originalName = Original Name
-dbwizard.importStatus.summary = The following list shows recognised database pools. You can deploy any pools to Geronimo that were configured as plain JDBC pools, or XA pools where Geronimo has a supported XA adapter. Below the pool list is the list of status messages from the import process.
-dbwizard.importStatus.title = <b>Import Database Pools</b> -- Step 2: Review Imported Data
-dbwizard.importUpload.aboutWebLogic = If WebLogic 8.1 is installed on the same machine as Geronimo, and the WebLogic domain directory is readable by the user running Geronimo, you can also point directly to the WebLogic installation and domain directories. This has the advantage that the import process can read the database passwords, whereas if you just import a <tt>config.xml</tt> above you'll need to re-enter all the passwords.
-dbwizard.importUpload.alternateImport = Alternate {0} Import
-dbwizard.importUpload.domainDirectoryPath = Domain directory path
-dbwizard.importUpload.domainDirectoryPathExp = Enter the full path to the WebLogic domain directory (containing the <tt>config.xml</tt> file) for your WebLogic domain .
-dbwizard.importUpload.enterFullPath = Enter the full path to the <tt>weblogic81/server/lib</tt> directory for your WebLogic 8.1 installation .
-dbwizard.importUpload.path = Path
-dbwizard.importUpload.pleaseSelect = Select the
-dbwizard.importUpload.summary = This page starts the process of importing database pools from another application server. To do the import, you must upload a configuration file from the other server using the fields below. Geronimo server will convert the configuration information into Geronimo specific values, and ask you to confirm the configuration for each pool in the configuration.
-dbwizard.importUpload.title = <b>Import Database Pools</b> -- Step 1: Upload Configuration File
-dbwizard.list.createPool = Create a new database pool
-dbwizard.list.deployedAs = Deployed As
-dbwizard.list.hasDatabasePools = For each pool listed, you can click the <b>usage</b> link to see examples of how to use the pool from your application.
-dbwizard.list.noDatabasePools = There are no database pools defined
-dbwizard.list.serverWide = Server-wide
-dbwizard.list.summary = This page lists all the available database pools.
-dbwizard.list.usage = Usage
-dbwizard.selectDatabase.databaseType = Database Type
-dbwizard.selectDatabase.databaseTypeExp = The type of database the pool will connect to.
-dbwizard.selectDatabase.nameOfPool = Name of Database Pool
-dbwizard.selectDatabase.nameOfPoolExplanation = A name that is different than the name for any other database pools in the server (no spaces in the name please).
-dbwizard.selectDatabase.title = <b>Create Database Pool</b> -- Step 1: Select Name and Database
-dbwizard.selectDownload.otherJDBCDrivers = Here are some other JDBC drivers you might want to download on your own (just save them somewhere under geronimo/repository/)
-dbwizard.selectDownload.selectDriver = Select Driver
-dbwizard.selectDownload.selectDriverExp = A driver that Geronimo can download automatically for you.
-dbwizard.selectDownload.selectOtherDatabase = Select "other" database
-dbwizard.selectDownload.selectPredefinedDatabase = Select predefined database
-dbwizard.selectDownload.summary = <p>This page lets you automatically download a driver for a database where the driver JARs are available online without login or registration.</p><p><i>If this page took a very long time to load and there are no drivers listed in the box below, it probably means your Geronimo installation can't connect to apache.org to retrieve the driver download configuration file. Sorry for the inconvenience,you'll have to try again later or install the driver by hand (copy it to a directory under geronimo/repository/)</i></p>
-dbwizard.selectDownload.title = <b>Create Database Pool</b> -- Step 2: Select Driver, JAR, Parameters
-dbwizard.showPlan.addToEAR = Add to EAR
-dbwizard.showPlan.deployAsPartEAR = Instead of deploying as a top-level database pool, you can deploy this pool as part of an EAR. To add a database pool to an EAR using this plan:<ol> <li>Copy and paste the plan to a file</li> <li>Save the plan file to the top level of your EAR</li> <li>Copy the RAR file from <tt>GERONIMO_HOME/{0}</tt> to the top level of your EAR</li> <li>Create a <tt>META-INF/geronimo-application.xml</tt> file in your EAR that has a <tt>module</tt> entry like this (substituting the correct RAR file name and plan file name):</li></ol>
-dbwizard.showPlan.deployCommand = Deploy Command
-dbwizard.showPlan.deployPool = Deploy Pool
-dbwizard.showPlan.deployPoolFromCommandLine = To deploy a database pool from the command line using this plan,copy and paste it to a file (say, <tt>plan-file.xml</tt>) and save it. Then run a command like:
-dbwizard.showPlan.deploymentPlan = Deployment Plan
-dbwizard.showPlan.title = <b>Create Database Pool</b> -- Show Deployment Plan
-dbwizard.testConnection.connectedTo = Connected to
-dbwizard.testConnection.connectionError = Connection Error (see below)
-dbwizard.testConnection.deployAnyway = Deploy Anyway
-dbwizard.testConnection.testAgain = Test Again
-dbwizard.testConnection.testError = Test Error
-dbwizard.testConnection.testResult = Test Result
-dbwizard.testConnection.title = <b>Create Database Pool</b> -- Step 4: Test Connection
-dbwizard.tranql-connector-db2-xa.DatabaseName = Database Name
-dbwizard.tranql-connector-db2-xa.DatabaseNameExp = Specifies the name for the database server. This name is used as the database portion of the connection URL.
-dbwizard.tranql-connector-db2-xa.DowngradeHoldCursorsUnderXa = Downgrade Hold Cursors
-dbwizard.tranql-connector-db2-xa.DowngradeHoldCursorsUnderXaExp = Specifies whether the lock associated with a hold cursor will be downgraded.
-dbwizard.tranql-connector-db2-xa.DriverType = Driver Type
-dbwizard.tranql-connector-db2-xa.DriverTypeExp = The driver type to use for connections made on this datasource. Possible values are 2 or 4. Default is Type 4.
-dbwizard.tranql-connector-db2-xa.Password = Password
-dbwizard.tranql-connector-db2-xa.PasswordExp = \
-dbwizard.tranql-connector-db2-xa.PortNumber = Port Number
-dbwizard.tranql-connector-db2-xa.PortNumberExp = Specifies the port number the remote database server is listening on for incoming connections. The default for a DB2 server is 50000.
-dbwizard.tranql-connector-db2-xa.PreparedStatementCacheSize = PreparedStatement Cache Size
-dbwizard.tranql-connector-db2-xa.PreparedStatementCacheSizeExp = PreparedStatementCacheSize specifies the driver how many prepared statements should be associated with each connection. The default is no statement caching.
-dbwizard.tranql-connector-db2-xa.ResultSetHoldability = ResultSetHoldability
-dbwizard.tranql-connector-db2-xa.ResultSetHoldabilityExp = ResultSetHoldability has two possible values: HOLD_CURSORS_OVER_COMMIT and CLOSE_CURSORS_AT_COMMIT. Either of these values can be specified with any valid combination of resultSetConcurrency and resultSetHoldability. The value that you set overrides the default holdability for the connection.<br/><br/>HOLD_CURSORS_OVER_COMMIT = 1<br/>CLOSE_CURSORS_AT_COMMIT = 2
-dbwizard.tranql-connector-db2-xa.ServerName = Server Name
-dbwizard.tranql-connector-db2-xa.ServerNameExp = ServerName is the name or IP address of the host that the DB2 driver needs to connect to. There is no default value.
-dbwizard.tranql-connector-db2-xa.TraceFile = Trace File
-dbwizard.tranql-connector-db2-xa.TraceFileAppend = TraceFileAppend
-dbwizard.tranql-connector-db2-xa.TraceFileAppendExp = TraceFileAppend specifies whether to append to or overwrite the file that is specified by the traceFile property. The data type of this property is boolean. The default value is false, which means that the file that is specified by the traceFile property is overwritten.
-dbwizard.tranql-connector-db2-xa.TraceFileExp = Name of the tracefile to place trace records into.
-dbwizard.tranql-connector-db2-xa.UserName = User Name
-dbwizard.tranql-connector-db2-xa.UserNameExp = The name of the userID used to connect to the remote database server.
-dbwizard.tranql-connector-derby-client-local.CreateDatabase = Create Database
-dbwizard.tranql-connector-derby-client-local.CreateDatabaseExp = Flag indicating that the database should be created if it does not exist
-dbwizard.tranql-connector-derby-client-local.DatabaseName = Database Name
-dbwizard.tranql-connector-derby-client-local.DatabaseNameExp = Name of the database to connect to.
-dbwizard.tranql-connector-derby-client-local.LoginTimeout = Login Timeout
-dbwizard.tranql-connector-derby-client-local.LoginTimeoutExp = Time to wait before aborting remote login.
-dbwizard.tranql-connector-derby-client-local.Password = Password
-dbwizard.tranql-connector-derby-client-local.PasswordExp = Password credential used to establish the physical connection.
-dbwizard.tranql-connector-derby-client-local.PortNumber = Port Number
-dbwizard.tranql-connector-derby-client-local.PortNumberExp = IP port number to connect to.
-dbwizard.tranql-connector-derby-client-local.ServerName = Server Name
-dbwizard.tranql-connector-derby-client-local.ServerNameExp = Name of the server to connect to.
-dbwizard.tranql-connector-derby-client-local.UserName = User Name
-dbwizard.tranql-connector-derby-client-local.UserNameExp = Username used to establish the physical connection. This also establishes the default schema; if omitted the engine defaults to 'APP'.
-dbwizard.tranql-connector-derby-client-xa.CreateDatabase = Create Database
-dbwizard.tranql-connector-derby-client-xa.CreateDatabaseExp = Flag indicating that the database should be created if it does not exist
-dbwizard.tranql-connector-derby-client-xa.DatabaseName = Database Name
-dbwizard.tranql-connector-derby-client-xa.DatabaseNameExp = Name of the database to connect to.
-dbwizard.tranql-connector-derby-client-xa.LoginTimeout = Login Timeout
-dbwizard.tranql-connector-derby-client-xa.LoginTimeoutExp = Time to wait before aborting remote login.
-dbwizard.tranql-connector-derby-client-xa.Password = Password
-dbwizard.tranql-connector-derby-client-xa.PasswordExp = Password credential used to establish the physical connection.
-dbwizard.tranql-connector-derby-client-xa.PortNumber = Port Number
-dbwizard.tranql-connector-derby-client-xa.PortNumberExp = IP port number to connect to.
-dbwizard.tranql-connector-derby-client-xa.ServerName = Server Name
-dbwizard.tranql-connector-derby-client-xa.ServerNameExp = Name of the server to connect to.
-dbwizard.tranql-connector-derby-client-xa.UserName = User Name
-dbwizard.tranql-connector-derby-client-xa.UserNameExp = Username used to establish the physical connection. This also establishes the default schema; if omitted the engine defaults to 'APP'.
-dbwizard.tranql-connector-derby-embed-local.CreateDatabase = Create Database
-dbwizard.tranql-connector-derby-embed-local.CreateDatabaseExp = Flag indicating that the database should be created if it does not exist.
-dbwizard.tranql-connector-derby-embed-local.DatabaseName = Database Name
-dbwizard.tranql-connector-derby-embed-local.DatabaseNameExp = Name of the database to connect to.
-dbwizard.tranql-connector-derby-embed-local.LoginTimeout = Login Timeout
-dbwizard.tranql-connector-derby-embed-local.LoginTimeoutExp = This config-property is currently ignored by Derby.
-dbwizard.tranql-connector-derby-embed-local.Password = Password
-dbwizard.tranql-connector-derby-embed-local.PasswordExp = Password credential used to establish the physical connection.
-dbwizard.tranql-connector-derby-embed-local.ShutdownDatabase = Shutdown Database
-dbwizard.tranql-connector-derby-embed-local.ShutdownDatabaseExp = If set to the string "shutdown", this will cause the database to shutdown when a java.sql.Connection object is obtained from the data source.
-dbwizard.tranql-connector-derby-embed-local.UserName = User Name
-dbwizard.tranql-connector-derby-embed-local.UserNameExp = Username used to establish the physical connection. This also establishes the default schema; if omitted the engine defaults to 'APP'.
-dbwizard.tranql-connector-derby-embed-xa.CreateDatabase = Create Database
-dbwizard.tranql-connector-derby-embed-xa.CreateDatabaseExp = Flag indicating that the database should be created if it does not exist. This is a boolean value.
-dbwizard.tranql-connector-derby-embed-xa.DatabaseName = Database Name
-dbwizard.tranql-connector-derby-embed-xa.DatabaseNameExp = Name of the database to connect to.
-dbwizard.tranql-connector-derby-embed-xa.LoginTimeout = Login Timeout
-dbwizard.tranql-connector-derby-embed-xa.LoginTimeoutExp = This config-property is currently ignored by Derby.
-dbwizard.tranql-connector-derby-embed-xa.Password = Password
-dbwizard.tranql-connector-derby-embed-xa.PasswordExp = Password credential used to establish the physical connection.
-dbwizard.tranql-connector-derby-embed-xa.UserName = User Name
-dbwizard.tranql-connector-derby-embed-xa.UserNameExp = Username used to establish the physical connection. This also establishes the default schema; if omitted the engine defaults to 'APP'.
-dbwizard.tranql-connector-informix-xa.DatabaseName = Database Name
-dbwizard.tranql-connector-informix-xa.DatabaseNameExp = The database Name.
-dbwizard.tranql-connector-informix-xa.IfxHost = IfxHost
-dbwizard.tranql-connector-informix-xa.IfxHostExp = The Informix database server's IP address or the host name.
-dbwizard.tranql-connector-informix-xa.IfxProtocolTrace = IfxProtocolTrace
-dbwizard.tranql-connector-informix-xa.IfxProtocolTraceExp = The value of IfxPROTOCOLTRACE.
-dbwizard.tranql-connector-informix-xa.IfxProtocolTraceFile = IfxProtocolTraceFile
-dbwizard.tranql-connector-informix-xa.IfxProtocolTraceFileExp = The value of IfxPROTOCOLTRACEFILE.
-dbwizard.tranql-connector-informix-xa.IfxSQLHostFile = IfxSQLHostFile
-dbwizard.tranql-connector-informix-xa.IfxSQLHostFileExp = The value of IfxSQLH_FILE.
-dbwizard.tranql-connector-informix-xa.IfxSQLHostType = IfxSQLHostType
-dbwizard.tranql-connector-informix-xa.IfxSQLHostTypeExp = The value of IfxSQLH_TYPE.
-dbwizard.tranql-connector-informix-xa.Password = Password
-dbwizard.tranql-connector-informix-xa.PasswordExp = The password (case-insensitive).
-dbwizard.tranql-connector-informix-xa.PortNumber = Port Number
-dbwizard.tranql-connector-informix-xa.PortNumberExp = The Informix database server's port number.
-dbwizard.tranql-connector-informix-xa.ServerName = Server Name
-dbwizard.tranql-connector-informix-xa.ServerNameExp = The Informix database server instance Name.
-dbwizard.tranql-connector-informix-xa.UserName = User Name
-dbwizard.tranql-connector-informix-xa.UserNameExp = The user's name (case-insensitive).
-dbwizard.tranql-connector-mysql-local.DatabaseName = Database Name
-dbwizard.tranql-connector-mysql-local.DatabaseNameExp = Name of the database to connect to.
-dbwizard.tranql-connector-mysql-local.Password = Password
-dbwizard.tranql-connector-mysql-local.PasswordExp = Password credential used to establish the physical connection.
-dbwizard.tranql-connector-mysql-local.PortNumber = Port Number
-dbwizard.tranql-connector-mysql-local.PortNumberExp = IP port number to connect to.
-dbwizard.tranql-connector-mysql-local.ServerName = Server Name
-dbwizard.tranql-connector-mysql-local.ServerNameExp = Name of the server to connect to.
-dbwizard.tranql-connector-mysql-local.UserName = User Name
-dbwizard.tranql-connector-mysql-local.UserNameExp = Username used to establish the physical connection.
-dbwizard.tranql-connector-mysql-xa.DatabaseName = Database Name
-dbwizard.tranql-connector-mysql-xa.DatabaseNameExp = Name of the database to connect to.
-dbwizard.tranql-connector-mysql-xa.Password = Password
-dbwizard.tranql-connector-mysql-xa.PasswordExp = Password credential used to establish the physical connection.
-dbwizard.tranql-connector-mysql-xa.PortNumber = Port Number
-dbwizard.tranql-connector-mysql-xa.PortNumberExp = IP port number to connect to.
-dbwizard.tranql-connector-mysql-xa.ServerName = Server Name
-dbwizard.tranql-connector-mysql-xa.ServerNameExp = Name of the server to connect to.
-dbwizard.tranql-connector-mysql-xa.UserName = User Name
-dbwizard.tranql-connector-mysql-xa.UserNameExp = Username used to establish the physical connection.
-dbwizard.tranql-connector-oracle-local.DataSourceName = DataSource Name
-dbwizard.tranql-connector-oracle-local.DataSourceNameExp = \
-dbwizard.tranql-connector-oracle-local.DatabaseName = Database Name
-dbwizard.tranql-connector-oracle-local.DatabaseNameExp = \
-dbwizard.tranql-connector-oracle-local.Description = Description
-dbwizard.tranql-connector-oracle-local.DescriptionExp = \
-dbwizard.tranql-connector-oracle-local.DriverType = Driver Type
-dbwizard.tranql-connector-oracle-local.DriverTypeExp = \
-dbwizard.tranql-connector-oracle-local.LoginTimeout = Login Timeout
-dbwizard.tranql-connector-oracle-local.LoginTimeoutExp = \
-dbwizard.tranql-connector-oracle-local.MaxStatements = Max Statements
-dbwizard.tranql-connector-oracle-local.MaxStatementsExp = \
-dbwizard.tranql-connector-oracle-local.NetworkProtocol = Network Protocol
-dbwizard.tranql-connector-oracle-local.NetworkProtocolExp = \
-dbwizard.tranql-connector-oracle-local.Password = Password
-dbwizard.tranql-connector-oracle-local.PasswordExp = \
-dbwizard.tranql-connector-oracle-local.PortNumber = Port Number
-dbwizard.tranql-connector-oracle-local.PortNumberExp = \
-dbwizard.tranql-connector-oracle-local.ServerName = Server Name
-dbwizard.tranql-connector-oracle-local.ServerNameExp = \
-dbwizard.tranql-connector-oracle-local.ServiceName = Service Name
-dbwizard.tranql-connector-oracle-local.ServiceNameExp = \
-dbwizard.tranql-connector-oracle-local.TNSEntryName = TNS Entry Name
-dbwizard.tranql-connector-oracle-local.TNSEntryNameExp = \
-dbwizard.tranql-connector-oracle-local.UserName = User Name
-dbwizard.tranql-connector-oracle-local.UserNameExp = \
-dbwizard.tranql-connector-oracle-xa.DataSourceName = DataSource Name
-dbwizard.tranql-connector-oracle-xa.DataSourceNameExp = \
-dbwizard.tranql-connector-oracle-xa.DatabaseName = Database Name
-dbwizard.tranql-connector-oracle-xa.DatabaseNameExp = \
-dbwizard.tranql-connector-oracle-xa.Description = Description
-dbwizard.tranql-connector-oracle-xa.DescriptionExp = \
-dbwizard.tranql-connector-oracle-xa.DriverType = Driver Type
-dbwizard.tranql-connector-oracle-xa.DriverTypeExp = \
-dbwizard.tranql-connector-oracle-xa.LoginTimeout = Login Timeout
-dbwizard.tranql-connector-oracle-xa.LoginTimeoutExp = \
-dbwizard.tranql-connector-oracle-xa.MaxStatements = Max Statements
-dbwizard.tranql-connector-oracle-xa.MaxStatementsExp = \
-dbwizard.tranql-connector-oracle-xa.NetworkProtocol = Network Protocol
-dbwizard.tranql-connector-oracle-xa.NetworkProtocolExp = \
-dbwizard.tranql-connector-oracle-xa.Password = Password
-dbwizard.tranql-connector-oracle-xa.PasswordExp = \
-dbwizard.tranql-connector-oracle-xa.PortNumber = Port Number
-dbwizard.tranql-connector-oracle-xa.PortNumberExp = \
-dbwizard.tranql-connector-oracle-xa.ServerName = Server Name
-dbwizard.tranql-connector-oracle-xa.ServerNameExp = \
-dbwizard.tranql-connector-oracle-xa.ServiceName = Service Name
-dbwizard.tranql-connector-oracle-xa.ServiceNameExp = \
-dbwizard.tranql-connector-oracle-xa.TNSEntryName = TNS Entry Name
-dbwizard.tranql-connector-oracle-xa.TNSEntryNameExp = \
-dbwizard.tranql-connector-oracle-xa.UserName = User Name
-dbwizard.tranql-connector-oracle-xa.UserNameExp = \
-dbwizard.tranql-connector-postgresql-local.DatabaseName = Database Name
-dbwizard.tranql-connector-postgresql-local.DatabaseNameExp = Name of the database to connect to.
-dbwizard.tranql-connector-postgresql-local.Password = Password
-dbwizard.tranql-connector-postgresql-local.PasswordExp = Password credential used to establish the physical connection.
-dbwizard.tranql-connector-postgresql-local.PortNumber = Port Number
-dbwizard.tranql-connector-postgresql-local.PortNumberExp = IP port number to connect to.
-dbwizard.tranql-connector-postgresql-local.PrepareThreshold = Prepare Threshold
-dbwizard.tranql-connector-postgresql-local.PrepareThresholdExp = \
-dbwizard.tranql-connector-postgresql-local.ServerName = Server Name
-dbwizard.tranql-connector-postgresql-local.ServerNameExp = Name of the server to connect to.
-dbwizard.tranql-connector-postgresql-local.UserName = User Name
-dbwizard.tranql-connector-postgresql-local.UserNameExp = Username used to establish the physical connection.
-dbwizard.tranql-connector-postgresql-xa.DatabaseName = Database Name
-dbwizard.tranql-connector-postgresql-xa.DatabaseNameExp = Name of the database to connect to.
-dbwizard.tranql-connector-postgresql-xa.Password = Password
-dbwizard.tranql-connector-postgresql-xa.PasswordExp = Password credential used to establish the physical connection.
-dbwizard.tranql-connector-postgresql-xa.PortNumber = Port Number
-dbwizard.tranql-connector-postgresql-xa.PortNumberExp = IP port number to connect to.
-dbwizard.tranql-connector-postgresql-xa.PrepareThreshold = Prepare Threshold
-dbwizard.tranql-connector-postgresql-xa.PrepareThresholdExp = \
-dbwizard.tranql-connector-postgresql-xa.ServerName = Server Name
-dbwizard.tranql-connector-postgresql-xa.ServerNameExp = Name of the server to connect to.
-dbwizard.tranql-connector-postgresql-xa.UserName = User Name
-dbwizard.tranql-connector-postgresql-xa.UserNameExp = Username used to establish the physical connection.
-dbwizard.tranql-connector-sqlserver2000-xa.DatabaseName = Database Name
-dbwizard.tranql-connector-sqlserver2000-xa.DatabaseNameExp = The name of the SQL Server database to connect to.
-dbwizard.tranql-connector-sqlserver2000-xa.Password = Password
-dbwizard.tranql-connector-sqlserver2000-xa.PasswordExp = The case-insensitive password used to connect to your SQL Server database.
-dbwizard.tranql-connector-sqlserver2000-xa.PortNumber = Port Number
-dbwizard.tranql-connector-sqlserver2000-xa.PortNumberExp = The TCP port of the SQL Server, the default is 1433.
-dbwizard.tranql-connector-sqlserver2000-xa.SelectMethod = SelectMethod
-dbwizard.tranql-connector-sqlserver2000-xa.SelectMethodExp = SelectMethod={cursor | direct}. Refer to Microsoft documentation for more information. Direct is very unlikely to work in a managed environment.
-dbwizard.tranql-connector-sqlserver2000-xa.SendStringParameters = SendStringParameters
-dbwizard.tranql-connector-sqlserver2000-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}. Refer to Microsoft documentation for details. The default is true and this is less likely to cause encoding conflicts but may be slighty slower under some circumstances.
-dbwizard.tranql-connector-sqlserver2000-xa.ServerName = Server Name
-dbwizard.tranql-connector-sqlserver2000-xa.ServerNameExp = The IP address of the SQL Server.
-dbwizard.tranql-connector-sqlserver2000-xa.UserName = User Name
-dbwizard.tranql-connector-sqlserver2000-xa.UserNameExp = The case-insensitive username used to connect to your SQL Server database.
-dbwizard.tranql-connector-sqlserver2005-xa.DatabaseName = Database Name
-dbwizard.tranql-connector-sqlserver2005-xa.DatabaseNameExp = The name of the SQL Server database to connect to.
-dbwizard.tranql-connector-sqlserver2005-xa.Password = Password
-dbwizard.tranql-connector-sqlserver2005-xa.PasswordExp = The case-insensitive password used to connect to your SQL Server database.
-dbwizard.tranql-connector-sqlserver2005-xa.PortNumber = Port Number
-dbwizard.tranql-connector-sqlserver2005-xa.PortNumberExp = The TCP port of the SQL Server, the default is 1433.
-dbwizard.tranql-connector-sqlserver2005-xa.SelectMethod = SelectMethod
-dbwizard.tranql-connector-sqlserver2005-xa.SelectMethodExp = SelectMethod={cursor | direct}. Refer to Microsoft documentation for more information. Direct is very unlikely to work in a managed environment.
-dbwizard.tranql-connector-sqlserver2005-xa.SendStringParameters = SendStringParameters
-dbwizard.tranql-connector-sqlserver2005-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}. Refer to Microsoft documentation for details. The default is true and this is less likely to cause encoding conflicts but may be slightly slower under some circumstances.
-dbwizard.tranql-connector-sqlserver2005-xa.ServerName = Server Name
-dbwizard.tranql-connector-sqlserver2005-xa.ServerNameExp = The IP address of the SQL Server.
-dbwizard.tranql-connector-sqlserver2005-xa.UserName = User Name
-dbwizard.tranql-connector-sqlserver2005-xa.UserNameExp = The case-insensitive username used to connect to your SQL Server database.
-dbwizard.usage.applicationCode = Application Code
-dbwizard.usage.geronimo_webExp = <p>To point the resource reference to a specific database pool in Geronimo, the web application needs to have a <tt>geronimo-web.xml</tt> deployment plan. That may be packaged in the WAR in the <tt>WEB-INF</tt> directory, or it may be provided separately on the command line to the deploy tool. The <tt>geronimo-web.xml</tt> plan should have a <tt>dependency</tt> element pointing to the database pool module, and a <tt>resource-ref</tt> block corresponding to the <tt>web.xml</tt> <tt>resource-ref</tt> above, which maps the resource reference to a specific database pool. In that block, the <tt>ref-name</tt> must match the <tt>res-ref-name</tt> from the <tt>web.xml</tt> (above) and the <tt>resource-link</tt> must point to the database pool by name.</p> <p><i>If you have only one pool named {0} deployed in Geronimo, you can point to it like this.</i></p>
-dbwizard.usage.moreThanOnePool = If you have more than one pool named {0} (for example, two dependencies that <b>each</b> include a component named {1}), then you can specify the pool to use more explicitly like this:
-dbwizard.usage.resource_refSection = The <tt>web.xml</tt> should have a <tt>resource-ref</tt> section declaring the database pool, like this. Note the <tt>res-ref-name</tt>, which is what we'll need to map the reference to a pool, and also what the application will need in order to access the pool.
-dbwizard.usage.searchOnlyOne = That will search for a pool named {0} in the current application and any modules listed as dependencies (and their dependencies, etc.).
-dbwizard.usage.title = This page shows how to use the database pool {0} from a Java EE application. The example here is a Web application, but other application modules would work in the same way.
-dbwizard.usage.usingInCode = To get a reference to the database pool, your application can use code like this. Note that the JNDI lookup string is <tt>java:comp/env/</tt> plus the <tt>res-ref-name</tt> used in <tt>web.xml</tt> (above).
-
-derbylogmanager.help.title = This portlet shows the log file for Geronimo's internal database, Derby.
-derbylogmanager.view.Lines = Lines
-derbylogmanager.view.containingText = Containing text
-derbylogmanager.view.filterLog = Filter Log
-derbylogmanager.view.filterResults = Filter results
-derbylogmanager.view.integer = The focussed field must be an integer.
-derbylogmanager.view.matchCriterial = {0} total message(s) in log file. {1} matched your criteria.
-derbylogmanager.view.maxResults = Max Results
-derbylogmanager.view.noEntries = No entries found with the specified criteria.
-derbylogmanager.view.numberOfResultsCapped = number of results capped
-derbylogmanager.view.refresh = Refresh
-derbylogmanager.view.to = To
-
-internaldb.common.DB = DB
-internaldb.common.DBMajorVersion = DB Major Version
-internaldb.common.DBMinorVersion = DB Minor Version
-internaldb.common.DBProductName = DB Product Name
-internaldb.common.DBProductVersion = DB Product Version
-internaldb.common.Item = Item
-internaldb.common.JDBCMajorVersion = JDBC Major Version
-internaldb.common.JDBCMinorVersion = JDBC Minor Version
-internaldb.common.SQLCommands = SQL Command/s
-internaldb.common.SQLStateType = SQL State Type
-internaldb.common.Value = Value
-internaldb.common.application = Application
-internaldb.common.create = Create
-internaldb.common.createDB = Create DB
-internaldb.common.databases = Databases
-internaldb.common.defaultTransactionIsolation = Default Transaction Isolation
-internaldb.common.delete = Delete
-internaldb.common.deleteDB = Delete DB
-internaldb.common.driver = Driver
-internaldb.common.driverMajorVersion = Driver Major Version
-internaldb.common.driverMinorVersion = Driver Minor Version
-internaldb.common.driverName = Driver Name
-internaldb.common.driverVersion = Driver Version
-internaldb.common.empty = Empty
-internaldb.common.emptyText = The focussed field cannot be empty.
-internaldb.common.etc = Etc
-internaldb.common.functions = Functions
-internaldb.common.note = Note
-internaldb.common.numericFunctions = Numeric Functions
-internaldb.common.queryResult = Query Result
-internaldb.common.readOnly = Read Only
-internaldb.common.result = Result
-internaldb.common.resultSetHoldability = Result Set Holdability
-internaldb.common.schemas = Schemas
-internaldb.common.stringFunctions = String Functions
-internaldb.common.supportedSQLKeywords = Supported SQL Keywords
-internaldb.common.supportedTypes = Supported Types
-internaldb.common.system = System
-internaldb.common.systemFunctions = System Functions
-internaldb.common.table = Table
-internaldb.common.tableTypes = Table Types
-internaldb.common.tables = Tables
-internaldb.common.timeDateFunctions = Time Date Functions
-internaldb.common.useDB = Use DB
-internaldb.common.useDS = Use DataSource
-internaldb.common.userName = Username
-internaldb.common.viewContents = View Contents
-internaldb.common.viewDatabases = View Databases
-internaldb.common.viewTables = View Tables
-internaldb.dbViewerHelp.content = Displays all the available databases and their tables and displays the contents of the tables. From the main window, to view the tables in a database, click on the database link. This will show all the tables in the database. To view the contents of the tables, click on the "View Contents" link. At the bottom of the DB Viewer window pane there will be links to take the user back to other views, e.g., "View Databases" and/or "View Tables."
-internaldb.internalDBHelp.content = This page provides information about the internal database, such as, the product name, the version of the database, the supported functions and the supported SQL commands, among other things. Scroll to the bottom to see all the information.
-internaldb.listDatabases.nodatabases = No databases
-internaldb.listDatabases.title = Database List
-internaldb.listTables.noTables = No tables
-internaldb.runSQLHelp.createDBExp = Enter the name of the new database to be created, then click on the "Create" button.
-internaldb.runSQLHelp.deleteDBExp = Delete an existing database, by selecting it from the pull-down menu and then clicking on "Delete."
-internaldb.runSQLHelp.runSQLExp = Enter the SQL commands, separated by semicolons, in the "SQL Command/s" text box. To run the SQL command(s), click on the "Run SQL" button.
-internaldb.runSQLHelp.summary = Allows the user to run SQL commands to manipulate the data in the tables, create a new database or delete a database. The user can enter the SQL commands in the "SQL Command(s)" text box and click on "Run SQL."
-internaldb.runSQLHelp.useDBExp = Select a database to use from the pull-down menu.
-internaldb.runSQLHelp.useDSExp = Select a datasource to use from the pull-down menu.
-internaldb.runSQLNormal.note1 = 1) Use ';' to separate multiple statements
-internaldb.runSQLNormal.note2 = 2) Query results will be displayed for single 'Select' statement
-internaldb.runSQLNormal.note3 = 3) Use single quotes to encapsulate literal strings
-internaldb.runSQLNormal.reallyDeleteDatabase = Are you sure you want to delete this database?
-internaldb.runSQLNormal.runSQL = Run SQL
diff --git a/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_ja.properties b/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_ja.properties
deleted file mode 100644
index 6e2d2ae..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_ja.properties
+++ /dev/null
@@ -1,450 +0,0 @@
-#=====================================================================
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=====================================================================
-
-dbwizard.basicParams.database = データベース
-dbwizard.basicParams.driverConnectionProperties = ドライバー接続情報
-dbwizard.basicParams.host = ホスト
-dbwizard.basicParams.port = ポート
-dbwizard.basicParams.propertyExp = {0} に接続するためのプロパティーです。任意入力の可能性もあります (JDBC ドライバーのドキュメントを参照してください)。
-dbwizard.basicParams.seeDocumentation = JDBC ドライバーのドキュメントを参照してください。
-dbwizard.basicParams.title = <b>データベース・プールの作成</b> -- Step 2: ドライバー、JAR ファイル、パラメーターの設定
-dbwizard.basicParams.typicalJDBCURL = JDBC URL 書式
-dbwizard.basicParams.unableToLoadDriver = 指定された JAR ファイルからドライバーをロードできません!
-dbwizard.common.DBPassword = DB パスワード
-dbwizard.common.DBPasswordExp = データベースへ接続するために使用されるパスワード
-dbwizard.common.DBUserName = DB ユーザー名
-dbwizard.common.DBUserNameExp = データベースへ接続するために使用されるユーザー名
-dbwizard.common.JDBCConnectURL = JDBC 接続 URL
-dbwizard.common.JDBCDriverClass = JDBC ドライバー・クラス
-dbwizard.common.URLFits = 生成された URL が JDBC ドライバーの書式を満たしていることを確認してください。
-dbwizard.common.actions = 操作
-dbwizard.common.blockingTimeout = ブロッキング・タイムアウト
-dbwizard.common.cancel = キャンセル
-dbwizard.common.configFile = 構成ファイル
-dbwizard.common.confirmAndDeploy = 確認とデプロイ
-dbwizard.common.confirmPassword = 確認用パスワード
-dbwizard.common.connectionPoolParameters = 接続プールのパラメーター
-dbwizard.common.delete = 削除
-dbwizard.common.deploy = デプロイ
-dbwizard.common.downloadDriver = ドライバーのダウンロード
-dbwizard.common.driverJAR = ドライバーの JAR
-dbwizard.common.driverJARExplanation = JAR ファイルはデータベース接続に必要です。CTRL + クリック、SHIFT + クリックを使用して複数の JAR ファイルを選択することができます。<br>JAR ファイルは GERONIMO/repository へ事前にインストールされている必要があります。(または
-dbwizard.common.driverTransactionTypes = コネクション・プールがサポートするトランザクション・タイプ
-dbwizard.common.edit = 編集
-dbwizard.common.editSettings = 再入力
-dbwizard.common.emptyText = フォーカスされている項目は空欄にできません。
-dbwizard.common.finish = 終了
-dbwizard.common.idleTimeout = アイドル・タイムアウト
-dbwizard.common.import = {0} インポート
-dbwizard.common.importFromJBoss = JBoss 4 から移行
-dbwizard.common.importFromWebLogic = WebLogic 8.1 から移行
-dbwizard.common.inMilliseconds = ミリ秒
-dbwizard.common.inMinutes = 分
-dbwizard.common.maxNoOfCon = プール内のコネクションの最大数。デフォルト値は 10 です。
-dbwizard.common.name = 名前
-dbwizard.common.next = 次へ
-dbwizard.common.passwordMismatch = パスワードが一致していません。
-dbwizard.common.poolMaxSize = 最大プール・サイズ
-dbwizard.common.poolMinSize = 最小プール・サイズ
-dbwizard.common.returnToList = 一覧に戻る
-dbwizard.common.save = 保存
-dbwizard.common.showPlan = プラン表示
-dbwizard.common.skipRemainingPools = 残りのプールをスキップ
-dbwizard.common.skipTestAndDeploy = テストをスキップしてデプロイ
-dbwizard.common.skipTestAndShowPlan = テストをスキップしてプラン表示
-dbwizard.common.state = 状態
-dbwizard.common.testConnection = テスト接続
-dbwizard.common.transactionType = トランザクション・タイプ
-dbwizard.common.usingPoolWizard = Geronimo データベース・プール・ウイザードの使用
-dbwizard.confirmURL.blockingTimeoutExp = 接続待ち時間の長さ。空欄にするとデフォルト値を設定します。
-dbwizard.confirmURL.driverStatus = ドライバーの状態
-dbwizard.confirmURL.idleTimeoutExp = コネクションを閉じるまでの待ち時間。空欄にするとデフォルト値を設定します。
-dbwizard.confirmURL.loadedSuccessfully = 正常にロードしました
-dbwizard.confirmURL.maxNoOfCon = プール内のコネクションの最大数。空欄にするとデフォルト値を設定します。
-dbwizard.confirmURL.minimumNoOfCon = プール内のコネクションの最小数。空欄にするとデフォルト値を設定します。
-dbwizard.confirmURL.title = <b>データベース・プールの作成</b> -- Step 3: プールの最終構成
-dbwizard.downloadStatus.summary = ドライバーのダウンロード経過を監視します。
-dbwizard.downloadStatus.title = <b>データベース・プールの作成</b> -- ドライバーのダウンロード
-dbwizard.edit.basicConProperties = 接続の基本属性
-dbwizard.edit.blockingTimeoutExp = 接続時の待ち時間。デフォルト値は 5000 です。
-dbwizard.edit.errorMsg01 = 最小プール・サイズは数値である必要があります。デフォルト値は 0 です。
-dbwizard.edit.errorMsg02 = 最小プール・サイズは正数である必要があります。デフォルト値は 0 です。
-dbwizard.edit.errorMsg03 = 最大プール・サイズは数値である必要があります。デフォルト値は 10 です。
-dbwizard.edit.errorMsg04 = 最大プール・サイズは 0 より大きい数値である必要があります。デフォルト値は 10 です。
-dbwizard.edit.errorMsg05 = 最大プール・サイズは最小プール・サイズより大きい数値である必要があります。
-dbwizard.edit.idleTimeoutExp = 使用されていないコネクションを放置しておく時間。デフォルト値は 15 です。
-dbwizard.edit.maxNoOfCon = プール内のコネクションの最大数。デフォルト値は 10 です。
-dbwizard.edit.minimumNoOfCon = プール内のコネクションの最小数。デフォルト値は 0 です。
-dbwizard.edit.poolName = プール名
-dbwizard.edit.poolNameExp = サーバー内で他のデータベース・プール名と重複しない一意的な名前 (名前に空白を含めないでください)。
-dbwizard.edit.poolType = プール・タイプ
-dbwizard.edit.seeDocumentation = JDBC ドライバーのドキュメントを参照してください。
-dbwizard.edit.seeLog = 詳細はログを参照してください。
-dbwizard.edit.summary = このページでは、既存のデータベース・プールを編集します。
-dbwizard.edit.unableToLoadDriver = 指定された JAR ファイルからドライバーをロードできません!
-dbwizard.importStatus.currentPools = サーバー内のプール
-dbwizard.importStatus.importFailed = インポート処理の失敗、または、有効なデータベースが見つかりません!
-dbwizard.importStatus.importMessages = インポート・メッセージ
-dbwizard.importStatus.importStatus = インポート状態
-dbwizard.importStatus.originalJNDI = オリジナルの JNDI
-dbwizard.importStatus.originalName = オリジナルの名前
-dbwizard.importStatus.summary = 認識されたデータベース・プールは以下の通りです。いずれのプールも Geronimo にデプロイ可能で、JDBC プール、または、Geronimo がサポートする XA アダプターの XA プールとして構成されます。以下のプール一覧は、インポート処理の状況メッセージです。
-dbwizard.importStatus.title = <b>データベース・プールのインポート</b> -- Step 2: インポートしたデータの確認
-dbwizard.importUpload.aboutWebLogic = WebLogic 8.1 が Geronimo と同じマシンにインストールされていて WebLogic のドメイン・ディレクトリーが Geronimo を実行しているユーザーから参照可能であれば、WebLogic のインストレーションとドメイン・ディレクトリーを直接参照することができます。この方式の場合、インポート処理がデータベースのパスワードを読み取る利点があります。これに対して <tt>config.xml</tt> をインポートする場合は、パスワードを再入力する必要があります。
-dbwizard.importUpload.alternateImport = 代替 {0} のインポート
-dbwizard.importUpload.domainDirectoryPath = ドメイン・ディレクトリー・パス
-dbwizard.importUpload.domainDirectoryPathExp = WebLogic ドメインのドメイン・ディレクトリー (<tt>config.xml</tt> が格納されているディレクトリー) の絶対パスを入力してください。
-dbwizard.importUpload.enterFullPath = WebLogic 8.1 の <tt>weblogic81/server/lib</tt> ディレクトリーの絶対パスを入力してください。
-dbwizard.importUpload.path = パス
-dbwizard.importUpload.pleaseSelect = 選択してください
-dbwizard.importUpload.summary = このページでは、他のアプリケーション・サーバーのデータベース・プールのインポートを開始します。インポートするには、以下の項目を使って構成ファイルをアップロードする必要があります。その後、属性値を変換して、構成で探索する各プールの構成の確認を求められます。
-dbwizard.importUpload.title = <b>データベース・プールのインポート</b> -- Step 1: 構成ファイルのアップロード
-dbwizard.list.createPool = 新規データベース・プールの作成
-dbwizard.list.deployedAs = デプロイ
-dbwizard.list.hasDatabasePools = 一覧の各プールの <b>使用方法</b> リンクをクリックすると、アプリケーションからプールを使用する方法のサンプルが表示されます。
-dbwizard.list.noDatabasePools = データベース・プールが定義されていません
-dbwizard.list.serverWide = サーバ全体
-dbwizard.list.summary = このページでは使用可能なデータベース・プールの一覧を表示します。
-dbwizard.list.usage = 使用方法
-dbwizard.selectDatabase.databaseType = データベース・タイプ
-dbwizard.selectDatabase.databaseTypeExp = 接続するデータベースのタイプ
-dbwizard.selectDatabase.nameOfPool = データベース・プールの名前
-dbwizard.selectDatabase.nameOfPoolExplanation = サーバー内で他のデータベース・プール名と重複しない一意的な名前 (名前に空白を含めないでください)。
-dbwizard.selectDatabase.title = <b>データベース・プールの作成</b> -- Step 1: 名前、データベースの設定
-dbwizard.selectDownload.otherJDBCDrivers = ダウンロードしたい他の JDBC ドライバーがここにあります (geronimo/repository/ 配下のどこかに保管されます)
-dbwizard.selectDownload.selectDriver = ドライバーの選択
-dbwizard.selectDownload.selectDriverExp = Geronimo が自動的にダウンロードするドライバー。
-dbwizard.selectDownload.selectOtherDatabase = データベースから "その他" を選択してください。
-dbwizard.selectDownload.selectPredefinedDatabase = 既存のデータベースから選択
-dbwizard.selectDownload.summary = <p>このページでは、データベースのドライバーを自動でダウンロードします。ドライバーの JAR は、ユーザー登録やログインなしで使用可能なオンラインです。</p><p><i>このページからロードする時間がとてもかかったり、以下の一覧にドライバーがない場合、おそらく Geronimo のインストール機能がドライバーをダウンロードする構成ファイルを取得する際に apache.org へ接続できないと思われます。不便で申し訳ございませんが、再度試みるか、ドライバーを手動でインストールしてください (geronimo/repository/ 配下のディレクトリーにドライバーをコピーしてください)。</i></p>
-dbwizard.selectDownload.title = <b>データベース・プールの作成</b> -- Step 2 ドライバー、JAR、パラメーターの設定
-dbwizard.showPlan.addToEAR = EAR に追加
-dbwizard.showPlan.deployAsPartEAR = トップレベルのデータベース・プールとして登録する代わりに、EAR の一部としてデプロイすることもできます。このプランを使って EAR にデータベース・プールを追加するには以下の操作を実行してください。<ol> <li>プラン・ファイルをコピー＆ペーストで保存</li> <li>プランファイルを EAR ファイルのトップレベルに保存</li> <li>RAR ファイルを <tt>GERONIMO_HOME/{0}</tt> からコピーして、EAR ファイルのトップレベルに保存</li> <li>(正しい RAR ファイル名とプラン・ファイル名を代用し) このような <tt>module</tt> 要素を持つ <tt>META-INF/geronimo-application.xml</tt> を EAR ファイル内に作成:</li></ol>
-dbwizard.showPlan.deployCommand = デプロイ・コマンド
-dbwizard.showPlan.deployPool = プールのデプロイ
-dbwizard.showPlan.deployPoolFromCommandLine = このプランを使ってコマンドラインからデータベース・プールをデプロイするには、(<tt>plan-file.xml</tt> と言う名前の) ファイルに保存して、以下のコマンドを実行して下さい。
-dbwizard.showPlan.deploymentPlan = デプロイメント・プラン
-dbwizard.showPlan.title = <b>データベース・プールの作成</b> -- デプロイメント・プランの表示
-dbwizard.testConnection.connectedTo = 接続済み
-dbwizard.testConnection.connectionError = 接続失敗 (以下を参照)
-dbwizard.testConnection.deployAnyway = デプロイ中止
-dbwizard.testConnection.testAgain = 再テスト
-dbwizard.testConnection.testError = テスト・エラー
-dbwizard.testConnection.testResult = テスト結果
-dbwizard.testConnection.title = <b>データベース・プールの作成</b> -- Step 4: テスト接続
-dbwizard.tranql-connector-db2-xa.DatabaseName = データベース名
-dbwizard.tranql-connector-db2-xa.DatabaseNameExp = データベース・サーバーの名前を指定します。この名前は接続 URL のデータベースの一部として使用されます。
-dbwizard.tranql-connector-db2-xa.DowngradeHoldCursorsUnderXa = Hold カーソルのダウングレード
-dbwizard.tranql-connector-db2-xa.DowngradeHoldCursorsUnderXaExp = Hold カーソルと関連付けられているロックをダウングレードするかどうかを指定します。
-dbwizard.tranql-connector-db2-xa.DriverType = ドライバー・タイプ
-dbwizard.tranql-connector-db2-xa.DriverTypeExp = このデータソースに作成されたコネクションで使用するドライバー・タイプ。指定可能な値は 2 もしくは 4 です。デフォルト値はタイプ 4 です。
-dbwizard.tranql-connector-db2-xa.Password = パスワード
-dbwizard.tranql-connector-db2-xa.PasswordExp = \
-dbwizard.tranql-connector-db2-xa.PortNumber = ポート番号
-dbwizard.tranql-connector-db2-xa.PortNumberExp = リモート・データベース・サーバーが受信したコネクションを待ち受けるポート番号を指定します。DB2 サーバーのデフォルト値は 50000 です。
-dbwizard.tranql-connector-db2-xa.PreparedStatementCacheSize = PreparedStatement キャッシュ・サイズ
-dbwizard.tranql-connector-db2-xa.PreparedStatementCacheSizeExp = PreparedStatement キャッシュ・サイズは、PreparedStatement が各コネクションと対応させる数をドライバーに伝えます。デフォルトではステートメントをキャッシュしません。
-dbwizard.tranql-connector-db2-xa.ResultSetHoldability = ResultSetHoldability
-dbwizard.tranql-connector-db2-xa.ResultSetHoldabilityExp = ResultSetHoldability には指定可能な値が 2 つあります: HOLD_CURSORS_OVER_COMMIT と CLOSE_CURSORS_AT_COMMIT です。これらの値はどちらも resultSetConcurrency と resultSetConcurrency の有効な組み合わせに指定可能です。設定した値はコネクションのデフォルト holdability を上書きします。<br/><br/>HOLD_CURSORS_OVER_COMMIT = 1<br/>CLOSE_CURSORS_AT_COMMIT = 2
-dbwizard.tranql-connector-db2-xa.ServerName = サーバー名
-dbwizard.tranql-connector-db2-xa.ServerNameExp = サーバー名は DB2 ドライバーが接続するために必要なホストの名前 / IP アドレスです。デフォルト値はありません。
-dbwizard.tranql-connector-db2-xa.TraceFile = トレース・ファイル
-dbwizard.tranql-connector-db2-xa.TraceFileAppend = トレース・ファイル挿入
-dbwizard.tranql-connector-db2-xa.TraceFileAppendExp = トレース・ファイル属性で指定されたファイルに挿入するか、または、上書きするかを指定します。この属性のデータ・タイプはブーリアンです。デフォルト値は false で、トレース・ファイル属性で指定されたファイルが上書きされることを意味します。
-dbwizard.tranql-connector-db2-xa.TraceFileExp = トレースを記録するトレース・ファイルの名前。
-dbwizard.tranql-connector-db2-xa.UserName = ユーザー名
-dbwizard.tranql-connector-db2-xa.UserNameExp = リモート・データベース・サーバーへの接続に使用されるユーザー ID の名前。
-dbwizard.tranql-connector-derby-client-local.CreateDatabase = データベースの作成
-dbwizard.tranql-connector-derby-client-local.CreateDatabaseExp = データベースが存在していなかった場合に作成するかどうかを示すフラグ。
-dbwizard.tranql-connector-derby-client-local.DatabaseName = データベース名
-dbwizard.tranql-connector-derby-client-local.DatabaseNameExp = 接続先のデータベースの名前。
-dbwizard.tranql-connector-derby-client-local.LoginTimeout = ログイン・タイムアウト
-dbwizard.tranql-connector-derby-client-local.LoginTimeoutExp = リモート・ログインを終了する前に待機する時間。
-dbwizard.tranql-connector-derby-client-local.Password = パスワード
-dbwizard.tranql-connector-derby-client-local.PasswordExp = 物理コネクションを確立するために使用されるパスワード資格情報。
-dbwizard.tranql-connector-derby-client-local.PortNumber = ポート番号
-dbwizard.tranql-connector-derby-client-local.PortNumberExp = 接続先 IP のポート番号。
-dbwizard.tranql-connector-derby-client-local.ServerName = サーバー名
-dbwizard.tranql-connector-derby-client-local.ServerNameExp = 接続先のサーバーの名前。
-dbwizard.tranql-connector-derby-client-local.UserName = ユーザー名
-dbwizard.tranql-connector-derby-client-local.UserNameExp = 物理コネクションを確立するために使用されるユーザー名。デフォルト・スキーマも確立します。省略すると、エンジンは 'APP' をデフォルト設定します。
-dbwizard.tranql-connector-derby-client-xa.CreateDatabase = データベース作成
-dbwizard.tranql-connector-derby-client-xa.CreateDatabaseExp = データベースが存在していなかった場合に作成するかどうかを示すフラグ。
-dbwizard.tranql-connector-derby-client-xa.DatabaseName = データベース名
-dbwizard.tranql-connector-derby-client-xa.DatabaseNameExp = 接続先のデータベースの名前。
-dbwizard.tranql-connector-derby-client-xa.LoginTimeout = ログイン・タイムアウト
-dbwizard.tranql-connector-derby-client-xa.LoginTimeoutExp = リモート・ログインを終了する前に待機する時間。
-dbwizard.tranql-connector-derby-client-xa.Password = パスワード
-dbwizard.tranql-connector-derby-client-xa.PasswordExp = 物理コネクションを確立するために使用されるパスワード資格情報。
-dbwizard.tranql-connector-derby-client-xa.PortNumber = ポート番号
-dbwizard.tranql-connector-derby-client-xa.PortNumberExp = 接続先 IP のポート番号。
-dbwizard.tranql-connector-derby-client-xa.ServerName = サーバー名
-dbwizard.tranql-connector-derby-client-xa.ServerNameExp = 接続先のサーバーの名前。
-dbwizard.tranql-connector-derby-client-xa.UserName = ユーザー名
-dbwizard.tranql-connector-derby-client-xa.UserNameExp = 物理コネクションを確立するために使用されるユーザー名。デフォルト・スキーマも確立します。省略すると、エンジンは 'APP' をデフォルト設定します。
-dbwizard.tranql-connector-derby-embed-local.CreateDatabase = データベース作成
-dbwizard.tranql-connector-derby-embed-local.CreateDatabaseExp = データベースが存在していなかった場合に作成するかどうかを示すフラグ。
-dbwizard.tranql-connector-derby-embed-local.DatabaseName = データベース名
-dbwizard.tranql-connector-derby-embed-local.DatabaseNameExp = 接続先のデータベースの名前。
-dbwizard.tranql-connector-derby-embed-local.LoginTimeout = ログイン・タイムアウト
-dbwizard.tranql-connector-derby-embed-local.LoginTimeoutExp = 現在 Derby ではこのコンフィグ属性を無視します。
-dbwizard.tranql-connector-derby-embed-local.Password = パスワード
-dbwizard.tranql-connector-derby-embed-local.PasswordExp = 物理コネクションを確立するために使用されるパスワード資格情報。
-dbwizard.tranql-connector-derby-embed-local.ShutdownDatabase = データベースのシャットダウン
-dbwizard.tranql-connector-derby-embed-local.ShutdownDatabaseExp = "shutdown" 文字列を設定すると、データソースから java.sql.Connection オブジェクトを取得する時にデータベースをシャットダウンさせます。
-dbwizard.tranql-connector-derby-embed-local.UserName = ユーザー名
-dbwizard.tranql-connector-derby-embed-local.UserNameExp = 物理コネクションを確立するために使用されるユーザー名。デフォルト・スキーマも確立します。省略すると、エンジンは 'APP' をデフォルト設定します。
-dbwizard.tranql-connector-derby-embed-xa.CreateDatabase = データベース作成
-dbwizard.tranql-connector-derby-embed-xa.CreateDatabaseExp = データベースが存在していなかった場合に作成するかどうかを示すフラグ。これはブーリアン値です。
-dbwizard.tranql-connector-derby-embed-xa.DatabaseName = データベース名
-dbwizard.tranql-connector-derby-embed-xa.DatabaseNameExp = 接続先のデータベースの名前。
-dbwizard.tranql-connector-derby-embed-xa.LoginTimeout = ログイン・タイムアウト
-dbwizard.tranql-connector-derby-embed-xa.LoginTimeoutExp = 現在 Derby ではこのコンフィグ属性を無視します。
-dbwizard.tranql-connector-derby-embed-xa.Password = パスワード
-dbwizard.tranql-connector-derby-embed-xa.PasswordExp = 物理コネクションを確立するために使用されるパスワード資格情報。
-dbwizard.tranql-connector-derby-embed-xa.UserName = ユーザー名
-dbwizard.tranql-connector-derby-embed-xa.UserNameExp = 物理コネクションを確立するために使用されるユーザー名。デフォルト・スキーマも確立します。省略すると、エンジンは 'APP' をデフォルト設定します。
-dbwizard.tranql-connector-informix-xa.DatabaseName = データベース名
-dbwizard.tranql-connector-informix-xa.DatabaseNameExp = データベースの名前。
-dbwizard.tranql-connector-informix-xa.IfxHost = IfxHost
-dbwizard.tranql-connector-informix-xa.IfxHostExp = Informix データベース・サーバーの IP アドレスまたはホスト名。
-dbwizard.tranql-connector-informix-xa.IfxProtocolTrace = IfxProtocolTrace
-dbwizard.tranql-connector-informix-xa.IfxProtocolTraceExp = IfxPROTOCOLTRACE の値。
-dbwizard.tranql-connector-informix-xa.IfxProtocolTraceFile = IfxProtocolTraceFile
-dbwizard.tranql-connector-informix-xa.IfxProtocolTraceFileExp = IfxPROTOCOLTRACEFILE の値。
-dbwizard.tranql-connector-informix-xa.IfxSQLHostFile = IfxSQLHostFile
-dbwizard.tranql-connector-informix-xa.IfxSQLHostFileExp = IfxSQLH_FILE の値。
-dbwizard.tranql-connector-informix-xa.IfxSQLHostType = IfxSQLHostType
-dbwizard.tranql-connector-informix-xa.IfxSQLHostTypeExp = IfxSQLH_TYPE の値。
-dbwizard.tranql-connector-informix-xa.Password = パスワード
-dbwizard.tranql-connector-informix-xa.PasswordExp = パスワード (大文字と小文字を区別しません)。
-dbwizard.tranql-connector-informix-xa.PortNumber = ポート番号
-dbwizard.tranql-connector-informix-xa.PortNumberExp = Informix データベース・サーバーのポート番号。
-dbwizard.tranql-connector-informix-xa.ServerName = サーバー名
-dbwizard.tranql-connector-informix-xa.ServerNameExp = Informix データベース・サーバー・インスタンス名。
-dbwizard.tranql-connector-informix-xa.UserName = ユーザー名
-dbwizard.tranql-connector-informix-xa.UserNameExp = ユーザーの名前 (大文字と小文字を区別しません)。
-dbwizard.tranql-connector-mysql-local.DatabaseName = データベース名
-dbwizard.tranql-connector-mysql-local.DatabaseNameExp = 接続先のデータベースの名前。
-dbwizard.tranql-connector-mysql-local.Password = パスワード
-dbwizard.tranql-connector-mysql-local.PasswordExp = 物理コネクションを確立するために使用されるパスワード資格情報。
-dbwizard.tranql-connector-mysql-local.PortNumber = ポート番号
-dbwizard.tranql-connector-mysql-local.PortNumberExp = 接続先 IP のポート番号。
-dbwizard.tranql-connector-mysql-local.ServerName = サーバー名
-dbwizard.tranql-connector-mysql-local.ServerNameExp = 接続先のサーバーの名前。
-dbwizard.tranql-connector-mysql-local.UserName = ユーザー名
-dbwizard.tranql-connector-mysql-local.UserNameExp = 物理コネクションを確立するために使用されるユーザー名。
-dbwizard.tranql-connector-mysql-xa.DatabaseName = データベース名
-dbwizard.tranql-connector-mysql-xa.DatabaseNameExp = 接続先のデータベースの名前。
-dbwizard.tranql-connector-mysql-xa.Password = パスワード
-dbwizard.tranql-connector-mysql-xa.PasswordExp = 物理コネクションを確立するために使用されるパスワード資格情報。
-dbwizard.tranql-connector-mysql-xa.PortNumber = ポート番号
-dbwizard.tranql-connector-mysql-xa.PortNumberExp = 接続先 IP のポート番号。
-dbwizard.tranql-connector-mysql-xa.ServerName = サーバー名
-dbwizard.tranql-connector-mysql-xa.ServerNameExp = 接続先のサーバーの名前。
-dbwizard.tranql-connector-mysql-xa.UserName = ユーザー名
-dbwizard.tranql-connector-mysql-xa.UserNameExp = 物理コネクションを確立するために使用されるユーザー名。
-dbwizard.tranql-connector-oracle-local.DataSourceName = データソース名
-dbwizard.tranql-connector-oracle-local.DataSourceNameExp = \
-dbwizard.tranql-connector-oracle-local.DatabaseName = データベース名
-dbwizard.tranql-connector-oracle-local.DatabaseNameExp = \
-dbwizard.tranql-connector-oracle-local.Description = 記述
-dbwizard.tranql-connector-oracle-local.DescriptionExp = \
-dbwizard.tranql-connector-oracle-local.DriverType = ドライバー・タイプ
-dbwizard.tranql-connector-oracle-local.DriverTypeExp = \
-dbwizard.tranql-connector-oracle-local.LoginTimeout = ログイン・タイムアウト
-dbwizard.tranql-connector-oracle-local.LoginTimeoutExp = \
-dbwizard.tranql-connector-oracle-local.MaxStatements = 最大ステートメント数
-dbwizard.tranql-connector-oracle-local.MaxStatementsExp = \
-dbwizard.tranql-connector-oracle-local.NetworkProtocol = ネットワーク・プロトコル
-dbwizard.tranql-connector-oracle-local.NetworkProtocolExp = \
-dbwizard.tranql-connector-oracle-local.Password = パスワード
-dbwizard.tranql-connector-oracle-local.PasswordExp = \
-dbwizard.tranql-connector-oracle-local.PortNumber = ポート番号
-dbwizard.tranql-connector-oracle-local.PortNumberExp = \
-dbwizard.tranql-connector-oracle-local.ServerName = サーバー名
-dbwizard.tranql-connector-oracle-local.ServerNameExp = \
-dbwizard.tranql-connector-oracle-local.ServiceName = サービス名
-dbwizard.tranql-connector-oracle-local.ServiceNameExp = \
-dbwizard.tranql-connector-oracle-local.TNSEntryName = TNS エントリー名
-dbwizard.tranql-connector-oracle-local.TNSEntryNameExp = \
-dbwizard.tranql-connector-oracle-local.UserName = ユーザー名
-dbwizard.tranql-connector-oracle-local.UserNameExp = \
-dbwizard.tranql-connector-oracle-xa.DataSourceName = データソース名
-dbwizard.tranql-connector-oracle-xa.DataSourceNameExp = \
-dbwizard.tranql-connector-oracle-xa.DatabaseName = データベース名
-dbwizard.tranql-connector-oracle-xa.DatabaseNameExp = \
-dbwizard.tranql-connector-oracle-xa.Description = 記述
-dbwizard.tranql-connector-oracle-xa.DescriptionExp = \
-dbwizard.tranql-connector-oracle-xa.DriverType = ドライバー・タイプ
-dbwizard.tranql-connector-oracle-xa.DriverTypeExp = \
-dbwizard.tranql-connector-oracle-xa.LoginTimeout = ログイン・タイムアウト
-dbwizard.tranql-connector-oracle-xa.LoginTimeoutExp = \
-dbwizard.tranql-connector-oracle-xa.MaxStatements = 最大ステートメント数
-dbwizard.tranql-connector-oracle-xa.MaxStatementsExp = \
-dbwizard.tranql-connector-oracle-xa.NetworkProtocol = ネットワーク・プロトコル
-dbwizard.tranql-connector-oracle-xa.NetworkProtocolExp = \
-dbwizard.tranql-connector-oracle-xa.Password = パスワード
-dbwizard.tranql-connector-oracle-xa.PasswordExp = \
-dbwizard.tranql-connector-oracle-xa.PortNumber = ポート番号
-dbwizard.tranql-connector-oracle-xa.PortNumberExp = \
-dbwizard.tranql-connector-oracle-xa.ServerName = サーバー名
-dbwizard.tranql-connector-oracle-xa.ServerNameExp = \
-dbwizard.tranql-connector-oracle-xa.ServiceName = サービス名
-dbwizard.tranql-connector-oracle-xa.ServiceNameExp = \
-dbwizard.tranql-connector-oracle-xa.TNSEntryName = TNS エントリー名
-dbwizard.tranql-connector-oracle-xa.TNSEntryNameExp = \
-dbwizard.tranql-connector-oracle-xa.UserName = ユーザー名
-dbwizard.tranql-connector-oracle-xa.UserNameExp = \
-dbwizard.tranql-connector-postgresql-local.DatabaseName = データベース名
-dbwizard.tranql-connector-postgresql-local.DatabaseNameExp = 接続先のデータベースの名前。
-dbwizard.tranql-connector-postgresql-local.Password = パスワード
-dbwizard.tranql-connector-postgresql-local.PasswordExp = 物理コネクションを確立するために使用されるパスワード資格情報。
-dbwizard.tranql-connector-postgresql-local.PortNumber = ポート番号
-dbwizard.tranql-connector-postgresql-local.PortNumberExp = 接続先 IP のポート番号。
-dbwizard.tranql-connector-postgresql-local.PrepareThreshold = Prepare Threshold
-dbwizard.tranql-connector-postgresql-local.PrepareThresholdExp = \
-dbwizard.tranql-connector-postgresql-local.ServerName = サーバー名
-dbwizard.tranql-connector-postgresql-local.ServerNameExp = 接続先のサーバーの名前。
-dbwizard.tranql-connector-postgresql-local.UserName = ユーザー名
-dbwizard.tranql-connector-postgresql-local.UserNameExp = 物理コネクションを確立するために使用されるユーザー名。
-dbwizard.tranql-connector-postgresql-xa.DatabaseName = データベース名
-dbwizard.tranql-connector-postgresql-xa.DatabaseNameExp = 接続先のデータベースの名前。
-dbwizard.tranql-connector-postgresql-xa.Password = パスワード
-dbwizard.tranql-connector-postgresql-xa.PasswordExp = 物理コネクションを確立するために使用されるパスワード資格情報。
-dbwizard.tranql-connector-postgresql-xa.PortNumber = ポート番号
-dbwizard.tranql-connector-postgresql-xa.PortNumberExp = 接続先 IP のポート番号。
-dbwizard.tranql-connector-postgresql-xa.PrepareThreshold = Prepare Threshold
-dbwizard.tranql-connector-postgresql-xa.PrepareThresholdExp = \
-dbwizard.tranql-connector-postgresql-xa.ServerName = サーバー名
-dbwizard.tranql-connector-postgresql-xa.ServerNameExp = サーバー名
-dbwizard.tranql-connector-postgresql-xa.UserName = ユーザー名
-dbwizard.tranql-connector-postgresql-xa.UserNameExp = 物理コネクションを確立するために使用されるユーザー名。
-dbwizard.tranql-connector-sqlserver2000-xa.DatabaseName = データベース名
-dbwizard.tranql-connector-sqlserver2000-xa.DatabaseNameExp = 接続する SQL Server のデータベースの名前。
-dbwizard.tranql-connector-sqlserver2000-xa.Password = パスワード
-dbwizard.tranql-connector-sqlserver2000-xa.PasswordExp = SQL Server データベースに接続するために使用される大文字と小文字を区別しないパスワード。
-dbwizard.tranql-connector-sqlserver2000-xa.PortNumber = ポート番号
-dbwizard.tranql-connector-sqlserver2000-xa.PortNumberExp = SQL Server の TCP ポートで、デフォルト値は 1433 です。
-dbwizard.tranql-connector-sqlserver2000-xa.SelectMethod = SelectMethod
-dbwizard.tranql-connector-sqlserver2000-xa.SelectMethodExp = SelectMethod={cursor | direct}。それ以上の情報はマイクロソフトのドキュメントを参照してください。Direct は管理環境の中で基本的に動作しません。
-dbwizard.tranql-connector-sqlserver2000-xa.SendStringParameters = SendStringParameters
-dbwizard.tranql-connector-sqlserver2000-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}。詳細はマイクロソフトのドキュメントを参照してください。デフォルト値は true で、これによってエンコーディングの不一致はまず発生しませんが、一部の環境では処理速度が少々低下するかもしれません。
-dbwizard.tranql-connector-sqlserver2000-xa.ServerName = サーバー名
-dbwizard.tranql-connector-sqlserver2000-xa.ServerNameExp = SQL Server の IP アドレス。
-dbwizard.tranql-connector-sqlserver2000-xa.UserName = ユーザー名
-dbwizard.tranql-connector-sqlserver2000-xa.UserNameExp = SQL Server データベースに接続するために使用される大文字と小文字を区別しないユーザー名。
-dbwizard.tranql-connector-sqlserver2005-xa.DatabaseName = データベース名
-dbwizard.tranql-connector-sqlserver2005-xa.DatabaseNameExp = 接続する SQL Server のデータベースの名前。
-dbwizard.tranql-connector-sqlserver2005-xa.Password = パスワード
-dbwizard.tranql-connector-sqlserver2005-xa.PasswordExp = SQL Server データベースに接続するために使用される大文字と小文字を区別しないパスワード。
-dbwizard.tranql-connector-sqlserver2005-xa.PortNumber = ポート番号
-dbwizard.tranql-connector-sqlserver2005-xa.PortNumberExp = SQL Server の TCP ポートで、デフォルト値は 1433 です。
-dbwizard.tranql-connector-sqlserver2005-xa.SelectMethod = SelectMethod
-dbwizard.tranql-connector-sqlserver2005-xa.SelectMethodExp = SelectMethod={cursor | direct}。それ以上の情報はマイクロソフトのドキュメントを参照してください。Direct は管理環境の中で基本的に動作しません。
-dbwizard.tranql-connector-sqlserver2005-xa.SendStringParameters = SendStringParameters
-dbwizard.tranql-connector-sqlserver2005-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}。詳細はマイクロソフトのドキュメントを参照してください。初期値は true で、これによってエンコーディングの不一致はまず発生しませんが、一部の環境では処理速度が少々低下するかもしれません。
-dbwizard.tranql-connector-sqlserver2005-xa.ServerName = サーバー名
-dbwizard.tranql-connector-sqlserver2005-xa.ServerNameExp = SQL Server の IP アドレス。
-dbwizard.tranql-connector-sqlserver2005-xa.UserName = ユーザー名
-dbwizard.tranql-connector-sqlserver2005-xa.UserNameExp = SQL Server データベースに接続するために使用される大文字と小文字を区別しないユーザー名。
-dbwizard.usage.applicationCode = アプリケーションのコード
-dbwizard.usage.geronimo_webExp = <p>Geronimo のデータベース・プールを定義したリソース参照を使用するには、Web アプリケーションに <tt>geronimo-web.xml</tt> デプロイメント・プランが必要です。これは、WAR ファイルの WEB-INF ディレクトリに同梱しても、コマンドライン上のデプロイ・ツールで分割して指定しても構いません。\r\n<tt>geronimo-web.xml</tt> プランには、データベース・プールのモジュールを記述した <tt>dependency</tt> 要素と、前述の <tt>web.xml</tt> <tt>resource-ref</tt>に対応した <tt>resource-ref</tt> ブロックが必要で、これは指定したデータベース・プールへのリソース参照に結びつけられます。ここでは、<tt>ref-name</tt> が <tt>web.xml</tt> の <tt>res-ref-name</tt> (前述) と一致し、<tt>resource-link</tt> はデータベース・プールの名前と一致していなければいけません。</p> <p><i>{0} という名前の Geronimo にデプロイされた 1 つのデータベース・プールのみを使用する場合は、以下のようになります。</i></p>\r\n
-dbwizard.usage.moreThanOnePool = 複数の {0} という名前の JNDI リソースを使用すると (例えば、2 つの dependencies モジュールが<b>それぞれ</b> {1} という名前のコンポーネントを含んでいる場合) 、以下のように使用するプールをさらに明示的に指定することができます:
-dbwizard.usage.resource_refSection = <tt>web.xml</tt> には、以下のようなデータベース・プールを記述した <tt>resource-ref</tt> セクションが必要です。<tt>res-ref-name</tt> にはプールへの参照をマップする必要があることや、アプリケーションがプールへアクセスするために必要であるということに注意してください。
-dbwizard.usage.searchOnlyOne = 上記の例では、アプリケーションと dependencies の各モジュール (および、それらの依存モジュール、等) が {0} という名前のプールを検索します。
-dbwizard.usage.title = このページでは、J2EE アプリケーションからデータベース・プール {0} を使用する方法について説明します。この例は Web アプリケーションですが、Web アプリケーション以外でも同様の方法で動作します。
-dbwizard.usage.usingInCode = データベース・プールへの参照を取得するには、以下のようにコーディングします。JNDI をルックアップする文字列は <tt>java:comp/env/</tt> に web.xml に記述された <tt>res-ref-name</tt> を連結したものであるということに注意してください (上記参照)。
-
-derbylogmanager.help.title = このポートレットでは、Geronimo 内部のデータベースである Derby のログファイルを表示します。
-derbylogmanager.view.Lines = 行
-derbylogmanager.view.containingText = 検索文字列
-derbylogmanager.view.filterLog = ログのフィルター
-derbylogmanager.view.filterResults = 検索結果
-derbylogmanager.view.integer = フォーカスされている項目は整数値である必要があります。
-derbylogmanager.view.matchCriterial = ログファイルの総メッセージ数 {0} 件のうち、{1} 件が条件に一致しました。
-derbylogmanager.view.maxResults = 最大結果数
-derbylogmanager.view.noEntries = 指定した条件に一致するログが見つかりません。
-derbylogmanager.view.numberOfResultsCapped = 結果の表示件数には上限があります。
-derbylogmanager.view.refresh = 更新
-derbylogmanager.view.to = ～
-
-internaldb.common.DB = データベース
-internaldb.common.DBMajorVersion = DB メジャー・バージョン
-internaldb.common.DBMinorVersion = DB マイナー・バージョン
-internaldb.common.DBProductName = DB プロダクト名
-internaldb.common.DBProductVersion = DB プロダクト・バージョン
-internaldb.common.Item = 項目
-internaldb.common.JDBCMajorVersion = JDBC メジャー・バージョン
-internaldb.common.JDBCMinorVersion = JDBC マイナー・バージョン
-internaldb.common.SQLCommands = SQL コマンド
-internaldb.common.SQLStateType = SQL 標準
-internaldb.common.Value = 値
-internaldb.common.application = アプリケーション
-internaldb.common.create = 作成
-internaldb.common.createDB = DB<br/>作成
-internaldb.common.databases = データベース
-internaldb.common.defaultTransactionIsolation = デフォルトの分離レベル
-internaldb.common.delete = 削除
-internaldb.common.deleteDB = DB<br/>削除
-internaldb.common.driver = ドライバー
-internaldb.common.driverMajorVersion = ドライバーのメジャー・バージョン
-internaldb.common.driverMinorVersion = ドライバーのマイナー・バージョン
-internaldb.common.driverName = ドライバー名
-internaldb.common.driverVersion = ドライバーのバージョン
-internaldb.common.empty = データなし
-internaldb.common.emptyText = フォーカスされている項目は空欄にできません。
-internaldb.common.etc = その他
-internaldb.common.functions = 関数
-internaldb.common.note = 注意
-internaldb.common.numericFunctions = 数学関数
-internaldb.common.queryResult = 検索結果
-internaldb.common.readOnly = 読み取り専用
-internaldb.common.result = 実行結果
-internaldb.common.resultSetHoldability = 結果セットの保持
-internaldb.common.schemas = スキーマ
-internaldb.common.stringFunctions = 文字列関数
-internaldb.common.supportedSQLKeywords = サポートする SQL キーワード
-internaldb.common.supportedTypes = サポートする型
-internaldb.common.system = システム
-internaldb.common.systemFunctions = システム関数
-internaldb.common.table = テーブル
-internaldb.common.tableTypes = テーブルのタイプ
-internaldb.common.tables = テーブル
-internaldb.common.timeDateFunctions = 日付時刻関数
-internaldb.common.useDB = DB<br/>選択
-internaldb.common.useDS = データソース<br/>選択
-internaldb.common.userName = ユーザー名
-internaldb.common.viewContents = 内容表示
-internaldb.common.viewDatabases = データベース一覧
-internaldb.common.viewTables = テーブル一覧
-internaldb.dbViewerHelp.content = 使用可能なすべてのデータベースとそのテーブルを表示し、テーブルのデータも表示します。テーブルの一覧を表示するには、メインウインドウにて各データベースのアプリケーション・リンクかシステム・リンクをクリックします。これでデータベース内のテーブルが表示されます。テーブルのデータを参照するには、"内容表示" リンクをクリックします。DB ビューアー・ウインドウの最下部では、他のビューに戻る "データベース表示" や "テーブル表示" のリンクがあります。
-internaldb.internalDBHelp.content = このページでは、プロダクト名、データベースのバージョン、サポートしている機能と SQL コマンドといった内部データベースの情報を表示します。すべての情報を参照するには、画面をスクロールして下さい。
-internaldb.listDatabases.nodatabases = データベースなし
-internaldb.listDatabases.title = データベース一覧
-internaldb.listTables.noTables = テーブルなし
-internaldb.runSQLHelp.createDBExp = 新規データベースの名前を入力して、 "作成" ボタンをクリックしてください。
-internaldb.runSQLHelp.deleteDBExp = プルダウン・メニューから選択して "削除" ボタンをクリックすると、既存のデータベースを削除します。\r\n
-internaldb.runSQLHelp.runSQLExp = "SQL コマンド" テキストボックスに、(複数のステートメントがある場合) セミコロンで区切って、SQL コマンドを入力してください。SQL を実行するには、"SQL 実行" ボタンをクリックします。
-internaldb.runSQLHelp.summary = SQL コマンドの実行、テーブル内のデータの操作、データベースの作成、データベースの削除ができます。"SQL コマンド" テキストボックスに SQL コマンドを入力し、"SQL 実行" ボタンをクリックしてください。
-internaldb.runSQLHelp.useDBExp = プルダウン・メニューから、使用するデータベースを選択してください。
-internaldb.runSQLHelp.useDSExp = プルダウン・メニューから、使用するデータソースを選択してください。
-internaldb.runSQLNormal.note1 = 1) 複数ステートメントを分割するには ';' を使用します
-internaldb.runSQLNormal.note2 = 2) 単一の 'Select' ステートメントについてはクエリー結果を表示します
-internaldb.runSQLNormal.note3 = 3) リテラル文字列を入力するにはシングル・クォートを使用します
-internaldb.runSQLNormal.reallyDeleteDatabase = このデータベースを削除しますか?
-internaldb.runSQLNormal.runSQL = SQL 実行
diff --git a/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_zh.properties b/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_zh.properties
deleted file mode 100644
index 1ef5b25..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/i18n-resources/systemdatabase_zh.properties
+++ /dev/null
@@ -1,451 +0,0 @@
-#Generated by ResourceBundle Editor (http://eclipse-rbe.sourceforge.net)
-#=====================================================================
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#=====================================================================
-
-dbwizard.basicParams.database = 数据库
-dbwizard.basicParams.driverConnectionProperties = 驱动程序连接属性
-dbwizard.basicParams.host = 主机
-dbwizard.basicParams.port = 端口
-dbwizard.basicParams.propertyExp = 用来连接 {0} 的属性。该属性值可选（请参考 JDBC 驱动的文档）
-dbwizard.basicParams.seeDocumentation = 请参考 JDBC 驱动的文档
-dbwizard.basicParams.title = <b>创建数据库连接池</b> -- 步骤2: 选择驱动程序，JAR，参数
-dbwizard.basicParams.typicalJDBCURL = 典型的 JDBC URL
-dbwizard.basicParams.unableToLoadDriver = 不能从选中的 JAR 包中加载驱动!
-dbwizard.common.DBPassword = 数据库密码
-dbwizard.common.DBPasswordExp = 用于连接数据库的密码
-dbwizard.common.DBUserName = 数据库用户名
-dbwizard.common.DBUserNameExp = 用于连接数据库的用户名
-dbwizard.common.JDBCConnectURL = JDBC 连接 URL
-dbwizard.common.JDBCDriverClass = JDBC 驱动类
-dbwizard.common.URLFits = 确保生成的 URL 符合你的 JDBC 驱动的语法。
-dbwizard.common.actions = 操作
-dbwizard.common.blockingTimeout = 阻塞超时
-dbwizard.common.cancel = 取消
-dbwizard.common.configFile = 配置文件
-dbwizard.common.confirmAndDeploy = 确认并部署
-dbwizard.common.confirmPassword = 确认密码
-dbwizard.common.connectionPoolParameters = 连接池参数
-dbwizard.common.delete = 删除
-dbwizard.common.deploy = 部署
-dbwizard.common.downloadDriver = 下载驱动
-dbwizard.common.driverJAR = 驱动 JAR
-dbwizard.common.driverJARExplanation = 连接到数据库时所需要的 JAR 包。使用 CTRL 或者 SHIFT 键选择多个 JAR 包。<br>这些 JAR 包应该已被安装在 GERONIMO/repository/ 目录下，（或者
-dbwizard.common.driverTransactionTypes = 该连接池支持的事务类型
-dbwizard.common.edit = 编辑
-dbwizard.common.editSettings = 编辑设置
-dbwizard.common.emptyText = 焦点所在字段不能为空。
-dbwizard.common.finish = 完成
-dbwizard.common.idleTimeout = 空闲时间
-dbwizard.common.import = 从{0}导入
-dbwizard.common.importFromJBoss = 从 JBoss 4导入
-dbwizard.common.importFromWebLogic = 从 WebLogic 8.1导入
-dbwizard.common.inMilliseconds = 毫秒
-dbwizard.common.inMinutes = 分钟
-dbwizard.common.maxNoOfCon = 连接池中最小连接数目。默认值是 10。
-dbwizard.common.name = 名字
-dbwizard.common.next = 下一步
-dbwizard.common.passwordMismatch = 密码不匹配。
-dbwizard.common.poolMaxSize = 连接数最大值
-dbwizard.common.poolMinSize = 连接数最小值
-dbwizard.common.returnToList = 返回列表
-dbwizard.common.save = 保存
-dbwizard.common.showPlan = 显示部署计划
-dbwizard.common.skipRemainingPools = 跳过剩余池
-dbwizard.common.skipTestAndDeploy = 跳过测试而直接部署
-dbwizard.common.skipTestAndShowPlan = 跳过测试而显示部署计划
-dbwizard.common.state = 状态
-dbwizard.common.testConnection = 测试连接
-dbwizard.common.transactionType = 事务类型
-dbwizard.common.usingPoolWizard = 使用 Geronimo 数据库连接池向导
-dbwizard.confirmURL.blockingTimeoutExp = 每次调用所需等待的最长时间。留空表示使用默认值。
-dbwizard.confirmURL.driverStatus = 驱动状态
-dbwizard.confirmURL.idleTimeoutExp = 连接在关闭之前能有多长空闲时间。留空表示使用默认值。
-dbwizard.confirmURL.loadedSuccessfully = 成功加载驱动
-dbwizard.confirmURL.maxNoOfCon = 连接池中最大连接数。留空表示使用默认值。
-dbwizard.confirmURL.minimumNoOfCon = 连接池中最小连接数。留空表示使用默认值。
-dbwizard.confirmURL.title = <b>创建数据库连接池</b> -- 步骤 3: 连接池最后配置
-dbwizard.downloadStatus.summary = 这个页面用于监测驱动程序下载过程。
-dbwizard.downloadStatus.title = <b>创建数据库连接池</b> -- 下载驱动
-dbwizard.edit.basicConProperties = 连接基本属性
-dbwizard.edit.blockingTimeoutExp = 每次调用所需等待的最长时间。默认为 5000。
-dbwizard.edit.errorMsg01 = 池的最小值必须是一个数字，默认值是 0.
-dbwizard.edit.errorMsg02 = 池的最小值不能是负数，默认值是 0.
-dbwizard.edit.errorMsg03 = 池的最大值必须是一个数字，默认值是 10.
-dbwizard.edit.errorMsg04 = 池的最大值必须大于 0，默认值是 10。
-dbwizard.edit.errorMsg05 = 池的最大值必须大于最小值。
-dbwizard.edit.idleTimeoutExp = 连接在关闭之前能有多长空闲时间。默认为 15。
-dbwizard.edit.maxNoOfCon = 连接池中最大连接数目。默认为 10.
-dbwizard.edit.minimumNoOfCon = 连接池中最小连接数目。默认为 0。
-dbwizard.edit.poolName = 连接池名称
-dbwizard.edit.poolNameExp = 一个不同于服务器中其它数据库连接池的名称（名称中请不要有空格）。
-dbwizard.edit.poolType = 连接池类型
-dbwizard.edit.seeDocumentation = 请参考 JDBC 驱动的文档
-dbwizard.edit.seeLog = 查看日志文件了解详情
-dbwizard.edit.summary = 这个页面用于编辑已存在的数据库连接池。
-dbwizard.edit.unableToLoadDriver = 不能从选中的 JAR 包中加载驱动!
-dbwizard.importStatus.currentPools = 服务器中现有的连接池
-dbwizard.importStatus.importFailed = 导入连接池失败，或者没有发现任何可用的数据库连接池！
-dbwizard.importStatus.importMessages = 导入过程中的消息
-dbwizard.importStatus.importStatus = 导入状态
-dbwizard.importStatus.originalJNDI = 初始 JNDI
-dbwizard.importStatus.originalName = 初始连接池名称
-dbwizard.importStatus.summary = 下表列出了可识别出的数据库连接池。你可以把任何普通 JDBC 连接池或者 XA 连接池部署到 Geronimo，因为 Geronimo 包含支持 XA 的适配器。下面的连接池列表是一个导入过程中的状态信息列表。
-dbwizard.importStatus.title = <b>导入数据库连接池</b> -- 步骤2: 检查已导入数据
-dbwizard.importUpload.aboutWebLogic = 如果 WebLogic 8.1 和 Geronimo 安装在同一台机器，并且运行 Geronimo 的用户有 WebLogic 域目录的读取权限的话，你也可以直接指向 WebLogic 的安装和域目录。这样的好处在于导入过程能够读取数据库的密码，而如果你仅仅导入上面的<tt>config.xml</tt>，你就必须重新输入所有的密码。
-dbwizard.importUpload.alternateImport = {0}可选导入项
-dbwizard.importUpload.domainDirectoryPath = 域目录路径
-dbwizard.importUpload.domainDirectoryPathExp = 请输入 WebLogic 域目录的完全路径（包含<tt>config.xml</tt>文件）。
-dbwizard.importUpload.enterFullPath = 请输入到 <tt>weblogic81/server/lib</tt> 目录的完全路径。
-dbwizard.importUpload.path = 路径
-dbwizard.importUpload.pleaseSelect = 请选择
-dbwizard.importUpload.summary = 这个页面开始从其它应用服务器导入数据库连接池的过程。为了导入连接池，你需要使用下面的字段来上传其它服务器的配置文件。而我们会尽量转换这些值。并让你确认在配置文件中找到的每个连接池的配置。
-dbwizard.importUpload.title = <b>导入数据库连接池</b> -- 步骤1: 上传配置文件<b>
-dbwizard.list.createPool = 创建新的数据库连接池
-dbwizard.list.deployedAs = 部署为
-dbwizard.list.hasDatabasePools = 对下面列出的每个连接池，你可以点击<b>用法</b>链接来查看一些指导你如何在你的应用中使用连接池的示例。
-dbwizard.list.noDatabasePools = 不存在预定义的数据库连接池
-dbwizard.list.serverWide = 服务器范围
-dbwizard.list.summary = 这个页面列出了所有可用的数据库连接池。
-dbwizard.list.usage = 用法
-dbwizard.selectDatabase.databaseType = 数据库类型
-dbwizard.selectDatabase.databaseTypeExp = 连接池要连接到的数据库类型。
-dbwizard.selectDatabase.nameOfPool = 数据库连接池名称
-dbwizard.selectDatabase.nameOfPoolExplanation = 取一个与服务器中其它数据库连接池不同的名称（名称中请不要有空格）。
-dbwizard.selectDatabase.title = <b>创建数据库连接池</b> -- 步骤1: 选择名称和数据库
-dbwizard.selectDownload.otherJDBCDrivers = 这里是你可能想自己下载的其它一些 JDBC 驱动（只需要保存它们到 Geronimo/repository/ 下的某个地方即可）
-dbwizard.selectDownload.selectDriver = 选择驱动
-dbwizard.selectDownload.selectDriverExp = Geronimo 可以自动为你下载的驱动。
-dbwizard.selectDownload.selectOtherDatabase = 选择其它数据库
-dbwizard.selectDownload.selectPredefinedDatabase = 选择"预定义"的数据库
-dbwizard.selectDownload.summary = <p>这个页面让你自动地下载数据库的驱动器，这些驱动的 JAR 包不需要登录或注册即在线可用。</p><p><i>如果这个页面花费了很长时间下载驱动，或者在下面的下拉框中没有任何驱动，那么这可能意味着你安装的Geronimo不能连接到apache.org来获得有关驱动下载的配置文件。我们对这引起的不便非常抱歉，你可以稍后再次尝试，或者手动地安装驱动（将驱动复制到 Geronimo/repository/下的目录）。</i></p>
-dbwizard.selectDownload.title = <b>创建数据库连接池</b> -- 步骤2: 选择驱动，JAR，参数
-dbwizard.showPlan.addToEAR = 添加到EAR
-dbwizard.showPlan.deployAsPartEAR = 你可以部署连接池为 EAR 的一部分，而不是部署为 top-level 的数据库连接池。按照下面的步骤可以部署连接池为EAR的一部分：<ol> <li>拷贝并粘帖部署计划到文件中</li> <li>保存这份部署计划文件到你的EAR的顶层目录中</li> <li>从<tt>GERONIMO_HOME/{0}</tt>中拷贝RAR文件到你的EAR的顶层目录中</li> <li>在你的EAR中创建<tt>META-INF/geronimo-application.xml</tt>文件，其中包含类似下面的<tt>module</tt>的条目， （替换成正确的RAR文件名称和部署计划文件的名称）：</li></ol>
-dbwizard.showPlan.deployCommand = 部署命令
-dbwizard.showPlan.deployPool = 部署连接池
-dbwizard.showPlan.deployPoolFromCommandLine = 为了在命令行中使用部署计划来部署连接池，拷贝并粘帖上面的 XML 到文件中（如：<tt>plan-file.xml</tt>）保存它。然后执行类似下面的命令：
-dbwizard.showPlan.deploymentPlan = 部署计划
-dbwizard.showPlan.title = <b>创建数据库连接池</b> -- 显示部署计划
-dbwizard.testConnection.connectedTo = 连接到
-dbwizard.testConnection.connectionError = 连接出错（详情如下）
-dbwizard.testConnection.deployAnyway = 仍然部署
-dbwizard.testConnection.testAgain = 再次测试
-dbwizard.testConnection.testError = 测试错误
-dbwizard.testConnection.testResult = 测试结果
-dbwizard.testConnection.title = <b>创建数据库连接池</b> -- 步骤 4：测试连接
-dbwizard.tranql-connector-db2-xa.DatabaseName = 数据库名称
-dbwizard.tranql-connector-db2-xa.DatabaseNameExp = 指定数据库服务器的名称。该名称作为连接 URL 的数据库部分。
-dbwizard.tranql-connector-db2-xa.DowngradeHoldCursorsUnderXa = Downgrade Hold Cursors
-dbwizard.tranql-connector-db2-xa.DowngradeHoldCursorsUnderXaExp = 指定与持有指针关联的锁是否会降级
-dbwizard.tranql-connector-db2-xa.DriverType = 驱动类型
-dbwizard.tranql-connector-db2-xa.DriverTypeExp = 用于建立到该数据源的连接的驱动类型。可选类型值为 2 或 4。默认值是类型4.
-dbwizard.tranql-connector-db2-xa.Password = 密码
-dbwizard.tranql-connector-db2-xa.PasswordExp = \
-dbwizard.tranql-connector-db2-xa.PortNumber = 端口号
-dbwizard.tranql-connector-db2-xa.PortNumberExp = 指定远端数据库侦听到来连接的端口号。DB2 服务器默认为50000.
-dbwizard.tranql-connector-db2-xa.PreparedStatementCacheSize = PreparedStatement缓存大小
-dbwizard.tranql-connector-db2-xa.PreparedStatementCacheSizeExp = 告诉驱动每个连接应该关联多少个PreparedStatement。默认值是不使用PreparedStatement缓存。
-dbwizard.tranql-connector-db2-xa.ResultSetHoldability = ResultSetHoldability
-dbwizard.tranql-connector-db2-xa.ResultSetHoldabilityExp = 结果集的可保存性有两个可选值 : HOLD_CURSORS_OVER_COMMIT 和 CLOSE_CURSORS_AT_COMMIT. 任何一个值可以通过 resultSetConcurrency 和 resultSetHoldability 的有效组合进行设置. 您所设置的值讲覆盖 Connection 的默认值. <br/><br/>HOLD_CURSORS_OVER_COMMIT = 1<br/>CLOSE_CURSORS_AT_COMMIT = 2
-dbwizard.tranql-connector-db2-xa.ServerName = 服务器名称
-dbwizard.tranql-connector-db2-xa.ServerNameExp = DB2 驱动需要连接到的主机的名称或者 IP 地址。该项没有默认值。
-dbwizard.tranql-connector-db2-xa.TraceFile = Trace 文件
-dbwizard.tranql-connector-db2-xa.TraceFileAppend = TraceFileAppend
-dbwizard.tranql-connector-db2-xa.TraceFileAppendExp = 指定是累加还是覆盖 Trace 文件。该属性的类型为布尔值。默认值是 false ,意为覆盖 Trace 文件。
-dbwizard.tranql-connector-db2-xa.TraceFileExp = 放置跟踪记录的文件名称。
-dbwizard.tranql-connector-db2-xa.UserName = 用户名称
-dbwizard.tranql-connector-db2-xa.UserNameExp = 用于连接到远端数据库服务器的用户 ID 的名称。
-dbwizard.tranql-connector-derby-client-local.CreateDatabase = 创建数据库
-dbwizard.tranql-connector-derby-client-local.CreateDatabaseExp = 标志位指示数据库不存在时是否要创建。
-dbwizard.tranql-connector-derby-client-local.DatabaseName = 数据库名称
-dbwizard.tranql-connector-derby-client-local.DatabaseNameExp = 要连接的数据库名称。
-dbwizard.tranql-connector-derby-client-local.LoginTimeout = 登录超时
-dbwizard.tranql-connector-derby-client-local.LoginTimeoutExp = 终止远程登录前等待的时间。
-dbwizard.tranql-connector-derby-client-local.Password = 密码
-dbwizard.tranql-connector-derby-client-local.PasswordExp = 用于建立物理连接的密码证书。
-dbwizard.tranql-connector-derby-client-local.PortNumber = 端口号
-dbwizard.tranql-connector-derby-client-local.PortNumberExp = 要连接的 IP 端口号。
-dbwizard.tranql-connector-derby-client-local.ServerName = 服务器名称
-dbwizard.tranql-connector-derby-client-local.ServerNameExp = 要连接的服务器名称。
-dbwizard.tranql-connector-derby-client-local.UserName = 用户名
-dbwizard.tranql-connector-derby-client-local.UserNameExp = 用于建立物理连接的用户名。它还建立默认的 schema ,如果省略，引擎默认设为'APP'。
-dbwizard.tranql-connector-derby-client-xa.CreateDatabase = 创建数据库
-dbwizard.tranql-connector-derby-client-xa.CreateDatabaseExp = 标志位指示数据库不存在时是否要创建。
-dbwizard.tranql-connector-derby-client-xa.DatabaseName = 数据库名称
-dbwizard.tranql-connector-derby-client-xa.DatabaseNameExp = 要连接的数据库名称。
-dbwizard.tranql-connector-derby-client-xa.LoginTimeout = 登录超时
-dbwizard.tranql-connector-derby-client-xa.LoginTimeoutExp = 终止远程登录前等待的时间。
-dbwizard.tranql-connector-derby-client-xa.Password = 密码
-dbwizard.tranql-connector-derby-client-xa.PasswordExp = 用于建立物理连接的密码证书。
-dbwizard.tranql-connector-derby-client-xa.PortNumber = 端口号
-dbwizard.tranql-connector-derby-client-xa.PortNumberExp = 要连接的 IP 端口号。
-dbwizard.tranql-connector-derby-client-xa.ServerName = 服务器名称
-dbwizard.tranql-connector-derby-client-xa.ServerNameExp = 要连接的服务器名称。
-dbwizard.tranql-connector-derby-client-xa.UserName = 用户名
-dbwizard.tranql-connector-derby-client-xa.UserNameExp = 用于建立物理连接的用户名。它还建立默认的 schema ,如果省略，引擎默认设为'APP'。
-dbwizard.tranql-connector-derby-embed-local.CreateDatabase = 创建数据库
-dbwizard.tranql-connector-derby-embed-local.CreateDatabaseExp = 标志位指示数据库不存在时是否要创建。
-dbwizard.tranql-connector-derby-embed-local.DatabaseName = 数据库名称
-dbwizard.tranql-connector-derby-embed-local.DatabaseNameExp = 要连接的数据库名称。
-dbwizard.tranql-connector-derby-embed-local.LoginTimeout = 登录超时
-dbwizard.tranql-connector-derby-embed-local.LoginTimeoutExp = 该配置属性当前被 Derby 忽略。
-dbwizard.tranql-connector-derby-embed-local.Password = 密码
-dbwizard.tranql-connector-derby-embed-local.PasswordExp = 用于建立物理连接的密码证书。
-dbwizard.tranql-connector-derby-embed-local.ShutdownDatabase = 关闭数据库
-dbwizard.tranql-connector-derby-embed-local.ShutdownDatabaseExp = 如果设为字符串 "shutdown"，则从数据源获得一个 java.sql.Connection 对象后关闭数据库。
-dbwizard.tranql-connector-derby-embed-local.UserName = 用户名
-dbwizard.tranql-connector-derby-embed-local.UserNameExp = 用于建立物理连接的用户名。它还建立默认的 schema ,如果省略，引擎默认设为'APP'。
-dbwizard.tranql-connector-derby-embed-xa.CreateDatabase = 创建数据库
-dbwizard.tranql-connector-derby-embed-xa.CreateDatabaseExp = 标志位指示数据库不存在时是否要创建。这是一个布尔值。
-dbwizard.tranql-connector-derby-embed-xa.DatabaseName = 数据库名称
-dbwizard.tranql-connector-derby-embed-xa.DatabaseNameExp = 要连接的数据库名称。
-dbwizard.tranql-connector-derby-embed-xa.LoginTimeout = 登录超时
-dbwizard.tranql-connector-derby-embed-xa.LoginTimeoutExp = 该配置属性当前被 Derby 忽略。
-dbwizard.tranql-connector-derby-embed-xa.Password = 密码
-dbwizard.tranql-connector-derby-embed-xa.PasswordExp = 用于建立物理连接的密码证书。
-dbwizard.tranql-connector-derby-embed-xa.UserName = 用户名
-dbwizard.tranql-connector-derby-embed-xa.UserNameExp = 用于建立物理连接的用户名。它还建立默认的 schema,如果省略，引擎默认设为'APP'。
-dbwizard.tranql-connector-informix-xa.DatabaseName = 数据库名称
-dbwizard.tranql-connector-informix-xa.DatabaseNameExp = 数据库名称。
-dbwizard.tranql-connector-informix-xa.IfxHost = IfxHost
-dbwizard.tranql-connector-informix-xa.IfxHostExp = Informix 数据库服务器的 IP 地址或者主机名。
-dbwizard.tranql-connector-informix-xa.IfxProtocolTrace = IfxProtocolTrace
-dbwizard.tranql-connector-informix-xa.IfxProtocolTraceExp = IfxPROTOCOLTRACE 的值。
-dbwizard.tranql-connector-informix-xa.IfxProtocolTraceFile = IfxProtocolTraceFile
-dbwizard.tranql-connector-informix-xa.IfxProtocolTraceFileExp = IfxPROTOCOLTRACEFILE 的值。
-dbwizard.tranql-connector-informix-xa.IfxSQLHostFile = IfxSQLHostFile
-dbwizard.tranql-connector-informix-xa.IfxSQLHostFileExp = IfxSQLH_FILE 的值。
-dbwizard.tranql-connector-informix-xa.IfxSQLHostType = IfxSQLHostType
-dbwizard.tranql-connector-informix-xa.IfxSQLHostTypeExp = IfxSQLH_TYPE 的值。
-dbwizard.tranql-connector-informix-xa.Password = 密码
-dbwizard.tranql-connector-informix-xa.PasswordExp = 密码（区分大小写）。
-dbwizard.tranql-connector-informix-xa.PortNumber = 端口号
-dbwizard.tranql-connector-informix-xa.PortNumberExp = Informix 数据库服务器的端口号。
-dbwizard.tranql-connector-informix-xa.ServerName = 服务器名称
-dbwizard.tranql-connector-informix-xa.ServerNameExp = Informix 数据库服务器的实例名称。
-dbwizard.tranql-connector-informix-xa.UserName = 用户名
-dbwizard.tranql-connector-informix-xa.UserNameExp = 用户名（区分大小写）。
-dbwizard.tranql-connector-mysql-local.DatabaseName = 数据库名称
-dbwizard.tranql-connector-mysql-local.DatabaseNameExp = 要连接的数据库名称。
-dbwizard.tranql-connector-mysql-local.Password = 密码
-dbwizard.tranql-connector-mysql-local.PasswordExp = 用于建立物理连接的密码证书。
-dbwizard.tranql-connector-mysql-local.PortNumber = 端口号
-dbwizard.tranql-connector-mysql-local.PortNumberExp = 要连接的 IP 端口号。
-dbwizard.tranql-connector-mysql-local.ServerName = 服务器名称
-dbwizard.tranql-connector-mysql-local.ServerNameExp = 要连接的服务器名称。
-dbwizard.tranql-connector-mysql-local.UserName = 用户名
-dbwizard.tranql-connector-mysql-local.UserNameExp = 用于建立物理连接的用户名。
-dbwizard.tranql-connector-mysql-xa.DatabaseName = 数据库名称
-dbwizard.tranql-connector-mysql-xa.DatabaseNameExp = 要连接的数据库名称。
-dbwizard.tranql-connector-mysql-xa.Password = 密码
-dbwizard.tranql-connector-mysql-xa.PasswordExp = 用于建立物理连接的密码证书。
-dbwizard.tranql-connector-mysql-xa.PortNumber = 端口号
-dbwizard.tranql-connector-mysql-xa.PortNumberExp = 要连接的 IP 端口号。
-dbwizard.tranql-connector-mysql-xa.ServerName = 服务器名称
-dbwizard.tranql-connector-mysql-xa.ServerNameExp = 要连接的服务器名称。
-dbwizard.tranql-connector-mysql-xa.UserName = 用户名
-dbwizard.tranql-connector-mysql-xa.UserNameExp = 用于建立物理连接的用户名。
-dbwizard.tranql-connector-oracle-local.DataSourceName = 数据源名称
-dbwizard.tranql-connector-oracle-local.DataSourceNameExp = \
-dbwizard.tranql-connector-oracle-local.DatabaseName = 数据库名称
-dbwizard.tranql-connector-oracle-local.DatabaseNameExp = \
-dbwizard.tranql-connector-oracle-local.Description = 描述
-dbwizard.tranql-connector-oracle-local.DescriptionExp = \
-dbwizard.tranql-connector-oracle-local.DriverType = 驱动类型
-dbwizard.tranql-connector-oracle-local.DriverTypeExp = \
-dbwizard.tranql-connector-oracle-local.LoginTimeout = 登录超时
-dbwizard.tranql-connector-oracle-local.LoginTimeoutExp = \
-dbwizard.tranql-connector-oracle-local.MaxStatements = Statement 最大值
-dbwizard.tranql-connector-oracle-local.MaxStatementsExp = \
-dbwizard.tranql-connector-oracle-local.NetworkProtocol = 网络协议
-dbwizard.tranql-connector-oracle-local.NetworkProtocolExp = \
-dbwizard.tranql-connector-oracle-local.Password = 密码
-dbwizard.tranql-connector-oracle-local.PasswordExp = \
-dbwizard.tranql-connector-oracle-local.PortNumber = 端口号
-dbwizard.tranql-connector-oracle-local.PortNumberExp = \
-dbwizard.tranql-connector-oracle-local.ServerName = 服务器名称
-dbwizard.tranql-connector-oracle-local.ServerNameExp = \
-dbwizard.tranql-connector-oracle-local.ServiceName = 服务名称
-dbwizard.tranql-connector-oracle-local.ServiceNameExp = \
-dbwizard.tranql-connector-oracle-local.TNSEntryName = TNS 条目名称
-dbwizard.tranql-connector-oracle-local.TNSEntryNameExp = \
-dbwizard.tranql-connector-oracle-local.UserName = 用户名
-dbwizard.tranql-connector-oracle-local.UserNameExp = \
-dbwizard.tranql-connector-oracle-xa.DataSourceName = 数据源名称
-dbwizard.tranql-connector-oracle-xa.DataSourceNameExp = \
-dbwizard.tranql-connector-oracle-xa.DatabaseName = 数据库名称
-dbwizard.tranql-connector-oracle-xa.DatabaseNameExp = \
-dbwizard.tranql-connector-oracle-xa.Description = 描述
-dbwizard.tranql-connector-oracle-xa.DescriptionExp = \
-dbwizard.tranql-connector-oracle-xa.DriverType = 驱动类型
-dbwizard.tranql-connector-oracle-xa.DriverTypeExp = \
-dbwizard.tranql-connector-oracle-xa.LoginTimeout = 登录超时
-dbwizard.tranql-connector-oracle-xa.LoginTimeoutExp = \
-dbwizard.tranql-connector-oracle-xa.MaxStatements = Statement 最大值
-dbwizard.tranql-connector-oracle-xa.MaxStatementsExp = \
-dbwizard.tranql-connector-oracle-xa.NetworkProtocol = 网络协议
-dbwizard.tranql-connector-oracle-xa.NetworkProtocolExp = \
-dbwizard.tranql-connector-oracle-xa.Password = 密码
-dbwizard.tranql-connector-oracle-xa.PasswordExp = \
-dbwizard.tranql-connector-oracle-xa.PortNumber = 端口号
-dbwizard.tranql-connector-oracle-xa.PortNumberExp = \
-dbwizard.tranql-connector-oracle-xa.ServerName = 服务器名称
-dbwizard.tranql-connector-oracle-xa.ServerNameExp = \
-dbwizard.tranql-connector-oracle-xa.ServiceName = 服务名称
-dbwizard.tranql-connector-oracle-xa.ServiceNameExp = \
-dbwizard.tranql-connector-oracle-xa.TNSEntryName = TNS 条目名称
-dbwizard.tranql-connector-oracle-xa.TNSEntryNameExp = \
-dbwizard.tranql-connector-oracle-xa.UserName = 用户名
-dbwizard.tranql-connector-oracle-xa.UserNameExp = \
-dbwizard.tranql-connector-postgresql-local.DatabaseName = 数据库名称
-dbwizard.tranql-connector-postgresql-local.DatabaseNameExp = 要连接的数据库名称。
-dbwizard.tranql-connector-postgresql-local.Password = 密码
-dbwizard.tranql-connector-postgresql-local.PasswordExp = 用于建立物理连接的密码证书。
-dbwizard.tranql-connector-postgresql-local.PortNumber = 端口号
-dbwizard.tranql-connector-postgresql-local.PortNumberExp = 要连接的 IP 端口号。
-dbwizard.tranql-connector-postgresql-local.PrepareThreshold = Prepare 阈值
-dbwizard.tranql-connector-postgresql-local.PrepareThresholdExp = \
-dbwizard.tranql-connector-postgresql-local.ServerName = 服务器名称
-dbwizard.tranql-connector-postgresql-local.ServerNameExp = 要连接的服务器名称。
-dbwizard.tranql-connector-postgresql-local.UserName = 用户名
-dbwizard.tranql-connector-postgresql-local.UserNameExp = 用于建立物理连接的用户名。
-dbwizard.tranql-connector-postgresql-xa.DatabaseName = 数据库名称
-dbwizard.tranql-connector-postgresql-xa.DatabaseNameExp = 要连接的数据库名称。
-dbwizard.tranql-connector-postgresql-xa.Password = 密码
-dbwizard.tranql-connector-postgresql-xa.PasswordExp = 用于建立物理连接的密码证书。
-dbwizard.tranql-connector-postgresql-xa.PortNumber = 端口号
-dbwizard.tranql-connector-postgresql-xa.PortNumberExp = 要连接的 IP 端口号。
-dbwizard.tranql-connector-postgresql-xa.PrepareThreshold = Prepare 阈值
-dbwizard.tranql-connector-postgresql-xa.PrepareThresholdExp = \
-dbwizard.tranql-connector-postgresql-xa.ServerName = 服务器名称
-dbwizard.tranql-connector-postgresql-xa.ServerNameExp = 要连接的服务器名称。
-dbwizard.tranql-connector-postgresql-xa.UserName = 用户名
-dbwizard.tranql-connector-postgresql-xa.UserNameExp = 用于建立物理连接的用户名。
-dbwizard.tranql-connector-sqlserver2000-xa.DatabaseName = 数据库名称
-dbwizard.tranql-connector-sqlserver2000-xa.DatabaseNameExp = 要连接的 SQL Server 数据库名称。
-dbwizard.tranql-connector-sqlserver2000-xa.Password = 密码
-dbwizard.tranql-connector-sqlserver2000-xa.PasswordExp = 用于连接 SQL Server 数据库的区分大小写的密码。
-dbwizard.tranql-connector-sqlserver2000-xa.PortNumber = 端口号
-dbwizard.tranql-connector-sqlserver2000-xa.PortNumberExp = SQL Server 的 TCP 端口，默认为 1433。
-dbwizard.tranql-connector-sqlserver2000-xa.SelectMethod = SelectMethod
-dbwizard.tranql-connector-sqlserver2000-xa.SelectMethodExp = SelectMethod={cursor | direct}.查阅微软文档以获得更多信息，Direct 不能用于受管环境中。
-dbwizard.tranql-connector-sqlserver2000-xa.SendStringParameters = SendStringParameters
-dbwizard.tranql-connector-sqlserver2000-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}。查阅微软文档以获得细节。默认是true，这不大会导致编码冲突但在一些环境下可能会略微慢一些。
-dbwizard.tranql-connector-sqlserver2000-xa.ServerName = 服务器名称
-dbwizard.tranql-connector-sqlserver2000-xa.ServerNameExp = SQL Server 的 IP 地址。
-dbwizard.tranql-connector-sqlserver2000-xa.UserName = 用户名
-dbwizard.tranql-connector-sqlserver2000-xa.UserNameExp = 用于连接 SQL Server 数据库的区分大小写的用户名。
-dbwizard.tranql-connector-sqlserver2005-xa.DatabaseName = 数据库名称
-dbwizard.tranql-connector-sqlserver2005-xa.DatabaseNameExp = 要连接的 SQL Server 数据库名称。
-dbwizard.tranql-connector-sqlserver2005-xa.Password = 密码
-dbwizard.tranql-connector-sqlserver2005-xa.PasswordExp = 用于连接 SQL Server 数据库的区分大小写的密码。
-dbwizard.tranql-connector-sqlserver2005-xa.PortNumber = 端口号
-dbwizard.tranql-connector-sqlserver2005-xa.PortNumberExp = SQL Server 的 TCP 端口，默认为 1433。
-dbwizard.tranql-connector-sqlserver2005-xa.SelectMethod = SelectMethod
-dbwizard.tranql-connector-sqlserver2005-xa.SelectMethodExp = SelectMethod={cursor | direct}.查阅微软文档以获得更多信息，Direct 不能用于受管环境中。
-dbwizard.tranql-connector-sqlserver2005-xa.SendStringParameters = SendStringParameters
-dbwizard.tranql-connector-sqlserver2005-xa.SendStringParametersExp = SendStringParametersAsUnicode={true | false}。查阅微软文档以获得细节。默认是true，这不大会导致编码冲突但在一些环境下可能会略微慢一些。
-dbwizard.tranql-connector-sqlserver2005-xa.ServerName = 服务器名称
-dbwizard.tranql-connector-sqlserver2005-xa.ServerNameExp = SQL Server 的 IP 地址。
-dbwizard.tranql-connector-sqlserver2005-xa.UserName = 用户名
-dbwizard.tranql-connector-sqlserver2005-xa.UserNameExp = 用于连接 SQL Server 数据库的区分大小写的用户名。
-dbwizard.usage.applicationCode = 应用代码
-dbwizard.usage.geronimo_webExp = <p>要把资源引用指向 Gernimo 中特定的数据库连接池，Web应用中需要有<tt>geronimo-web.xml</tt>部署计划。它可以打包在 WAR 包中的<tt>WEB-INF</tt>目录，也可以在命令行中将它单独提供给部署工具。<tt>geronimo-web.xml</tt>部署计划中有<tt>dependency</tt>元素可以用来指向数据库连接池模块，和对应于于上面<tt>web.xml</tt>的 <tt>resource-ref</tt>的<tt>resource-ref</tt>块，它用来把资源引用指向特定的数据库连接池。在这个块中<tt>ref-name</tt>必须与<tt>web.xml</tt> 中的<tt>resource-link</tt>相一致。<tt>resource-link</tt>在名称上必须与服务器中定义的数据库连接池名称相一致。</p><p><i>如果你在Geronimo中只部署了一个名叫{0}的数据库连接池，你可以像下面一样指向连接池。</i></p>
-dbwizard.usage.moreThanOnePool = 如果你有多于一个的连接池叫做：{0}(举例来说,有两个依赖项，<b>每个</b>都包含一个叫{0}的组件),那么你可以像下面一样更精确地定义要使用的连接池：
-dbwizard.usage.resource_refSection = <tt>web.xml</tt>中有一个<tt>resource-ref</tt>段可以用来象下面一样声明数据库连接池。注意：我们使用<tt>res-ref-name</tt>映射到服务器中定义的连接池的引用。在应用中使用<tt>res-ref-name</tt>的值来访问连接池。
-dbwizard.usage.searchOnlyOne = 这会在当前应用中查找一个名为{0} 的数据库连接池和任何列为依赖项的模块（以及这些依赖项的依赖项等等）。
-dbwizard.usage.title = 这个页面介绍了怎样在 Java EE 应用中使用数据库连接池{0}。这里以 Web 应用为例，其它应用模块也应该可以用同样的方式处理。
-dbwizard.usage.usingInCode = 要获得指向数据库连接池的引用，在你的应用中应该使用类似下面的代码。注意：你的 JNDI 字符串应该是<tt>java:comp/env/</tt>再加<tt>web.xml</tt>中的<tt>res-ref-name</tt>。
-
-derbylogmanager.help.title = 这个 portle t显示了 Geronimo 内嵌数据库 Derby 的日志信息。
-derbylogmanager.view.Lines = 行
-derbylogmanager.view.containingText = 包含文字
-derbylogmanager.view.filterLog = 过滤日志
-derbylogmanager.view.filterResults = 过滤结果
-derbylogmanager.view.integer = 焦点所在字段必须为整数。
-derbylogmanager.view.matchCriterial = 在日志文件中总共有 {0} 条信息，与条件匹配的有 {1} 条。
-derbylogmanager.view.maxResults = 最多显示
-derbylogmanager.view.noEntries = 没有找到符合条件的信息。
-derbylogmanager.view.numberOfResultsCapped = 覆盖的结果数
-derbylogmanager.view.refresh = 刷新
-derbylogmanager.view.to = 到
-
-internaldb.common.DB = 数据库
-internaldb.common.DBMajorVersion = 数据库高版本号
-internaldb.common.DBMinorVersion = 数据库低版本号
-internaldb.common.DBProductName = 数据库产品名
-internaldb.common.DBProductVersion = 数据库产品版本
-internaldb.common.Item = 项
-internaldb.common.JDBCMajorVersion = JDBC 高版本号
-internaldb.common.JDBCMinorVersion = JDBC 低版本号
-internaldb.common.SQLCommands = SQL 命令
-internaldb.common.SQLStateType = SQL 语句类型
-internaldb.common.Value = 值
-internaldb.common.application = 应用
-internaldb.common.create = 创建
-internaldb.common.createDB = 创建数据库
-internaldb.common.databases = 数据库
-internaldb.common.defaultTransactionIsolation = 默认事务隔离级别
-internaldb.common.delete = 删除
-internaldb.common.deleteDB = 删除数据库
-internaldb.common.driver = 驱动
-internaldb.common.driverMajorVersion = 驱动高版本号
-internaldb.common.driverMinorVersion = 驱动低版本号
-internaldb.common.driverName = 驱动名
-internaldb.common.driverVersion = 驱动版本
-internaldb.common.empty = 空
-internaldb.common.emptyText = 焦点所在字段不能为空。
-internaldb.common.etc = 其它
-internaldb.common.functions = 函数
-internaldb.common.note = 注意
-internaldb.common.numericFunctions = 数字函数
-internaldb.common.queryResult = 查询结果
-internaldb.common.readOnly = 只读
-internaldb.common.result = 结果
-internaldb.common.resultSetHoldability = 结果集的保持力
-internaldb.common.schemas = 模式
-internaldb.common.stringFunctions = 字符串函数
-internaldb.common.supportedSQLKeywords = 支持的 SQL 关键字
-internaldb.common.supportedTypes = 支持的类型
-internaldb.common.system = 系统
-internaldb.common.systemFunctions = 系统函数
-internaldb.common.table = 表
-internaldb.common.tableTypes = 表类型
-internaldb.common.tables = 表
-internaldb.common.timeDateFunctions = 时间/日期函数
-internaldb.common.useDB = 使用数据库
-internaldb.common.useDS = 使用数据源
-internaldb.common.userName = 用户名
-internaldb.common.viewContents = 查看内容
-internaldb.common.viewDatabases = 查看数据库
-internaldb.common.viewTables = 查看表
-internaldb.dbViewerHelp.content = 显示所有可用的数据库，以及数据库中的表和表的内容。要查看数据库中的表，在主窗口中，点击数据库的链接。这会显示数据库中的所有表。要查看表中的内容，点击"查看内容"链接，在"查看数据库"面板的底部，有一些链接用于把用户带到其它视图。比如："查看数据库"和/或"查看表"。
-internaldb.internalDBHelp.content = 这个页面提供了内部数据库的信息，比如：产品名称，数据库版本，支持的函数，支持的 SQL 命令等等。滚动页面到底部去查看所有信息。
-internaldb.listDatabases.nodatabases = 没有数据库
-internaldb.listDatabases.title = 数据库列表
-internaldb.listTables.noTables = 没有表
-internaldb.runSQLHelp.createDBExp = 输入要新创建的数据库的名称，然后点击"创建"按钮。
-internaldb.runSQLHelp.deleteDBExp = 要删除一个已经存在的数据库，请从下拉框中选择它，并点击"删除."。
-internaldb.runSQLHelp.runSQLExp = 在" SQL 命令"文本框中，输入用分号分割的 SQL 命令，点击"运行 SQL"按钮来运行 SQL 命令。
-internaldb.runSQLHelp.summary = 允许用户使用SQL命令直接操作表中的数据，并且创建或删除数据库。在"SQL 命令"文本框中，用户可以输入 SQL 命令,并点击"运行 SQL."
-internaldb.runSQLHelp.useDBExp = 从下拉框中选择要操作的数据库
-internaldb.runSQLHelp.useDSExp = 从下拉框中选择要操作的数据源
-internaldb.runSQLNormal.note1 = 1) 使用;分开多个语句
-internaldb.runSQLNormal.note2 = 2) 单个 Select 语句的查询结果会被显示
-internaldb.runSQLNormal.note3 = 3) 使用单引号括住文本字符串
-internaldb.runSQLNormal.reallyDeleteDatabase = 确定要删除这个数据库么？
-internaldb.runSQLNormal.runSQL = 运行SQL
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/ajax/ProgressInfo.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/ajax/ProgressInfo.java
deleted file mode 100644
index e8074fd..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/ajax/ProgressInfo.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.console.ajax;
-
-import org.directwebremoting.annotations.DataTransferObject;
-import org.directwebremoting.annotations.RemoteProperty;
-
-@DataTransferObject
-public class ProgressInfo {
- public static final String PROGRESS_INFO_KEY = "progressinfokey";
- private int progressPercent = -1;
- private String mainMessage;
- private String subMessage;
- private boolean finished;
-
- @RemoteProperty
- public int getProgressPercent() {
- return progressPercent;
- }
-
- public void setProgressPercent(int progressPercent) {
- this.progressPercent = progressPercent;
- }
-
- @RemoteProperty
- public String getMainMessage() {
- return mainMessage;
- }
-
- public void setMainMessage(String mainMessage) {
- this.mainMessage = mainMessage;
- }
-
- @RemoteProperty
- public String getSubMessage() {
- return subMessage;
- }
-
- public void setSubMessage(String subMessage) {
- this.subMessage = subMessage;
- }
-
- @RemoteProperty
- public boolean isFinished() {
- return finished;
- }
-
- public void setFinished(boolean finished) {
- this.finished = finished;
- }
-}
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/ajax/ProgressMonitor.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/ajax/ProgressMonitor.java
deleted file mode 100644
index 768c237..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/ajax/ProgressMonitor.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.console.ajax;
-
-import javax.servlet.http.HttpSession;
-
-import org.directwebremoting.WebContextFactory;
-import org.directwebremoting.annotations.RemoteMethod;
-import org.directwebremoting.annotations.RemoteProxy;
-
-/**
- * Provides information to an AJAX client during server side
- * activities.
- */
-@RemoteProxy
-public class ProgressMonitor
-{
- @RemoteMethod
- public ProgressInfo getProgressInfo()
- {
- HttpSession session = WebContextFactory.get().getSession(false);
-
- if (session.getAttribute(ProgressInfo.PROGRESS_INFO_KEY) != null) {
- return (ProgressInfo) session.getAttribute(ProgressInfo.PROGRESS_INFO_KEY);
- } else {
- return new ProgressInfo();
- }
- }
-}
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/DataSourceInfo.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/DataSourceInfo.java
deleted file mode 100644
index 43412d4..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/DataSourceInfo.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.console.databasemanager;
-
-import javax.management.ObjectName;
-
-public class DataSourceInfo implements Comparable {
- private ObjectName objectName;
-
- private String name;
-
- private Integer state;
-
- private boolean working;
-
- private String message;
-
- public ObjectName getObjectName() {
- return objectName;
- }
-
- public void setObjectName(ObjectName objectName) {
- this.objectName = objectName;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public Integer getState() {
- return state;
- }
-
- public void setState(Integer state) {
- this.state = state;
- }
-
- public int compareTo(Object o) {
- return name.compareToIgnoreCase(((DataSourceInfo) o).name);
- }
-
- public boolean isWorking() {
- return working;
- }
-
- public void setWorking(boolean working) {
- this.working = working;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-}
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/ManagementHelper.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/ManagementHelper.java
deleted file mode 100644
index ba506f9..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/ManagementHelper.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.geronimo.console.databasemanager;
-
-import javax.enterprise.deploy.spi.DeploymentManager;
-import javax.enterprise.deploy.spi.exceptions.DeploymentManagerCreationException;
-import javax.enterprise.deploy.spi.factories.DeploymentFactory;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletSession;
-
-import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel;
-import org.apache.geronimo.kernel.Kernel;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ManagementHelper {
- private final static String PLUGIN_HELPER_KEY = "org.apache.geronimo.console.systemdb.ManagementHelper";
- private final Kernel kernel;
-
- public static ManagementHelper getManagementHelper(PortletRequest request) {
- ManagementHelper helper = (ManagementHelper) request.getPortletSession(true).getAttribute(PLUGIN_HELPER_KEY, PortletSession.APPLICATION_SCOPE);
- if (helper == null) {
- Kernel kernel = PortletManager.getKernel();
- helper = new ManagementHelper(kernel);
- request.getPortletSession().setAttribute(PLUGIN_HELPER_KEY, helper, PortletSession.APPLICATION_SCOPE);
- }
- return helper;
- }
-
- public ManagementHelper(Kernel kernel) {
- this.kernel = kernel;
- }
-
- public DeploymentManager getDeploymentManager() {
- DeploymentFactory factory = new DeploymentFactoryWithKernel(kernel);
- try {
- return factory.getDeploymentManager("deployer:geronimo:inVM", null, null);
- } catch (DeploymentManagerCreationException e) {
- // log.error(e.getMessage(), e);
- return null;
- }
- }
-}
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriver.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriver.java
deleted file mode 100644
index fa1e87b..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriver.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.console.databasemanager.wizard;
-
-import java.util.Set;
-import java.util.List;
-
-import org.apache.geronimo.kernel.repository.Artifact;
-
-/**
- * Interface for GBeans that provide information about a database driver
- * and the associated deployment procedure.
- *
- * @version $Rev$ $Date$
- */
-public interface DatabaseDriver {
- String getName();
- String getURLPrototype();
- List<String> getURLParameters();
- String getDriverClassName();
- int getDefaultPort();
- boolean isSpecific();
- Artifact getRAR();
- Set<Artifact> getDependencyFilters();
-}
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriverGBean.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriverGBean.java
deleted file mode 100644
index ebc683b..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabaseDriverGBean.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/**
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.console.databasemanager.wizard;
-
-import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
-
-import java.util.regex.Pattern;
-import java.util.regex.Matcher;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Set;
-import java.util.HashSet;
-
-/**
- * Implementation of DatabaseDriver that contains database driver information
- * contained in the console's deployment plan.
- *
- * @version $Rev$ $Date$
- */
-public class DatabaseDriverGBean implements DatabaseDriver {
- private final static Pattern PARAM_PATTERN = Pattern.compile("\\{.+?\\}");
- private String name;
- private String URLPrototype;
- private String driverClassName;
- private int defaultPort;
- private boolean specific;
- private Artifact RAR;
- private Set<Artifact> dependencyFilters;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getURLPrototype() {
- return URLPrototype;
- }
-
- public void setURLPrototype(String URLPrototype) {
- this.URLPrototype = URLPrototype;
- }
-
- public String getDriverClassName() {
- return driverClassName;
- }
-
- public void setDriverClassName(String driverClassName) {
- this.driverClassName = driverClassName;
- }
-
- public int getDefaultPort() {
- return defaultPort;
- }
-
- public void setDefaultPort(int defaultPort) {
- this.defaultPort = defaultPort;
- }
-
- public boolean isSpecific() {
- return specific;
- }
-
- public void setSpecific(boolean specific) {
- this.specific = specific;
- }
-
- public Artifact getRAR() {
- return RAR;
- }
-
- public void setDependencyFilterStrings(List<String> filterStrings) {
- dependencyFilters = new HashSet<Artifact>();
- for (String filterString: filterStrings) {
- Artifact filter = Artifact.createPartial(filterString);
- dependencyFilters.add(filter);
- }
- }
-
- public Set<Artifact> getDependencyFilters() {
- return dependencyFilters != null && !dependencyFilters.isEmpty()? dependencyFilters : null;
- }
-
- public void setRARName(String name) {
- RAR = Artifact.create(name);
- }
-
- public List<String> getURLParameters() {
- Matcher m = PARAM_PATTERN.matcher(URLPrototype);
- List<String> list = new ArrayList<String>();
- while(m.find()) {
- list.add(URLPrototype.substring(m.start()+1, m.end()-1));
- }
- return list;
- }
-
- public static final GBeanInfo GBEAN_INFO;
-
- static {
- GBeanInfoBuilder infoFactory = GBeanInfoBuilder.createStatic("Database Driver Info", DatabaseDriverGBean.class);
- infoFactory.addAttribute("name", String.class, true, true);
- infoFactory.addAttribute("URLPrototype", String.class, true, true);
- infoFactory.addAttribute("driverClassName", String.class, true, true);
- infoFactory.addAttribute("defaultPort", int.class, true, true);
- infoFactory.addAttribute("specific", boolean.class, true, true);
- infoFactory.addAttribute("RARName", String.class, true, true);
- infoFactory.addAttribute("dependencyFilterStrings", List.class, true, true);
- infoFactory.addAttribute("dependencyFilters", Set.class, false, false);
- infoFactory.addInterface(DatabaseDriver.class);
-
- GBEAN_INFO = infoFactory.getBeanInfo();
- }
-
- public static GBeanInfo getGBeanInfo() {
- return GBEAN_INFO;
- }
-}
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
deleted file mode 100644
index fd69f07..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DatabasePoolPortlet.java
+++ /dev/null
@@ -1,1756 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.console.databasemanager.wizard;
-
-import java.io.BufferedOutputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.Serializable;
-import java.io.StringReader;
-import java.io.StringWriter;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.Driver;
-import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Random;
-import java.util.Set;
-import java.util.SortedSet;
-
-import javax.enterprise.deploy.model.DDBean;
-import javax.enterprise.deploy.model.DDBeanRoot;
-import javax.enterprise.deploy.shared.ModuleType;
-import javax.enterprise.deploy.spi.DeploymentConfiguration;
-import javax.enterprise.deploy.spi.DeploymentManager;
-import javax.enterprise.deploy.spi.Target;
-import javax.enterprise.deploy.spi.TargetModuleID;
-import javax.enterprise.deploy.spi.status.ProgressObject;
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequest;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.commons.fileupload.FileItem;
-import org.apache.commons.fileupload.disk.DiskFileItemFactory;
-import org.apache.commons.fileupload.portlet.PortletFileUpload;
-import org.apache.geronimo.connector.deployment.jsr88.ConfigPropertySetting;
-import org.apache.geronimo.connector.deployment.jsr88.ConnectionDefinition;
-import org.apache.geronimo.connector.deployment.jsr88.ConnectionDefinitionInstance;
-import org.apache.geronimo.connector.deployment.jsr88.ConnectionManager;
-import org.apache.geronimo.connector.deployment.jsr88.Connector15DCBRoot;
-import org.apache.geronimo.connector.deployment.jsr88.ConnectorDCB;
-import org.apache.geronimo.connector.deployment.jsr88.ResourceAdapter;
-import org.apache.geronimo.connector.deployment.jsr88.SinglePool;
-import org.apache.geronimo.connector.outbound.PoolingAttributes;
-import org.apache.geronimo.console.BasePortlet;
-import org.apache.geronimo.console.ajax.ProgressInfo;
-import org.apache.geronimo.console.databasemanager.ManagementHelper;
-import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.converter.DatabaseConversionStatus;
-import org.apache.geronimo.converter.JDBCPool;
-import org.apache.geronimo.converter.bea.WebLogic81DatabaseConverter;
-import org.apache.geronimo.converter.jboss.JBoss4DatabaseConverter;
-import org.apache.geronimo.deployment.service.jsr88.EnvironmentData;
-import org.apache.geronimo.deployment.tools.loader.ConnectorDeployable;
-import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.kernel.config.ConfigurationManager;
-import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.management.State;
-import org.apache.geronimo.kernel.proxy.GeronimoManagedBean;
-import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.FileWriteMonitor;
-import org.apache.geronimo.kernel.repository.ListableRepository;
-import org.apache.geronimo.kernel.repository.WriteableRepository;
-import org.apache.geronimo.kernel.util.XmlUtil;
-import org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory;
-import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
-/**
- * A portlet that lets you configure and deploy JDBC connection pools.
- *
- * @version $Rev$ $Date$
- */
-public class DatabasePoolPortlet extends BasePortlet {
- private static final Logger log = LoggerFactory.getLogger(DatabasePoolPortlet.class);
- private final static Set<String> INCLUDE_ARTIFACTIDS = new HashSet<String>(Arrays.asList("system-database"));
-
- private final static Set<String> EXCLUDE_GROUPIDS = new HashSet<String>(Arrays.asList("org.apache.geronimo.modules",
- "org.apache.geronimo.configs",
- "org.apache.geronimo.applications",
- "org.apache.geronimo.assemblies",
- "org.apache.cxf",
- "org.apache.tomcat",
- "org.tranql",
- "commons-cli",
- "commons-io",
- "commons-logging",
- "commons-lang",
- "axis",
- "org.apache.axis2",
- "org.apache.directory",
- "org.apache.activemq",
- "org.apache.openejb",
- "org.apache.myfaces",
- "org.mortbay.jetty"));
- private final static String DRIVER_SESSION_KEY = "org.apache.geronimo.console.dbpool.Drivers";
- private final static String CONFIG_SESSION_KEY = "org.apache.geronimo.console.dbpool.ConfigParam";
- private final static String DRIVER_INFO_URL = "http://geronimo.apache.org/driver-downloads.properties";
- private static final String LIST_VIEW = "/WEB-INF/view/dbwizard/list.jsp";
- private static final String EDIT_VIEW = "/WEB-INF/view/dbwizard/edit.jsp";
- private static final String SELECT_RDBMS_VIEW = "/WEB-INF/view/dbwizard/selectDatabase.jsp";
- private static final String BASIC_PARAMS_VIEW = "/WEB-INF/view/dbwizard/basicParams.jsp";
- private static final String CONFIRM_URL_VIEW = "/WEB-INF/view/dbwizard/confirmURL.jsp";
- private static final String TEST_CONNECTION_VIEW = "/WEB-INF/view/dbwizard/testConnection.jsp";
- private static final String DOWNLOAD_VIEW = "/WEB-INF/view/dbwizard/selectDownload.jsp";
- private static final String DOWNLOAD_STATUS_VIEW = "/WEB-INF/view/dbwizard/downloadStatus.jsp";
- private static final String SHOW_PLAN_VIEW = "/WEB-INF/view/dbwizard/showPlan.jsp";
- private static final String IMPORT_UPLOAD_VIEW = "/WEB-INF/view/dbwizard/importUpload.jsp";
- private static final String IMPORT_STATUS_VIEW = "/WEB-INF/view/dbwizard/importStatus.jsp";
- private static final String USAGE_VIEW = "/WEB-INF/view/dbwizard/usage.jsp";
- private static final String LIST_MODE = "list";
- private static final String EDIT_MODE = "edit";
- private static final String SELECT_RDBMS_MODE = "rdbms";
- private static final String BASIC_PARAMS_MODE = "params";
- private static final String CONFIRM_URL_MODE = "url";
- private static final String TEST_CONNECTION_MODE = "test";
- private static final String SHOW_PLAN_MODE = "plan";
- private static final String DOWNLOAD_MODE = "download";
- private static final String DOWNLOAD_STATUS_MODE = "downloadStatus";
- private static final String EDIT_EXISTING_MODE = "editExisting";
- private static final String DELETE_MODE = "delete";
- private static final String SAVE_MODE = "save";
- private static final String IMPORT_START_MODE = "startImport";
- private static final String IMPORT_UPLOAD_MODE = "importUpload";
- private static final String IMPORT_STATUS_MODE = "importStatus";
- private static final String IMPORT_COMPLETE_MODE = "importComplete";
- private static final String WEBLOGIC_IMPORT_MODE = "weblogicImport";
- private static final String USAGE_MODE = "usage";
- private static final String IMPORT_EDIT_MODE = "importEdit";
- private static final String MODE_KEY = "mode";
- private static final String LOCAL = "LOCAL";
- private static final String XA = "XA";
- private static final String NONE = "NONE";
- private static final String[] ORDERED_PROPERTY_NAMES = { "property-DatabaseName", "property-CreateDatabase", "property-UserName", "property-Password" };
-
- private PortletRequestDispatcher listView;
- private PortletRequestDispatcher editView;
- private PortletRequestDispatcher selectRDBMSView;
- private PortletRequestDispatcher basicParamsView;
- private PortletRequestDispatcher confirmURLView;
- private PortletRequestDispatcher testConnectionView;
- private PortletRequestDispatcher downloadView;
- private PortletRequestDispatcher downloadStatusView;
- private PortletRequestDispatcher planView;
- private PortletRequestDispatcher importUploadView;
- private PortletRequestDispatcher importStatusView;
- private PortletRequestDispatcher usageView;
- private Map<String, String> rarPathMap;
-
- public void init(PortletConfig portletConfig) throws PortletException {
- super.init(portletConfig);
- listView = portletConfig.getPortletContext().getRequestDispatcher(LIST_VIEW);
- editView = portletConfig.getPortletContext().getRequestDispatcher(EDIT_VIEW);
- selectRDBMSView = portletConfig.getPortletContext().getRequestDispatcher(SELECT_RDBMS_VIEW);
- basicParamsView = portletConfig.getPortletContext().getRequestDispatcher(BASIC_PARAMS_VIEW);
- confirmURLView = portletConfig.getPortletContext().getRequestDispatcher(CONFIRM_URL_VIEW);
- testConnectionView = portletConfig.getPortletContext().getRequestDispatcher(TEST_CONNECTION_VIEW);
- downloadView = portletConfig.getPortletContext().getRequestDispatcher(DOWNLOAD_VIEW);
- downloadStatusView = portletConfig.getPortletContext().getRequestDispatcher(DOWNLOAD_STATUS_VIEW);
- planView = portletConfig.getPortletContext().getRequestDispatcher(SHOW_PLAN_VIEW);
- importUploadView = portletConfig.getPortletContext().getRequestDispatcher(IMPORT_UPLOAD_VIEW);
- importStatusView = portletConfig.getPortletContext().getRequestDispatcher(IMPORT_STATUS_VIEW);
- usageView = portletConfig.getPortletContext().getRequestDispatcher(USAGE_VIEW);
- rarPathMap = new HashMap<String, String>();
- rarPathMap.put("TranQL XA Resource Adapter for DB2", "tranql-connector-db2-xa");
- rarPathMap.put("TranQL Client Local Transaction Resource Adapter for Apache Derby", "tranql-connector-derby-client-local");
- rarPathMap.put("TranQL Client XA Resource Adapter for Apache Derby", "tranql-connector-derby-client-xa");
-// rarPathMap.put("TranQL Embedded Local Transaction Resource Adapter for Apache Derby", "tranql-connector-derby-embed-local");
-// rarPathMap.put("TranQL Embedded XA Resource Adapter for Apache Derby", "tranql-connector-derby-embed-xa");
- rarPathMap.put("TranQL Embedded XA Resource Adapter for Apache Derby", "tranql-connector-derby-embed-local");
- rarPathMap.put("TranQL XA Resource Adapter for Informix", "tranql-connector-informix-xa");
- rarPathMap.put("TranQL Client Local Transaction Resource Adapter for MySQL", "tranql-connector-mysql-local");
- rarPathMap.put("TranQL Client XA Resource Adapter for MySQL", "tranql-connector-mysql-xa");
- rarPathMap.put("TranQL Local Resource Adapter for Oracle", "tranql-connector-oracle-local");
- rarPathMap.put("TranQL XA Resource Adapter for Oracle", "tranql-connector-oracle-xa");
- rarPathMap.put("TranQL Local Resource Adapter for PostgreSQL", "tranql-connector-postgresql-local");
- rarPathMap.put("TranQL XA Resource Adapter for PostgreSQL", "tranql-connector-postgresql-xa");
- rarPathMap.put("TranQL XA Resource Adapter for SQLServer 2000", "tranql-connector-sqlserver2000-xa");
- rarPathMap.put("TranQL XA Resource Adapter for SQLServer 2005", "tranql-connector-sqlserver2005-xa");
- }
-
- public void destroy() {
- listView = null;
- editView = null;
- selectRDBMSView = null;
- basicParamsView = null;
- confirmURLView = null;
- testConnectionView = null;
- downloadView = null;
- downloadStatusView = null;
- planView = null;
- importUploadView = null;
- importStatusView = null;
- usageView = null;
- rarPathMap.clear();
- super.destroy();
- }
-
- public DriverDownloader.DriverInfo[] getDriverInfo(PortletRequest request) {
- PortletSession session = request.getPortletSession(true);
- DriverDownloader.DriverInfo[] results = (DriverDownloader.DriverInfo[]) session.getAttribute(DRIVER_SESSION_KEY,
- PortletSession.APPLICATION_SCOPE);
- if (results == null) {
- DriverDownloader downloader = new DriverDownloader();
- try {
- results = downloader.loadDriverInfo(new URL(DRIVER_INFO_URL));
- session.setAttribute(DRIVER_SESSION_KEY, results, PortletSession.APPLICATION_SCOPE);
- } catch (MalformedURLException e) {
- log.error("Unable to download driver data", e);
- results = new DriverDownloader.DriverInfo[0];
- }
- }
- return results;
- }
-
- /**
- * Loads data about a resource adapter. Depending on what we already have, may load
- * the name and description, but always loads the config property descriptions.
- *
- * @param request Pass it or die
- * @param rarPath If we're creating a new RA, the path to identify it
- * @param displayName If we're editing an existing RA, its name
- * @param adapterAbstractName If we're editing an existing RA, its AbstractName
- * @return resource adapter parameter data object
- */
- public ResourceAdapterParams getRARConfiguration(PortletRequest request, String rarPath, String displayName, String adapterAbstractName) {
- PortletSession session = request.getPortletSession(true);
- if (rarPath != null && !rarPath.equals("")) {
- ResourceAdapterParams results = (ResourceAdapterParams) session.getAttribute(
- CONFIG_SESSION_KEY + "-" + rarPath, PortletSession.APPLICATION_SCOPE);
- if (results == null) {
- results = loadConfigPropertiesByPath(request, rarPath);
- session.setAttribute(CONFIG_SESSION_KEY + "-" + rarPath, results, PortletSession.APPLICATION_SCOPE);
- session.setAttribute(CONFIG_SESSION_KEY + "-" + results.displayName, results, PortletSession.APPLICATION_SCOPE);
- }
- return results;
- } else if (displayName != null && !displayName.equals(
- "") && adapterAbstractName != null && !adapterAbstractName.equals("")) {
- ResourceAdapterParams results = (ResourceAdapterParams) session.getAttribute(
- CONFIG_SESSION_KEY + "-" + displayName, PortletSession.APPLICATION_SCOPE);
- if (results == null) {
- results = loadConfigPropertiesByAbstractName(request, rarPathMap.get(displayName), adapterAbstractName);
- session.setAttribute(CONFIG_SESSION_KEY + "-" + displayName, results, PortletSession.APPLICATION_SCOPE);
- }
- return results;
- } else {
- throw new IllegalArgumentException();
- }
- }
-
- public void processAction(ActionRequest actionRequest,
- ActionResponse actionResponse) throws PortletException, IOException {
- String mode = actionRequest.getParameter(MODE_KEY);
- if (mode.equals(IMPORT_UPLOAD_MODE)) {
- processImportUpload(actionRequest, actionResponse);
- actionResponse.setRenderParameter(MODE_KEY, IMPORT_STATUS_MODE);
- return;
- }
- PoolData data = new PoolData();
- data.load(actionRequest);
- if (mode.equals("process-" + SELECT_RDBMS_MODE)) {
- DatabaseDriver info = getDatabaseInfo(actionRequest, data);
- if (info != null) {
- data.rarPath = info.getRAR().toString();
- if (info.isSpecific()) {
- data.adapterDisplayName = "Unknown"; // will pick these up when we process the RA type in the render request
- data.adapterDescription = "Unknown";
- actionResponse.setRenderParameter(MODE_KEY, EDIT_MODE);
- } else {
- data.driverClass = info.getDriverClassName();
- data.urlPrototype = info.getURLPrototype();
- actionResponse.setRenderParameter(MODE_KEY, BASIC_PARAMS_MODE);
- }
- } else {
- actionResponse.setRenderParameter(MODE_KEY, SELECT_RDBMS_MODE);
- }
- } else if (mode.equals("process-" + DOWNLOAD_MODE)) {
- String name = actionRequest.getParameter("driverName");
- DriverDownloader.DriverInfo[] drivers = getDriverInfo(actionRequest);
- DriverDownloader.DriverInfo found = null;
- for (DriverDownloader.DriverInfo driver : drivers) {
- if (driver.getName().equals(name)) {
- found = driver;
- break;
- }
- }
- if (found != null) {
- data.jars = new String[]{found.getRepositoryURI()};
- WriteableRepository repo = PortletManager.getCurrentServer(actionRequest).getWritableRepositories()[0];
- final PortletSession session = actionRequest.getPortletSession();
- ProgressInfo progressInfo = new ProgressInfo();
- progressInfo.setMainMessage("Downloading " + found.getName());
- session.setAttribute(ProgressInfo.PROGRESS_INFO_KEY, progressInfo, PortletSession.APPLICATION_SCOPE);
- // Start the download monitoring
- new Thread(new Downloader(found, progressInfo, repo)).start();
- actionResponse.setRenderParameter(MODE_KEY, DOWNLOAD_STATUS_MODE);
- } else {
- actionResponse.setRenderParameter(MODE_KEY, DOWNLOAD_MODE);
- }
- } else if (mode.equals("process-" + DOWNLOAD_STATUS_MODE)) {
- if (data.getDbtype() == null || data.getDbtype().equals("Other")) {
- actionResponse.setRenderParameter(MODE_KEY, BASIC_PARAMS_MODE);
- } else {
- actionResponse.setRenderParameter(MODE_KEY, EDIT_MODE);
- }
- } else if (mode.equals("process-" + BASIC_PARAMS_MODE)) {
- DatabaseDriver info;
- info = getDatabaseInfo(actionRequest, data);
- if (info != null) {
- data.url = populateURL(info.getURLPrototype(), info.getURLParameters(), data.getUrlProperties());
- }
- if (attemptDriverLoad(actionRequest, data) != null) {
- actionResponse.setRenderParameter(MODE_KEY, CONFIRM_URL_MODE);
- } else {
- actionResponse.setRenderParameter("driverError", "Unable to load driver " + data.driverClass);
- actionResponse.setRenderParameter(MODE_KEY, BASIC_PARAMS_MODE);
- }
- } else if (mode.equals("process-" + CONFIRM_URL_MODE)) {
- String test = actionRequest.getParameter("test");
- if (test == null || test.equals("true")) {
- try {
- String targetDBInfo = attemptConnect(actionRequest, data);
- actionResponse.setRenderParameter("targetDBInfo", targetDBInfo);
- actionResponse.setRenderParameter("connected", "true");
- } catch (Exception e) {
- StringWriter writer = new StringWriter();
- PrintWriter temp = new PrintWriter(writer);
- e.printStackTrace(temp);
- temp.flush();
- temp.close();
- addErrorMessage(actionRequest, getLocalizedString(actionRequest, "dbwizard.testConnection.connectionError"), writer.getBuffer().toString());
- actionResponse.setRenderParameter("connected", "false");
- }
- actionResponse.setRenderParameter(MODE_KEY, TEST_CONNECTION_MODE);
- } else {
- save(actionRequest, actionResponse, data, false);
- }
- } else if (mode.equals(SAVE_MODE)) {
- save(actionRequest, actionResponse, data, false);
- } else if (mode.equals(SHOW_PLAN_MODE)) {
- String plan = save(actionRequest, actionResponse, data, true);
- actionRequest.getPortletSession(true).setAttribute("deploymentPlan", plan);
- actionResponse.setRenderParameter(MODE_KEY, SHOW_PLAN_MODE);
- } else if (mode.equals(EDIT_EXISTING_MODE)) {
- final String name = actionRequest.getParameter("adapterAbstractName");
- loadConnectionFactory(actionRequest, name, data.getAbstractName(), data);
- actionResponse.setRenderParameter("adapterAbstractName", name);
- actionResponse.setRenderParameter(MODE_KEY, EDIT_MODE);
- } else if (mode.equals(SELECT_RDBMS_MODE)) {
- if (data.getAdapterDisplayName() == null) { // Set a default for a new pool
- data.adapterDisplayName = "TranQL Generic JDBC Resource Adapter";
- }
- actionResponse.setRenderParameter(MODE_KEY, mode);
- } else if (mode.equals(WEBLOGIC_IMPORT_MODE)) {
- String domainDir = actionRequest.getParameter("weblogicDomainDir");
- String libDir = actionRequest.getParameter("weblogicLibDir");
- try {
- DatabaseConversionStatus status = WebLogic81DatabaseConverter.convert(libDir, domainDir);
- actionRequest.getPortletSession(true).setAttribute("ImportStatus", new ImportStatus(status));
- actionResponse.setRenderParameter(MODE_KEY, IMPORT_STATUS_MODE);
- } catch (Exception e) {
- log.error("Unable to import", e);
- actionResponse.setRenderParameter("from", actionRequest.getParameter("from"));
- actionResponse.setRenderParameter(MODE_KEY, IMPORT_START_MODE);
- }
- } else if (mode.equals(IMPORT_START_MODE)) {
- actionResponse.setRenderParameter("from", actionRequest.getParameter("from"));
- actionResponse.setRenderParameter(MODE_KEY, mode);
- } else if (mode.equals(IMPORT_EDIT_MODE)) {
- ImportStatus status = getImportStatus(actionRequest);
- int index = Integer.parseInt(actionRequest.getParameter("importIndex"));
- status.setCurrentPoolIndex(index);
- loadImportedData(actionRequest, data, status.getCurrentPool());
- actionResponse.setRenderParameter(MODE_KEY, EDIT_MODE);
- } else if (mode.equals(IMPORT_COMPLETE_MODE)) {
- ImportStatus status = getImportStatus(actionRequest);
- log.warn("Import Results:"); //todo: create a screen for this
- log.warn(" " + status.getSkippedCount() + " ignored");
- log.warn(" " + status.getStartedCount() + " reviewed but not deployed");
- log.warn(" " + status.getPendingCount() + " not reviewed");
- log.warn(" " + status.getFinishedCount() + " deployed");
- actionRequest.getPortletSession().removeAttribute("ImportStatus");
- } else if (mode.equals(DELETE_MODE)) {
- String name = actionRequest.getParameter("adapterAbstractName");
- loadConnectionFactory(actionRequest, name, data.getAbstractName(), data);
- delete(actionRequest, actionResponse, data);
- } else {
- actionResponse.setRenderParameter(MODE_KEY, mode);
- }
- data.store(actionResponse);
- }
-
- private static class Downloader implements Runnable {
- private WriteableRepository repo;
- private DriverDownloader.DriverInfo driver;
- private ProgressInfo progressInfo;
-
- public Downloader(DriverDownloader.DriverInfo driver, ProgressInfo progressInfo, WriteableRepository repo) {
- this.driver = driver;
- this.progressInfo = progressInfo;
- this.repo = repo;
- }
-
- public void run() {
- DriverDownloader downloader = new DriverDownloader();
- try {
- downloader.loadDriver(repo, driver, new FileWriteMonitor() {
- private int fileSize;
-
- public void writeStarted(String fileDescription, int fileSize) {
- this.fileSize = fileSize;
- log.info("Downloading " + fileDescription);
- }
-
- public void writeProgress(int bytes) {
- int kbDownloaded = (int) Math.floor(bytes / 1024);
- if (fileSize > 0) {
- int percent = (bytes * 100) / fileSize;
- progressInfo.setProgressPercent(percent);
- progressInfo.setSubMessage(kbDownloaded + " / " + fileSize / 1024 + " Kb downloaded");
- } else {
- progressInfo.setSubMessage(kbDownloaded + " Kb downloaded");
- }
- }
-
- public void writeComplete(int bytes) {
- log.info("Finished downloading " + bytes + " b");
- }
- });
- } catch (IOException e) {
- log.error("Unable to download database driver", e);
- } finally {
- progressInfo.setFinished(true);
- }
- }
- }
-
- private void loadImportedData(PortletRequest request, PoolData data, ImportStatus.PoolProgress progress) throws PortletException {
- if (!progress.getType().equals(ImportStatus.PoolProgress.TYPE_XA)) {
- JDBCPool pool = (JDBCPool) progress.getPool();
- data.dbtype = "Other";
- data.adapterDisplayName = "TranQL Generic JDBC Resource Adapter";
- data.blockingTimeout = getImportString(pool.getBlockingTimeoutMillis());
- data.driverClass = pool.getDriverClass();
- data.idleTimeout = pool.getIdleTimeoutMillis() != null ? Integer.toString(
- pool.getIdleTimeoutMillis().intValue() / (60 * 1000)) : null;
- data.maxSize = getImportString(pool.getMaxSize());
- data.minSize = getImportString(pool.getMinSize());
- data.name = pool.getName();
- data.password = pool.getPassword();
- data.url = pool.getJdbcURL();
- data.user = pool.getUsername();
- if (pool.getDriverClass() != null) {
- DatabaseDriver info = getDatabaseInfoFromDriver(request, data);
- if (info != null) {
- data.rarPath = info.getRAR().toString();
- data.urlPrototype = info.getURLPrototype();
- } else {
- throw new PortletException("Don't recognize database driver " + data.driverClass + "!");
- }
- }
- } else {
- //todo: handle XA
- }
- }
-
- private static String getImportString(Integer value) {
- return value == null ? null : value.toString();
- }
-
- private boolean processImportUpload(ActionRequest request, ActionResponse response) throws PortletException {
- String type = request.getParameter("importSource");
- response.setRenderParameter("importSource", type);
- if (!PortletFileUpload.isMultipartContent(request)) {
- throw new PortletException("Expected file upload");
- }
-
- PortletFileUpload uploader = new PortletFileUpload(new DiskFileItemFactory());
- try {
- List<FileItem> items = uploader.parseRequest(request);
- for (FileItem item : items) {
- if (!item.isFormField()) {
- File file = File.createTempFile("geronimo-import", "");
- file.deleteOnExit();
- log.debug("Writing database pool import file to " + file.getAbsolutePath());
- item.write(file);
- DatabaseConversionStatus status = processImport(file, type);
- request.getPortletSession(true).setAttribute("ImportStatus", new ImportStatus(status));
- return true;
- } else {
- throw new PortletException("Not expecting any form fields");
- }
- }
- } catch (PortletException e) {
- throw e;
- } catch (Exception e) {
- throw new PortletException(e);
- }
- return false;
- }
-
- private DatabaseConversionStatus processImport(File importFile, String type) throws PortletException, IOException {
- if (type.equals("JBoss 4")) {
- return JBoss4DatabaseConverter.convert(new FileReader(importFile));
- } else if (type.equals("WebLogic 8.1")) {
- return WebLogic81DatabaseConverter.convert(new FileReader(importFile));
- } else {
- throw new PortletException("Unknown import type '" + type + "'");
- }
- }
-
- private ResourceAdapterParams loadConfigPropertiesByPath(PortletRequest request, String rarPath) {
- DeploymentManager mgr = ManagementHelper.getManagementHelper(request).getDeploymentManager();
- try {
- URI uri = getRAR(request, rarPath).toURI();
- ConnectorDeployable deployable = new ConnectorDeployable(PortletManager.getRepositoryEntryBundle(request, uri.toString()));
- final DDBeanRoot ddBeanRoot = deployable.getDDBeanRoot();
- String adapterName = null, adapterDesc = null;
- String[] test = ddBeanRoot.getText("connector/display-name");
- if (test != null && test.length > 0) {
- adapterName = test[0];
- }
- test = ddBeanRoot.getText("connector/description");
- if (test != null && test.length > 0) {
- adapterDesc = test[0];
- }
- DDBean[] definitions = ddBeanRoot.getChildBean(
- "connector/resourceadapter/outbound-resourceadapter/connection-definition");
- List<ConfigParam> configs = new ArrayList<ConfigParam>();
- if (definitions != null) {
- for (DDBean definition : definitions) {
- String iface = definition.getText("connectionfactory-interface")[0];
- if (iface.equals("javax.sql.DataSource")) {
- DDBean[] beans = definition.getChildBean("config-property");
- for (DDBean bean : beans) {
- String name = bean.getText("config-property-name")[0].trim();
- String type = bean.getText("config-property-type")[0].trim();
- test = bean.getText("config-property-value");
- String value = test == null || test.length == 0 ? null : test[0].trim();
- test = bean.getText("description");
- String desc = test == null || test.length == 0 ? null : test[0].trim();
- configs.add(new ConfigParam(name, type, desc, value));
- }
- }
- }
- }
- return new ResourceAdapterParams(adapterName, adapterDesc, rarPath.substring(11, rarPath.length()-5), configs.toArray(new ConfigParam[configs.size()]));
- } catch (Exception e) {
- log.error("Unable to read configuration properties", e);
- return null;
- } finally {
- if (mgr != null) mgr.release();
- }
- }
-
- private ResourceAdapterParams loadConfigPropertiesByAbstractName(PortletRequest request, String rarPath, String abstractName) {
- ResourceAdapterModule module = (ResourceAdapterModule) PortletManager.getManagedBean(request,
- new AbstractName(URI.create(abstractName)));
- String dd = module.getDeploymentDescriptor();
- DocumentBuilderFactory factory = XmlUtil.newDocumentBuilderFactory();
- factory.setValidating(false);
- factory.setNamespaceAware(true);
- try {
- DocumentBuilder builder = factory.newDocumentBuilder();
- final StringReader reader = new StringReader(dd);
- Document doc = builder.parse(new InputSource(reader));
- reader.close();
- Element elem = doc.getDocumentElement(); // connector
- String displayName = getFirstText(elem.getElementsByTagName("display-name"));
- String description = getFirstText(elem.getElementsByTagName("description"));
- elem = (Element) elem.getElementsByTagName("resourceadapter").item(0);
- elem = (Element) elem.getElementsByTagName("outbound-resourceadapter").item(0);
- NodeList defs = elem.getElementsByTagName("connection-definition");
- List<ConfigParam> all = new ArrayList<ConfigParam>();
- for (int i = 0; i < defs.getLength(); i++) {
- final Element def = (Element) defs.item(i);
- String iface = getFirstText(def.getElementsByTagName("connectionfactory-interface")).trim();
- if (iface.equals("javax.sql.DataSource")) {
- NodeList configs = def.getElementsByTagName("config-property");
- for (int j = 0; j < configs.getLength(); j++) {
- Element config = (Element) configs.item(j);
- String name = getFirstText(config.getElementsByTagName("config-property-name")).trim();
- String type = getFirstText(config.getElementsByTagName("config-property-type")).trim();
- String test = getFirstText(config.getElementsByTagName("config-property-value"));
- String value = test == null ? null : test.trim();
- test = getFirstText(config.getElementsByTagName("description"));
- String desc = test == null ? null : test.trim();
- all.add(new ConfigParam(name, type, desc, value));
- }
- }
- }
- return new ResourceAdapterParams(displayName, description, rarPath, all.toArray(new ConfigParam[all.size()]));
- } catch (Exception e) {
- log.error("Unable to read resource adapter DD", e);
- return null;
- }
- }
-
- private String getFirstText(NodeList list) {
- if (list.getLength() == 0) {
- return null;
- }
- Element first = (Element) list.item(0);
- StringBuffer buf = new StringBuffer();
- NodeList all = first.getChildNodes();
- for (int i = 0; i < all.getLength(); i++) {
- Node node = all.item(i);
- if (node.getNodeType() == Node.TEXT_NODE) {
- buf.append(node.getNodeValue());
- }
- }
- return buf.toString();
- }
-
- private void loadConnectionFactory(ActionRequest actionRequest, String adapterName, String factoryName, PoolData data) {
- AbstractName abstractAdapterName = new AbstractName(URI.create(adapterName));
- AbstractName abstractFactoryName = new AbstractName(URI.create(factoryName));
-
- ResourceAdapterModule adapter = (ResourceAdapterModule) PortletManager.getManagedBean(actionRequest,
- abstractAdapterName);
- JCAManagedConnectionFactory factory = (JCAManagedConnectionFactory) PortletManager.getManagedBean(actionRequest,
- abstractFactoryName);
- data.adapterDisplayName = adapter.getDisplayName();
- data.adapterDescription = adapter.getDescription();
- try {
- data.name = (String) abstractFactoryName.getName().get("name");
- if (data.isGeneric()) {
- data.url = (String) factory.getConfigProperty("ConnectionURL");
- data.driverClass = (String) factory.getConfigProperty("Driver");
- data.user = (String) factory.getConfigProperty("UserName");
- data.password = (String) factory.getConfigProperty("Password");
- } else {
- ResourceAdapterParams params = getRARConfiguration(actionRequest, data.getRarPath(),
- data.getAdapterDisplayName(), adapterName);
- for (int i = 0; i < params.getConfigParams().length; i++) {
- ConfigParam cp = params.getConfigParams()[i];
- Object value = factory.getConfigProperty(cp.getName());
- data.properties.put("property-" + cp.getName(), value == null ? null : value.toString());
- }
- data.sort();
- }
- } catch (Exception e) {
- log.error("Unable to look up connection property", e);
- }
- //todo: push the lookup into ManagementHelper
- PoolingAttributes pool = (PoolingAttributes) factory.getConnectionManagerContainer();
- data.minSize = Integer.toString(pool.getPartitionMinSize());
- data.maxSize = Integer.toString(pool.getPartitionMaxSize());
- data.blockingTimeout = Integer.toString(pool.getBlockingTimeoutMilliseconds());
- data.idleTimeout = Integer.toString(pool.getIdleTimeoutMinutes());
-
- }
-
- protected void doView(RenderRequest renderRequest, RenderResponse renderResponse) throws IOException, PortletException {
- if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
- return;
- }
- try {
- String mode = renderRequest.getParameter(MODE_KEY);
- PoolData data = new PoolData();
- data.load(renderRequest);
- renderRequest.setAttribute("pool", data);
- // If not headed anywhere in particular, send to list
- if (mode == null || mode.equals("")) {
- mode = LIST_MODE;
- }
- // If headed to list but there's an import in progress, redirect to import status
- if (mode.equals(LIST_MODE) && getImportStatus(renderRequest) != null) {
- mode = IMPORT_STATUS_MODE;
- }
-
- if (mode.equals(LIST_MODE)) {
- renderList(renderRequest, renderResponse);
- } else if (mode.equals(EDIT_MODE)) {
- renderEdit(renderRequest, renderResponse, data);
- } else if (mode.equals(SELECT_RDBMS_MODE)) {
- renderSelectRDBMS(renderRequest, renderResponse);
- } else if (mode.equals(DOWNLOAD_MODE)) {
- renderDownload(renderRequest, renderResponse);
- } else if (mode.equals(DOWNLOAD_STATUS_MODE)) {
- renderDownloadStatus(renderRequest, renderResponse);
- } else if (mode.equals(BASIC_PARAMS_MODE)) {
- renderBasicParams(renderRequest, renderResponse, data);
- } else if (mode.equals(CONFIRM_URL_MODE)) {
- renderConfirmURL(renderRequest, renderResponse);
- } else if (mode.equals(TEST_CONNECTION_MODE)) {
- renderTestConnection(renderRequest, renderResponse);
- } else if (mode.equals(SHOW_PLAN_MODE)) {
- renderPlan(renderRequest, renderResponse, data);
- } else if (mode.equals(IMPORT_START_MODE)) {
- renderImportUploadForm(renderRequest, renderResponse);
- } else if (mode.equals(IMPORT_STATUS_MODE)) {
- renderImportStatus(renderRequest, renderResponse);
- } else if (mode.equals(USAGE_MODE)) {
- renderUsage(renderRequest, renderResponse);
- }
- } catch (Throwable e) {
- log.error("Unable to render portlet", e);
- }
- }
-
- private void renderUsage(RenderRequest request, RenderResponse response) throws IOException, PortletException {
- usageView.include(request, response);
- }
-
- private void renderImportStatus(RenderRequest request, RenderResponse response) throws IOException, PortletException {
- request.setAttribute("status", getImportStatus(request));
- populatePoolList(request);
- importStatusView.include(request, response);
- }
-
- private void renderImportUploadForm(RenderRequest request, RenderResponse response) throws IOException, PortletException {
- request.setAttribute("from", request.getParameter("from"));
- importUploadView.include(request, response);
- }
-
- private void renderList(RenderRequest renderRequest, RenderResponse renderResponse) throws IOException, PortletException {
- populatePoolList(renderRequest);
- listView.include(renderRequest, renderResponse);
- }
-
- private void populatePoolList(PortletRequest renderRequest) {
- ResourceAdapterModule[] modules = PortletManager.getOutboundRAModules(renderRequest, "javax.sql.DataSource");
- List<ConnectionPool> list = new ArrayList<ConnectionPool>();
- for (ResourceAdapterModule module : modules) {
- AbstractName moduleName = PortletManager.getManagementHelper(renderRequest).getNameFor(module);
-
- JCAManagedConnectionFactory[] databases = PortletManager.getOutboundFactoriesForRA(renderRequest, module,
- "javax.sql.DataSource");
- for (JCAManagedConnectionFactory db : databases) {
- AbstractName dbName = PortletManager.getManagementHelper(renderRequest).getNameFor(db);
- list.add(new ConnectionPool(moduleName, dbName, (String) dbName.getName().get(NameFactory.J2EE_NAME),
- ((GeronimoManagedBean) db).getState()));
- }
- }
- Collections.sort(list);
- renderRequest.setAttribute("pools", list);
- }
-
- private void renderEdit(RenderRequest renderRequest, RenderResponse renderResponse, PoolData data) throws IOException, PortletException {
- if (data.abstractName == null || data.abstractName.equals("")) {
- DatabaseDriver info = getDatabaseInfo(renderRequest, data);
- loadDriverJARList(renderRequest, info);
- }
- if (!data.isGeneric()) {
- ResourceAdapterParams params = getRARConfiguration(renderRequest, data.getRarPath(),
- data.getAdapterDisplayName(), renderRequest.getParameter("adapterAbstractName"));
- data.adapterDisplayName = params.getDisplayName();
- data.adapterDescription = params.getDescription();
- data.adapterRarPath = params.getRarPath();
- Map<String, ConfigParam> map = new HashMap<String, ConfigParam>();
- boolean more = false;
- for (int i = 0; i < params.getConfigParams().length; i++) {
- ConfigParam param = params.getConfigParams()[i];
- if (!data.properties.containsKey("property-" + param.getName())) {
- data.properties.put("property-" + param.getName(), param.getDefaultValue());
- more = true;
- }
- map.put("property-" + param.getName(), param);
- }
- if (more) {
- data.loadPropertyNames();
- }
- data.sort();
- renderRequest.setAttribute("ConfigParams", map);
- }
- editView.include(renderRequest, renderResponse);
- }
-
- private void renderSelectRDBMS(RenderRequest renderRequest, RenderResponse renderResponse) throws IOException, PortletException {
- renderRequest.setAttribute("databases", getAllDrivers(renderRequest));
- selectRDBMSView.include(renderRequest, renderResponse);
- }
-
- private void renderDownload(RenderRequest renderRequest, RenderResponse renderResponse) throws IOException, PortletException {
- renderRequest.setAttribute("drivers", getDriverInfo(renderRequest));
- downloadView.include(renderRequest, renderResponse);
- }
-
- private void renderDownloadStatus(RenderRequest renderRequest, RenderResponse renderResponse) throws IOException, PortletException {
- downloadStatusView.include(renderRequest, renderResponse);
- }
-
- private void renderBasicParams(RenderRequest renderRequest, RenderResponse renderResponse, PoolData data) throws IOException, PortletException {
- DatabaseDriver info = getDatabaseInfo(renderRequest, data);
- loadDriverJARList(renderRequest, info);
- // Make sure all properties available for the DB are listed
- if (info != null) {
- for (String param : info.getURLParameters()) {
- final String key = "urlproperty-" + param;
- if (!data.getUrlProperties().containsKey(key)) {
- data.getUrlProperties().put(key,
- param.equalsIgnoreCase("port") && info.getDefaultPort() > 0 ? info.getDefaultPort() : null);
- }
- }
- }
- // Pass on errors
- renderRequest.setAttribute("driverError", renderRequest.getParameter("driverError"));
-
- basicParamsView.include(renderRequest, renderResponse);
- }
-
- private void loadDriverJARList(RenderRequest renderRequest, DatabaseDriver info) {
- // List the available JARs
- List<String> list = new ArrayList<String>();
- ListableRepository[] repos = PortletManager.getCurrentServer(renderRequest).getRepositories();
- Set<Artifact> dependencyFilters = info == null? null : info.getDependencyFilters();
- for (ListableRepository repo : repos) {
- SortedSet<Artifact> artifacts = repo.list();
- for (Artifact artifact : artifacts) {
- if (dependencyFilters != null) {
- for (Artifact filter: dependencyFilters) {
- // It is too strict if using artifact.matches(filter)
- if (filter.getGroupId() != null && artifact.getGroupId().indexOf(filter.getGroupId()) == -1) continue;
- if (filter.getArtifactId() != null && artifact.getArtifactId().indexOf(filter.getArtifactId()) == -1) continue;
- if (filter.getVersion() != null && !artifact.getVersion().equals(filter.getVersion())) continue;
- if (filter.getType() != null && !artifact.getType().equals(filter.getType())) continue;
- list.add(artifact.toString());
- }
-
- } else if (INCLUDE_ARTIFACTIDS.contains(artifact.getArtifactId())
- || !EXCLUDE_GROUPIDS.contains(artifact.getGroupId())) {
- list.add(artifact.toString());
- }
- }
- }
- Collections.sort(list);
- renderRequest.setAttribute("availableJars", list);
- }
-
- private void renderConfirmURL(RenderRequest renderRequest, RenderResponse renderResponse) throws IOException, PortletException {
- confirmURLView.include(renderRequest, renderResponse);
- }
-
- private void renderTestConnection(RenderRequest renderRequest, RenderResponse renderResponse) throws IOException, PortletException {
- // Pass on results
- renderRequest.setAttribute("targetDBInfo", renderRequest.getParameter("targetDBInfo"));
- renderRequest.setAttribute("connected", Boolean.valueOf(renderRequest.getParameter("connected")));
- testConnectionView.include(renderRequest, renderResponse);
- }
-
- private void renderPlan(RenderRequest renderRequest, RenderResponse renderResponse, PoolData data) throws IOException, PortletException {
- // Pass on results
- renderRequest.setAttribute("deploymentPlan", renderRequest.getPortletSession().getAttribute("deploymentPlan"));
- // Digest the RAR URI
- String path = PortletManager.getRepositoryEntry(renderRequest, data.getRarPath()).getPath();
- String base = PortletManager.getCurrentServer(renderRequest).getServerInfo().getCurrentBaseDirectory();
- if (base != null && path.startsWith(base)) {
- path = path.substring(base.length());
- if (path.startsWith("/")) {
- path = path.substring(1);
- }
- } else {
- int pos = path.lastIndexOf('/');
- path = path.substring(pos + 1);
- }
- renderRequest.setAttribute("rarRelativePath", path);
-
- planView.include(renderRequest, renderResponse);
- }
-
- private static String attemptConnect(PortletRequest request, PoolData data) throws SQLException, IllegalAccessException, InstantiationException {
- Class driverClass = attemptDriverLoad(request, data);
- Driver driver = (Driver) driverClass.newInstance();
- if (driver.acceptsURL(data.url)) {
- Properties props = new Properties();
- if (data.user != null) {
- props.put("user", data.user);
- }
- if (data.password != null) {
- props.put("password", data.password);
- }
- Connection con = null;
- try {
- con = driver.connect(data.url, props);
- final DatabaseMetaData metaData = con.getMetaData();
- return metaData.getDatabaseProductName() + " " + metaData.getDatabaseProductVersion();
- } finally {
- if (con != null) {
- try {
- con.close();
- } catch (SQLException e) {
- //ignore
- }
- }
- }
- } else throw new SQLException("Driver " + data.getDriverClass() + " does not accept URL " + data.url);
- }
-
- private void delete(PortletRequest request, ActionResponse response, PoolData data) {
- // check to make sure the abstract name does not begin with 'org.apache.geronimo.configs'
- // if it does not - then delete it -- otherwise it is a system database
- if (data.getAbstractName() != null) {
- boolean isSystemDatabasePool = (data.getAbstractName().indexOf("org.apache.geronimo.configs") == 0);
-
- if (!isSystemDatabasePool) {
- DeploymentManager mgr = ManagementHelper.getManagementHelper(request).getDeploymentManager();
- try {
- // retrieve all running modules
- TargetModuleID[] runningIds = mgr.getRunningModules(ModuleType.RAR, mgr.getTargets());
-
- // index of module to keep
- int index = -1;
-
- // only keep module id that is associated with selected DB pool
- for (int i = 0; i < runningIds.length; i++) {
- if (data.getAbstractName().contains(runningIds[i].getModuleID())) {
- index = i;
- break;
- }
- }
- TargetModuleID[] ids = {runningIds[index]};
-
- // undeploy the db pool
- ProgressObject po = mgr.undeploy(ids);
- waitForProgress(po);
-
- if (po.getDeploymentStatus().isCompleted()) {
- log.info("Undeployment completed successfully!");
- }
- } catch (Exception e) {
- log.error("Undeployment unsuccessful!");
- } finally {
- if (mgr != null) mgr.release();
- }
- }
- }
- }
-
- private static String save(PortletRequest request, ActionResponse response, PoolData data, boolean planOnly) {
- ImportStatus status = getImportStatus(request);
- if (data.abstractName == null || data.abstractName.equals("")) { // we're creating a new pool
- data.name = data.name.replaceAll("\\s", "");
- DeploymentManager mgr = ManagementHelper.getManagementHelper(request).getDeploymentManager();
- try {
- File rarFile = getRAR(request, data.getRarPath());
- URI uri = getRAR(request, data.getRarPath()).toURI();
- ConnectorDeployable deployable = new ConnectorDeployable(PortletManager.getRepositoryEntryBundle(request, uri.toString()));
- DeploymentConfiguration config = mgr.createConfiguration(deployable);
- final DDBeanRoot ddBeanRoot = deployable.getDDBeanRoot();
- Connector15DCBRoot root = (Connector15DCBRoot) config.getDConfigBeanRoot(ddBeanRoot);
- ConnectorDCB connector = (ConnectorDCB) root.getDConfigBean(
- ddBeanRoot.getChildBean(root.getXpaths()[0])[0]);
-
- EnvironmentData environment = new EnvironmentData();
- connector.setEnvironment(environment);
- org.apache.geronimo.deployment.service.jsr88.Artifact configId = new org.apache.geronimo.deployment.service.jsr88.Artifact();
- environment.setConfigId(configId);
- configId.setGroupId("console.dbpool");
- configId.setVersion("1.0");
- configId.setType("car");
-
- String artifactId = data.name;
- // simply replace / with _ if / exists within the artifactId
- // this is needed because we don't allow / within the artifactId
- artifactId = artifactId.replace('/', '_');
-
- // Let's check whether the artifact exists
- ConfigurationManager configurationManager = ConfigurationUtil.getConfigurationManager(PortletManager.getKernel());
- if (configurationManager.isInstalled(new Artifact(configId.getGroupId(), artifactId,
- configId.getVersion(), configId.getType()))) {
- artifactId = artifactId + "_" + new Random(System.currentTimeMillis()).nextInt(99);
- }
-
- configId.setArtifactId(artifactId);
-
- String[] jars = data.getJars();
- int length = jars[jars.length - 1].length() == 0 ? jars.length - 1 : jars.length;
- org.apache.geronimo.deployment.service.jsr88.Artifact[] dependencies = new org.apache.geronimo.deployment.service.jsr88.Artifact[length];
- for (int i = 0; i < dependencies.length; i++) {
- dependencies[i] = new org.apache.geronimo.deployment.service.jsr88.Artifact();
- }
- environment.setDependencies(dependencies);
- for (int i = 0; i < dependencies.length; i++) {
- Artifact tmp = Artifact.create(jars[i]);
- dependencies[i].setGroupId(tmp.getGroupId());
- dependencies[i].setArtifactId(tmp.getArtifactId());
- dependencies[i].setVersion(tmp.getVersion().toString());
- dependencies[i].setType(tmp.getType());
- }
-
- ResourceAdapter adapter = connector.getResourceAdapter()[0];
- ConnectionDefinition definition = new ConnectionDefinition();
- adapter.setConnectionDefinition(new ConnectionDefinition[]{definition});
- definition.setConnectionFactoryInterface("javax.sql.DataSource");
- ConnectionDefinitionInstance instance = new ConnectionDefinitionInstance();
- definition.setConnectionInstance(new ConnectionDefinitionInstance[]{instance});
- instance.setName(data.getName());
- ConfigPropertySetting[] settings = instance.getConfigPropertySetting();
- if (data.isGeneric()) { // it's a generic TranQL JDBC pool
- for (ConfigPropertySetting setting : settings) {
- if (setting.getName().equals("UserName")) {
- setting.setValue(data.user);
- } else if (setting.getName().equals("Password")) {
- setting.setValue(data.password);
- } else if (setting.getName().equals("ConnectionURL")) {
- setting.setValue(data.url);
- } else if (setting.getName().equals("Driver")) {
- setting.setValue(data.driverClass);
- }
- }
- } else { // it's an XA driver or non-TranQL RA
- for (ConfigPropertySetting setting : settings) {
- String value = data.properties.get("property-" + setting.getName());
- setting.setValue(value == null ? "" : value);
- }
- }
- ConnectionManager manager = instance.getConnectionManager();
- if(XA.equals(data.transactionType)){
- manager.setTransactionXA(true);
- } else if (NONE.equals(data.transactionType)){
- manager.setTransactionNone(true);
- } else {
- manager.setTransactionLocal(true);
- }
-
- SinglePool pool = new SinglePool();
- manager.setPoolSingle(pool);
- pool.setMatchOne(true);
- // Max Size needs to be set before the minimum. This is because
- // the connection manager will constrain the minimum based on the
- // current maximum value in the pool. We might consider adding a
- // setPoolConstraints method to allow specifying both at the same time.
- if (data.maxSize != null && !data.maxSize.equals("")) {
- pool.setMaxSize(new Integer(data.maxSize));
- }
- if (data.minSize != null && !data.minSize.equals("")) {
- pool.setMinSize(new Integer(data.minSize));
- }
- if (data.blockingTimeout != null && !data.blockingTimeout.equals("")) {
- pool.setBlockingTimeoutMillis(new Integer(data.blockingTimeout));
- }
- if (data.idleTimeout != null && !data.idleTimeout.equals("")) {
- pool.setIdleTimeoutMinutes(new Integer(data.idleTimeout));
- }
-
- if (planOnly) {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- config.save(out);
- out.close();
- return new String(out.toByteArray(), "US-ASCII");
- } else {
- File tempFile = File.createTempFile("console-deployment", ".xml");
- tempFile.deleteOnExit();
- log.debug("Writing database pool deployment plan to " + tempFile.getAbsolutePath());
- BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(tempFile));
- config.save(out);
- out.flush();
- out.close();
- Target[] targets = mgr.getTargets();
- if (null == targets) {
- throw new IllegalStateException("No target to distribute to");
- }
- targets = new Target[] {targets[0]};
-
- ProgressObject po = mgr.distribute(targets, rarFile, tempFile);
- waitForProgress(po);
- if (po.getDeploymentStatus().isCompleted()) {
- TargetModuleID[] ids = po.getResultTargetModuleIDs();
- po = mgr.start(ids);
- waitForProgress(po);
- if (po.getDeploymentStatus().isCompleted()) {
- ids = po.getResultTargetModuleIDs();
- if (status != null) {
- status.getCurrentPool().setName(data.getName());
- status.getCurrentPool().setConfigurationName(ids[0].getModuleID());
- status.getCurrentPool().setFinished(true);
- response.setRenderParameter(MODE_KEY, IMPORT_STATUS_MODE);
- }
-
- log.info("Deployment completed successfully!");
- }
- } else if (po.getDeploymentStatus().isFailed()) {
- data.deployError = "Unable to deploy: " + data.name;
- response.setRenderParameter(MODE_KEY, EDIT_MODE);
- log.info("Deployment Failed!");
- }
- }
- } catch (Exception e) {
- log.error("Unable to save connection pool", e);
- } finally {
- if (mgr != null) mgr.release();
- }
- } else { // We're saving updates to an existing pool
- if (planOnly) {
- throw new UnsupportedOperationException("Can't update a plan for an existing deployment");
- }
- try {
- JCAManagedConnectionFactory factory = (JCAManagedConnectionFactory) PortletManager.getManagedBean(
- request, new AbstractName(URI.create(data.getAbstractName())));
- if (data.isGeneric()) {
- factory.setConfigProperty("ConnectionURL", data.getUrl());
- factory.setConfigProperty("UserName", data.getUser());
- factory.setConfigProperty("Password", data.getPassword());
- } else {
- for (Map.Entry<String, String> entry : data.getProperties().entrySet()) {
- factory.setConfigProperty(entry.getKey().substring("property-".length()),
- entry.getValue());
- }
- }
- //todo: push the lookup into ManagementHelper
- PoolingAttributes pool = (PoolingAttributes) factory.getConnectionManagerContainer();
- pool.setPartitionMinSize(
- data.minSize == null || data.minSize.equals("") ? 0 : Integer.parseInt(data.minSize));
- pool.setPartitionMaxSize(
- data.maxSize == null || data.maxSize.equals("") ? 10 : Integer.parseInt(data.maxSize));
- pool.setBlockingTimeoutMilliseconds(
- data.blockingTimeout == null || data.blockingTimeout.equals("") ? 5000 : Integer.parseInt(
- data.blockingTimeout));
- pool.setIdleTimeoutMinutes(
- data.idleTimeout == null || data.idleTimeout.equals("") ? 15 : Integer.parseInt(
- data.idleTimeout));
- } catch (Exception e) {
- log.error("Unable to save connection pool", e);
- }
- }
- return null;
- }
-
- private static void waitForProgress(ProgressObject po) {
- while (po.getDeploymentStatus().isRunning()) {
- try {
- Thread.sleep(100);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- private static ImportStatus getImportStatus(PortletRequest request) {
- return (ImportStatus) request.getPortletSession(true).getAttribute("ImportStatus");
- }
-
- private static File getRAR(PortletRequest request, String rarPath) {
- org.apache.geronimo.kernel.repository.Artifact artifact = org.apache.geronimo.kernel.repository.Artifact.create(
- rarPath);
- ListableRepository[] repos = PortletManager.getCurrentServer(request).getRepositories();
- for (ListableRepository repo : repos) {
- // if the artifact is not fully resolved then try to resolve it
- if (!artifact.isResolved()) {
- SortedSet results = repo.list(artifact);
- if (!results.isEmpty()) {
- artifact = (Artifact) results.first();
- } else {
- continue;
- }
- }
- File url = repo.getLocation(artifact);
- if (url != null) {
- if (url.exists() && url.canRead() && !url.isDirectory()) {
- return url;
- }
- }
- }
- return null;
- }
-
- /**
- * WARNING: This method relies on having access to the same repository
- * URLs as the server uses.
- *
- * @param request portlet request
- * @param data info about jars to include
- * @return driver class
- */
- private static Class attemptDriverLoad(PortletRequest request, PoolData data) {
- List<URL> list = new ArrayList<URL>();
- try {
- String[] jars = data.getJars();
- if (jars == null) {
- log.error("Driver load failed since no jar files were selected.");
- return null;
- }
- ListableRepository[] repos = PortletManager.getCurrentServer(request).getRepositories();
-
- for (String jar : jars) {
- Artifact artifact = Artifact.create(
- jar);
- for (ListableRepository repo : repos) {
- File url = repo.getLocation(artifact);
- if (url != null) {
- list.add(url.toURI().toURL());
- }
- }
- }
- URLClassLoader loader = new URLClassLoader(list.toArray(new URL[list.size()]),
- DatabasePoolPortlet.class.getClassLoader());
- try {
- return loader.loadClass(data.driverClass);
- } catch (ClassNotFoundException e) {
- return null;
- }
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
-
- private static String populateURL(String url, List<String> keys, Map properties) {
- for (String key : keys) {
- String value = (String) properties.get("urlproperty-" + key);
- if (value == null || value.equals("")) {
- int begin = url.indexOf("{" + key + "}");
- int end = begin + key.length() + 2;
- for (int j = begin - 1; j >= 0; j--) {
- char c = url.charAt(j);
- if (c == ';' || c == ':') {
- begin = j;
- break;
- } else if (c == '/') {
- if (url.length() > end && url.charAt(end) == '/') {
- begin = j; // Don't leave // if foo is null for /<foo>/
- }
- break;
- }
- }
- url = url.substring(0, begin) + url.substring(end);
- } else {
- if (value.indexOf('\\') != -1 || value.indexOf('$') != -1) {
- // value contains backslash or dollar sign and needs preprocessing for replaceAll to work properly
- StringBuffer temp = new StringBuffer();
- char[] valueChars = value.toCharArray();
- for (char valueChar : valueChars) {
- if (valueChar == '\\' || valueChar == '$') {
- temp.append('\\');
- }
- temp.append(valueChar);
- }
- value = temp.toString();
- }
- url = url.replaceAll("\\{" + key + "\\}", value);
- }
- }
- return url;
- }
-
- private static DatabaseDriver[] getAllDrivers(PortletRequest request) {
- DatabaseDriver[] result = (DatabaseDriver[]) PortletManager.getGBeansImplementing(request,
- DatabaseDriver.class);
- Arrays.sort(result, new Comparator<DatabaseDriver>() {
- public int compare(DatabaseDriver o1, DatabaseDriver o2) {
- String name1 = o1.getName();
- String name2 = o2.getName();
- if (name1.equals("Other")) name1 = "zzzOther";
- if (name2.equals("Other")) name2 = "zzzOther";
- return name1.compareTo(name2);
- }
- });
- return result;
- }
-
- private static DatabaseDriver getDatabaseInfo(PortletRequest request, PoolData data) {
- DatabaseDriver info = null;
- DatabaseDriver[] all = getAllDrivers(request);
- for (DatabaseDriver next : all) {
- if (next.getName().equals(data.getDbtype())) {
- info = next;
- break;
- }
- }
- return info;
- }
-
- private static DatabaseDriver getDatabaseInfoFromDriver(PortletRequest request, PoolData data) {
- DatabaseDriver info = null;
- DatabaseDriver[] all = getAllDrivers(request);
- for (DatabaseDriver next : all) {
- if (next.getDriverClassName() != null && next.getDriverClassName().equals(data.getDriverClass())) {
- info = next;
- break;
- }
- }
- return info;
- }
-
- public static class PoolData implements Serializable {
- private static final long serialVersionUID = 1L;
- private String name;
- private String dbtype;
- private String user;
- private String password;
- private Map<String, String> properties = new LinkedHashMap<String, String>(); // Configuration for non-Generic drivers
- private Map<String, Object> urlProperties = new HashMap<String, Object>(); // URL substitution for Generic drivers
- private Map<String, String> propertyNames; //todo: store these in the ConfigParam instead
- private String driverClass;
- private String url;
- private String urlPrototype;
- private String[] jars;
- private String minSize;
- private String maxSize;
- private String blockingTimeout;
- private String idleTimeout;
- private String abstractName;
- private String adapterDisplayName;
- private String adapterDescription;
- private String adapterRarPath;
- private String rarPath;
- private String transactionType;
- private String importSource;
- private Map<String, String> abstractNameMap; // generated as needed, don't need to read/write it
- private String deployError;
-
- public void load(PortletRequest request) {
- name = request.getParameter("name");
- if (name != null && name.equals("")) name = null;
- driverClass = request.getParameter("driverClass");
- if (driverClass != null && driverClass.equals("")) driverClass = null;
- dbtype = request.getParameter("dbtype");
- if (dbtype != null && dbtype.equals("")) dbtype = null;
- user = request.getParameter("user");
- if (user != null && user.equals("")) user = null;
- password = request.getParameter("password");
- if (password != null && password.equals("")) password = null;
- url = request.getParameter("url");
- if (url != null && url.equals("")) {
- url = null;
- } else if (url != null && url.startsWith("URLENCODED")) {
- try {
- url = URLDecoder.decode(url.substring(10), "UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException("Unable to decode URL", e);
- } catch (IllegalArgumentException e) { // not encoded after all??
- url = url.substring(10);
- }
- }
- urlPrototype = request.getParameter("urlPrototype");
- if (urlPrototype != null && urlPrototype.equals("")) urlPrototype = null;
- jars = request.getParameterValues("jars");
- minSize = request.getParameter("minSize");
- if (minSize != null && minSize.equals("")) minSize = null;
- maxSize = request.getParameter("maxSize");
- if (maxSize != null && maxSize.equals("")) maxSize = null;
- blockingTimeout = request.getParameter("blockingTimeout");
- if (blockingTimeout != null && blockingTimeout.equals("")) blockingTimeout = null;
- idleTimeout = request.getParameter("idleTimeout");
- if (idleTimeout != null && idleTimeout.equals("")) idleTimeout = null;
- abstractName = request.getParameter("abstractName");
- if (abstractName != null && abstractName.equals("")) abstractName = null;
- adapterDisplayName = request.getParameter("adapterDisplayName");
- if (adapterDisplayName != null && adapterDisplayName.equals("")) adapterDisplayName = null;
- adapterDescription = request.getParameter("adapterDescription");
- if (adapterDescription != null && adapterDescription.equals("")) adapterDescription = null;
- rarPath = request.getParameter("rarPath");
- if (rarPath != null && rarPath.equals("")) rarPath = null;
- importSource = request.getParameter("importSource");
- if (importSource != null && importSource.equals("")) importSource = null;
- transactionType = request.getParameter("transactionType");
- if (transactionType != null && "".equals(transactionType)) {
- if (dbtype != null && dbtype.endsWith("XA")) {
- transactionType = XA;
- } else {
- transactionType = LOCAL;
- }
- }
- Map map = request.getParameterMap();
- propertyNames = new HashMap<String, String>();
- for (Object o : map.keySet()) {
- String key = (String) o;
- if (key.startsWith("urlproperty-")) {
- urlProperties.put(key, request.getParameter(key));
- } else if (key.startsWith("property-")) {
- properties.put(key, request.getParameter(key));
- propertyNames.put(key, getPropertyName(key));
- }
- }
- sort();
- deployError = request.getParameter("deployError");
- if (deployError != null && deployError.equals("")) deployError = null;
- }
-
- public void loadPropertyNames() {
- propertyNames = new HashMap<String, String>();
- for (String key : properties.keySet()) {
- propertyNames.put(key, getPropertyName(key));
- }
- }
-
- private static String getPropertyName(String key) {
- int pos = key.indexOf('-');
- key = Character.toUpperCase(key.charAt(pos + 1)) + key.substring(pos + 2);
- StringBuffer buf = new StringBuffer();
- pos = 0;
- for (int i = 1; i < key.length(); i++) {
- if(key.charAt(i)=='_')
- {
- buf.append(key.substring(pos, i)).append(" ");
- pos = i+1;
- }
- else{
- if (Character.isUpperCase(key.charAt(i))) {
- if (Character.isUpperCase(key.charAt(i - 1)) || key.charAt(i-1)=='_') { // ongoing capitalized word
-
- } else { // start of a new word
- buf.append(key.substring(pos, i)).append(" ");
- pos = i;
- }
- } else {
- if (Character.isUpperCase(
- key.charAt(i - 1)) && i - pos > 1) { // first lower-case after a series of caps
- buf.append(key.substring(pos, i - 1)).append(" ");
- pos = i - 1;
- }
- }
- }
- }
- buf.append(key.substring(pos));
- return buf.toString();
- }
-
- public void store(ActionResponse response) {
- if (name != null) response.setRenderParameter("name", name);
- if (dbtype != null) response.setRenderParameter("dbtype", dbtype);
- if (driverClass != null) response.setRenderParameter("driverClass", driverClass);
- if (user != null) response.setRenderParameter("user", user);
- if (password != null) response.setRenderParameter("password", password);
- if (url != null) { // attempt to work around Pluto/Tomcat error with ; in a stored value
- try {
- response.setRenderParameter("url", "URLENCODED" + URLEncoder.encode(url, "UTF-8"));
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException("Unable to encode URL", e);
- }
- }
- if (urlPrototype != null) response.setRenderParameter("urlPrototype", urlPrototype);
- if (jars != null) response.setRenderParameter("jars", jars);
- if (minSize != null) response.setRenderParameter("minSize", minSize);
- if (maxSize != null) response.setRenderParameter("maxSize", maxSize);
- if (blockingTimeout != null) response.setRenderParameter("blockingTimeout", blockingTimeout);
- if (idleTimeout != null) response.setRenderParameter("idleTimeout", idleTimeout);
- if (abstractName != null) response.setRenderParameter("abstractName", abstractName);
- if (adapterDisplayName != null) response.setRenderParameter("adapterDisplayName", adapterDisplayName);
- if (adapterDescription != null) response.setRenderParameter("adapterDescription", adapterDescription);
- if (importSource != null) response.setRenderParameter("importSource", importSource);
- if (rarPath != null) response.setRenderParameter("rarPath", rarPath);
- if (transactionType != null) response.setRenderParameter("transactionType", transactionType);
- for (Map.Entry<String, Object> entry : urlProperties.entrySet()) {
- if (entry.getValue() != null) {
- response.setRenderParameter(entry.getKey(), entry.getValue().toString());
- }
- }
- for (Map.Entry<String, String> entry : properties.entrySet()) {
- if (entry.getValue() != null) {
- response.setRenderParameter(entry.getKey(), entry.getValue());
- }
- }
- if (deployError != null) response.setRenderParameter("deployError", deployError);
- }
-
-
- public void sort() {
- Map<String, String> sortedProperties = new LinkedHashMap<String, String>();
-
- for (String propertyName : ORDERED_PROPERTY_NAMES) {
- if (properties.containsKey(propertyName)) {
- sortedProperties.put(propertyName, properties.get(propertyName));
- properties.remove(propertyName);
- }
- }
-
- sortedProperties.putAll(properties);
-
- properties = sortedProperties;
- }
-
- public String getName() {
- return name;
- }
-
- public String getDbtype() {
- return dbtype;
- }
-
- public String getUser() {
- return user;
- }
-
- public String getPassword() {
- return password;
- }
-
- public Map<String, String> getProperties() {
- return properties;
- }
-
- public Map<String, String> getPropertyNames() {
- return propertyNames;
- }
-
- public Map<String, Object> getUrlProperties() {
- return urlProperties;
- }
-
- public String getUrl() {
- return url;
- }
-
- public String[] getJars() {
- return jars;
- }
-
- public String getMinSize() {
- return minSize;
- }
-
- public String getMaxSize() {
- return maxSize;
- }
-
- public String getBlockingTimeout() {
- return blockingTimeout;
- }
-
- public String getIdleTimeout() {
- return idleTimeout;
- }
-
- public String getDriverClass() {
- return driverClass;
- }
-
- public String getUrlPrototype() {
- return urlPrototype;
- }
-
- public String getAbstractName() {
- return abstractName;
- }
-
- public String getAdapterDisplayName() {
- return adapterDisplayName;
- }
-
- public String getAdapterDescription() {
- return adapterDescription;
- }
-
- public String getAdapterRarPath() {
- return adapterRarPath;
- }
-
- public String getRarPath() {
- return rarPath;
- }
-
- public boolean isGeneric() {
- //todo: is there any better way to tell?
- return adapterDisplayName == null || adapterDisplayName.equals("TranQL Generic JDBC Resource Adapter");
- }
-
- public String getImportSource() {
- return importSource;
- }
-
- public Map<String, String> getAbstractNameMap() {
- if (abstractName == null) return Collections.emptyMap();
- if (abstractNameMap != null) return abstractNameMap;
- AbstractName name = new AbstractName(URI.create(abstractName));
- abstractNameMap = new HashMap<String, String>(name.getName());
- abstractNameMap.put("domain", name.getObjectName().getDomain());
- abstractNameMap.put("groupId", name.getArtifact().getGroupId());
- abstractNameMap.put("artifactId", name.getArtifact().getArtifactId());
- abstractNameMap.put("type", name.getArtifact().getType());
- abstractNameMap.put("version", name.getArtifact().getVersion().toString());
- return abstractNameMap;
- }
-
- public String getDeployError() {
- return deployError;
- }
-
- public String getTransactionType() {
- return transactionType;
- }
-
- public void setTransactionType(String transactionType) {
- this.transactionType = transactionType;
- }
-
- }
-
- public static class ConnectionPool implements Serializable, Comparable {
- private static final long serialVersionUID = 1L;
- private final String adapterAbstractName;
- private final String factoryAbstractName;
- private final String name;
- private final String parentName;
- private final int state;
-
- public ConnectionPool(AbstractName adapterAbstractName, AbstractName factoryAbstractName, String name, int state) {
- this.adapterAbstractName = adapterAbstractName.toURI().toString();
- String parent = (String) adapterAbstractName.getName().get(NameFactory.J2EE_APPLICATION);
- if (parent != null && parent.equals("null")) {
- parent = null;
- }
- parentName = parent;
- this.factoryAbstractName = factoryAbstractName.toURI().toString();
- this.name = name;
- this.state = state;
- }
-
- public String getAdapterAbstractName() {
- return adapterAbstractName;
- }
-
- public String getFactoryAbstractName() {
- return factoryAbstractName;
- }
-
- public String getName() {
- return name;
- }
-
- public String getParentName() {
- return parentName;
- }
-
- public int getState() {
- return state;
- }
-
- public String getStateName() {
- return State.toString(state);
- }
-
- public int compareTo(Object o) {
- final ConnectionPool pool = (ConnectionPool) o;
- int names = name.compareTo(pool.name);
- if (parentName == null) {
- if (pool.parentName == null) {
- return names;
- } else {
- return -1;
- }
- } else {
- if (pool.parentName == null) {
- return 1;
- } else {
- int test = parentName.compareTo(pool.parentName);
- if (test != 0) {
- return test;
- } else {
- return names;
- }
- }
- }
- }
- }
-
- public static class ResourceAdapterParams {
- private String displayName;
- private String description;
- private String rarPath;
- private ConfigParam[] configParams;
-
- public ResourceAdapterParams(String displayName, String description, String rarPath, ConfigParam[] configParams) {
- this.displayName = displayName;
- this.description = description;
- this.rarPath = rarPath;
- this.configParams = configParams;
- }
-
- public String getDisplayName() {
- return displayName;
- }
-
- public String getDescription() {
- return description;
- }
-
- public String getRarPath() {
- return rarPath;
- }
-
- public ConfigParam[] getConfigParams() {
- return configParams;
- }
- }
-
- public static class ConfigParam {
- private String name;
- private String type;
- private String description;
- private String defaultValue;
-
- public ConfigParam(String name, String type, String description, String defaultValue) {
- this.name = name;
- this.type = type;
- this.description = description;
- this.defaultValue = defaultValue;
- }
-
- public String getName() {
- return name;
- }
-
- public String getType() {
- return type;
- }
-
- public String getDescription() {
- return description;
- }
-
- public String getDefaultValue() {
- return defaultValue;
- }
- }
-}
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DriverDownloader.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DriverDownloader.java
deleted file mode 100644
index 2f66d20..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/DriverDownloader.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.console.databasemanager.wizard;
-
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.Serializable;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Properties;
-import java.util.Random;
-import java.util.Set;
-import java.util.jar.JarEntry;
-import java.util.jar.JarFile;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.geronimo.kernel.repository.Artifact;
-import org.apache.geronimo.kernel.repository.FileWriteMonitor;
-import org.apache.geronimo.kernel.repository.WriteableRepository;
-
-/**
- * A utility that handles listing and downloading available JDBC driver JARs.
- * It can handle straight JARs and also JARs in ZIP files.
- *
- * @version $Rev$ $Date$
- */
-public class DriverDownloader {
- private static final Logger log = LoggerFactory.getLogger(DriverDownloader.class);
- Random random;
-
- public Properties readDriverFile(URL url) {
- try {
- InputStream in = url.openStream();
- Properties props = new Properties();
- props.load(in);
- in.close();
- return props;
- } catch (IOException e) {
- log.error("Unable to download driver properties", e);
- return null;
- }
- }
-
- public DriverInfo[] loadDriverInfo(URL driverInfoFile) {
- List list = new ArrayList();
- Properties props = readDriverFile(driverInfoFile);
- if(props == null) {
- return new DriverInfo[0];
- }
- Set drivers = new HashSet();
- for (Iterator it = props.keySet().iterator(); it.hasNext();) {
- String key = (String) it.next();
- if(!key.startsWith("driver.")) {
- continue;
- }
- int pos = key.indexOf('.', 7);
- if(pos > -1) {
- drivers.add(key.substring(7, pos));
- }
- }
- List urls = new ArrayList();
- for (Iterator it = drivers.iterator(); it.hasNext();) {
- String driver = (String) it.next();
- String name = props.getProperty("driver."+driver+".name");
- String repository = props.getProperty("driver."+driver+".repository");
- String unzip = props.getProperty("driver."+driver+".unzip");
- urls.clear();
- int index = 1;
- while(true) {
- String url = props.getProperty("driver."+driver+".url."+index);
- if(url != null) {
- ++index;
- try {
- urls.add(new URL(url));
- } catch (MalformedURLException e) {
- log.error("Unable to process URL from driver list", e);
- }
- } else {
- break;
- }
- }
- if(name != null && repository != null && urls.size() > 0) {
- DriverInfo info = new DriverInfo(name, repository);
- info.setUnzipPath(unzip);
- info.setUrls((URL[]) urls.toArray(new URL[urls.size()]));
- list.add(info);
- }
- }
- Collections.sort(list);
- return (DriverInfo[]) list.toArray(new DriverInfo[list.size()]);
- }
-
- /**
- * Downloads a driver and loads it into the local repository.
- */
- public void loadDriver(WriteableRepository repo, DriverInfo driver, FileWriteMonitor monitor) throws IOException {
- int urlIndex = 0;
- if (driver.urls.length > 1) {
- if (random == null) {
- random = new Random();
- }
- urlIndex = random.nextInt(driver.urls.length);
- }
- URL url = driver.urls[urlIndex];
- InputStream in;
- String uri = driver.getRepositoryURI();
- if (driver.unzipPath != null) {
- byte[] buf = new byte[1024];
- int size;
- int total = 0;
- int threshold = 10240;
- URLConnection uc = url.openConnection();
- int filesize = uc.getContentLength();
- InputStream net = uc.getInputStream();
- JarFile jar = null;
- File download = null;
- try {
- download = File.createTempFile("geronimo-driver-download", ".zip");
- OutputStream out = new BufferedOutputStream(new FileOutputStream(download));
- if (monitor != null) {
- monitor.writeStarted("Download driver archive to " + download, filesize);
- }
- try {
- while ((size = net.read(buf)) > -1) {
- out.write(buf, 0, size);
- if (monitor != null) {
- total += size;
- if (total > threshold) {
- monitor.writeProgress(total);
- threshold += 10240;
- }
- }
- }
- out.flush();
- out.close();
- } finally {
- if (monitor != null) {
- monitor.writeComplete(total);
- }
- }
- jar = new JarFile(download);
- JarEntry entry = jar.getJarEntry(driver.unzipPath);
- if (entry == null) {
- log.error("Cannot extract driver JAR " + driver.unzipPath + " from download file " + url);
- } else {
- in = jar.getInputStream(entry);
- repo.copyToRepository(in, (int)entry.getSize(), Artifact.create(uri), monitor);
- }
- } finally {
- if (jar != null) try {
- jar.close();
- } catch (IOException e) {
- log.error("Unable to close JAR file", e);
- }
- if (download != null) {
- download.delete();
- }
- }
- } else {
- URLConnection con = url.openConnection();
- in = con.getInputStream();
- repo.copyToRepository(in, con.getContentLength(), Artifact.create(uri), monitor);
- }
- }
-
- public static class DriverInfo implements Comparable, Serializable {
- private final static long serialVersionUID = -1202452382992975449L;
-
- private String name;
- private String repositoryURI;
- private String unzipPath;
- private URL[] urls;
-
- public DriverInfo(String name, String repositoryURI) {
- this.name = name;
- this.repositoryURI = repositoryURI;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getRepositoryURI() {
- return repositoryURI;
- }
-
- public void setRepositoryURI(String repositoryURI) {
- this.repositoryURI = repositoryURI;
- }
-
- public String getUnzipPath() {
- return unzipPath;
- }
-
- public void setUnzipPath(String unzipPath) {
- this.unzipPath = unzipPath;
- }
-
- public URL[] getUrls() {
- return urls;
- }
-
- public void setUrls(URL[] urls) {
- this.urls = urls;
- }
-
- public int compareTo(Object o) {
- return name.compareTo(((DriverInfo)o).name);
- }
- }
-}
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java
deleted file mode 100644
index c774aaa..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/databasemanager/wizard/ImportStatus.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.console.databasemanager.wizard;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import org.apache.geronimo.converter.DatabaseConversionStatus;
-import org.apache.geronimo.converter.AbstractDatabasePool;
-import org.apache.geronimo.converter.JDBCPool;
-import org.apache.geronimo.converter.XADatabasePool;
-
-/**
- * Tracks the progress of a database pool import operation.
- *
- * @version $Rev$ $Date$
- */
-public class ImportStatus implements Serializable {
- private DatabaseConversionStatus original;
- private int currentPool = -1;
- private PoolProgress[] pools;
-
- public ImportStatus(DatabaseConversionStatus original) {
- this.original = original;
- List list = new ArrayList();
- for (int i = 0; i < original.getNoTXPools().length; i++) {
- JDBCPool pool = original.getNoTXPools()[i];
- list.add(new PoolProgress(pool, PoolProgress.TYPE_NOTX));
- }
- for (int i = 0; i < original.getJdbcPools().length; i++) {
- JDBCPool pool = original.getJdbcPools()[i];
- list.add(new PoolProgress(pool, PoolProgress.TYPE_LOCAL));
- }
- for (int i = 0; i < original.getXaPools().length; i++) {
- XADatabasePool pool = original.getXaPools()[i];
- final PoolProgress progress = new PoolProgress(pool, PoolProgress.TYPE_XA);
- if(pool.getXaDataSourceClass().indexOf("apache.derby") < 0) {
- progress.setSkipped(true);
- }
- list.add(progress);
- }
- pools = (PoolProgress[]) list.toArray(new PoolProgress[list.size()]);
- }
-
- public boolean isFinished() {
- for (int i = 0; i < pools.length; i++) {
- PoolProgress pool = pools[i];
- if(!pool.isFinished() && !pool.isSkipped()) {
- return false;
- }
- }
- return true;
- }
-
- public void setCurrentPoolIndex(int currentPool) {
- this.currentPool = currentPool;
- getCurrentPool().setStarted(true);
- }
-
- public DatabaseConversionStatus getOriginal() {
- return original;
- }
-
- public int getCurrentPoolIndex() {
- return currentPool;
- }
-
- public PoolProgress getCurrentPool() {
- return currentPool > -1 ? pools[currentPool] : null;
- }
-
- public PoolProgress[] getPools() {
- return pools;
- }
-
- public int getPendingCount() {
- int count = 0;
- for (int i = 0; i < pools.length; i++) {
- PoolProgress pool = pools[i];
- if(!pool.isSkipped() && !pool.isStarted()) {
- ++count;
- }
- }
- return count;
- }
-
- public int getStartedCount() {
- int count = 0;
- for (int i = 0; i < pools.length; i++) {
- PoolProgress pool = pools[i];
- if(pool.isStarted() && !pool.isFinished() && !pool.isSkipped()) {
- ++count;
- }
- }
- return count;
- }
-
- public int getFinishedCount() {
- int count = 0;
- for (int i = 0; i < pools.length; i++) {
- PoolProgress pool = pools[i];
- if(!pool.isSkipped() && pool.isFinished()) {
- ++count;
- }
- }
- return count;
- }
-
- public int getSkippedCount() {
- int count = 0;
- for (int i = 0; i < pools.length; i++) {
- PoolProgress pool = pools[i];
- if(pool.isSkipped()) {
- ++count;
- }
- }
- return count;
- }
-
- public final static class PoolProgress implements Serializable {
- public final static String TYPE_NOTX = "NoTX";
- public final static String TYPE_LOCAL = "JDBC";
- public final static String TYPE_XA = "XA";
-
- private AbstractDatabasePool pool;
- private boolean started;
- private boolean finished;
- private boolean skipped;
- private String type;
- private String name; // Once in Geronimo
- private String configurationName; // Once in Geronimo
-
- public PoolProgress(AbstractDatabasePool pool, String type) {
- this.pool = pool;
- this.type = type;
- }
-
- public AbstractDatabasePool getPool() {
- return pool;
- }
-
- public boolean isStarted() {
- return started;
- }
-
- public void setStarted(boolean started) {
- this.started = started;
- }
-
- public boolean isFinished() {
- return finished;
- }
-
- public void setFinished(boolean finished) {
- this.finished = finished;
- }
-
- public boolean isSkipped() {
- return skipped;
- }
-
- public void setSkipped(boolean skipped) {
- this.skipped = skipped;
- }
-
- public String getType() {
- return type;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getConfigurationName() {
- return configurationName;
- }
-
- public void setConfigurationName(String configurationName) {
- this.configurationName = configurationName;
- }
-
- public String getStatus() {
- return isSkipped() ? "Ignored" : isFinished() ? "Deployed as "+name : isStarted() ? "Started" : "Pending";
- }
- }
-}
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/derbylogmanager/DerbyLogHelper.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/derbylogmanager/DerbyLogHelper.java
deleted file mode 100644
index 0f3c1d8..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/derbylogmanager/DerbyLogHelper.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.console.derbylogmanager;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Stack;
-
-import org.apache.geronimo.console.util.KernelHelper;
-
-import org.apache.geronimo.console.internaldb.DerbyConnectionUtil;
-
-public class DerbyLogHelper extends KernelHelper {
- private static ArrayList logs = new ArrayList();
-
- private static boolean cached = false;
-
- private static int lineCount = 0;
-
- private static final String LOG_FILENAME = "derby.log";
-
- public static Collection getLogs() throws IOException {
- if (!cached) {
- refresh();
- }
- return logs;
- }
-
- public static void refresh() throws IOException {
- cached = false;
- logs.clear();
- BufferedReader in = new BufferedReader(getFileReader());
- lineCount = 0;
- Stack holder = new Stack();
- for (String line = in.readLine(); line != null; line = in.readLine()) {
- holder.push(line);
- lineCount++;
- }
- logs.addAll(holder);
- cached = true;
- }
-
- public static int getLineCount() {
- return lineCount;
- }
-
- private static InputStreamReader getFileReader() throws IOException {
- String pathToFile = getSystemHome() + File.separator + LOG_FILENAME;
- return new FileReader(new File(pathToFile));
- }
-
- public static String getSystemHome() {
- return DerbyConnectionUtil.getDerbyHome();
- }
-
-}
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/derbylogmanager/DerbyLogViewerPortlet.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/derbylogmanager/DerbyLogViewerPortlet.java
deleted file mode 100644
index 0583bdb..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/derbylogmanager/DerbyLogViewerPortlet.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.console.derbylogmanager;
-
-import org.apache.geronimo.console.BasePortlet;
-import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.derby.DerbyLog;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletContext;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.PortletSession;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-import java.io.IOException;
-import java.io.Serializable;
-
-public class DerbyLogViewerPortlet extends BasePortlet {
- private final static String CRITERIA_KEY = "org.apache.geronimo.console.derby.log.CRITERIA";
-
- protected PortletRequestDispatcher normalView;
-
- protected PortletRequestDispatcher helpView;
-
- public void destroy() {
- super.destroy();
- normalView = null;
- helpView = null;
- }
-
- protected void doHelp(RenderRequest renderRequest,
- RenderResponse renderResponse) throws PortletException, IOException {
- helpView.include(renderRequest, renderResponse);
- }
-
- protected void doView(RenderRequest renderRequest,
- RenderResponse renderResponse) throws PortletException, IOException {
- if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
- return;
- }
- String action = renderRequest.getParameter("action");
-
- DerbyLog log = (DerbyLog) PortletManager.getManagedBeans(renderRequest, DerbyLog.class)[0];//todo: what if it's not there?
- Criteria criteria = (Criteria) renderRequest.getPortletSession(true).getAttribute(CRITERIA_KEY, PortletSession.PORTLET_SCOPE);
-
- if (criteria == null || (action != null && !"refresh".equals(action))) {
- if(criteria == null)
- criteria = new Criteria();
- String startPos = renderRequest.getParameter("startPos");
- String endPos = renderRequest.getParameter("endPos");
- String maxRows = renderRequest.getParameter("maxRows");
- String searchString = renderRequest.getParameter("searchString");
-
- criteria.max = maxRows == null || maxRows.equals("") ? criteria.max : Integer.parseInt(maxRows);
- criteria.start = startPos == null || startPos.equals("") ? null : new Integer(startPos);
- criteria.stop = endPos == null || endPos.equals("") ? null : new Integer(endPos);
- criteria.text = searchString == null || searchString.equals("") ? null : searchString;
- renderRequest.getPortletSession(true).setAttribute(CRITERIA_KEY, criteria, PortletSession.PORTLET_SCOPE);
- }
-
- DerbyLog.SearchResults results = log.searchLog(criteria.start, criteria.stop,
- criteria.max, criteria.text);
- renderRequest.setAttribute("searchResults", results.getResults());
- renderRequest.setAttribute("lineCount", new Integer(results.getLineCount()));
- renderRequest.setAttribute("startPos", criteria.start);
- renderRequest.setAttribute("endPos", criteria.stop);
- renderRequest.setAttribute("searchString", criteria.text);
- renderRequest.setAttribute("maxRows", criteria.max);
- if(results.isCapped()) {
- renderRequest.setAttribute("capped", Boolean.TRUE);
- }
-
- normalView.include(renderRequest, renderResponse);
- }
-
- @Override
- public void processAction(ActionRequest actionRequest, ActionResponse actionResponse) throws PortletException, IOException {
- //Add all the parameters to the actionResponse Attributes so we can get the back
- actionResponse.setRenderParameters(actionRequest.getParameterMap());
- }
-
- private static class Criteria implements Serializable {
- Integer max = 10;
- Integer start;
- Integer stop;
- String text;
- }
-
- public void init(PortletConfig portletConfig) throws PortletException {
- PortletContext pc = portletConfig.getPortletContext();
- normalView = pc
- .getRequestDispatcher("/WEB-INF/view/derbylogmanager/view.jsp");
- helpView = pc
- .getRequestDispatcher("/WEB-INF/view/derbylogmanager/help.jsp");
- super.init(portletConfig);
- }
-}
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerHelper.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerHelper.java
deleted file mode 100644
index beda1b1..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerHelper.java
+++ /dev/null
@@ -1,173 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.console.internaldb;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Vector;
-
-import org.apache.geronimo.console.util.KernelManagementHelper;
-import org.apache.geronimo.console.util.ManagementHelper;
-import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.KernelRegistry;
-import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
-
-public class DBViewerHelper {
-
- private static final String SYS_TBL_PREFIX = "SYS.";
-
- private static final int COUNT_COL = 1;
-
- /**
- * List the databases having datasources deployed.
- *
- * @param derbySysHome
- * @return
- */
- public Collection<String> getDataSourceNames() {
-
- List<String> databaseNames = new ArrayList<String>();
-
- Kernel kernel = KernelRegistry.getSingleKernel();
- ManagementHelper helper = new KernelManagementHelper(kernel);
- ResourceAdapterModule[] modules = helper.getOutboundRAModules(helper.getDomains()[0].getServerInstances()[0], "javax.sql.DataSource");
- for (ResourceAdapterModule module : modules) {
- org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory[] databases = helper.getOutboundFactories(module, "javax.sql.DataSource");
- for (org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory db : databases) {
- try {
- AbstractName dbName = kernel.getAbstractNameFor(db);
- String datasourceName = (String)dbName.getName().get(NameFactory.J2EE_NAME);
- databaseNames.add(datasourceName);
- } catch (Exception ignored) {
- }
- }
- }
-
- return databaseNames;
- }
-
- /**
- * List the databases given the derby home directory.
- *
- * @param derbySysHome
- * @return
- */
- public Collection<String> getDerbyDatabases(String derbySysHome) {
- List<String> databases = new ArrayList<String>();
- File f = new File(derbySysHome);
- // Check if this is a directory
- if (f.isDirectory()) {
- // Check for folders only
- File[] files = f.listFiles();
- for (int i = 0; i < files.length; i++) {
- if (files[i].isDirectory()) {
- databases.add(files[i].getName());
- }
- }
- }
-
- return databases;
- }
-
- /**
- * @param derbySysHome
- * @param dbName
- * @return
- */
- public boolean isDBValid(String derbySysHome, String dbName) {
- if ((derbySysHome == null) || (derbySysHome.trim().length() == 0)) {
- return false;
- }
- if ((dbName == null) || (dbName.trim().length() == 0)) {
- return false;
- }
-
- Collection databases = getDerbyDatabases(derbySysHome);
- return databases.contains(dbName);
- }
-
- /**
- * @param dbName
- * @param tblName
- * @return
- */
- public boolean isTblValid(String dbName, String tblName) {
- if ((dbName == null) || (dbName.trim().length() == 0)) {
- return false;
- }
- if ((tblName == null) || (tblName.trim().length() == 0)) {
- return false;
- }
- return true;
-
- // Removed this code because it doesn't seem necessary and causes a
- // weird ClassCastException when rs.next() is called.
- /*
- else {
- if (tblName.toUpperCase().startsWith(SYS_TBL_PREFIX)) {
- tblName = tblName.substring(SYS_TBL_PREFIX.length());
- }
- }
-
- Connection conn = null;
- PreparedStatement ps = null;
- ResultSet rs = null;
- try {
- conn = DerbyConnectionUtil.getDerbyConnection(dbName);
- ps = conn.prepareStatement("SELECT count(*) FROM SYS.SYSTABLES"
- + " WHERE tablename=?");
- ps.setString(1, tblName.toUpperCase());
- rs = ps.executeQuery();
- if (rs.next()) {
- int count = rs.getInt(COUNT_COL);
- if (count == 1) {
- return true;
- }
- }
- } catch (Throwable e) {
- e.printStackTrace();
- System.out.println("ERROR: " + e.getMessage());
- // Assume table is not valid
- return false;
- } finally {
- // close DB connection
- try {
- if (rs != null) {
- rs.close();
- }
- if (ps != null) {
- ps.close();
- }
- if (conn != null) {
- conn.close();
- }
- } catch (SQLException e) {
- // problem closing DB connection
- }
- }
-
- return false;
- */
- }
-
-}
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerPortlet.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerPortlet.java
deleted file mode 100644
index 08e63a6..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DBViewerPortlet.java
+++ /dev/null
@@ -1,204 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.console.internaldb;
-
-import java.io.IOException;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
-import org.apache.geronimo.console.BasePortlet;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class DBViewerPortlet extends BasePortlet {
-
- private static final Logger log = LoggerFactory.getLogger(DBViewerPortlet.class);
-
- private static final int RDBMS_DERBY = 1;
-
- private static final int RDBMS_MSSQL = 2;
-
- private static final String HELPVIEW_JSP = "/WEB-INF/view/internaldb/dbViewerHelp.jsp";
-
- private static final String LISTDATABASES_JSP = "/WEB-INF/view/internaldb/listDatabases.jsp";
-
- private static final String LISTDATABASES_MAXIMIZEDVIEW_JSP = "/WEB-INF/view/internaldb/listDatabasesMaximized.jsp";
-
- private static final String LISTTABLES_JSP = "/WEB-INF/view/internaldb/listTables.jsp";
-
- private static final String LISTTABLES_MAXIMIZEDVIEW_JSP = "/WEB-INF/view/internaldb/listTablesMaximized.jsp";
-
- private static final String VIEWTABLECONTENTS_JSP = "/WEB-INF/view/internaldb/viewTableContents.jsp";
-
- private static final String VIEWTABLECONTENTS_MAXIMIZEDVIEW_JSP = "/WEB-INF/view/internaldb/viewTableContentsMaximized.jsp";
-
- private static final String LISTDB_ACTION = "listDatabases";
-
- private static final String LISTTBLS_ACTION = "listTables";
-
- private static final String VIEWTBLCONTENTS_ACTION = "viewTableContents";
-
- private static DBViewerHelper helper = new DBViewerHelper();
-
- private PortletRequestDispatcher helpView;
-
- private PortletRequestDispatcher listDatabasesView;
-
- private PortletRequestDispatcher listTablesView;
-
- private PortletRequestDispatcher viewTableContentsView;
-
- private PortletRequestDispatcher listDatabasesMaximizedView;
-
- private PortletRequestDispatcher listTablesMaximizedView;
-
- private PortletRequestDispatcher viewTableContentsMaximizedView;
-
- public void processAction(ActionRequest actionRequest,
- ActionResponse actionResponse) throws PortletException, IOException {
- // getting parameters here because it fails on doView()
- String action = actionRequest.getParameter("action");
- String db = actionRequest.getParameter("db");
- String tbl = actionRequest.getParameter("tbl");
- String viewTables = actionRequest.getParameter("viewTables");
- String rdbms = actionRequest.getParameter("rdbms");
- // pass them to the render request
- if (action != null) {
- actionResponse.setRenderParameter("action", action);
- }
- if (db != null) {
- actionResponse.setRenderParameter("db", db);
- }
- if (tbl != null) {
- actionResponse.setRenderParameter("tbl", tbl);
- }
- if (viewTables != null) {
- actionResponse.setRenderParameter("viewTables", viewTables);
- }
- if (rdbms != null) {
- actionResponse.setRenderParameter("rdbms", rdbms);
- }
- }
-
- protected void doView(RenderRequest renderRequest,
- RenderResponse renderResponse) throws IOException, PortletException {
- if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
- return;
- }
- String action = renderRequest.getParameter("action");
- String db = renderRequest.getParameter("db");
- String tbl = renderRequest.getParameter("tbl");
- String viewTables = renderRequest.getParameter("viewTables");
- String rdbms = renderRequest.getParameter("rdbms");
- int rdbmsParam = (rdbms == null ? RDBMS_DERBY : Integer.parseInt(rdbms));
-
- if (rdbmsParam == RDBMS_DERBY) {
- // Check is database & table is valid
- if (LISTTBLS_ACTION.equals(action)
- || VIEWTBLCONTENTS_ACTION.equals(action)) {
- if (!helper.isDBValid(DerbyConnectionUtil.getDerbyHome(), db)) {
- // DB not valid
- log.error("Database is not valid: " + db);
- action = "";
- }
- }
- if (VIEWTBLCONTENTS_ACTION.equals(action)) {
- if (!helper.isTblValid(db, tbl)) {
- // Table not valid
- log.error("Table is not valid: " + tbl);
- action = "";
- }
- }
- }
-
- renderRequest.setAttribute("rdbms", rdbms);
- if (LISTTBLS_ACTION.equals(action)) {
- renderRequest.setAttribute("db", db);
- renderRequest.setAttribute("viewTables", viewTables);
- renderRequest.setAttribute("ds", DerbyConnectionUtil
- .getDataSourceForDataBaseName(db));
-
- if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
- listTablesView.include(renderRequest, renderResponse);
- } else {
- listTablesMaximizedView.include(renderRequest, renderResponse);
- }
- } else if (VIEWTBLCONTENTS_ACTION.equals(action)) {
- renderRequest.setAttribute("db", db);
- renderRequest.setAttribute("tbl", tbl);
- renderRequest.setAttribute("viewTables", viewTables);
- renderRequest.setAttribute("ds", DerbyConnectionUtil
- .getDataSourceForDataBaseName(db));
- if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
- viewTableContentsView.include(renderRequest, renderResponse);
- } else {
- viewTableContentsMaximizedView.include(renderRequest, renderResponse);
- }
- } else {
- renderRequest.setAttribute("databases", helper
- .getDerbyDatabases(DerbyConnectionUtil.getDerbyHome()));
- if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
- listDatabasesView.include(renderRequest, renderResponse);
- } else {
- listDatabasesMaximizedView.include(renderRequest, renderResponse);
- }
- }
- }
-
- protected void doHelp(RenderRequest renderRequest,
- RenderResponse renderResponse) throws PortletException, IOException {
- helpView.include(renderRequest, renderResponse);
- }
-
- public void init(PortletConfig portletConfig) throws PortletException {
- super.init(portletConfig);
- helpView = portletConfig.getPortletContext().getRequestDispatcher(
- HELPVIEW_JSP);
- listDatabasesView = portletConfig.getPortletContext()
- .getRequestDispatcher(LISTDATABASES_JSP);
- listTablesView = portletConfig.getPortletContext()
- .getRequestDispatcher(LISTTABLES_JSP);
- viewTableContentsView = portletConfig.getPortletContext()
- .getRequestDispatcher(VIEWTABLECONTENTS_JSP);
- listDatabasesMaximizedView = portletConfig.getPortletContext()
- .getRequestDispatcher(LISTDATABASES_MAXIMIZEDVIEW_JSP);
- listTablesMaximizedView = portletConfig.getPortletContext()
- .getRequestDispatcher(LISTTABLES_MAXIMIZEDVIEW_JSP);
- viewTableContentsMaximizedView = portletConfig.getPortletContext()
- .getRequestDispatcher(VIEWTABLECONTENTS_MAXIMIZEDVIEW_JSP);
- }
-
- public void destroy() {
- helpView = null;
- listDatabasesView = null;
- listTablesView = null;
- viewTableContentsView = null;
- listDatabasesMaximizedView = null;
- listTablesMaximizedView = null;
- viewTableContentsMaximizedView = null;
- super.destroy();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java
deleted file mode 100644
index fa3312c..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/DerbyConnectionUtil.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.console.internaldb;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-import java.util.Set;
-
-import javax.sql.DataSource;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.geronimo.console.util.KernelManagementHelper;
-import org.apache.geronimo.console.util.ManagementHelper;
-import org.apache.geronimo.derby.DerbySystemGBean;
-import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.gbean.AbstractNameQuery;
-import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.KernelRegistry;
-import org.apache.geronimo.management.JCAManagedConnectionFactory;
-import org.apache.geronimo.management.geronimo.ResourceAdapterModule;
-
-/**
- * A static class to handle retreiving connections. This class is built to
- * handle lookups to the SystemDatabase as a special case. If a connection is
- * requested for the SystemDatabase this class gets a DataSource from an admin
- * object registered in the geronimo kernel otherwise the DataSource is looked
- * up via JNDI.
- *
- * @version $Rev$ $Date$
- */
-public class DerbyConnectionUtil {
-
- private static final Logger log = LoggerFactory.getLogger(DerbyConnectionUtil.class);
-
- public static final String CREATE_DB_PROP = ";create=true";
-
- public static final String SHUTDOWN_DB_PROP = ";shutdown=true";
-
- private static final int RDBMS_DERBY = 1;
-
- private static final int RDBMS_MSSQL = 2;
-
- private static final String SYSTEM_DB = "SYSTEMDATABASE";
-
- private static final String DERBY_DRIVER = "org.apache.derby.jdbc.EmbeddedDriver";
-
- private static final String PROTOCOL = "jdbc:derby:";
-
- private static final String EMPTY_PROPS = "";
-
- private static AbstractName SYSTEM_DATASOURCE_NAME = null;
-
- static {
- try {
- log.debug("Looking up system datasource name...");
-
- // cache the name for the system data source
- AbstractNameQuery query = new AbstractNameQuery(JCAManagedConnectionFactory.class.getName());
- Set<AbstractName> names = KernelRegistry.getSingleKernel().listGBeans(query);
- for (AbstractName name : names) {
- String nameProperty = name.getNameProperty("name");
- if ("SystemDatasource".equals(nameProperty)) {
- SYSTEM_DATASOURCE_NAME = name;
- log.debug("Using system datasource name: " + SYSTEM_DATASOURCE_NAME);
- }
- }
-
- if (SYSTEM_DATASOURCE_NAME == null) {
- log.warn("Failed to lookup system datasource name");
- }
- }
- catch (Throwable t) {
- //
- // HACK: Log any errors which occur when this is loading...
- // the system is not logging the full detail, which it should
- // but for now lets show the details here
- //
- log.error("Failed to initialize", t);
- throw new Error(t);
- }
- }
-
- private static String derbyHome = null;
-
- /**
- * Get the Derby home directory path.
- */
- public static String getDerbyHome() {
- if (derbyHome == null) {
- try {
- derbyHome = (String)KernelRegistry.getSingleKernel().getAttribute(DerbySystemGBean.class, "derbyHome");
- }
- catch (Exception e) {
- throw new RuntimeException("Failed to query derbyHome", e);
- }
- }
- return derbyHome;
- }
-
- /**
- * Get database connection.
- *
- * @param dbName
- * @return
- * @throws SQLException
- */
- private static Connection getConnection(String dbName, String properties,
- String protocol, String driver) throws SQLException {
- try {
- Class.forName(driver).newInstance();
- } catch (Exception e) {
- log.error("Problem loading driver class", e);
- }
- // If we are looking for the SystemDatabase get it from the kernel
- // because it is not binded to our JNDI Context.
- if (SYSTEM_DB.equalsIgnoreCase(dbName)) {
- return getSystemDBConnection();
- } else {
- return DriverManager.getConnection(protocol + dbName + properties);
- }
- }
-
- /**
- * Get a connection to derby.
- *
- * @param dbName
- * the name of the database to connect to.
- * @param properties
- * the properties to pass to the connection string.
- * @return connection
- */
- public static Connection getDerbyConnection(String dbName, String properties)
- throws SQLException {
- return getConnection(dbName, properties, PROTOCOL, DERBY_DRIVER);
- }
-
- public static Connection getDerbyConnection(String dbName)
- throws SQLException {
- return getDerbyConnection(dbName, EMPTY_PROPS);
- }
-
- /**
- * Get a connection to the SystemDatabase.
- *
- * @return
- * @throws SQLException
- */
- public static Connection getSystemDBConnection() throws SQLException {
- DataSource ds = null;
- try {
- ds = getDataSourceForDataBaseName(SYSTEM_DB);
- return ds.getConnection();
- } catch (Exception e) {
- throw new SQLException(e.getMessage());
- }
- }
-
- /**
- * Get a connaction to a named datasource
- *
- * @param dbName
- * @return
- * @throws SQLException
- */
- public static Connection getDataSourceConnection(String dataSourceName) throws SQLException{
- try {
- return getDataSource(dataSourceName).getConnection();
- } catch (Exception e) {
- throw new SQLException(e.getMessage());
- }
- }
-
- /**
- * Get the datasource if dbName is == SYSTEM_DB, otherwise finds the datasource among JCAManagedConnectionFactories, otherwise returns null.
- *
- * @param dbName
- * @return datasource
- */
- public static DataSource getDataSourceForDataBaseName(String dbName) {
- try {
- if (SYSTEM_DATASOURCE_NAME!=null && SYSTEM_DB.equalsIgnoreCase(dbName)) {
- return (DataSource) KernelRegistry.getSingleKernel().invoke(
- SYSTEM_DATASOURCE_NAME, "$getResource");
- }
- } catch (Exception e) {
- log.error("Problem getting datasource " + dbName, e);
- }
-
- Kernel kernel = KernelRegistry.getSingleKernel();
- ManagementHelper helper = new KernelManagementHelper(kernel);
- ResourceAdapterModule[] modules = helper.getOutboundRAModules(helper.getDomains()[0].getServerInstances()[0], "javax.sql.DataSource");
- for (ResourceAdapterModule module : modules) {
- org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory[] databases = helper.getOutboundFactories(module, "javax.sql.DataSource");
- for (org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory db : databases) {
- try {
- Object databaseName = db.getConfigProperty("DatabaseName");
- if(dbName.equalsIgnoreCase((String) databaseName)) {
- AbstractName tempDbName = helper.getNameFor(db);
- return (DataSource) KernelRegistry.getSingleKernel().invoke(
- tempDbName, "$getResource");
- }
- } catch (Exception ignored) {
- }
- }
- }
-
- return null;
- }
-
- /**
- * Get the datasource if dbName is == SYSTEM_DB, otherwise finds the datasource among JCAManagedConnectionFactories, otherwise returns null.
- *
- * @param dbName
- * @return datasource
- */
- public static DataSource getDataSource(String dsName) {
- try {
- if (SYSTEM_DATASOURCE_NAME!=null && ((String)SYSTEM_DATASOURCE_NAME.getName().get(NameFactory.J2EE_NAME)).equalsIgnoreCase(dsName)) {
- return (DataSource) KernelRegistry.getSingleKernel().invoke(
- SYSTEM_DATASOURCE_NAME, "$getResource");
- }
- } catch (Exception e) {
- log.error("Problem getting datasource " + dsName, e);
- }
-
- Kernel kernel = KernelRegistry.getSingleKernel();
- ManagementHelper helper = new KernelManagementHelper(kernel);
- ResourceAdapterModule[] modules = helper.getOutboundRAModules(helper.getDomains()[0].getServerInstances()[0], "javax.sql.DataSource");
- for (ResourceAdapterModule module : modules) {
- org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory[] databases = helper.getOutboundFactories(module, "javax.sql.DataSource");
- for (org.apache.geronimo.management.geronimo.JCAManagedConnectionFactory db : databases) {
- try {
- AbstractName dbName = kernel.getAbstractNameFor(db);
- String datasourceName = (String)dbName.getName().get(NameFactory.J2EE_NAME);
- if(dsName.equalsIgnoreCase(datasourceName)) {
- AbstractName tempDbName = helper.getNameFor(db);
- return (DataSource) KernelRegistry.getSingleKernel().invoke(
- tempDbName, "$getResource");
- }
- } catch (Exception ignored) {
- }
- }
- }
-
- return null;
- }
-
-}
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/InternalDBHelper.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/InternalDBHelper.java
deleted file mode 100644
index 7ba64ad..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/InternalDBHelper.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.console.internaldb;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.sql.Connection;
-import java.sql.DatabaseMetaData;
-import java.sql.ResultSet;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.util.Hashtable;
-import java.util.Map;
-
-public class InternalDBHelper {
- private static final Logger log = LoggerFactory.getLogger(InternalDBHelper.class);
-
- private static final int RDBMS_DERBY = 1;
-
- private static final int RDBMS_MSSQL = 2;
-
- private static final String JNDI_DERBY = "java:comp/env/SystemDatasource";
-
- private static final Map derbyDBInfo = new Hashtable();
-
- /**
- * Returns the database metadata as a map.
- */
- public Map getDBInfo() {
- derbyDBInfo.clear();
- Connection conn = null;
- try {
- conn = DerbyConnectionUtil.getSystemDBConnection();
- DatabaseMetaData dbMD = (DatabaseMetaData) conn.getMetaData();
-
- // DB
- derbyDBInfo.put("URL", removeNull(dbMD.getURL()));
- derbyDBInfo.put("Username", removeNull(dbMD.getUserName()));
- derbyDBInfo.put("Read Only", removeNull(String.valueOf(dbMD
- .isReadOnly())));
- derbyDBInfo.put("DB Product Name", removeNull(dbMD
- .getDatabaseProductName()));
- derbyDBInfo.put("DB Product Version", removeNull(dbMD
- .getDatabaseProductVersion()));
- derbyDBInfo.put("DB Major Version", removeNull(String.valueOf(dbMD
- .getDatabaseMajorVersion())));
- derbyDBInfo.put("DB Minor Version", removeNull(String.valueOf(dbMD
- .getDatabaseMinorVersion())));
-
- // Driver
- derbyDBInfo.put("Driver Name", removeNull(dbMD.getDriverName()));
- derbyDBInfo.put("Driver Version", removeNull(dbMD
- .getDriverVersion()));
- derbyDBInfo.put("Driver Major Version", removeNull(String
- .valueOf(dbMD.getDriverMajorVersion())));
- derbyDBInfo.put("Driver Minor Version", removeNull(String
- .valueOf(dbMD.getDriverMinorVersion())));
-
- // JDBC
- derbyDBInfo.put("JDBC Major Version", removeNull(String
- .valueOf(dbMD.getJDBCMajorVersion())));
- derbyDBInfo.put("JDBC Minor Version", removeNull(String
- .valueOf(dbMD.getJDBCMinorVersion())));
-
- // Functions
- derbyDBInfo.put("Numeric Functions", removeNull(dbMD
- .getNumericFunctions()));
- derbyDBInfo.put("String Functions", removeNull(dbMD
- .getStringFunctions()));
- derbyDBInfo.put("System Functions", removeNull(dbMD
- .getSystemFunctions()));
- derbyDBInfo.put("Time Date Functions", removeNull(dbMD
- .getTimeDateFunctions()));
-
- // Etc
- derbyDBInfo.put("Supported SQL Keywords", removeNull(dbMD
- .getSQLKeywords().replace(',', ' ')));
- derbyDBInfo.put("Supported Types", removeNull(getColumnData(dbMD
- .getTypeInfo(), "TYPE_NAME")));
- derbyDBInfo.put("Table Types", removeNull(getColumnData(dbMD
- .getTableTypes(), "TABLE_TYPE")));
- derbyDBInfo.put("Schemas", removeNull(getColumnData(dbMD
- .getSchemas(), "TABLE_SCHEM")));
- String tx = null;
-
- switch (dbMD.getDefaultTransactionIsolation()) {
- case Connection.TRANSACTION_NONE:
- tx = "not supported";
- break;
- case Connection.TRANSACTION_READ_COMMITTED:
- tx = "dirty reads are prevented; non-repeatable reads and phantom reads can occur";
- break;
- case Connection.TRANSACTION_READ_UNCOMMITTED:
- tx = "dirty reads, non-repeatable reads and phantom reads can occur";
- break;
- case Connection.TRANSACTION_REPEATABLE_READ:
- tx = "dirty reads and non-repeatable reads are prevented; phantom reads can occur";
- break;
- case Connection.TRANSACTION_SERIALIZABLE:
- tx = "dirty reads, non-repeatable reads and phantom reads are prevented";
- break;
- default:
- tx = "";
- break;
- }
-
- derbyDBInfo.put("Default Transaction Isolation", removeNull(tx));
- String holdability = null;
-
- switch (dbMD.getResultSetHoldability()) {
- case ResultSet.HOLD_CURSORS_OVER_COMMIT:
- holdability = "hold cursors over commit";
- break;
- case ResultSet.CLOSE_CURSORS_AT_COMMIT:
- holdability = "close cursors at commit";
- break;
- default:
- holdability = "";
- break;
- }
- derbyDBInfo.put("Result Set Holdability", removeNull(holdability));
- String sqlStateType = null;
-
- switch (dbMD.getSQLStateType()) {
- case DatabaseMetaData.sqlStateXOpen:
- sqlStateType = "X/Open SQL CLI";
- break;
- case DatabaseMetaData.sqlStateSQL99:
- sqlStateType = "SQL99";
- break;
- default:
- sqlStateType = "";
- break;
- }
- derbyDBInfo.put("SQL State Type", removeNull(sqlStateType));
- } catch (SQLException e) {
- printSQLError((SQLException) e);
- } finally {
- // close DB connection
- try {
- if (conn != null) {
- conn.close();
- }
- } catch (SQLException e) {
- // problem closing DB connection
- }
- }
-
- return derbyDBInfo;
- }
-
- private String removeNull(String s) {
- return ((s == null) ? "" : s);
- }
-
- /**
- * Get a specific column data as a string separated by ','.
- */
- private String getColumnData(ResultSet rs, String colName) {
- StringBuffer result = new StringBuffer();
- try {
- ResultSetMetaData rsmd = rs.getMetaData();
-
- // 1) Get column number
- int selectedCol = -1;
- int numberOfColumns = rsmd.getColumnCount();
- for (int i = 1; i <= numberOfColumns; i++) {
- String columnName = rsmd.getColumnName(i);
- if (columnName.equals(colName)) {
- selectedCol = i;
- break;
- }
- }
-
- // 2) Get data
- boolean firstData = true;
- while (rs.next()) {
- for (int i = 1; i <= numberOfColumns; i++) {
- if (i == selectedCol) {
- if (firstData) {
- firstData = false;
- } else {
- result.append(',');
- }
- String columnValue = rs.getString(i);
- result.append(columnValue);
- }
- }
- }
- } catch (SQLException e) {
- printSQLError((SQLException) e);
- }
-
- return result.toString();
- }
-
- /**
- * Print the SQL exception including chained exceptions
- * if there is one.
- *
- * @param e
- */
- private void printSQLError(SQLException e) {
- while (e != null) {
- log.error(e.toString(), e);
- e = e.getNextException();
- }
- }
-
-}
\ No newline at end of file
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/InternalDBPortlet.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/InternalDBPortlet.java
deleted file mode 100644
index c64a2f2..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/InternalDBPortlet.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.console.internaldb;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
-import org.apache.geronimo.console.BasePortlet;
-
-public class InternalDBPortlet extends BasePortlet {
-
- private static final String NORMALVIEW_JSP = "/WEB-INF/view/internaldb/internalDBNormal.jsp";
-
- private static final String MAXIMIZEDVIEW_JSP = "/WEB-INF/view/internaldb/internalDBMaximized.jsp";
-
- private static final String HELPVIEW_JSP = "/WEB-INF/view/internaldb/internalDBHelp.jsp";
-
- private static InternalDBHelper helper = new InternalDBHelper();
-
- private static Map javaSysInfo = new HashMap();
-
- private PortletRequestDispatcher normalView;
-
- private PortletRequestDispatcher maximizedView;
-
- private PortletRequestDispatcher helpView;
-
- public void processAction(ActionRequest actionRequest,
- ActionResponse actionResponse) throws PortletException, IOException {
- // Getting parameters here because it fails on doView()
- String rdbms = actionRequest.getParameter("rdbms");
- if (rdbms != null) {
- actionResponse.setRenderParameter("rdbms", rdbms);
- }
- }
-
- protected void doView(RenderRequest renderRequest,
- RenderResponse renderResponse) throws IOException, PortletException {
- if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
- return;
- }
-
- String rdbmsParam = renderRequest.getParameter("rdbms");
- int rdbms = 1;
- if ((rdbmsParam != null) && (rdbmsParam.length() > 0)) {
- rdbms = Integer.parseInt(rdbmsParam);
- }
- Map internalDB = helper.getDBInfo();
- renderRequest.setAttribute("internalDB", internalDB);
-
- if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
- normalView.include(renderRequest, renderResponse);
- } else {
- maximizedView.include(renderRequest, renderResponse);
- }
- }
-
- protected void doHelp(RenderRequest renderRequest,
- RenderResponse renderResponse) throws PortletException, IOException {
- helpView.include(renderRequest, renderResponse);
- }
-
- public void init(PortletConfig portletConfig) throws PortletException {
- super.init(portletConfig);
- normalView = portletConfig.getPortletContext().getRequestDispatcher(
- NORMALVIEW_JSP);
- maximizedView = portletConfig.getPortletContext().getRequestDispatcher(
- MAXIMIZEDVIEW_JSP);
- helpView = portletConfig.getPortletContext().getRequestDispatcher(
- HELPVIEW_JSP);
- }
-
- public void destroy() {
- normalView = null;
- maximizedView = null;
- helpView = null;
- super.destroy();
- }
-
-}
\ No newline at end of file
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java
deleted file mode 100644
index ed4c94e..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLHelper.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.console.internaldb;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.io.File;
-import java.sql.Connection;
-import java.sql.SQLException;
-import java.sql.Statement;
-
-import javax.portlet.PortletRequest;
-
-import org.apache.geronimo.console.BasePortlet;
-
-import org.apache.geronimo.kernel.util.InputUtils;
-
-public class RunSQLHelper {
-
- private static final Logger log = LoggerFactory.getLogger(RunSQLHelper.class);
-
- private static final String DERBY_BACKUP_FOLDER = "derby.backup";
-
- private static final String PARENT_FOLDER = "..";
-
- private static final String BAK_EXTENSION = ".bak";
-
- private static final String BAK_PREFIX = "BAK_";
-
- private final BasePortlet portlet;
-
- public RunSQLHelper (BasePortlet portlet) {
- this.portlet = portlet;
- }
-
- public boolean createDB(String dbName, PortletRequest request) {
-
- // ensure there are no illegal chars in DB name
- InputUtils.validateSafeInput(dbName);
-
- Connection conn = null;
- try {
- conn = DerbyConnectionUtil.getDerbyConnection(dbName,
- DerbyConnectionUtil.CREATE_DB_PROP);
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "sysdb.infoMsg01", dbName));
- return true;
- } catch (Throwable e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg01"), e.getMessage());
- return false;
- } finally {
- // close DB connection
- try {
- if (conn != null) {
- conn.close();
- }
- } catch (SQLException e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg02"), e.getMessage());
- }
- }
- }
-
- public boolean backupDB(String derbyHome, String dbName, PortletRequest request) {
- return false;
- }
-
- public boolean restoreDB(String derbyHome, String dbName, PortletRequest request) {
- return false;
- }
-
- public boolean deleteDB(String derbyHome, String dbName, PortletRequest request) {
- // shutdown database before deleting it
- if (!shutdownDB(dbName)) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg03"));
- return false;
- }
-
- try {
- // create backup folder if not created
- File derbyBackupFolder = new File(derbyHome + File.separatorChar
- + PARENT_FOLDER + File.separatorChar + DERBY_BACKUP_FOLDER);
- if (!derbyBackupFolder.exists()) {
- if (!derbyBackupFolder.mkdirs()) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg04"));
- return false;
- }
- }
-
- File oldDBFolder = new File(derbyHome + File.separatorChar + dbName);
- if (oldDBFolder.exists()) {
- // Need to add a prefix because File.createTempFile's first
- // argument must be a String at least three characters long.
- File tmpFile = File.createTempFile(BAK_PREFIX + dbName,
- BAK_EXTENSION, derbyBackupFolder);
- File newDBFolder = new File(tmpFile.getAbsolutePath());
- /*
- * Delete temp file and create a temp folder using the temp
- * filename
- */
- if (tmpFile.delete()) {
- if (newDBFolder.mkdirs()) {
- if (!oldDBFolder.renameTo(new File(newDBFolder,
- oldDBFolder.getName()))) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg05"));
- return false;
- }
- }
- }
- }
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "sysdb.infoMsg02", dbName));
- return true;
- } catch (Exception e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg06"), e.getMessage());
- return false;
- }
- }
-
- public boolean runSQL(String connName, String sql, Boolean dsConn, PortletRequest request) {
- if ((sql == null) || (sql.trim().length() == 0)) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg07"));
- return false;
- }
-
- Connection conn = null;
- Statement s = null;
- try {
- if (dsConn) {
- conn = DerbyConnectionUtil.getDataSourceConnection(connName);
- } else {
- conn = DerbyConnectionUtil.getDerbyConnection(connName);
- }
- conn.setAutoCommit(false);
-
- s = conn.createStatement();
- String[] sqlCmds = sql.split(";");
- for (int i = 0; i < sqlCmds.length; i++) {
- if (sqlCmds[i].trim().length() > 0) {
- // debug printout (remove later)
- log.debug("SQL" + i + ": <" + sqlCmds[i].trim() + ">");
- s.execute(sqlCmds[i]);
- }
- }
- conn.commit();
- portlet.addInfoMessage(request, portlet.getLocalizedString(request, "sysdb.infoMsg03"));
- return true;
- } catch (SQLException e) {
- try {
- conn.rollback();
- } catch (Exception unHandledException) {
- }
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg08"), e.getMessage());
- return false;
- } catch (Throwable e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg08"), e.getMessage());
- return false;
- } finally {
- // close DB connection
- try {
- if (s != null) {
- s.close();
- }
- if (conn != null) {
- conn.setAutoCommit(true);
- conn.close();
- }
- } catch (SQLException e) {
- portlet.addErrorMessage(request, portlet.getLocalizedString(request, "sysdb.errorMsg02"), e.getMessage());
- }
- }
- }
-
- private boolean shutdownDB(String dbName) {
- boolean ok = true;
-
- boolean gotSQLExc = false;
- try {
- DerbyConnectionUtil.getDerbyConnection(dbName,
- DerbyConnectionUtil.SHUTDOWN_DB_PROP);
- } catch (SQLException se) {
- gotSQLExc = true;
- }
-
- if (!gotSQLExc) {
- ok = false;
- }
-
- return ok;
- }
-
-}
diff --git a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java b/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java
deleted file mode 100644
index 5fa7093..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/java/org/apache/geronimo/console/internaldb/RunSQLPortlet.java
+++ /dev/null
@@ -1,190 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.console.internaldb;
-
-import java.io.IOException;
-import java.util.Collection;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
-import org.apache.geronimo.console.BasePortlet;
-
-public class RunSQLPortlet extends BasePortlet {
-
- private static final String NORMALVIEW_JSP = "/WEB-INF/view/internaldb/runSQLNormal.jsp";
-
- private static final String MAXIMIZEDVIEW_JSP = "/WEB-INF/view/internaldb/runSQLMaximized.jsp";
-
- private static final String HELPVIEW_JSP = "/WEB-INF/view/internaldb/runSQLHelp.jsp";
-
- private static final String CREATEDB_ACTION = "Create";
-
- private static final String DELETEDB_ACTION = "Delete";
-
- private static final String RUNSQL_ACTION = "Run SQL";
-
- private static final String BACKUPDB_ACTION = "Backup";
-
- private static final String RESTOREDB_ACTION = "Restore";
-
- private static final String DATASOURCE_MODE = "datasource";
-
- private static final String DATABASE_MODE = "database";
-
- private static DBViewerHelper dbHelper = new DBViewerHelper();
-
- private RunSQLHelper sqlHelper;
-
- private PortletRequestDispatcher normalView;
-
- private PortletRequestDispatcher maximizedView;
-
- private PortletRequestDispatcher helpView;
-
- private Collection<String> databases;
-
- private Collection<String> dataSourceNames;
-
- private String action;
-
- private String createDB;
-
- private String deleteDB;
-
- private String useDB;
-
- private String backupDB;
-
- private String restoreDB;
-
- private String sqlStmts;
-
- private String connectionMode; // either datasource or database
-
- private boolean actionResult;
-
- public void processAction(ActionRequest actionRequest,
- ActionResponse actionResponse) throws PortletException, IOException {
- // Getting parameters here because it fails on doView()
- action = actionRequest.getParameter("action");
- createDB = actionRequest.getParameter("createDB");
- deleteDB = actionRequest.getParameter("deleteDB");
- useDB = actionRequest.getParameter("useDB");
- backupDB = actionRequest.getParameter("backupDB");
- restoreDB = actionRequest.getParameter("restoreDB");
- sqlStmts = actionRequest.getParameter("sqlStmts");
- if (CREATEDB_ACTION.equals(action)) {
- sqlHelper.createDB(createDB, actionRequest);
- } else if (DELETEDB_ACTION.equals(action)) {
- sqlHelper.deleteDB(DerbyConnectionUtil.getDerbyHome(), deleteDB, actionRequest);
- } else if (RUNSQL_ACTION.equals(action)) {
- actionResult = sqlHelper.runSQL(useDB, sqlStmts, RunSQLPortlet.DATASOURCE_MODE.equals(connectionMode), actionRequest);
- } else if (BACKUPDB_ACTION.equals(action)) {
- sqlHelper.backupDB(DerbyConnectionUtil.getDerbyHome(), backupDB, actionRequest);
- } else if (RESTOREDB_ACTION.equals(action)) {
- sqlHelper.restoreDB(DerbyConnectionUtil.getDerbyHome(), restoreDB, actionRequest);
- }
- }
-
- protected void doView(RenderRequest renderRequest,
- RenderResponse renderResponse) throws IOException, PortletException {
- if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
- return;
- }
-
- String singleSelectStmt;
- databases = dbHelper.getDerbyDatabases(DerbyConnectionUtil.getDerbyHome());
- dataSourceNames = dbHelper.getDataSourceNames();
- renderRequest.setAttribute("databases", databases);
- renderRequest.setAttribute("dataSourceNames", dataSourceNames);
- renderRequest.setAttribute("sqlStmts", sqlStmts);
- renderRequest.setAttribute("useDB", useDB);
- renderRequest.setAttribute("connectionMode", connectionMode);
- if (RUNSQL_ACTION.equals(action)) {
- // check if it's a single Select statement
- if ((sqlStmts != null) && (sqlStmts.trim().indexOf(';') == -1)
- && sqlStmts.trim().toUpperCase().startsWith("SELECT")
- && actionResult) {
- singleSelectStmt = sqlStmts.trim();
- } else {
- singleSelectStmt = "";
- }
- renderRequest.setAttribute("singleSelectStmt", singleSelectStmt);
- renderRequest.setAttribute("ds", DerbyConnectionUtil.getDataSource(useDB));
- }
- if ((action != null) && (action.trim().length() > 0)) {
- //set action to null so that subsequent renders of portlet
- // won't display
- //action result if there is no action to process
- action = null;
- }
- if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
- normalView.include(renderRequest, renderResponse);
- } else {
- maximizedView.include(renderRequest, renderResponse);
- }
- }
-
- protected void doHelp(RenderRequest renderRequest,
- RenderResponse renderResponse) throws PortletException, IOException {
- renderRequest.setAttribute("connectionMode", connectionMode);
- helpView.include(renderRequest, renderResponse);
- }
-
- public void init(PortletConfig portletConfig) throws PortletException {
- super.init(portletConfig);
- normalView = portletConfig.getPortletContext().getRequestDispatcher(
- NORMALVIEW_JSP);
- maximizedView = portletConfig.getPortletContext().getRequestDispatcher(
- MAXIMIZEDVIEW_JSP);
- helpView = portletConfig.getPortletContext().getRequestDispatcher(
- HELPVIEW_JSP);
- databases = dbHelper.getDerbyDatabases(DerbyConnectionUtil.getDerbyHome());
- dataSourceNames = dbHelper.getDataSourceNames();
- String mode = portletConfig.getInitParameter("connectionMode");
- if ((mode != null) && (mode.trim().equalsIgnoreCase(RunSQLPortlet.DATASOURCE_MODE))) {
- connectionMode = RunSQLPortlet.DATASOURCE_MODE;
- } else {
- connectionMode = RunSQLPortlet.DATABASE_MODE;
- }
- sqlHelper = new RunSQLHelper(this);
- }
-
- public void destroy() {
- normalView = null;
- maximizedView = null;
- helpView = null;
- if (databases != null) {
- databases.clear();
- databases = null;
- }
- if (dataSourceNames != null) {
- dataSourceNames.clear();
- dataSourceNames = null;
- }
- super.destroy();
- }
-
-}
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/CommonMsg.tld b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
deleted file mode 100644
index a695a4a..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/CommonMsg.tld
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!DOCTYPE taglib PUBLIC
- "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.1//EN"
- "http://java.sun.com/j2ee/dtds/web-jsptaglibrary_1_1.dtd">
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<taglib>
-
- <tlibversion>1.0</tlibversion>
- <jspversion>1.1</jspversion>
- <shortname>pluto</shortname>
- <uri>http://portals.apache.org/pluto</uri>
-
- <tag>
- <name>commonMsg</name>
- <tagclass>org.apache.geronimo.console.message.CommonMessageTag</tagclass>
- <bodycontent>empty</bodycontent>
- </tag>
-
-</taglib>
-
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/portlet.xml b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/portlet.xml
deleted file mode 100644
index 1d5a48d..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/portlet.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<portlet-app version="1.0">
-
- <portlet>
- <description>Portlet for displaying internal DB info</description>
- <portlet-name>InternalDB</portlet-name>
- <display-name>Internal Database Portlet</display-name>
- <portlet-class>org.apache.geronimo.console.internaldb.InternalDBPortlet</portlet-class>
- <expiration-cache>-1</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- <portlet-mode>HELP</portlet-mode>
- </supports>
- <supported-locale>en</supported-locale>
- <supported-locale>zh</supported-locale>
- <supported-locale>ja</supported-locale>
- <resource-bundle>portletinfo</resource-bundle>
- <portlet-info>
- <title>DB Info</title>
- <short-title>DB Info</short-title>
- <keywords>DB Info</keywords>
- </portlet-info>
- </portlet>
-
- <portlet>
- <description>Portlet for viewing database contents</description>
- <portlet-name>DBViewer</portlet-name>
- <display-name>Database Viewer Portlet</display-name>
- <portlet-class>org.apache.geronimo.console.internaldb.DBViewerPortlet</portlet-class>
- <expiration-cache>-1</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- <portlet-mode>HELP</portlet-mode>
- </supports>
- <supported-locale>en</supported-locale>
- <supported-locale>zh</supported-locale>
- <supported-locale>ja</supported-locale>
- <resource-bundle>portletinfo</resource-bundle>
- <portlet-info>
- <title>DB Viewer</title>
- <short-title>DB Viewer</short-title>
- <keywords>DB Viewer</keywords>
- </portlet-info>
- </portlet>
-
- <portlet>
- <description>Portlet for viewing the derby System database logs.</description>
- <portlet-name>DerbyLogViewer</portlet-name>
- <display-name>Derby Log Viewer Portlet</display-name>
- <portlet-class>org.apache.geronimo.console.derbylogmanager.DerbyLogViewerPortlet</portlet-class>
- <expiration-cache>-1</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- <portlet-mode>HELP</portlet-mode>
- </supports>
- <supported-locale>en</supported-locale>
- <supported-locale>zh</supported-locale>
- <supported-locale>ja</supported-locale>
- <resource-bundle>portletinfo</resource-bundle>
- <portlet-info>
- <title>Derby Log Viewer</title>
- <short-title>Derby Log Viewer</short-title>
- <keywords>Derby, Log, Viewer</keywords>
- </portlet-info>
- </portlet>
-
- <portlet>
- <description>Portlet for running SQL commands</description>
- <portlet-name>RunSQL</portlet-name>
- <display-name>Run SQL Portlet</display-name>
- <portlet-class>org.apache.geronimo.console.internaldb.RunSQLPortlet</portlet-class>
- <expiration-cache>-1</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- <portlet-mode>HELP</portlet-mode>
- </supports>
- <supported-locale>en</supported-locale>
- <supported-locale>zh</supported-locale>
- <supported-locale>ja</supported-locale>
- <resource-bundle>portletinfo</resource-bundle>
- <portlet-info>
- <title>Run SQL</title>
- <short-title>Run SQL</short-title>
- <keywords>Run SQL</keywords>
- </portlet-info>
- <init-param>
- <name>connectionMode</name>
- <value>database</value>
- </init-param>
- </portlet>
-
- <portlet>
- <description>Portlet for running DataSource SQL commands</description>
- <portlet-name>RunSQLDS</portlet-name>
- <display-name>DataSource Run SQL Portlet</display-name>
- <portlet-class>org.apache.geronimo.console.internaldb.RunSQLPortlet</portlet-class>
- <expiration-cache>-1</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- <portlet-mode>HELP</portlet-mode>
- </supports>
- <supported-locale>en</supported-locale>
- <supported-locale>zh</supported-locale>
- <supported-locale>ja</supported-locale>
- <resource-bundle>portletinfo</resource-bundle>
- <portlet-info>
- <title>Run SQL</title>
- <short-title>Run SQL</short-title>
- <keywords>Run SQL</keywords>
- </portlet-info>
- <init-param>
- <name>connectionMode</name>
- <value>datasource</value>
- </init-param>
- </portlet>
-
- <portlet>
- <description>Portlet for managing database pools</description>
- <portlet-name>DBWizard</portlet-name>
- <display-name>Database Pool Wizard</display-name>
- <portlet-class>org.apache.geronimo.console.databasemanager.wizard.DatabasePoolPortlet</portlet-class>
- <expiration-cache>-1</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- </supports>
- <supported-locale>en</supported-locale>
- <supported-locale>zh</supported-locale>
- <supported-locale>ja</supported-locale>
- <resource-bundle>portletinfo</resource-bundle>
- <portlet-info>
- <title>Database Pools</title>
- <short-title>Database Pools</short-title>
- <keywords>Database Pool Wizard</keywords>
- </portlet-info>
- </portlet>
-
-</portlet-app>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp
deleted file mode 100644
index e85f6e3..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp
+++ /dev/null
@@ -1,84 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<portlet:defineObjects/>
-<script type='text/javascript' src='/console/dwr3/interface/ProgressMonitor.js'></script>
-<script type='text/javascript' src='/console/dwr3/engine.js'></script>
-<script type='text/javascript' src='/console/dwr3/util.js'></script>
-
-<script type="text/javascript">
-dwr.engine.setErrorHandler(<portlet:namespace/>onError);
-function <portlet:namespace/>refreshProgress()
-{
- metadata = {};
- metadata.callback=<portlet:namespace/>updateProgress;
- metadata.errorHandler=<portlet:namespace/>onError;
- ProgressMonitor.getProgressInfo(metadata);
-}
-
-function <portlet:namespace/>onError() {
-}
-
-function <portlet:namespace/>updateProgress(progressInfo)
-{
- // get the bean values from DWR
- var progressPercent = progressInfo.progressPercent;
- var mainMessage = progressInfo.mainMessage;
- var subMessage = progressInfo.subMessage;
- var finished = progressInfo.finished;
-
- // set the bean values in the HTML document
- if (mainMessage != null) {
- document.getElementById('<portlet:namespace/>progressMeterMainMessage').innerHTML = mainMessage;
- }
- if (subMessage != null) {
- document.getElementById('<portlet:namespace/>progressMeterSubMessage').innerHTML = subMessage;
- }
- if (progressPercent > -1) {
- document.getElementById('<portlet:namespace/>progressMeterShell').style.display = 'block';
- document.getElementById('<portlet:namespace/>progressMeterBar').style.width = parseInt(progressPercent * 3.5) + 'px';
- } else {
- document.getElementById('<portlet:namespace/>progressMeterShell').style.display = 'block';
- document.getElementById('<portlet:namespace/>progressMeterBar').style.width = '0px';
- }
- if(finished) {
- document.forms['<portlet:namespace/>ContinueForm'].submit();
- } else {
- window.setTimeout('<portlet:namespace/>refreshProgress()', 1000);
- }
- return true;
-}
-
-function <portlet:namespace/>startProgress()
-{
- document.getElementById('<portlet:namespace/>progressMeterMainMessage').innerHTML = 'Processing...';
- document.getElementById('<portlet:namespace/>progressMeter').style.display = 'block';
- window.setTimeout("<portlet:namespace/>refreshProgress()", 1000);
- return true;
-}
-</script>
-
-<div id="<portlet:namespace/>progressMeter" style="display: none; padding-top: 5px;">
- <br/>
- <div>
- <div id="<portlet:namespace/>progressMeterMainMessage"></div>
- <div id="<portlet:namespace/>progressMeterSubMessage"></div>
- <div id="<portlet:namespace/>progressMeterShell" style="display: none; width: 350px; height: 20px; border: 1px inset; background: #eee;">
- <div id="<portlet:namespace/>progressMeterBar" style="width: 0; height: 20px; border-right: 1px solid #444; background: #9ACB34;"></div>
- </div>
- </div>
-</div>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/basicParams.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/basicParams.jsp
deleted file mode 100644
index b4a6e05..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/basicParams.jsp
+++ /dev/null
@@ -1,156 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-
-<%-- $Rev$ $Date$ --%>
-
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg" %>
-<fmt:setBundle basename="systemdatabase"/>
-
-<portlet:defineObjects/>
-
-<script language="JavaScript">
-var <portlet:namespace/>formName = "<portlet:namespace/>DatabaseForm";
-var <portlet:namespace/>requiredFields = new Array("driverClass", "jars");
-var <portlet:namespace/>passwordFields = new Array("password");
-function <portlet:namespace/>validateForm(){
- if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields)) {
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="dbwizard.common.emptyText"/>');
- return false;
- }
- if(!passwordElementsConfirm(<portlet:namespace/>formName, <portlet:namespace/>passwordFields)) {
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="dbwizard.common.passwordMismatch"/>');
- return false;
- }
- return true;
-}
-</script>
-
-<CommonMsg:commonMsg/><div id="<portlet:namespace/>CommonMsgContainer"></div>
-
-<p><fmt:message key="dbwizard.basicParams.title"/></p>
-
-<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
-<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
- <input type="hidden" name="mode" value="process-params" />
- <input type="hidden" name="name" value="${pool.name}" />
- <input type="hidden" name="dbtype" value="${pool.dbtype}" />
- <input type="hidden" name="url" value="${pool.url}" />
- <input type="hidden" name="urlPrototype" value="${pool.urlPrototype}" />
- <input type="hidden" name="minSize" value="${pool.minSize}" />
- <input type="hidden" name="maxSize" value="${pool.maxSize}" />
- <input type="hidden" name="idleTimeout" value="${pool.idleTimeout}" />
- <input type="hidden" name="blockingTimeout" value="${pool.blockingTimeout}" />
- <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
- <input type="hidden" name="adapterDescription" value="${pool.adapterDescription}" />
- <input type="hidden" name="rarPath" value="${pool.rarPath}" />
- <input type="hidden" name="transactionType" value="${pool.transactionType}" />
- <c:forEach var="prop" items="${pool.properties}">
- <input type="hidden" name="${prop.key}" value="${prop.value}" />
- </c:forEach>
- <table border="0">
- <!-- ENTRY FIELD: Driver Class -->
- <tr>
- <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>driverClass"><fmt:message key="dbwizard.common.JDBCDriverClass"/></label>:</div></th>
- <td><input name="driverClass" id="<portlet:namespace/>driverClass" type="text" size="30" value="${pool.driverClass}"></td>
- </tr>
- <tr>
- <td></td>
- <td>
- <fmt:message key="dbwizard.basicParams.seeDocumentation"/>
- </td>
- </tr>
- <!-- ENTRY FIELD: Driver JAR -->
- <tr>
- <th><div align="right"><label for="<portlet:namespace/>jars"><fmt:message key="dbwizard.common.driverJAR"/></label>:</div></th>
- <td>
- <select multiple="true" name="jars" id="<portlet:namespace/>jars" size="10">
- <c:forEach var="availableJar" items="${availableJars}">
- <option value="${availableJar}" <c:forEach var="jar" items="${pool.jars}"><c:if test="${availableJar == jar}">selected</c:if></c:forEach>>
- ${availableJar}
- </option>
- </c:forEach>
- </select>
- </td>
- </tr>
- <tr>
- <td></td>
- <td>
- <fmt:message key="dbwizard.common.driverJARExplanation"/>
- <input type="button" value='<fmt:message key="dbwizard.common.downloadDriver"/>' onclick="document.<portlet:namespace/>DatabaseForm.mode.value='download';document.<portlet:namespace/>DatabaseForm.submit();return false;" />)
- </td>
- </tr>
- <!-- ENTRY FIELD: Username -->
- <tr>
- <th><div align="right"><fmt:message key="dbwizard.common.DBUserName"/>:</div></th>
- <td><input name="user" id="<portlet:namespace/>user" type="text" size="20" value="${pool.user}" autocomplete="off"></td>
- </tr>
- <tr>
- <td></td>
- <td><label for="<portlet:namespace/>user"><fmt:message key="dbwizard.common.DBUserNameExp"/></label></td>
- </tr>
- <!-- ENTRY FIELD: Password -->
- <tr>
- <th><div align="right"><fmt:message key="dbwizard.common.DBPassword"/>:</div></th>
- <td><input name="password" id="<portlet:namespace/>password" type="password" size="20" value="${pool.password}" autocomplete="off"></td>
- </tr>
- <tr>
- <th><div align="right"><label for="<portlet:namespace/>confirm-password"><fmt:message key="dbwizard.common.confirmPassword"/></label>:</div></th>
- <td><input name="confirm-password" id="<portlet:namespace/>confirm-password" type="password" size="20" value="${pool.password}" autocomplete="off"></td>
- </tr>
- <tr>
- <td></td>
- <td><label for="<portlet:namespace/>password"><fmt:message key="dbwizard.common.DBPasswordExp"/></label></td>
- </tr>
- <!-- ENTRY FIELD: URL Properties -->
- <tr>
- <th colspan="2"><fmt:message key="dbwizard.basicParams.driverConnectionProperties"/></th>
- </tr>
- <tr>
- <th><div align="right"><fmt:message key="dbwizard.basicParams.typicalJDBCURL"/>:</div></th>
- <td><c:out value="${pool.urlPrototype}" /></td>
- </tr>
- <c:forEach var="prop" items="${pool.urlProperties}">
- <tr>
- <th><div align="right"><label for="<portlet:namespace/>${prop.key}">${fn:substringAfter(prop.key,"urlproperty-")}:</label></div></th>
- <td><input name="${prop.key}" id="<portlet:namespace/>${prop.key}" type="text" size="20" value="${prop.value}"></td>
- </tr>
- <tr>
- <td></td>
- <td>
- <fmt:message key="dbwizard.basicParams.propertyExp">
- <fmt:param value="${pool.dbtype}"/>
- </fmt:message>
- </td>
- </tr>
- </c:forEach>
- <!-- SUBMIT BUTTON -->
- <tr>
- <td></td>
- <td><input type="submit" value='<fmt:message key="dbwizard.common.next"/>' onClick="return <portlet:namespace/>validateForm();"/></td>
- </tr>
- </table>
-</form>
-<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
-
-
-<p><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="list" />
- </portlet:actionURL>"><fmt:message key="dbwizard.common.cancel"/></a></p>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/confirmURL.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/confirmURL.jsp
deleted file mode 100644
index 2ae6751..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/confirmURL.jsp
+++ /dev/null
@@ -1,175 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-<portlet:defineObjects/>
-
-<div id="<portlet:namespace/>CommonMsgContainer"></div>
-
-<p><fmt:message key="dbwizard.confirmURL.title"/></p>
-
-<script language="JavaScript">
-function <portlet:namespace/>validate() {
-
- if (document.<portlet:namespace/>DatabaseForm.minSize.value == "") {
- document.<portlet:namespace/>DatabaseForm.minSize.value = 0;
- }
- if (document.<portlet:namespace/>DatabaseForm.maxSize.value == "") {
- document.<portlet:namespace/>DatabaseForm.maxSize.value = 10;
- }
-
- var min = parseInt(document.<portlet:namespace/>DatabaseForm.minSize.value);
- var max = parseInt(document.<portlet:namespace/>DatabaseForm.maxSize.value);
-
- if (isNaN(min)) {
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="dbwizard.edit.errorMsg01"/>');
- min = document.<portlet:namespace/>DatabaseForm.minSize.value = 0;
- return false;
- }
- if (min < 0){
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="dbwizard.edit.errorMsg02"/>');
- min = document.<portlet:namespace/>DatabaseForm.minSize.value = 0;
- return false;
- }
- if (isNaN(max)) {
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="dbwizard.edit.errorMsg03"/>');
- max = document.<portlet:namespace/>DatabaseForm.maxSize.value = 10;
- return false;
- }
- if (max <= 0){
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="dbwizard.edit.errorMsg04"/>');
- max = document.<portlet:namespace/>DatabaseForm.maxSize.value = 10;
- return false;
- }
- if (min > max) {
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="dbwizard.edit.errorMsg05"/>');
- return false;
- }
- return true;
-}
-</script>
-
-<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
-<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
- <input type="hidden" name="mode" value="process-url" />
- <input type="hidden" name="test" value="true" />
- <input type="hidden" name="name" value="${pool.name}" />
- <input type="hidden" name="dbtype" value="${pool.dbtype}" />
- <input type="hidden" name="user" value="${pool.user}" />
- <input type="hidden" name="password" value="${pool.password}" />
- <input type="hidden" name="urlPrototype" value="${pool.urlPrototype}" />
- <input type="hidden" name="driverClass" value="${pool.driverClass}" />
- <c:forEach var="jar" items="${pool.jars}">
- <input type="hidden" name="jars" value="${jar}" />
- </c:forEach> <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
- <input type="hidden" name="adapterDescription" value="${pool.adapterDescription}" />
- <input type="hidden" name="rarPath" value="${pool.rarPath}" />
- <c:forEach var="prop" items="${pool.properties}">
- <input type="hidden" name="${prop.key}" value="${prop.value}" />
- </c:forEach>
- <c:forEach var="prop" items="${pool.urlProperties}">
- <input type="hidden" name="${prop.key}" value="${prop.value}" />
- </c:forEach>
- <table border="0">
- <!-- ENTRY FIELD: URL -->
- <tr>
- <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>url"><fmt:message key="dbwizard.common.JDBCConnectURL"/></label>:</div></th>
- <td><input name="url" id="<portlet:namespace/>url" type="text" size="50" value="${pool.url}"></td>
- </tr>
- <tr>
- <td></td>
- <td><fmt:message key="dbwizard.common.URLFits"/></td>
- </tr>
- <!-- STATUS FIELD: Driver Load -->
- <tr>
- <th><div align="right"><fmt:message key="dbwizard.confirmURL.driverStatus"/>:</div></th>
- <td><i><fmt:message key="dbwizard.confirmURL.loadedSuccessfully"/></i></td>
- </tr>
- <!-- HEADER -->
- <tr>
- <th colspan="2"><fmt:message key="dbwizard.common.connectionPoolParameters"/></th>
- </tr>
- <!-- ENTRY FIELD: TRANSACTION TYPE -->
- <tr>
- <th><div align="right"><label for="<portlet:namespace/>transactionType"><fmt:message key="dbwizard.common.transactionType"/></label>:</div></th>
- <td>
- <select name="transactionType" id="<portlet:namespace/>transactionType">
- <option <c:if test="${'LOCAL' == pool.transactionType}">selected</c:if>>LOCAL</option>
- <option <c:if test="${'XA' == pool.transactionType}">selected</c:if>>XA</option>
- <option <c:if test="${'NONE' == pool.transactionType}">selected</c:if>>NONE</option>
- </select>
- </td>
- </tr>
- <tr>
- <td></td>
- <td><fmt:message key="dbwizard.common.driverTransactionTypes"/></td>
- </tr>
-
- <!-- ENTRY FIELD: Min Size -->
- <tr>
- <th><div align="right"><fmt:message key="dbwizard.common.poolMinSize"/>:</div></th>
- <td><input name="minSize" id="<portlet:namespace/>minSize" type="text" size="5" value="${pool.minSize}"></td>
- </tr>
- <tr>
- <td></td>
- <td><label for="<portlet:namespace/>minSize"><fmt:message key="dbwizard.confirmURL.minimumNoOfCon"/></label></td>
- </tr>
- <!-- ENTRY FIELD: Max Size -->
- <tr>
- <th><div align="right"><fmt:message key="dbwizard.common.poolMaxSize"/>:</div></th>
- <td><input name="maxSize" id="<portlet:namespace/>maxSize" type="text" size="5" value="${pool.maxSize}"></td>
- </tr>
- <tr>
- <td></td>
- <td><label for="<portlet:namespace/>maxSize"><fmt:message key="dbwizard.confirmURL.maxNoOfCon"/></label></td>
- </tr>
- <!-- ENTRY FIELD: Blocking Timeout -->
- <tr>
- <th><div align="right"><fmt:message key="dbwizard.common.blockingTimeout"/>:</div></th>
- <td><input name="blockingTimeout" id="<portlet:namespace/>blockingTimeout" type="text" size="7" value="${pool.blockingTimeout}"> (<fmt:message key="dbwizard.common.inMilliseconds"/>)</td>
- </tr>
- <tr>
- <td></td>
- <td><label for="<portlet:namespace/>blockingTimeout"><fmt:message key="dbwizard.confirmURL.blockingTimeoutExp"/></label></td>
- </tr>
- <!-- ENTRY FIELD: Idle timeout -->
- <tr>
- <th><div align="right"><fmt:message key="dbwizard.common.idleTimeout"/>:</div></th>
- <td><input name="idleTimeout" id="<portlet:namespace/>idleTimeout" type="text" size="5" value="${pool.idleTimeout}"> (<fmt:message key="dbwizard.common.inMinutes"/>)</td>
- </tr>
- <tr>
- <td></td>
- <td><label for="<portlet:namespace/>idleTimeout"><fmt:message key="dbwizard.confirmURL.idleTimeoutExp"/></label></td>
- </tr>
- <!-- SUBMIT BUTTON -->
- <tr>
- <td></td>
- <td>
- <input type="button" value='<fmt:message key="dbwizard.common.testConnection"/>' onclick="if (<portlet:namespace/>validate()){document.<portlet:namespace/>DatabaseForm.test.value='true';document.<portlet:namespace/>DatabaseForm.submit();}" />
- <input type="button" value='<fmt:message key="dbwizard.common.skipTestAndDeploy"/>' onclick="if (<portlet:namespace/>validate()){document.<portlet:namespace/>DatabaseForm.test.value='false';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
- <input type="button" value='<fmt:message key="dbwizard.common.skipTestAndShowPlan"/>' onclick="if (<portlet:namespace/>validate()){document.<portlet:namespace/>DatabaseForm.mode.value='plan';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
- </td>
- </tr>
- </table>
-</form>
-<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
-
-<p><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="list" />
- </portlet:actionURL>"><fmt:message key="dbwizard.common.cancel"/></a></p>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/downloadStatus.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/downloadStatus.jsp
deleted file mode 100644
index ce51f2c..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/downloadStatus.jsp
+++ /dev/null
@@ -1,64 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-<portlet:defineObjects/>
-
-<p><fmt:message key="dbwizard.downloadStatus.title"/></p>
-
-<p><fmt:message key="dbwizard.downloadStatus.summary"/></p>
-
-<!-- Form that will be submitted when the download is complete -->
-<form name="<portlet:namespace/>ContinueForm" action="<portlet:actionURL/>" method="POST">
- <input type="hidden" name="mode" value="process-downloadStatus" />
- <input type="hidden" name="name" value="${pool.name}" />
- <input type="hidden" name="dbtype" value="${pool.dbtype}" />
- <input type="hidden" name="user" value="${pool.user}" />
- <input type="hidden" name="password" value="${pool.password}" />
- <input type="hidden" name="driverClass" value="${pool.driverClass}" />
- <input type="hidden" name="url" value="${pool.url}" />
- <input type="hidden" name="urlPrototype" value="${pool.urlPrototype}" />
- <c:forEach var="jar" items="${pool.jars}">
- <input type="hidden" name="jars" value="${jar}" />
- </c:forEach> <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
- <input type="hidden" name="minSize" value="${pool.minSize}" />
- <input type="hidden" name="maxSize" value="${pool.maxSize}" />
- <input type="hidden" name="idleTimeout" value="${pool.idleTimeout}" />
- <input type="hidden" name="blockingTimeout" value="${pool.blockingTimeout}" />
- <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
- <input type="hidden" name="adapterDescription" value="${pool.adapterDescription}" />
- <input type="hidden" name="rarPath" value="${pool.rarPath}" />
- <input type="hidden" name="transactionType" value="${pool.transactionType}" />
- <c:forEach var="prop" items="${pool.properties}">
- <input type="hidden" name="${prop.key}" value="${prop.value}" />
- </c:forEach>
- <c:forEach var="prop" items="${pool.urlProperties}">
- <input type="hidden" name="${prop.key}" value="${prop.value}" />
- </c:forEach>
-</form>
-
-<%-- Display the download progress bar --%>
-<jsp:include flush="true" page="../ajax/progressbar.jsp"/>
-<script type="text/javascript">
- <portlet:namespace/>startProgress();
-</script>
-
-<p><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="list" />
- </portlet:actionURL>"><fmt:message key="dbwizard.common.returnToList"/></a></p>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/edit.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/edit.jsp
deleted file mode 100644
index 28f4152..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/edit.jsp
+++ /dev/null
@@ -1,415 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-
-<%-- $Rev$ $Date$ --%>
-
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg" %>
-<fmt:setBundle basename="systemdatabase"/>
-
-<portlet:defineObjects/>
-
-<script language="JavaScript">
-var <portlet:namespace/>formName = "<portlet:namespace/>DatabaseForm";
-var <portlet:namespace/>requiredFields = new Array();
-var <portlet:namespace/>passwordFields = new Array();
-function <portlet:namespace/>validateForm(){
- if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields)) {
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="dbwizard.common.emptyText"/>');
- return false;
- }
- if(!passwordElementsConfirm(<portlet:namespace/>formName, <portlet:namespace/>passwordFields)) {
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="dbwizard.common.passwordMismatch"/>');
- return false;
- }
- return <portlet:namespace/>validate();
-}
-</script>
-
-<CommonMsg:commonMsg/><div id="<portlet:namespace/>CommonMsgContainer"></div>
-
-<p>
- <c:choose> <%-- Can't change the pool name after deployment because it's wired into all the ObjectNames --%>
- <c:when test="${empty pool.rarPath}">
- <fmt:message key="dbwizard.edit.summary"/>
- </c:when>
- <c:otherwise>
- <fmt:message key="dbwizard.basicParams.title"/>
- </c:otherwise>
- </c:choose>
-</p>
-
-<script language="JavaScript">
-function <portlet:namespace/>validate() {
-
- if (document.<portlet:namespace/>DatabaseForm.minSize.value == "") {
- document.<portlet:namespace/>DatabaseForm.minSize.value = 0;
- }
- if (document.<portlet:namespace/>DatabaseForm.maxSize.value == "") {
- document.<portlet:namespace/>DatabaseForm.maxSize.value = 10;
- }
-
- var min = parseInt(document.<portlet:namespace/>DatabaseForm.minSize.value);
- var max = parseInt(document.<portlet:namespace/>DatabaseForm.maxSize.value);
-
- if (isNaN(min)) {
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="dbwizard.edit.errorMsg01"/>');
- min = document.<portlet:namespace/>DatabaseForm.minSize.value = 0;
- return false;
- }
- if (min < 0){
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="dbwizard.edit.errorMsg02"/>');
- min = document.<portlet:namespace/>DatabaseForm.minSize.value = 0;
- return false;
- }
- if (isNaN(max)) {
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="dbwizard.edit.errorMsg03"/>');
- max = document.<portlet:namespace/>DatabaseForm.maxSize.value = 10;
- return false;
- }
- if (max <= 0){
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="dbwizard.edit.errorMsg04"/>');
- max = document.<portlet:namespace/>DatabaseForm.maxSize.value = 10;
- return false;
- }
- if (min > max) {
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="dbwizard.edit.errorMsg05"/>');
- return false;
- }
- return true;
-}
-</script>
-
-<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
-<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
- <input type="hidden" name="mode" value="process-url" />
- <input type="hidden" name="test" value="true" />
-
- <input type="hidden" name="dbtype" value="${pool.dbtype}" />
- <input type="hidden" name="urlPrototype" value="${pool.urlPrototype}" />
- <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
- <c:forEach var="prop" items="${pool.urlProperties}">
- <input type="hidden" name="${prop.key}" value="${prop.value}" />
- </c:forEach>
- <input type="hidden" name="abstractName" value="${pool.abstractName}" />
- <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
- <input type="hidden" name="adapterDescription" value="${pool.adapterDescription}" />
- <input type="hidden" name="rarPath" value="${pool.rarPath}" />
-
- <table border="0">
- <!-- ENTRY FIELD: NAME -->
- <tr>
- <th style="min-width: 140px"><div align="right"><fmt:message key="dbwizard.edit.poolName"/>:</div></th>
- <td>
- <c:choose> <%-- Can't change the pool name after deployment because it's wired into all the ObjectNames --%>
- <c:when test="${empty pool.abstractName}">
- <input name="name" type="text" size="30" value="${pool.name}" title='<fmt:message key="dbwizard.edit.poolName"/>'>
- <script language="JavaScript">
- <portlet:namespace/>requiredFields = <portlet:namespace/>requiredFields.concat(new Array("name"));
- </script>
- </c:when>
- <c:otherwise>
- <input name="name" type="hidden" value="${pool.name}" />
- <b><c:out value="${pool.name}" /></b>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- <tr>
- <td></td>
- <td><fmt:message key="dbwizard.edit.poolNameExp"/></td>
- </tr>
- <!-- STATUS FIELD: Display Name -->
- <tr>
- <th><div align="right"><fmt:message key="dbwizard.edit.poolType"/>:</div></th>
- <td><i><c:out value="${pool.adapterDisplayName}" /></i></td>
- </tr>
- <tr>
- <td />
- <td><c:out value="${pool.adapterDescription}" /></td>
- </tr>
- <!-- HEADER -->
- <tr>
- <th colspan="2"><fmt:message key="dbwizard.edit.basicConProperties"/></th>
- </tr>
-<c:choose>
- <c:when test="${pool.generic}"> <%-- This is a standard TranQL JDBC pool -- we know what parameters it wants --%>
- <!-- ENTRY FIELD: Driver Class -->
- <tr>
- <th><div align="right"><fmt:message key="dbwizard.common.JDBCDriverClass" />:</div></th>
- <td>
- <c:choose>
- <c:when test="${empty pool.abstractName}">
- <input name="driverClass" title='<fmt:message key="dbwizard.common.JDBCDriverClass" />' type="text" size="30" value="${pool.driverClass}">
- <script language="JavaScript">
- <portlet:namespace/>requiredFields = <portlet:namespace/>requiredFields.concat(new Array("driverClass"));
- </script>
- </c:when>
- <c:otherwise>
- <input type="hidden" name="driverClass" value="${pool.driverClass}" />
- <i><c:out value="${pool.driverClass}" /></i>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- <tr>
- <td></td>
- <td>
- <c:if test="${!(empty driverError)}"><font color="red"><b><fmt:message key="dbwizard.edit.unableToLoadDriver"/></b></font></c:if>
- <fmt:message key="dbwizard.edit.seeDocumentation"/>
- </td>
- </tr>
- <!-- ENTRY FIELD: Driver JAR -->
- <c:choose> <%-- Can't set JAR after deployment because we don't know how to dig through dependencies yet --%>
- <c:when test="${empty pool.abstractName}">
- <tr>
- <th><div align="right"><label for="<portlet:namespace/>jars"><fmt:message key="dbwizard.common.driverJAR"/></label>:</div></th>
- <td>
- <select multiple="true" name="jars" id="<portlet:namespace/>jars" size="10">
- <c:forEach var="availableJar" items="${availableJars}">
- <option value="${availableJar}" <c:forEach var="jar" items="${pool.jars}"><c:if test="${availableJar == jar}">selected</c:if></c:forEach>>
- ${availableJar}
- </option>
- </c:forEach>
- </select>
- <script language="JavaScript">
- <portlet:namespace/>requiredFields = <portlet:namespace/>requiredFields.concat(new Array("jars"));
- </script>
- </td>
- </tr>
- <tr>
- <td></td>
- <td><fmt:message key="dbwizard.common.driverJARExplanation"/>
- <input type="button" value='<fmt:message key="dbwizard.common.downloadDriver"/>' onclick="document.<portlet:namespace/>DatabaseForm.mode.value='download';document.<portlet:namespace/>DatabaseForm.submit();return false;" />)
- </td>
- </tr>
- </c:when>
- <c:otherwise>
- <c:forEach var="jar" items="${pool.jars}">
- <input type="hidden" name="jars" value="${jar}" />
- </c:forEach>
- </c:otherwise>
- </c:choose>
- <!-- ENTRY FIELD: URL -->
- <tr>
- <th><div align="right"><label for="<portlet:namespace/>url"><fmt:message key="dbwizard.common.JDBCConnectURL"/></label>:</div></th>
- <td><input name="url" id="<portlet:namespace/>url" type="text" size="50" value="${pool.url}"></td>
- </tr>
- <script language="JavaScript">
- <portlet:namespace/>requiredFields = <portlet:namespace/>requiredFields.concat(new Array("url"));
- </script>
- <tr>
- <td></td>
- <td><fmt:message key="dbwizard.common.URLFits"/></td>
- </tr>
- <!-- ENTRY FIELD: Username -->
- <tr>
- <th><div align="right"><label for="<portlet:namespace/>user"><fmt:message key="dbwizard.common.DBUserName"/></label>:</div></th>
- <td><input name="user" id="<portlet:namespace/>user" type="text" size="20" value="${pool.user}" autocomplete="off"></td>
- </tr>
- <tr>
- <td></td>
- <td><fmt:message key="dbwizard.common.DBUserNameExp"/></td>
- </tr>
- <!-- ENTRY FIELD: Password -->
- <tr>
- <th><div align="right"><label for="<portlet:namespace/>password"><fmt:message key="dbwizard.common.DBPassword"/></label>:</div></th>
- <td><input name="password" id="<portlet:namespace/>password" type="password" size="20" value="${pool.password}" autocomplete="off"></td>
- </tr>
- <tr>
- <th><div align="right"><label for="<portlet:namespace/>confirm-password"><fmt:message key="dbwizard.common.confirmPassword"/></label>:</div></th>
- <td><input name="confirm-password" id="<portlet:namespace/>confirm-password" type="password" size="20" value="${pool.password}" autocomplete="off"></td>
- </tr>
- <script language="JavaScript">
- <portlet:namespace/>passwordFields = <portlet:namespace/>passwordFields.concat(new Array("password"));
- </script>
- <tr>
- <td></td>
- <td><fmt:message key="dbwizard.common.DBPasswordExp"/>
-
- <%-- Just to be safe, save all the non-Generic properties since we're not going to edit them here --%>
- <c:forEach var="prop" items="${pool.properties}">
- <input type="hidden" name="${prop.key}" value="${prop.value}" />
- </c:forEach>
- </td>
- </tr>
- </c:when>
- <c:otherwise> <%-- This is an XA or other connection factory that we don't have special parameter handling for --%>
- <!-- ENTRY FIELD: Driver JAR -->
- <c:choose> <%-- Can't set JAR after deployment because we don't know how to dig through dependencies yet --%>
- <c:when test="${empty pool.abstractName}">
- <tr>
- <th><div align="right"><label for="<portlet:namespace/>jars"><fmt:message key="dbwizard.common.driverJAR"/></label>:</div></th>
- <td>
- <select multiple="true" name="jars" id="<portlet:namespace/>jars" size="10">
- <c:forEach var="availableJar" items="${availableJars}">
- <option value="${availableJar}" <c:forEach var="jar" items="${pool.jars}"><c:if test="${availableJar == jar}">selected</c:if></c:forEach>>
- ${availableJar}
- </option>
- </c:forEach>
- </select>
- <script language="JavaScript">
- <portlet:namespace/>requiredFields = <portlet:namespace/>requiredFields.concat(new Array("jars"));
- </script>
- </td>
- </tr>
- <tr>
- <td></td>
- <td><fmt:message key="dbwizard.common.driverJARExplanation"/>
- <input type="button" value='<fmt:message key="dbwizard.common.downloadDriver"/>' onclick="document.<portlet:namespace/>DatabaseForm.mode.value='download';document.<portlet:namespace/>DatabaseForm.submit();return false;" />)
- </td>
- </tr>
- </c:when>
- <c:otherwise>
- <c:forEach var="jar" items="${pool.jars}">
- <input type="hidden" name="jars" value="${jar}" />
- </c:forEach>
- </c:otherwise>
- </c:choose>
- <c:forEach var="prop" items="${pool.properties}">
- <tr>
- <th><div align="right"><label for="<portlet:namespace/>${prop.key}"><fmt:message key="dbwizard.${pool.adapterRarPath}.${fn:substring(prop.key, 9, -1)}"/></label>:</div></th>
- <td><input name="${prop.key}" id="<portlet:namespace/>${prop.key}" <c:choose><c:when test="${fn:containsIgnoreCase(prop.key, 'password')}">type="password" autocomplete="off"</c:when><c:otherwise>type="text"</c:otherwise></c:choose> size="20" value="${prop.value}"></td>
- </tr>
- <c:if test="${fn:containsIgnoreCase(prop.key, 'password')}">
- <tr>
- <th><div align="right"><label for="<portlet:namespace/>confirm-${prop.key}"><fmt:message key="dbwizard.common.confirmPassword"/></label>:</div></th>
- <td><input name="confirm-${prop.key}" id="<portlet:namespace/>confirm-${prop.key}" type="password" size="20" value="${prop.value}" autocomplete="off"></td>
- </tr>
- <script language="JavaScript">
- <portlet:namespace/>passwordFields = <portlet:namespace/>passwordFields.concat(new Array("${prop.key}"));
- </script>
- </c:if>
- <tr>
- <td></td>
- <td><fmt:message key="dbwizard.${pool.adapterRarPath}.${fn:substring(prop.key, 9, -1)}Exp"/></td>
- </tr>
- </c:forEach>
- <tr><td colspan="2">
- <%-- Just to be safe, save all the Generic properties since we're not going to edit them here --%>
- <input type="hidden" name="user" value="${pool.user}" />
- <input type="hidden" name="password" value="${pool.password}" />
- <input type="hidden" name="driverClass" value="${pool.driverClass}" />
- <input type="hidden" name="url" value="${pool.url}" />
- <!-- There is already a form element "jars" defined in this form either as a "select" or as "hidden" field
- depending upon whether the pool is being created or edited. Commented out the following. Need to
- investigate the other four hidden elements above too. -->
- <!-- <input type="hidden" name="jars" value="${pool.jars}" /> -->
- </td></tr>
- </c:otherwise>
-</c:choose>
- <!-- HEADER -->
- <tr>
- <th colspan="2"><fmt:message key="dbwizard.common.connectionPoolParameters"/></th>
- </tr>
- <c:if test="${pool.transactionType != null}">
- <!-- ENTRY FIELD: TRANSACTION TYPE -->
- <tr>
- <th><div align="right"><label for="<portlet:namespace/>transactionType"><fmt:message key="dbwizard.common.transactionType"/></label>:</div></th>
- <td>
- <select name="transactionType" id="<portlet:namespace/>transactionType">
- <option <c:if test="${'LOCAL' == pool.transactionType}">selected</c:if>>LOCAL</option>
- <option <c:if test="${'XA' == pool.transactionType}">selected</c:if>>XA</option>
- <option <c:if test="${'NONE' == pool.transactionType}">selected</c:if>>NONE</option>
- </select>
- </td>
- </tr>
- <tr>
- <td></td>
- <td><fmt:message key="dbwizard.common.driverTransactionTypes"/></td>
- </tr>
- </c:if>
- <!-- ENTRY FIELD: Min Size -->
- <tr>
- <th><div align="right"><fmt:message key="dbwizard.common.poolMinSize"/>:</div></th>
- <td><input name="minSize" id="<portlet:namespace/>minSize" type="text" size="5" value="${pool.minSize}"></td>
- </tr>
- <tr>
- <td></td>
- <td><label for="<portlet:namespace/>minSize"><fmt:message key="dbwizard.edit.minimumNoOfCon"/></label></td>
- </tr>
- <!-- ENTRY FIELD: Max Size -->
- <tr>
- <th><div align="right"><fmt:message key="dbwizard.common.poolMaxSize"/>:</div></th>
- <td><input name="maxSize" id="<portlet:namespace/>maxSize" type="text" size="5" value="${pool.maxSize}"></td>
- </tr>
- <tr>
- <td></td>
- <td><label for="<portlet:namespace/>maxSize"><fmt:message key="dbwizard.common.maxNoOfCon"/></label></td>
- </tr>
- <!-- ENTRY FIELD: Blocking Timeout -->
- <tr>
- <th><div align="right"><fmt:message key="dbwizard.common.blockingTimeout"/>:</div></th>
- <td><input name="blockingTimeout" id="<portlet:namespace/>blockingTimeout" type="text" size="7" value="${pool.blockingTimeout}"> (<fmt:message key="dbwizard.common.inMilliseconds"/>)</td>
- </tr>
- <tr>
- <td></td>
- <td><label for="<portlet:namespace/>blockingTimeout"><fmt:message key="dbwizard.edit.blockingTimeoutExp"/></label></td>
- </tr>
- <!-- ENTRY FIELD: Idle timeout -->
- <tr>
- <th><div align="right"><fmt:message key="dbwizard.common.idleTimeout"/>:</div></th>
- <td><input name="idleTimeout" id="<portlet:namespace/>idleTimeout" type="text" size="5" value="${pool.idleTimeout}"> (<fmt:message key="dbwizard.common.inMinutes"/>)</td>
- </tr>
- <tr>
- <td></td>
- <td><label for="<portlet:namespace/>idleTimeout"><fmt:message key="dbwizard.edit.idleTimeoutExp"/></label></td>
- </tr>
-
- <!-- SUBMIT BUTTON -->
- <tr>
- <td></td>
- <td>
-<c:choose> <%-- Don't know how to test a non-generic pool, so you can only save it --%>
- <c:when test="${pool.generic}">
- <c:choose> <%-- Can't test after deployment because we don't know what JAR to put on the ClassPath, can't show plan becasue we can't update a plan --%>
- <c:when test="${empty pool.abstractName}">
- <input type="button" value='<fmt:message key="dbwizard.common.testConnection"/>' onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.test.value='true';document.<portlet:namespace/>DatabaseForm.submit();}" />
- <input type="button" value='<fmt:message key="dbwizard.common.skipTestAndDeploy"/>' onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.test.value='false';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
- <input type="button" value='<fmt:message key="dbwizard.common.skipTestAndShowPlan"/>' onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.mode.value='plan';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
- </c:when>
- <c:otherwise>
- <input type="button" value='<fmt:message key="dbwizard.common.save"/>' onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.mode.value='save';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
- </c:otherwise>
- </c:choose>
- </c:when>
- <c:otherwise> <%-- Not a generic JDBC pool --%>
- <c:choose>
- <c:when test="${empty pool.abstractName}"> <%-- If it's new we can preview the plan or save/deploy --%>
- <input type="button" value='<fmt:message key="dbwizard.common.deploy"/>' onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.mode.value='save';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
- <input type="button" value='<fmt:message key="dbwizard.common.showPlan"/>' onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.mode.value='plan';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
- </c:when>
- <c:otherwise> <%-- If it's existing we can only save --%>
- <input type="button" value='<fmt:message key="dbwizard.common.save"/>' onclick="if (<portlet:namespace/>validateForm()){document.<portlet:namespace/>DatabaseForm.mode.value='save';document.<portlet:namespace/>DatabaseForm.submit();return false;}" />
- </c:otherwise>
- </c:choose>
- </c:otherwise>
-</c:choose>
- </td>
- </tr>
- </table>
-</form>
-<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
-
-
-
-<p><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="list" />
- </portlet:actionURL>"><fmt:message key="dbwizard.common.cancel"/></a></p>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp
deleted file mode 100644
index 3e36e19..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/importStatus.jsp
+++ /dev/null
@@ -1,72 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg" %>
-<fmt:setBundle basename="systemdatabase"/>
-<portlet:defineObjects/>
-
-<CommonMsg:commonMsg/>
-
-<p><fmt:message key="dbwizard.importStatus.title"/></p>
-
-<p><fmt:message key="dbwizard.importStatus.summary"/></p>
-
-<table width="100%">
- <tr>
- <td class="DarkBackground"><fmt:message key="dbwizard.importStatus.originalJNDI"/></td>
- <td class="DarkBackground" align="center"><fmt:message key="dbwizard.importStatus.originalName"/></td>
- <td class="DarkBackground" align="center"><fmt:message key="dbwizard.importStatus.importStatus"/></td>
- <td class="DarkBackground" align="center"><fmt:message key="dbwizard.common.actions"/></td>
- </tr>
-<c:forEach var="pool" items="${status.pools}" varStatus="loop" >
- <tr>
- <td>${pool.pool.name}</td>
- <td>${pool.pool.jndiName}</td>
- <td>${pool.status}</td>
- <td>
- <c:choose>
- <c:when test="${pool.skipped || pool.finished}">
- </c:when>
- <c:otherwise>
- <a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="importEdit" />
- <portlet:param name="importIndex" value="${loop.index}" />
- </portlet:actionURL>"><fmt:message key="dbwizard.common.confirmAndDeploy"/></a>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
-</c:forEach>
- <tr>
- <td colspan="4" align="center">
- <a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="importComplete" />
- </portlet:actionURL>"><c:choose><c:when test="${status.finished}"><fmt:message key="dbwizard.common.finish"/></c:when><c:otherwise><fmt:message key="dbwizard.common.skipRemainingPools"/></c:otherwise></c:choose></a>
- </td>
- </tr>
-</table>
-
-<hr />
-
-<p><fmt:message key="dbwizard.importStatus.currentPools"/>:</p>
-<ul>
-<c:forEach var="pool" items="${pools}">
- <li>${pool.name}</li>
-</c:forEach>
-</ul>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/importUpload.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/importUpload.jsp
deleted file mode 100644
index 12ec2b0..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/importUpload.jsp
+++ /dev/null
@@ -1,95 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-<portlet:defineObjects/>
-
-
-<p><fmt:message key="dbwizard.importUpload.title"/></p>
-
-<p><fmt:message key="dbwizard.importUpload.summary"/></p>
-
-<form enctype="multipart/form-data" method="POST" name="<portlet:namespace/>ImportForm"
- action="<portlet:actionURL><portlet:param name="mode" value="importUpload"/><portlet:param name="importSource" value="${pool.importSource}"/></portlet:actionURL>">
- <table width="100%">
- <tr>
- <td class="DarkBackground" colspan="2"><fmt:message key="dbwizard.common.import"><fmt:param value="${pool.importSource}"/></fmt:message></td>
- </tr>
- <tr>
- <th align="right" style="min-width: 140px"><label for="<portlet:namespace/>configFile"><fmt:message key="dbwizard.common.configFile"/></label>:</th>
- <td><input type="file" name="configFile" id="<portlet:namespace/>configFile" /></td>
- </tr>
- <tr>
- <td></td>
- <td><fmt:message key="dbwizard.importUpload.pleaseSelect"/> ${from}.</td>
- </tr>
- <!-- SUBMIT BUTTON -->
- <tr>
- <td></td>
- <td><input type="submit" value='<fmt:message key="dbwizard.common.next"/>' /></td>
- </tr>
- </table>
-</form>
-
-<c:if test="${pool.importSource eq 'WebLogic 8.1'}">
-<br />
-<br />
-<br />
-<form name="<portlet:namespace/>WebLogicImportForm" action="<portlet:actionURL/>" method="POST">
- <input type="hidden" name="mode" value="weblogicImport" />
- <input type="hidden" name="importSource" value="${pool.importSource}" />
- <input type="hidden" name="from" value="${from}" />
- <table width="100%">
- <tr>
- <td class="DarkBackground" colspan="2"><fmt:message key="dbwizard.importUpload.alternateImport">
- <fmt:param value="${pool.importSource}" />
- </fmt:message></td>
- </tr>
- <tr>
- <td colspan="2"><fmt:message key="dbwizard.importUpload.aboutWebLogic"/></td>
- </tr>
- <tr>
- <th align="right" style="min-width: 140px"><label for="<portlet:namespace/>weblogicDomainDir"><fmt:message key="dbwizard.importUpload.domainDirectoryPath"/></label>:</th>
- <td><input type="text" name="weblogicDomainDir" id="<portlet:namespace/>weblogicDomainDir" size="40" /></td>
- </tr>
- <tr>
- <td></td>
- <td><fmt:message key="dbwizard.importUpload.domainDirectoryPathExp"/> (e.g. C:\bea\user_projects\domains\mydomain).</td>
- </tr>
- <tr>
- <th align="right"><tt>weblogic81/server/lib</tt> <label for="<portlet:namespace/>weblogicLibDir"><fmt:message key="dbwizard.importUpload.path"/></label>:</th>
- <td><input type="text" name="weblogicLibDir" id="<portlet:namespace/>weblogicLibDir" size="40" /></td>
- </tr>
- <tr>
- <td></td>
- <td><fmt:message key="dbwizard.importUpload.enterFullPath"/> (e.g. C:\bea\weblogic81\server\lib).</td>
- </tr>
- <!-- SUBMIT BUTTON -->
- <tr>
- <td></td>
- <td><input type="submit" value='<fmt:message key="dbwizard.common.next"/>' /></td>
- </tr>
- </table>
-</form>
-</c:if>
-
-
-<p><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="list" />
- </portlet:actionURL>"><fmt:message key="dbwizard.common.cancel"/></a></p>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp
deleted file mode 100644
index 41336a7..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/list.jsp
+++ /dev/null
@@ -1,112 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-<portlet:defineObjects/>
-
-<p><fmt:message key="dbwizard.list.summary"/></p>
-
-<p><fmt:message key="dbwizard.list.hasDatabasePools"/></p>
-
-<table width="100%" class="TableLine" summary="Database Pools - List">
- <tr>
- <th scope="col" class="DarkBackground" align="left"><fmt:message key="dbwizard.common.name"/></th>
- <th scope="col" class="DarkBackground" align="center"><fmt:message key="dbwizard.list.deployedAs"/></th>
- <th scope="col" class="DarkBackground" align="center"><fmt:message key="dbwizard.common.state"/></th>
- <th scope="col" class="DarkBackground" align="center"><fmt:message key="dbwizard.common.actions"/></th>
- </tr>
-<c:set var="backgroundClass" value='MediumBackground'/>
-<c:forEach var="pool" items="${pools}">
- <c:choose>
- <c:when test="${backgroundClass == 'MediumBackground'}" >
- <c:set var="backgroundClass" value='LightBackground'/>
- </c:when>
- <c:otherwise>
- <c:set var="backgroundClass" value='MediumBackground'/>
- </c:otherwise>
- </c:choose>
- <tr>
- <td class="${backgroundClass}">${pool.name}</td>
- <td class="${backgroundClass}">
- <c:choose>
- <c:when test="${empty pool.parentName}">
- <fmt:message key="dbwizard.list.serverWide" />
- </c:when>
- <c:otherwise>
- ${pool.parentName} <%-- todo: make this a link to an application portlet --%>
- </c:otherwise>
- </c:choose>
- </td>
- <td class="${backgroundClass}">${pool.stateName}</td>
- <td class="${backgroundClass}">
- <%--<c:choose>
- <c:when test="${info.stateName eq 'running'}">
- <a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="stop" />
- <portlet:param name="name" value="${info.objectName}" />
- <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
- <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
- </portlet:actionURL>">stop</a>
- </c:when>
- <c:otherwise>
- <a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="start" />
- <portlet:param name="name" value="${info.objectName}" />
- <portlet:param name="managerObjectName" value="${container.managerObjectName}" />
- <portlet:param name="containerObjectName" value="${container.containerObjectName}" />
- </portlet:actionURL>">start</a>
- </c:otherwise>
- </c:choose>--%>
- <a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="editExisting" />
- <portlet:param name="adapterAbstractName" value="${pool.adapterAbstractName}" />
- <portlet:param name="abstractName" value="${pool.factoryAbstractName}" />
- </portlet:actionURL>"><fmt:message key="dbwizard.common.edit"/></a>
- <a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="usage" />
- <portlet:param name="name" value="${pool.name}" />
- <portlet:param name="abstractName" value="${pool.factoryAbstractName}" />
- </portlet:actionURL>"><fmt:message key="dbwizard.list.usage"/></a>
- <a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="delete" />
- <portlet:param name="name" value="${info.objectName}" />
- <portlet:param name="adapterAbstractName" value="${pool.adapterAbstractName}" />
- <portlet:param name="abstractName" value="${pool.factoryAbstractName}" />
- </portlet:actionURL>"><fmt:message key="dbwizard.common.delete"/></a>
- </td>
- </tr>
-</c:forEach>
-</table>
-
-<p><fmt:message key="dbwizard.list.createPool"/>:</p>
-<ul>
- <li><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="rdbms" />
- </portlet:actionURL>"><fmt:message key="dbwizard.common.usingPoolWizard"/></a></li>
- <li><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="startImport" />
- <portlet:param name="importSource" value="JBoss 4" />
- <portlet:param name="from" value=" '*-ds.xml' file from the 'jboss4/server/name/deploy' directory" />
- </portlet:actionURL>"><fmt:message key="dbwizard.common.importFromJBoss"/></a></li>
- <li><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="startImport" />
- <portlet:param name="importSource" value="WebLogic 8.1" />
- <portlet:param name="from" value="'config.xml' file from the WebLogic domain directory" />
- </portlet:actionURL>"><fmt:message key="dbwizard.common.importFromWebLogic"/></a></li>
-</ul>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp
deleted file mode 100644
index d9b12a8..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDatabase.jsp
+++ /dev/null
@@ -1,112 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-
-<%-- $Rev$ $Date$ --%>
-
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-
-<portlet:defineObjects/>
-
-<script language="JavaScript">
-var <portlet:namespace/>formName = "<portlet:namespace/>DatabaseForm";
-var <portlet:namespace/>requiredFields = new Array("name");
-function <portlet:namespace/>validateForm(){
- if(!textElementsNotEmpty(<portlet:namespace/>formName,<portlet:namespace/>requiredFields)) {
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="dbwizard.common.emptyText"/>');
- return false;
- }
- return true;
-}
-</script>
-
-<div id="<portlet:namespace/>CommonMsgContainer"></div>
-
-<p><fmt:message key="dbwizard.selectDatabase.title"/></p>
-
-<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
-<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
- <input type="hidden" name="mode" value="process-rdbms" />
- <input type="hidden" name="user" value="${pool.user}" />
- <input type="hidden" name="password" value="${pool.password}" />
- <input type="hidden" name="driverClass" value="${pool.driverClass}" />
- <input type="hidden" name="url" value="${pool.url}" />
- <input type="hidden" name="urlPrototype" value="${pool.urlPrototype}" />
- <c:forEach var="jar" items="${pool.jars}">
- <input type="hidden" name="jars" value="${jar}" />
- </c:forEach> <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
- <input type="hidden" name="minSize" value="${pool.minSize}" />
- <input type="hidden" name="maxSize" value="${pool.maxSize}" />
- <input type="hidden" name="idleTimeout" value="${pool.idleTimeout}" />
- <input type="hidden" name="blockingTimeout" value="${pool.blockingTimeout}" />
- <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
- <input type="hidden" name="adapterDescription" value="${pool.adapterDescription}" />
- <input type="hidden" name="rarPath" value="${pool.rarPath}" />
- <input type="hidden" name="transactionType" value="${pool.transactionType}" />
- <c:forEach var="prop" items="${pool.properties}">
- <input type="hidden" name="${prop.key}" value="${prop.value}" />
- </c:forEach>
- <c:forEach var="prop" items="${pool.urlProperties}">
- <input type="hidden" name="${prop.key}" value="${prop.value}" />
- </c:forEach>
- <table border="0">
- <!-- ENTRY FIELD: NAME -->
- <tr>
- <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>name"><fmt:message key="dbwizard.selectDatabase.nameOfPool"/></label>:</div></th>
- <td><input name="name" id="<portlet:namespace/>name" type="text" size="30" value="${pool.name}"></td>
- </tr>
- <tr>
- <td></td>
- <td><fmt:message key="dbwizard.selectDatabase.nameOfPoolExplanation"/></td>
- </tr>
- <!-- ENTRY FIELD: DB TYPE -->
- <tr>
- <th><div align="right"><label for="<portlet:namespace/>dbtype"><fmt:message key="dbwizard.selectDatabase.databaseType"/></label>:</div></th>
- <td>
- <select name="dbtype" id="<portlet:namespace/>dbtype">
- <c:forEach var="db" items="${databases}">
- <option <c:if test="${db.name == pool.dbtype}">selected</c:if>>${db.name}</option>
- </c:forEach>
- </select>
- </td>
- </tr>
- <tr>
- <td></td>
- <td><fmt:message key="dbwizard.selectDatabase.databaseTypeExp"/></td>
- </tr>
- <tr>
- <td></td>
- <td><input type="submit" value='<fmt:message key="dbwizard.common.next"/>' onClick="return <portlet:namespace/>validateForm();"/></td>
- </tr>
- </table>
-</form>
-<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
-
-<%--
-<p><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="params" />
- </portlet:actionURL>">Select predefined database</a></p>
-<p><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="edit" />
- </portlet:actionURL>">Select "other" database</a></p>
---%>
-
-<p><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="list" />
- </portlet:actionURL>"><fmt:message key="dbwizard.common.cancel"/></a></p>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDownload.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDownload.jsp
deleted file mode 100644
index f33993a..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/selectDownload.jsp
+++ /dev/null
@@ -1,110 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-<portlet:defineObjects/>
-
-<p><fmt:message key="dbwizard.selectDownload.title"/></p>
-
-<fmt:message key="dbwizard.selectDownload.summary"/>
-
-
-<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
-<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST" onSubmit="startProgress()">
- <input type="hidden" name="mode" value="process-download" />
- <input type="hidden" name="name" value="${pool.name}" />
- <input type="hidden" name="dbtype" value="${pool.dbtype}" />
- <input type="hidden" name="user" value="${pool.user}" />
- <input type="hidden" name="password" value="${pool.password}" />
- <input type="hidden" name="driverClass" value="${pool.driverClass}" />
- <input type="hidden" name="url" value="${pool.url}" />
- <input type="hidden" name="urlPrototype" value="${pool.urlPrototype}" />
- <c:forEach var="jar" items="${pool.jars}">
- <input type="hidden" name="jars" value="${jar}" />
- </c:forEach> <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
- <input type="hidden" name="minSize" value="${pool.minSize}" />
- <input type="hidden" name="maxSize" value="${pool.maxSize}" />
- <input type="hidden" name="idleTimeout" value="${pool.idleTimeout}" />
- <input type="hidden" name="blockingTimeout" value="${pool.blockingTimeout}" />
- <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
- <input type="hidden" name="adapterDescription" value="${pool.adapterDescription}" />
- <input type="hidden" name="rarPath" value="${pool.rarPath}" />
- <input type="hidden" name="transactionType" value="${pool.transactionType}" />
- <c:forEach var="prop" items="${pool.properties}">
- <input type="hidden" name="${prop.key}" value="${prop.value}" />
- </c:forEach>
- <c:forEach var="prop" items="${pool.urlProperties}">
- <input type="hidden" name="${prop.key}" value="${prop.value}" />
- </c:forEach>
- <table border="0">
- <!-- ENTRY FIELD: DRIVER TYPE -->
- <tr>
- <th style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>driverName"><fmt:message key="dbwizard.selectDownload.selectDriver"/></label>:</div></th>
- <td>
- <select name="driverName" id="<portlet:namespace/>driverName">
- <c:forEach var="driver" items="${drivers}">
- <option>${driver.name}</option>
- </c:forEach>
- </select>
- </td>
- </tr>
- <tr>
- <td></td>
- <td><fmt:message key="dbwizard.selectDownload.selectDriverExp"/></td>
- </tr>
- <tr>
- <td></td>
- <td>
- <input type="submit" value='<fmt:message key="dbwizard.common.next"/>' />
- <input type="button" value='<fmt:message key="dbwizard.common.cancel"/>' onclick="document.<portlet:namespace/>DatabaseForm.mode.value='params';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
- </td>
- </tr>
- </table>
-</form>
-
-<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
-
-<%--
-<p><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="params" />
- </portlet:actionURL>"><fmt:message key="dbwizard.selectDownload.selectPredefinedDatabase"/></a></p>
-<p><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="edit" />
- </portlet:actionURL>"><fmt:message key="dbwizard.selectDownload.selectOtherDatabase"/></a></p>
---%>
-
-<p><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="list" />
- </portlet:actionURL>"><fmt:message key="dbwizard.common.returnToList"/></a></p>
-
-<p><br /><br /><br /><fmt:message key="dbwizard.selectDownload.otherJDBCDrivers"/>:</p>
-<ul>
- <li><a href="http://www.daffodildb.com/download/index.jsp">DaffodilDB</a></li>
- <li><a href="http://www.frontbase.com/cgi-bin/WebObjects/FrontBase">FrontBase</a></li>
- <li><a href="http://www.datadirect.com/products/jdbc/index.ssp">DataDirect SQL Server, DB2, Oracle, Informix, Sybase</a></li>
- <li><a href="http://www-306.ibm.com/software/data/informix/tools/jdbc/">Informix</a></li>
- <li><a href="http://www.intersystems.com/cache/downloads/index.html">InterSystems Cache</a></li>
- <li><a href="http://www.borland.com/products/downloads/download_jdatastore.html">JDataStore</a></li>
- <li><a href="http://developer.mimer.com/downloads/index.htm">Mimer</a></li>
- <li><a href="http://www.oracle.com/technology/software/tech/java/sqlj_jdbc/index.html">Oracle</a></li>
- <li><a href="http://www.pervasive.com/developerzone/access_methods/jdbc.asp">Pervasive</a></li>
- <li><a href="http://www.pointbase.com/products/downloads/">Pointbase</a></li>
- <li><a href="http://www.progress.com/esd/index.ssp">Progress</a></li>
- <li><a href="http://msdn.microsoft.com/en-us/data/aa937724.aspx">Microsoft SQL Server</a></li>
-</ul>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/showPlan.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/showPlan.jsp
deleted file mode 100644
index 71db8b4..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/showPlan.jsp
+++ /dev/null
@@ -1,104 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-<portlet:defineObjects/>
-
-<p><fmt:message key="dbwizard.showPlan.title"/></p>
-
-<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
-<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
- <input type="hidden" name="mode" value="save" />
- <input type="hidden" name="user" value="${pool.user}" />
- <input type="hidden" name="name" value="${pool.name}" />
- <input type="hidden" name="dbtype" value="${pool.dbtype}" />
- <input type="hidden" name="password" value="${pool.password}" />
- <input type="hidden" name="driverClass" value="${pool.driverClass}" />
- <input type="hidden" name="url" value="${pool.url}" />
- <input type="hidden" name="urlPrototype" value="${pool.urlPrototype}" />
- <c:forEach var="jar" items="${pool.jars}">
- <input type="hidden" name="jars" value="${jar}" />
- </c:forEach> <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
- <input type="hidden" name="minSize" value="${pool.minSize}" />
- <input type="hidden" name="maxSize" value="${pool.maxSize}" />
- <input type="hidden" name="idleTimeout" value="${pool.idleTimeout}" />
- <input type="hidden" name="blockingTimeout" value="${pool.blockingTimeout}" />
- <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
- <input type="hidden" name="adapterDescription" value="${pool.adapterDescription}" />
- <input type="hidden" name="rarPath" value="${pool.rarPath}" />
- <input type="hidden" name="transactionType" value="${pool.transactionType}" />
- <c:forEach var="prop" items="${pool.properties}">
- <input type="hidden" name="${prop.key}" value="${prop.value}" />
- </c:forEach>
- <c:forEach var="prop" items="${pool.urlProperties}">
- <input type="hidden" name="${prop.key}" value="${prop.value}" />
- </c:forEach>
- <table border="0">
- <!-- STATUS FIELD: Deployment Plan -->
- <tr>
- <th valign="top" style="min-width: 140px"><div align="right"><label for="<portlet:namespace/>deploymentPlan"><fmt:message key="dbwizard.showPlan.deploymentPlan"/></label>:</div></th>
- <td><textarea rows="30" cols="60" id="<portlet:namespace/>deploymentPlan" readonly>${deploymentPlan}</textarea></td>
- </tr>
- <!-- SUBMIT BUTTON -->
- <tr>
- <td></td>
- <td>
-<input type="submit" value='<fmt:message key="dbwizard.showPlan.deployPool"/>' />
-<input type="button" value='<fmt:message key="dbwizard.common.editSettings"/>' onclick="document.<portlet:namespace/>DatabaseForm.mode.value='edit';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
- </td>
- </tr>
- <!-- STATUS FIELD: Command-line guidance -->
- <tr>
- <th valign="top"><div align="right"><fmt:message key="dbwizard.showPlan.deployCommand"/>:</div></th>
- <td><fmt:message key="dbwizard.showPlan.deployPoolFromCommandLine"/>
-<pre>
-cd GERONIMO_HOME
-java -jar bin/deployer.jar deploy plan-file.xml \
- ${rarRelativePath}
-</pre></td>
- </tr>
- <!-- STATUS FIELD: Embed in EAR guidance -->
- <tr>
- <th valign="top"><div align="right"><fmt:message key="dbwizard.showPlan.addToEAR"/>:</div></th>
- <td>
- <fmt:message key="dbwizard.showPlan.deployAsPartEAR">
- <fmt:param value="${rarRelativePath}" />
- </fmt:message>
-<pre>
-<application
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
- <environment>
- <moduleId>
- <artifactId>MyApplication</artifactId>
- </moduleId>
- </environment>
- <module>
- <connector>rar-file-name.rar</connector>
- <alt-dd>plan-file-name.xml</alt-dd>
- </module>
-</application>
-</pre></td>
- </tr>
- </table>
-</form>
-<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
-
-<p><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="list" />
- </portlet:actionURL>"><fmt:message key="dbwizard.common.cancel"/></a></p>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/testConnection.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/testConnection.jsp
deleted file mode 100644
index 4d66266..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/testConnection.jsp
+++ /dev/null
@@ -1,93 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg" %>
-<fmt:setBundle basename="systemdatabase"/>
-<portlet:defineObjects/>
-
-
-<p><fmt:message key="dbwizard.testConnection.title"/></p>
-
-<!-- FORM TO COLLECT DATA FOR THIS PAGE -->
-<form name="<portlet:namespace/>DatabaseForm" action="<portlet:actionURL/>" method="POST">
- <input type="hidden" name="mode" value="save" />
- <input type="hidden" name="user" value="${pool.user}" />
- <input type="hidden" name="name" value="${pool.name}" />
- <input type="hidden" name="dbtype" value="${pool.dbtype}" />
- <input type="hidden" name="password" value="${pool.password}" />
- <input type="hidden" name="driverClass" value="${pool.driverClass}" />
- <input type="hidden" name="url" value="${pool.url}" />
- <input type="hidden" name="urlPrototype" value="${pool.urlPrototype}" />
- <c:forEach var="jar" items="${pool.jars}">
- <input type="hidden" name="jars" value="${jar}" />
- </c:forEach>
- <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
- <input type="hidden" name="minSize" value="${pool.minSize}" />
- <input type="hidden" name="maxSize" value="${pool.maxSize}" />
- <input type="hidden" name="idleTimeout" value="${pool.idleTimeout}" />
- <input type="hidden" name="blockingTimeout" value="${pool.blockingTimeout}" />
- <input type="hidden" name="adapterDisplayName" value="${pool.adapterDisplayName}" />
- <input type="hidden" name="adapterDescription" value="${pool.adapterDescription}" />
- <input type="hidden" name="rarPath" value="${pool.rarPath}" />
- <input type="hidden" name="transactionType" value="${pool.transactionType}" />
- <c:forEach var="prop" items="${pool.properties}">
- <input type="hidden" name="${prop.key}" value="${prop.value}" />
- </c:forEach>
- <c:forEach var="prop" items="${pool.urlProperties}">
- <input type="hidden" name="${prop.key}" value="${prop.value}" />
- </c:forEach>
- <table border="0">
- <tr>
- <td style="min-width: 140px"><div align="right"><fmt:message key="dbwizard.testConnection.testResult"/>:</div></td>
- <td>
- <c:choose>
- <c:when test="${connected}">
- <fmt:message key="dbwizard.testConnection.connectedTo"/> ${targetDBInfo}
- </c:when>
- <c:otherwise>
- <font color="red"><i><fmt:message key="dbwizard.testConnection.connectionError"/></i></font>
- <CommonMsg:commonMsg/>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- <!-- SUBMIT BUTTON -->
- <tr>
- <td> </td>
- <td>
- <c:choose>
- <c:when test="${connected}">
- <input type="submit" value='<fmt:message key="dbwizard.common.deploy"/>' />
- <input type="button" value='<fmt:message key="dbwizard.common.showPlan"/>' onclick="document.<portlet:namespace/>DatabaseForm.mode.value='plan';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
- </c:when>
- <c:otherwise>
- <input type="submit" value='<fmt:message key="dbwizard.testConnection.deployAnyway"/>' />
- <input type="button" value='<fmt:message key="dbwizard.common.editSettings"/>' onclick="document.<portlet:namespace/>DatabaseForm.mode.value='edit';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
- <input type="button" value='<fmt:message key="dbwizard.testConnection.testAgain"/>' onclick="document.<portlet:namespace/>DatabaseForm.mode.value='process-url';document.<portlet:namespace/>DatabaseForm.submit();return false;" />
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
- </table>
-</form>
-<!-- END OF FORM TO COLLECT DATA FOR THIS PAGE -->
-
-<p><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="list" />
- </portlet:actionURL>"><fmt:message key="dbwizard.common.cancel"/></a></p>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/usage.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/usage.jsp
deleted file mode 100644
index e80ee8d..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/dbwizard/usage.jsp
+++ /dev/null
@@ -1,148 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-<portlet:defineObjects/>
-
-<p><fmt:message key="dbwizard.usage.title">
-<fmt:param value="${pool.name}"/>
-</fmt:message></p>
-
-<p><b>WEB-INF/web.xml</b></p>
-
-<p><fmt:message key="dbwizard.usage.resource_refSection"/></p>
-
-<pre>
-<web-app 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"
- version="2.4">
-
- <!-- servlets and mappings and normal web.xml stuff here -->
-
- <resource-ref>
- <res-ref-name><b>jdbc/MyDataSource</b></res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
-</web-app>
-</pre>
-
-<p><b>WEB-INF/geronimo-web.xml</b></p>
-
-<fmt:message key="dbwizard.usage.geronimo_webExp">
-<fmt:param value="${pool.name}" />
-</fmt:message>
-
-
-<pre>
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
- <environment>
- <moduleId>
- <artifactId>MyWebApp</artifactId>
- </moduleId>
- <dependencies>
- <b><dependency>
- <groupId>${pool.abstractNameMap['groupId']}</groupId>
- <artifactId>${pool.abstractNameMap['artifactId']}</artifactId>
- </dependency></b>
- </dependencies>
- </environment>
-
- <context-root>/MyWebApp</context-root>
-
- <!-- security settings, if any, go here -->
-
- <resource-ref>
- <ref-name><b>jdbc/MyDataSource</b></ref-name>
- <b><resource-link>${pool.name}</resource-link></b>
- </resource-ref>
-</web-app>
-</pre>
-<fmt:message key="dbwizard.usage.searchOnlyOne">
-<fmt:param value="${pool.name}" />
-</fmt:message>
-</p>
-
-<p><i>
-<fmt:message key="dbwizard.usage.moreThanOnePool">
-<fmt:param value="${pool.name}" />
-</fmt:message>
-</i></p>
-
-
-<pre>
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
- <environment>
- <moduleId>
- <artifactId>MyWebApp</artifactId>
- </moduleId>
- <dependencies>
- <b><dependency>
- <groupId>${pool.abstractNameMap['groupId']}</groupId>
- <artifactId>${pool.abstractNameMap['artifactId']}</artifactId>
- </dependency></b>
- </dependencies>
- </environment>
-
- <context-root>/MyWebApp</context-root>
-
- <!-- security settings, if any, go here -->
-
- <resource-ref>
- <ref-name><b>jdbc/MyDataSource</b></ref-name>
- <b><pattern>
- <groupId>${pool.abstractNameMap['groupId']}</groupId>
- <artifactId>${pool.abstractNameMap['artifactId']}</artifactId>
- <name>${pool.abstractNameMap['name']}</name>
- </pattern></b>
- </resource-ref>
-</web-app>
-</pre>
-
-<p><b><fmt:message key="dbwizard.usage.applicationCode" /></b></p>
-
-<p><fmt:message key="dbwizard.usage.usingInCode" /></p>
-
-<pre>
-protected void doGet(HttpServletRequest request, HttpServletResponse response) {
- try {
- InitialContext ctx = new InitialContext();
- DataSource ds = ctx.lookup("java:comp/env/<b>jdbc/MyDataSource</b>");
- Connection con = ds.getConnection();
- } catch(NamingException e) {
- ...
- } catch(SQLException e) {
- ...
- }
-}
-</pre>
-
-<hr />
-
-<p><a href="<portlet:actionURL portletMode="view">
- <portlet:param name="mode" value="list" />
- </portlet:actionURL>"><fmt:message key="dbwizard.common.returnToList" /></a></p>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/help.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/help.jsp
deleted file mode 100644
index f919e1d..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/help.jsp
+++ /dev/null
@@ -1,20 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-<fmt:message key="derbylogmanager.help.title" />
-
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/view.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/view.jsp
deleted file mode 100644
index aadeeea..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/derbylogmanager/view.jsp
+++ /dev/null
@@ -1,93 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-
-<script language="JavaScript">
-var <portlet:namespace/>formName = "<portlet:namespace/>searchForm";
-var <portlet:namespace/>integerFields = new Array("startPos", "endPos", "maxRows");
-function <portlet:namespace/>validateForm(){
- for (i in <portlet:namespace/>integerFields) {
- if("" != document.forms[<portlet:namespace/>formName].elements[<portlet:namespace/>integerFields[i]].value && !checkIntegral(<portlet:namespace/>formName,<portlet:namespace/>integerFields[i])) {
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="derbylogmanager.view.integer"/>');
- return false;
- }
- }
- return true;
-}
-</script>
-
-<div id="<portlet:namespace/>CommonMsgContainer"></div><br>
-
-<table>
- <tr>
- <td><button onclick="location='<portlet:renderURL><portlet:param name="action" value="refresh"/></portlet:renderURL>'"><fmt:message key="derbylogmanager.view.refresh"/></button>
- <br/>
- <br/>
- </td>
- </tr>
- <tr>
- <td class="Smaller" valign="middle">
- <form action="<portlet:actionURL/>" name="<portlet:namespace/>searchForm" method="POST" onsubmit="return <portlet:namespace/>validateForm();">
- <b><fmt:message key="derbylogmanager.view.filterResults"/>:</b>
- <input type="hidden" value="search" name="action"/>
- <br/>
- <label for="<portlet:namespace/>startPos"><fmt:message key="derbylogmanager.view.Lines"/> </label><input type="text" name="startPos" id="<portlet:namespace/>startPos" value="${startPos}" size="3"/>
- <label for="<portlet:namespace/>endPos"><fmt:message key="derbylogmanager.view.to"/> </label><input type="text" name="endPos" id="<portlet:namespace/>endPos" value="${endPos}" size="3"/>
- <label for="<portlet:namespace/>maxRows"><fmt:message key="derbylogmanager.view.maxResults"/> </label><input type="text" name="maxRows" id="<portlet:namespace/>maxRows" value="${maxRows}" size="3"/>
- <label for="<portlet:namespace/>searchString"><fmt:message key="derbylogmanager.view.containingText"/> </label><input type="text" name="searchString" id="<portlet:namespace/>searchString" value="${searchString}"/>
- <br/>
- <input type="submit" value="<fmt:message key="derbylogmanager.view.filterLog"/>"/>
- </form>
- </td>
- </tr>
- <tr>
- <td>
- <c:choose>
- <c:when test="${searchResults != null && fn:length(searchResults) > 0}">
- <table>
- <tr>
- <td class="Smaller">
- <b>
- <fmt:message key="derbylogmanager.view.matchCriterial" >
- <fmt:param value="${lineCount}" />
- <fmt:param value="${fn:length(searchResults)}" />
- </fmt:message>
- <c:if test="${!empty capped}"> (<fmt:message key="derbylogmanager.view.numberOfResultsCapped"/>)</c:if>.
- </b>
- </td>
- </tr>
-
- <c:forEach var="line" items="${searchResults}">
- <tr>
- <td class="Smaller">${line.lineNumber}:
- <c:out escapeXml="true" value="${line.lineContent}" />
- </td>
- </tr>
- </c:forEach>
- </table>
- </c:when>
- <c:otherwise>
- <fmt:message key="derbylogmanager.view.noEntries"/>
- </c:otherwise>
- </c:choose>
- </td>
- </tr>
-</table>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/dbViewerHelp.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/dbViewerHelp.jsp
deleted file mode 100644
index 4556f15..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/dbViewerHelp.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-<fmt:message key="internaldb.dbViewerHelp.content"/>
\ No newline at end of file
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBHelp.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBHelp.jsp
deleted file mode 100644
index 419def2..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBHelp.jsp
+++ /dev/null
@@ -1,19 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-<fmt:message key="internaldb.internalDBHelp.content"/>
\ No newline at end of file
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBMaximized.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBMaximized.jsp
deleted file mode 100644
index 369fc73..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBMaximized.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ include file="internalDBNormal.jsp" %>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBNormal.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBNormal.jsp
deleted file mode 100644
index 9b29154..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/internalDBNormal.jsp
+++ /dev/null
@@ -1,198 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-<portlet:defineObjects/>
-
-<%--
-Choose DB:
-<c:choose>
- <c:when test="${(param.rdbms == '1') || (empty param.rdbms)}">
- Derby
- </c:when>
- <c:otherwise>
- <a href="<portlet:actionURL portletMode="view">
- <portlet:param name="rdbms" value="1" />
- </portlet:actionURL>">Derby
- </a>
- </c:otherwise>
-</c:choose>
-
- |
-
-<c:choose>
- <c:when test="${param.rdbms == '2'}">
- MS SQL
- </c:when>
- <c:otherwise>
- <a href="<portlet:actionURL portletMode="view">
- <portlet:param name="rdbms" value="2" />
- </portlet:actionURL>">MS SQL
- </a>
- </c:otherwise>
-</c:choose>
---%>
-<b><fmt:message key="internaldb.common.DB"/>:</b>
-<table width="100%" class="TableLine" summary="DB">
- <tr>
- <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="internaldb.common.Item"/></th>
- <th scope="col" class="DarkBackground" width="80%" align="center"><fmt:message key="internaldb.common.Value"/></th>
- </tr>
- <tr>
- <td class="LightBackground" width="20%" nowrap><fmt:message key="internaldb.common.DBProductName"/></td>
- <td class="LightBackground" width="80%">${internalDB['DB Product Name']}</td>
- </tr>
- <tr>
- <td class="MediumBackground"><fmt:message key="internaldb.common.DBProductVersion"/></td>
- <td class="MediumBackground">${internalDB['DB Product Version']}</td>
- </tr>
- <tr>
- <td class="LightBackground"><fmt:message key="internaldb.common.DBMajorVersion" /></td>
- <td class="LightBackground">${internalDB['DB Major Version']}</td>
- </tr>
- <tr>
- <td class="MediumBackground"><fmt:message key="internaldb.common.DBMinorVersion"/></td>
- <td class="MediumBackground">${internalDB['DB Minor Version']}</td>
- </tr>
-</table>
-<br/>
-
-<b><fmt:message key="internaldb.common.driver"/>:</b>
-<table width="100%" class="TableLine" summary="Driver">
- <tr>
- <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="internaldb.common.Item"/></th>
- <th scope="col" class="DarkBackground" width="80%" align="center"><fmt:message key="internaldb.common.Value"/></th>
- </tr>
- <tr>
- <td class="LightBackground" width="20%" nowrap><fmt:message key="internaldb.common.driverName"/></td>
- <td class="LightBackground" width="80%">${internalDB['Driver Name']}</td>
- </tr>
- <tr>
- <td class="MediumBackground"><fmt:message key="internaldb.common.driverVersion"/></td>
- <td class="MediumBackground">${internalDB['Driver Version']}</td>
- </tr>
- <tr>
- <td class="LightBackground"><fmt:message key="internaldb.common.driverMajorVersion"/></td>
- <td class="LightBackground">${internalDB['Driver Major Version']}</td>
- </tr>
- <tr>
- <td class="MediumBackground"><fmt:message key="internaldb.common.driverMinorVersion"/></td>
- <td class="MediumBackground">${internalDB['Driver Minor Version']}</td>
- </tr>
-</table>
-<br/>
-
-<b>JDBC:</b>
-<table width="100%" class="TableLine" summary="JDBC">
- <tr>
- <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="internaldb.common.Item"/></th>
- <th scope="col" class="DarkBackground" width="80%" align="center"><fmt:message key="internaldb.common.Value"/></th>
- </tr>
- <tr>
- <td class="LightBackground" width="20%" nowrap><fmt:message key="internaldb.common.JDBCMajorVersion"/></td>
- <td class="LightBackground" width="80%">${internalDB['JDBC Major Version']}</td>
- </tr>
- <tr>
- <td class="MediumBackground"><fmt:message key="internaldb.common.JDBCMinorVersion"/></td>
- <td class="MediumBackground">${internalDB['JDBC Minor Version']}</td>
- </tr>
-</table>
-<br/>
-
-<b><fmt:message key="internaldb.common.etc"/>:</b>
-<table width="100%" class="TableLine" summary="ETC">
- <tr>
- <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="internaldb.common.Item"/></th>
- <th scope="col" class="DarkBackground" width="80%" align="center"><fmt:message key="internaldb.common.Value"/></th>
- </tr>
- <tr>
- <td class="LightBackground" width="20%" nowrap>URL</td>
- <td class="LightBackground" width="80%">${internalDB['URL']}</td>
- </tr>
- <tr>
- <td class="MediumBackground"><fmt:message key="internaldb.common.userName"/></td>
- <td class="MediumBackground">${internalDB['Username']}</td>
- </tr>
- <tr>
- <td class="LightBackground"><fmt:message key="internaldb.common.readOnly"/></td>
- <td class="LightBackground">${internalDB['Read Only']}</td>
- </tr>
-</table>
-<br/>
-
-<b><fmt:message key="internaldb.common.functions"/>:</b>
-<table width="100%" class="TableLine" summary="Functions">
- <tr>
- <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="internaldb.common.Item"/></th>
- <th scope="col" class="DarkBackground" width="80%" align="center"><fmt:message key="internaldb.common.Value"/></th>
- </tr>
- <tr>
- <td class="LightBackground" width="20%" nowrap><fmt:message key="internaldb.common.numericFunctions"/></td>
- <td class="LightBackground" width="80%">${internalDB['Numeric Functions']}</td>
- </tr>
- <tr>
- <td class="MediumBackground"><fmt:message key="internaldb.common.stringFunctions"/></td>
- <td class="MediumBackground">${internalDB['String Functions']}</td>
- </tr>
- <tr>
- <td class="LightBackground"><fmt:message key="internaldb.common.systemFunctions"/></td>
- <td class="LightBackground">${internalDB['System Functions']}</td>
- </tr>
- <tr>
- <td class="MediumBackground"><fmt:message key="internaldb.common.timeDateFunctions"/></td>
- <td class="MediumBackground">${internalDB['Time Date Functions']}</td>
- </tr>
-</table>
-<br/>
-
-<b>SQL:</b>
-<table width="100%" class="TableLine" summary="SQL">
- <tr>
- <th scope="col" class="DarkBackground" width="20%" align="center"><fmt:message key="internaldb.common.Item"/></th>
- <th scope="col" class="DarkBackground" width="80%" align="center"><fmt:message key="internaldb.common.Value"/></th>
- </tr>
- <tr>
- <td class="LightBackground" width="20%" nowrap><fmt:message key="internaldb.common.supportedSQLKeywords"/></td>
- <td class="LightBackground" width="80%">${internalDB['Supported SQL Keywords']}</td>
- </tr>
- <tr>
- <td class="MediumBackground"><fmt:message key="internaldb.common.supportedTypes"/></td>
- <td class="MediumBackground">${internalDB['Supported Types']}</td>
- </tr>
- <tr>
- <td class="LightBackground"><fmt:message key="internaldb.common.tableTypes"/></td>
- <td class="LightBackground">${internalDB['Table Types']}</td>
- </tr>
- <tr>
- <td class="MediumBackground"><fmt:message key="internaldb.common.schemas"/></td>
- <td class="MediumBackground">${internalDB['Schemas']}</td>
- </tr>
- <tr>
- <td class="LightBackground"><fmt:message key="internaldb.common.SQLStateType"/></td>
- <td class="LightBackground">${internalDB['SQL State Type']}</td>
- </tr>
- <tr>
- <td class="MediumBackground"><fmt:message key="internaldb.common.defaultTransactionIsolation"/></td>
- <td class="MediumBackground">${internalDB['Default Transaction Isolation']}</td>
- </tr>
- <tr>
- <td class="LightBackground"><fmt:message key="internaldb.common.resultSetHoldability"/></td>
- <td class="LightBackground">${internalDB['Result Set Holdability']}</td>
- </tr>
-</table>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/listDatabases.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/listDatabases.jsp
deleted file mode 100644
index a3aee45..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/listDatabases.jsp
+++ /dev/null
@@ -1,68 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-<portlet:defineObjects/>
-
-<b><fmt:message key="internaldb.listDatabases.title"/>:</b>
-<table width="100%" class="TableLine" summary="DB Viewer - DB List">
- <tr>
- <th scope="col" class="DarkBackground" colspan="1" align="center"><fmt:message key="internaldb.common.databases"/></th>
- <th scope="col" class="DarkBackground" colspan="2" align="center"><fmt:message key="internaldb.common.viewTables"/></th>
- </tr>
- <%-- Check if there are databases to display --%>
- <c:choose>
- <c:when test="${fn:length(databases) == 0}">
- <tr>
- <td class="LightBackground" colspan="3" align="center">*** <fmt:message key="internaldb.listDatabases.nodatabases"/> ***</td>
- </tr>
- </c:when>
- <c:otherwise>
- <c:forEach var="db" items="${databases}" varStatus="status">
- <jsp:useBean type="javax.servlet.jsp.jstl.core.LoopTagStatus" id="status" />
- <tr>
- <c:choose>
- <c:when test="<%= status.getCount() % 2 == 1 %>">
- <c:set var="tdClass" scope="page" value="LightBackground" />
- </c:when>
- <c:otherwise>
- <c:set var="tdClass" scope="page" value="MediumBackground" />
- </c:otherwise>
- </c:choose>
- <td class="<c:out value='${tdClass}' />"><c:out value="${db}" /></td>
- <td class="<c:out value='${tdClass}' />" align="center">
- <a href="<portlet:actionURL portletMode="view">
- <portlet:param name="action" value="listTables" />
- <portlet:param name="db" value="${db}" />
- <portlet:param name="viewTables" value="application" />
- </portlet:actionURL>"><fmt:message key="internaldb.common.application"/></a>
- </td>
- <td class="<c:out value='${tdClass}' />" align="center">
- <a href="<portlet:actionURL portletMode="view">
- <portlet:param name="action" value="listTables" />
- <portlet:param name="db" value="${db}" />
- <portlet:param name="viewTables" value="system" />
- </portlet:actionURL>"><fmt:message key="internaldb.common.system"/></a>
- </td>
- </tr>
- </c:forEach>
- </c:otherwise>
- </c:choose>
-</table>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/listDatabasesMaximized.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/listDatabasesMaximized.jsp
deleted file mode 100644
index 44ec85a..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/listDatabasesMaximized.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ include file="listDatabases.jsp" %>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/listTables.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/listTables.jsp
deleted file mode 100644
index d8a3602..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/listTables.jsp
+++ /dev/null
@@ -1,103 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
-<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-<portlet:defineObjects/>
-
-<%-- TODO: Check if datasource is created --%>
-<%-- Datasource --%>
-<%-- Datasource --%>
-<c:if test="${ds == null}">
- <%-- Create the connection manually --%>
- <sql:setDataSource
- var="ds"
- driver="org.apache.derby.jdbc.EmbeddedDriver"
- url="jdbc:derby:${db};create=true"
- user=""
- password=""
- />
-</c:if>
-
-<%-- Select statement --%>
-<sql:transaction dataSource="${ds}">
- <sql:query var="tables">
- <%-- Set select statement depending on the view table type --%>
- <c:choose>
- <c:when test="${viewTables == 'application'}">
- select s.schemaname, t.tablename from sys.sysschemas s join sys.systables t on s.schemaid = t.schemaid
- where TABLETYPE='T'
- order by s.schemaname, t.tablename
- </c:when>
- <c:when test="${viewTables == 'system'}">
- select s.schemaname, t.tablename from sys.sysschemas s join sys.systables t on s.schemaid = t.schemaid
- where s.schemaname='SYS'
- order by s.schemaname, t.tablename
- </c:when>
- </c:choose>
- </sql:query>
-</sql:transaction>
-
-<center><b><fmt:message key="internaldb.common.DB"/>: <c:out value="${db}" /></b></center>
-<table width="100%">
- <tr>
- <td class="DarkBackground" colspan="3" align="center"><fmt:message key="internaldb.common.tables"/></td>
- </tr>
- <%-- Check if there are tables to display --%>
- <c:choose>
- <c:when test="${tables.rowCount == 0}">
- <tr>
- <td class="LightBackground" colspan="2" align="center">*** <fmt:message key="internaldb.listTables.noTables"/> ***</td>
- </tr>
- </c:when>
- <c:otherwise>
- <%-- Get the value of each column while iterating over rows --%>
- <c:forEach var="row" items="${tables.rowsByIndex}" varStatus="status">
- <jsp:useBean type="javax.servlet.jsp.jstl.core.LoopTagStatus" id="status" />
- <tr>
- <%-- Select table data class --%>
- <c:choose>
- <c:when test="<%= status.getCount() % 2 == 1 %>">
- <c:set var="tdClass" scope="page" value="LightBackground" />
- </c:when>
- <c:otherwise>
- <c:set var="tdClass" scope="page" value="MediumBackground" />
- </c:otherwise>
- </c:choose>
- <td class="<c:out value='${tdClass}' />"><c:out value="${row[0]}" /></td>
- <td class="<c:out value='${tdClass}' />"><c:out value="${row[1]}" /></td>
- <td class="<c:out value='${tdClass}' />" align="center">
- <a href="<portlet:actionURL portletMode="view">
- <portlet:param name="action" value="viewTableContents" />
- <portlet:param name="db" value="${db}" />
- <portlet:param name="tbl" value="${row[0]}.${row[1]}" />
- <portlet:param name="viewTables" value="${viewTables}" />
- </portlet:actionURL>"><fmt:message key="internaldb.common.viewContents"/></a>
- </td>
- </tr>
- </c:forEach>
- </c:otherwise>
- </c:choose>
-</table>
-
-<br>
-<a href="<portlet:actionURL portletMode="view">
- <portlet:param name="action" value="listDatabases" />
- </portlet:actionURL>"><fmt:message key="internaldb.common.viewDatabases"/>
-</a>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/listTablesMaximized.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/listTablesMaximized.jsp
deleted file mode 100644
index 2b2c813..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/listTablesMaximized.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ include file="listTables.jsp" %>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLHelp.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLHelp.jsp
deleted file mode 100644
index d985342..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLHelp.jsp
+++ /dev/null
@@ -1,57 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-<p><fmt:message key="internaldb.runSQLHelp.summary"/><br>
- </p>
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
-<c:choose>
- <c:when test="${connectionMode == 'datasource'}">
- <tr>
- <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"><fmt:message key="internaldb.common.useDS"/>:</td>
- <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="internaldb.runSQLHelp.useDSExp"/></td>
- </tr>
- <tr>
- <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">
- <img src="/console/images/run_sql.gif" alt="Run SQL"/></td>
- <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="internaldb.runSQLHelp.runSQLExp"/></td>
- </tr>
- </c:when>
- <c:otherwise>
- <tr>
- <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"><fmt:message key="internaldb.common.createDB"/>: / <br>
- <img src="/console/images/create.gif" alt="Create"/></td>
- <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="internaldb.runSQLHelp.createDBExp"/></td>
- </tr>
- <tr>
- <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"><fmt:message key="internaldb.common.deleteDB"/>: / <br>
- <img src="/console/images/delete.gif" alt="Delete"/></td>
- <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="internaldb.runSQLHelp.deleteDBExp"/></td>
- </tr>
- <tr>
- <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top"><fmt:message key="internaldb.common.useDB"/>:</td>
- <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="internaldb.runSQLHelp.useDBExp"/></td>
- </tr>
- <tr>
- <td class="MediumBackground" style="padding: 10px 10px 10px 5px; color: #1E1E52;" width="150" align="right" valign="top">
- <img src="/console/images/run_sql.gif" alt="Run SQL"/></td>
- <td class="LightBackground" style="padding: 10px 5px 10px 10px" valign="top"><fmt:message key="internaldb.runSQLHelp.runSQLExp"/></td>
- </tr>
- </c:otherwise>
-</c:choose>
-</table>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLMaximized.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLMaximized.jsp
deleted file mode 100644
index e6561fa..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLMaximized.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ include file="runSQLNormal.jsp" %>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
deleted file mode 100644
index 2f0c9c9..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/runSQLNormal.jsp
+++ /dev/null
@@ -1,198 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<%@ taglib uri="/WEB-INF/CommonMsg.tld" prefix="CommonMsg" %>
-<fmt:setBundle basename="systemdatabase"/>
-<portlet:defineObjects/>
-
-<script language="JavaScript">
-var <portlet:namespace/>formName = "<portlet:namespace/>DBForm";
-var <portlet:namespace/>requiredFields = new Array("createDB");
-var <portlet:namespace/>requiredFields2 = new Array("sqlStmts");
-
-function <portlet:namespace/>validateForm1(){
- var illegalChars= /[\.]{2}|[()<>,;:\\/"'\|]/ ;
- var action = document.forms[<portlet:namespace/>formName].elements['action'];
- action.value="Create";
- if (!textElementsNotEmpty(<portlet:namespace/>formName, <portlet:namespace/>requiredFields))
- {
- addErrorMessage("<portlet:namespace/>", '<fmt:message key="internaldb.common.emptyText"/>');
- return false;
- } else if (document.forms[<portlet:namespace/>formName].createDB.value.match(illegalChars)) {
- alert("Database name contains illegal characters");
- return false;
- }
- else
- return true;
-}
-function <portlet:namespace/>validateForm2(){
- var action = document.forms[<portlet:namespace/>formName].elements['action'];
- action.value="Delete";
- return confirm('<fmt:message key="internaldb.runSQLNormal.reallyDeleteDatabase"/>')
-}
-function <portlet:namespace/>validateForm3(){
- var action = document.forms[<portlet:namespace/>formName].elements['action'];
- action.value="Run SQL";
- return true;
-}
-</script>
-
-<CommonMsg:commonMsg/><div id="<portlet:namespace/>CommonMsgContainer"></div><br>
-
-<form name="<portlet:namespace/>DBForm" action="<portlet:actionURL portletMode='view'/>" method="post">
-<input type="hidden" name="action" value="" />
-<table width="100%" border="0">
-<c:choose>
- <c:when test="${connectionMode == 'database'}">
- <tr>
- <td><div align="right"><label for="<portlet:namespace/>createDB"><fmt:message key="internaldb.common.createDB"/></label>:</div></td>
- <td><input name="createDB" id="<portlet:namespace/>createDB" type="text" size="30">
- <input type="submit" value='<fmt:message key="internaldb.common.create"/>' onClick="return <portlet:namespace/>validateForm1();"></td>
- </tr>
- <tr>
- <td><div align="right"><label for="<portlet:namespace/>deleteDB"><fmt:message key="internaldb.common.deleteDB"/></label>:</div></td>
- <td>
- <select name="deleteDB" id="<portlet:namespace/>deleteDB">
- <c:forEach var="db" items="${databases}" varStatus="status">
- <option value="${db}">${db}</option>
- </c:forEach>
- </select>
- <input type="submit" value='<fmt:message key="internaldb.common.delete"/>' onClick="return <portlet:namespace/>validateForm2();">
- </td>
- </tr>
- <tr>
- <td><div align="right"><label for="<portlet:namespace/>useDB"><fmt:message key="internaldb.common.useDB"/></label>:</div></td>
- <td>
- <select name="useDB" id="<portlet:namespace/>useDB">
- <c:forEach var="db" items="${databases}" varStatus="status">
- <option value="${db}"<c:if test="${useDB==db}"> selected="selected"</c:if>>${db}</option>
- </c:forEach>
- </select>
- <input type="submit" value="<fmt:message key="internaldb.runSQLNormal.runSQL"/>" onClick="return <portlet:namespace/>validateForm3();"></td>
- </tr>
- </c:when>
- <c:otherwise>
- <tr>
- <td><div align="right"><label for="<portlet:namespace/>useDB"><fmt:message key="internaldb.common.useDS"/></label>:</div></td>
- <td>
- <select name="useDB" id="<portlet:namespace/>useDB">
- <c:forEach var="dsName" items="${dataSourceNames}" varStatus="status">
- <option value="${dsName}"<c:if test="${useDB==dsName}"> selected="selected"</c:if>>${dsName}</option>
- </c:forEach>
- </select>
- <input type="submit" value="<fmt:message key="internaldb.runSQLNormal.runSQL"/>" onClick="return <portlet:namespace/>validateForm3();"></td>
- </tr>
- </c:otherwise>
-</c:choose>
- <tr>
- <td></td>
- <td><div align="left"><label for="<portlet:namespace/>sqlStmts"><fmt:message key="internaldb.common.SQLCommands"/></label>:</div></td>
- </tr>
- <tr>
- <td></td>
- <td><textarea name="sqlStmts" id="<portlet:namespace/>sqlStmts" cols="65" rows="15"><c:out value="${sqlStmts}" /></textarea></td>
- </tr>
-</table>
-
-<table width="100%" border="0">
- <tr>
- <td></td>
- <td><fmt:message key="internaldb.common.note"/>:</td>
- </tr>
- <tr>
- <td></td>
- <td><fmt:message key="internaldb.runSQLNormal.note1"/></td>
- </tr>
- <tr>
- <td></td>
- <td><fmt:message key="internaldb.runSQLNormal.note2"/></td>
- </tr>
- <tr>
- <td></td>
- <td><fmt:message key="internaldb.runSQLNormal.note3"/></td>
- </tr>
-</table>
-<br>
-
-<%-- Display query result from single select statement --%>
-<c:if test="${!empty singleSelectStmt}">
- <%-- If in Database mode, make sure we have a Derby connection --%>
- <c:if test="${connectionMode == 'database'}">
- <c:if test="${ds == null}">
- <%-- Create the connection manually --%>
- <sql:setDataSource
- var="ds"
- driver="org.apache.derby.jdbc.EmbeddedDriver"
- url="jdbc:derby:${useDB};create=true"
- user=""
- password=""
- />
- </c:if>
- </c:if>
-
- <%-- Select statement --%>
- <sql:transaction dataSource="${ds}">
- <sql:query var="table">
- <%= request.getAttribute("singleSelectStmt") %>
- </sql:query>
- </sql:transaction>
-
- <center><b><fmt:message key="internaldb.common.queryResult"/></b></center>
- <table width="100%">
- <tr>
- <%-- Get the column names for the header of the table --%>
- <c:forEach var="columnName" items="${table.columnNames}">
- <td class="DarkBackground"><c:out value="${columnName}" /></td>
- </c:forEach>
- </tr>
-
- <%-- Check if there are table data to display --%>
- <c:choose>
- <c:when test="${table.rowCount == 0}">
- <tr>
- <td class="LightBackground" colspan="<c:out value='${fn:length(table.columnNames)}' />" align="center">*** <fmt:message key="internaldb.common.empty"/> ***</td>
- </tr>
- </c:when>
- <c:otherwise>
- <%-- Get the value of each column while iterating over rows --%>
- <c:forEach var="row" items="${table.rowsByIndex}" varStatus="status">
- <jsp:useBean type="javax.servlet.jsp.jstl.core.LoopTagStatus" id="status" />
- <tr>
- <c:choose>
- <c:when test="<%= status.getCount() % 2 == 1 %>">
- <c:forEach var="column" items="${row}">
- <td class="LightBackground"><c:out value="${column}" /></td>
- </c:forEach>
- </c:when>
- <c:otherwise>
- <c:forEach var="column" items="${row}">
- <td class="MediumBackground"><c:out value="${column}" /></td>
- </c:forEach>
- </c:otherwise>
- </c:choose>
- </tr>
- </c:forEach>
- </c:otherwise>
- </c:choose>
- </table>
-</c:if>
-
-</form>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/viewTableContents.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/viewTableContents.jsp
deleted file mode 100644
index 77ed190..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/viewTableContents.jsp
+++ /dev/null
@@ -1,95 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="sql" uri="http://java.sun.com/jsp/jstl/sql" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<fmt:setBundle basename="systemdatabase"/>
-<portlet:defineObjects/>
-
-<%-- TODO: Check if datasource is created --%>
-<%-- Datasource --%>
-<c:if test="${ds == null}">
- <%-- Create the connection manually --%>
- <sql:setDataSource
- var="ds"
- driver="org.apache.derby.jdbc.EmbeddedDriver"
- url="jdbc:derby:${db};create=true"
- user=""
- password=""
- />
-</c:if>
-
-<%-- Select statement --%>
-<sql:transaction dataSource="${ds}">
- <sql:query var="table">
- select * from ${tbl}
- </sql:query>
-</sql:transaction>
-
-<center><b><fmt:message key="internaldb.common.DB"/>: <c:out value="${db}" /> <fmt:message key="internaldb.common.table"/>: <c:out value="${tbl}" /></b></center>
-<table width="100%">
- <tr>
- <%-- Get the column names for the header of the table --%>
- <c:forEach var="columnName" items="${table.columnNames}">
- <td class="DarkBackground"><c:out value="${columnName}" /></td>
- </c:forEach>
- </tr>
-
- <%-- Check if there are table data to display --%>
- <c:choose>
- <c:when test="${table.rowCount == 0}">
- <tr>
- <td class="LightBackground" colspan="<c:out value='${fn:length(table.columnNames)}' />" align="center">*** <fmt:message key="internaldb.common.empty"/> ***</td>
- </tr>
- </c:when>
- <c:otherwise>
- <%-- Get the value of each column while iterating over rows --%>
- <c:forEach var="row" items="${table.rowsByIndex}" varStatus="status">
- <jsp:useBean type="javax.servlet.jsp.jstl.core.LoopTagStatus" id="status" />
- <tr>
- <c:choose>
- <c:when test="<%= status.getCount() % 2 == 1 %>">
- <c:forEach var="column" items="${row}">
- <td class="LightBackground"><c:out value="${column}" /></td>
- </c:forEach>
- </c:when>
- <c:otherwise>
- <c:forEach var="column" items="${row}">
- <td class="MediumBackground"><c:out value="${column}" /></td>
- </c:forEach>
- </c:otherwise>
- </c:choose>
- </tr>
- </c:forEach>
- </c:otherwise>
- </c:choose>
-</table>
-
-<br>
-<a href="<portlet:actionURL portletMode="view">
- <portlet:param name="action" value="listTables" />
- <portlet:param name="db" value="${db}" />
- <portlet:param name="viewTables" value="${viewTables}" />
- </portlet:actionURL>"><fmt:message key="internaldb.common.viewTables"/>
-</a>
- |
-<a href="<portlet:actionURL portletMode="view">
- <portlet:param name="action" value="listDatabases" />
- </portlet:actionURL>"><fmt:message key="internaldb.common.viewDatabases"/>
-</a>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/viewTableContentsMaximized.jsp b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/viewTableContentsMaximized.jsp
deleted file mode 100644
index 2949eeb..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/view/internaldb/viewTableContentsMaximized.jsp
+++ /dev/null
@@ -1,17 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ include file="viewTableContents.jsp" %>
diff --git a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/web.xml b/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 2cc1f76..0000000
--- a/plugins/system-database/sysdb-portlets/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements. See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-implied.
-
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5" metadata-complete="true">
- <display-name>system-database</display-name>
-
- <servlet>
- <servlet-name>dwr-invoker</servlet-name>
- <servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
- <init-param>
- <param-name>classes</param-name>
- <param-value>
- org.apache.geronimo.console.ajax.ProgressMonitor,
- org.apache.geronimo.console.ajax.ProgressInfo
- </param-value>
- </init-param>
- <init-param>
- <param-name>activeReverseAjaxEnabled</param-name>
- <param-value>true</param-value>
- </init-param>
- </servlet>
-
- <servlet>
- <display-name>Pluto Wrapper for Internal DB Portlet</display-name>
- <servlet-name>InternalDB</servlet-name>
- <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
- <init-param>
- <param-name>portlet-name</param-name>
- <param-value>InternalDB</param-value>
- </init-param>
- </servlet>
-
- <servlet>
- <display-name>Pluto Wrapper for DB Viewer Portlet</display-name>
- <servlet-name>DBViewer</servlet-name>
- <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
- <init-param>
- <param-name>portlet-name</param-name>
- <param-value>DBViewer</param-value>
- </init-param>
- </servlet>
-
- <servlet>
- <display-name>Pluto Wrapper for Run SQL Portlet</display-name>
- <servlet-name>RunSQL</servlet-name>
- <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
- <init-param>
- <param-name>portlet-name</param-name>
- <param-value>RunSQL</param-value>
- </init-param>
- </servlet>
-
- <servlet>
- <display-name>Pluto Wrapper for DataSource Run SQL Portlet</display-name>
- <servlet-name>RunSQLDS</servlet-name>
- <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
- <init-param>
- <param-name>portlet-name</param-name>
- <param-value>RunSQLDS</param-value>
- </init-param>
- </servlet>
-
- <servlet>
- <display-name>Pluto Wrapper for Derby Log Viewer Portlet</display-name>
- <servlet-name>DerbyLogViewer</servlet-name>
- <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
- <init-param>
- <param-name>portlet-name</param-name>
- <param-value>DerbyLogViewer</param-value>
- </init-param>
- </servlet>
-
- <servlet>
- <display-name>Pluto Wrapper for Database Wizard Portlet</display-name>
- <servlet-name>DBWizard</servlet-name>
- <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
- <init-param>
- <param-name>portlet-name</param-name>
- <param-value>DBWizard</param-value>
- </init-param>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>dwr-invoker</servlet-name>
- <url-pattern>/dwr3/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>InternalDB</servlet-name>
- <url-pattern>/PlutoInvoker/InternalDB/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>DBViewer</servlet-name>
- <url-pattern>/PlutoInvoker/DBViewer/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>RunSQL</servlet-name>
- <url-pattern>/PlutoInvoker/RunSQL/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>RunSQLDS</servlet-name>
- <url-pattern>/PlutoInvoker/RunSQLDS/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>DerbyLogViewer</servlet-name>
- <url-pattern>/PlutoInvoker/DerbyLogViewer/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>DBWizard</servlet-name>
- <url-pattern>/PlutoInvoker/DBWizard/*</url-pattern>
- </servlet-mapping>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>system-database</web-resource-name>
- <url-pattern>/PlutoInvoker/*</url-pattern>
- <url-pattern>/dwr3/*</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- </web-resource-collection>
- <auth-constraint>
- <role-name>admin</role-name>
- </auth-constraint>
- </security-constraint>
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>geronimo-admin</realm-name>
- </login-config>
- <security-role>
- <role-name>admin</role-name>
- </security-role>
-
- <!--
- For security reasons requests to the dwr servlet go through
- the "/console" web-app context. The purpose of dwr-filter is
- to map the attributes such as pathInfo, requestURI, etc. of
- the original request into the request that is delivered to
- the dwr-invoker servlet. The dwr-invoker servlet uses those
- attributes to create URLs that it sends back to the client.
- -->
- <filter>
- <filter-name>dwr-filter</filter-name>
- <filter-class>org.apache.geronimo.console.servlet.ForwardDispatchFilter</filter-class>
- </filter>
- <filter-mapping>
- <filter-name>dwr-filter</filter-name>
- <servlet-name>dwr-invoker</servlet-name>
- <dispatcher>FORWARD</dispatcher>
- </filter-mapping>
-</web-app>
diff --git a/testsuite/commands-testsuite/gshell/pom.xml b/testsuite/commands-testsuite/gshell/pom.xml
deleted file mode 100644
index 43f76c0..0000000
--- a/testsuite/commands-testsuite/gshell/pom.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>commands-testsuite</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>gshell</artifactId>
- <name>Geronimo TestSuite :: Commands Testsuite :: GShell</name>
-
- <description>
- Test for the gsh.bat/sh
- </description>
-
-</project>
diff --git a/testsuite/commands-testsuite/gshell/src/test/java/org/apache/geronimo/testsuite/gshell/deploy/DeployTest.java b/testsuite/commands-testsuite/gshell/src/test/java/org/apache/geronimo/testsuite/gshell/deploy/DeployTest.java
deleted file mode 100644
index ceca858..0000000
--- a/testsuite/commands-testsuite/gshell/src/test/java/org/apache/geronimo/testsuite/gshell/deploy/DeployTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.gshell.deploy;
-
-import java.io.ByteArrayOutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.geronimo.testsupport.commands.CommandTestSupport;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-@Test
-public class DeployTest extends CommandTestSupport {
-
- private static final String UP = "-u system -w manager";
-
- protected String execute(String[] args) throws Exception {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- List<String> cmd = new ArrayList<String>();
- cmd.addAll(Arrays.asList("-c"));
- if (args != null) {
- cmd.addAll(Arrays.asList(args));
- }
- execute(CommandTestSupport.GSH, cmd, null, baos);
- return baos.toString();
- }
-
- @Test
- public void testListAllModules() throws Exception {
- String[] args = new String[]{ "deploy/list-modules " + UP };
-
- String output = execute(args);
-
- if (output.indexOf("org.apache.geronimo.framework/j2ee-system") < 0) {
- Assert.fail("deploy/list-modules failed : " + output);
- }
- }
-
- @Test
- public void testListStartedModules() throws Exception {
- String[] args = new String[]{ "deploy/list-modules " + UP + " --started" };
-
- String output = execute(args);
-
- if (output.indexOf("org.apache.geronimo.framework/j2ee-system") < 0) {
- Assert.fail("deploy/list-modules --started failed : " + output);
- }
- if (output.indexOf("org.apache.geronimo.configs/client-corba-yoko") > 0) {
- Assert.fail("deploy/list-modules --started failed : " + output);
- }
- }
-
- @Test
- public void testListStoppedModules() throws Exception {
- String[] args = new String[]{ "deploy/list-modules " + UP + " --stopped" };
-
- String output = execute(args);
-
- if (output.indexOf("org.apache.geronimo.framework/j2ee-system") > 0) {
- Assert.fail("deploy/list-modules --stopped failed : " + output);
- }
- if (output.indexOf("org.apache.geronimo.configs/client-corba-yoko") < 0) {
- Assert.fail("deploy/list-modules --stopped failed : " + output);
- }
- }
-
- public void testListAllPlugins() throws Exception {
- //todo this testcase fails due to needing to select a repo
- /*
- String[] args = new String[]{"deploy/list-plugins " + UP};
-
- String output = execute(args);
-
- if (output.indexOf("org.apache.geronimo.framework/j2ee-system") < 0) {
- Assert.fail("deploy/list-modules failed : " + output);
- }
- */
- }
-
-}
diff --git a/testsuite/commands-testsuite/gshell/src/test/resources/testng.xml b/testsuite/commands-testsuite/gshell/src/test/resources/testng.xml
deleted file mode 100644
index 5dfc5d3..0000000
--- a/testsuite/commands-testsuite/gshell/src/test/resources/testng.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 514087 $ $Date: 2007-03-03 14:13:40 +0800 (Sat, 03 Mar 2007) $ -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-
-<suite name="Suite1" verbose="1">
- <test name="commands-testsuite.gshell">
- <packages>
- <package name="org.apache.geronimo.testsuite.gshell.deploy"/>
- </packages>
- </test>
-</suite>
-
diff --git a/testsuite/commands-testsuite/jaxws/pom.xml b/testsuite/commands-testsuite/jaxws/pom.xml
deleted file mode 100644
index 3c7cce9..0000000
--- a/testsuite/commands-testsuite/jaxws/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>commands-testsuite</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxws</artifactId>
- <name>Geronimo TestSuite :: Commands Testsuite :: JAXWS Tools</name>
-
- <description>
- Test for jaxws-toos.bat/sh
- </description>
-
- <dependencies>
- <!--dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.1_spec</artifactId>
- <scope>provided</scope>
- </dependency-->
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>project.build.directory</name>
- <value>${project.build.directory}</value>
- </property>
- <property>
- <name>project.directory</name>
- <value>${basedir}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/CXFToolsTest.java b/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/CXFToolsTest.java
deleted file mode 100644
index f288cdb..0000000
--- a/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/CXFToolsTest.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.jaxws;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.geronimo.testsupport.commands.CommandTestSupport;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-@Test
-public class CXFToolsTest extends CommandTestSupport {
-
- protected String executeJava2WS(String[] args) throws Exception {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- List<String> cmd = new ArrayList<String>();
- cmd.addAll(Arrays.asList("java2ws"));
- if (args != null) {
- cmd.addAll(Arrays.asList(args));
- }
- execute("cxf-tools", cmd, null, baos);
- return baos.toString();
- }
-
- protected String executeWSDL2Java(String[] args) throws Exception {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- List<String> cmd = new ArrayList<String>();
- cmd.addAll(Arrays.asList("wsdl2java"));
- if (args != null) {
- cmd.addAll(Arrays.asList(args));
- }
- execute("cxf-tools", cmd, null, baos);
- return baos.toString();
- }
-
- @Test
- public void testJava2WS() throws Exception {
- String projectDir = System.getProperty("project.directory");
- String targetDir = System.getProperty("project.build.directory");
-
- File outputDir = createUniqueDirectory(targetDir, "java2ws-");
- File testClassesDir = new File(projectDir, "target/test-classes");
-
- String[] args = new String[]{ "-verbose", "-wrapperbean", "-s", outputDir.getAbsolutePath(), "-cp", testClassesDir.getAbsolutePath(), "org.apache.geronimo.testsuite.jaxws.Greeter" };
-
- String output = executeJava2WS(args);
-
- checkGeneratedFiles(outputDir, output);
- }
-
- @Test
- public void testWSDL2Java() throws Exception {
- String projectDir = System.getProperty("project.directory");
- String targetDir = System.getProperty("project.build.directory");
-
- File outputDir = createUniqueDirectory(targetDir, "wsdl2java-");
- File wsdlFile = new File(projectDir, "src/test/java/org/apache/geronimo/testsuite/jaxws/greeter_control.wsdl");
-
- String[] args = new String[]{ "-verbose", "-keep", "-d", outputDir.getAbsolutePath(), wsdlFile.getAbsolutePath() };
-
- String output = executeWSDL2Java(args);
-
- checkGeneratedFiles(outputDir, output);
- }
-
- private void checkGeneratedFiles(File outputDir, String output) {
- System.out.println(output);
-
- String packageName = "org.apache.greeter_control.types.";
- packageName = packageName.replace('.', File.separatorChar);
- List<String> expectedFiles = Arrays.asList("GreetMe.java", "GreetMeOneWay.java", "GreetMeResponse.java", "SayHi.java", "SayHiResponse.java");
-
- for (String file : expectedFiles) {
- file = packageName + file;
- File sourceFile = new File(outputDir, file);
- Assert.assertTrue(sourceFile.exists(), "Source file " + file + " does not exist");
- }
- }
-
- private File createUniqueDirectory(String targetDir, String prefix) {
- File dir = new File(targetDir, prefix + System.currentTimeMillis());
- if (!dir.mkdir()) {
- throw new RuntimeException("Failed to create unqiue directory " + dir);
- }
- return dir;
- }
-
-}
diff --git a/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/Greeter.java b/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/Greeter.java
deleted file mode 100644
index ba4bbcc..0000000
--- a/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/Greeter.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.jaxws;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-@WebService(name = "Greeter", targetNamespace = "http://apache.org/greeter_control")
-public class Greeter {
-
-
- @WebMethod
- @WebResult(name = "responseType", targetNamespace = "http://apache.org/greeter_control/types")
- @RequestWrapper(localName = "sayHi", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.SayHi")
- @ResponseWrapper(localName = "sayHiResponse", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.SayHiResponse")
- public String sayHi() {
- return "hi";
- }
-
- /**
- *
- * @param requestType
- * @return
- * returns java.lang.String
- */
- @WebMethod
- @WebResult(name = "responseType", targetNamespace = "http://apache.org/greeter_control/types")
- @RequestWrapper(localName = "greetMe", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.GreetMe")
- @ResponseWrapper(localName = "greetMeResponse", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.GreetMeResponse")
- public String greetMe(
- @WebParam(name = "requestType", targetNamespace = "http://apache.org/greeter_control/types")
- String requestType) {
- return requestType;
- }
-
- /**
- *
- * @param requestType
- */
- @WebMethod
- @Oneway
- @RequestWrapper(localName = "greetMeOneWay", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.GreetMeOneWay")
- public void greetMeOneWay(
- @WebParam(name = "requestType", targetNamespace = "http://apache.org/greeter_control/types")
- String requestType) {
-
- }
-
-}
diff --git a/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java b/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java
deleted file mode 100644
index dcfdb02..0000000
--- a/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/JAXWSToolsTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.jaxws;
-
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.apache.geronimo.testsupport.commands.CommandTestSupport;
-import org.testng.Assert;
-import org.testng.annotations.Test;
-
-@Test
-public class JAXWSToolsTest extends CommandTestSupport {
-
- protected String executeWsGen(String[] args) throws Exception {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- List<String> cmd = new ArrayList<String>();
- cmd.addAll(Arrays.asList("wsgen"));
- if (args != null) {
- cmd.addAll(Arrays.asList(args));
- }
- execute("jaxws-tools", cmd, null, baos);
- return baos.toString();
- }
-
- protected String executeWsImport(String[] args) throws Exception {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- List<String> cmd = new ArrayList<String>();
- cmd.addAll(Arrays.asList("wsimport"));
- if (args != null) {
- cmd.addAll(Arrays.asList(args));
- }
- execute("jaxws-tools", cmd, null, baos);
- return baos.toString();
- }
-
- @Test
- public void testWsGen() throws Exception {
- String projectDir = System.getProperty("project.directory");
- String targetDir = System.getProperty("project.build.directory");
-
- File outputDir = createUniqueDirectory(targetDir, "wsgen-");
- File testClassesDir = new File(projectDir, "target/test-classes");
-
- String[] args = new String[]{ "-verbose", "-keep", "-d", outputDir.getAbsolutePath(), "-cp", testClassesDir.getAbsolutePath(), "org.apache.geronimo.testsuite.jaxws.Greeter" };
-
- String output = executeWsGen(args);
-
- checkGeneratedFiles(outputDir, output);
- }
-
- @Test
- public void testWsImport() throws Exception {
- String projectDir = System.getProperty("project.directory");
- String targetDir = System.getProperty("project.build.directory");
-
- File outputDir = createUniqueDirectory(targetDir, "wsimport-");
- File wsdlFile = new File(projectDir, "src/test/java/org/apache/geronimo/testsuite/jaxws/greeter_control.wsdl");
-
- String[] args = new String[]{ "-verbose", "-keep", "-d", outputDir.getAbsolutePath(), wsdlFile.getAbsolutePath() };
-
- String output = executeWsImport(args);
-
- checkGeneratedFiles(outputDir, output);
- }
-
- private void checkGeneratedFiles(File outputDir, String output) {
- String packageName = "org.apache.greeter_control.types.";
- packageName = packageName.replace('.', File.separatorChar);
- List<String> expectedFiles = Arrays.asList("GreetMe.java", "GreetMeOneWay.java", "GreetMeResponse.java", "SayHi.java", "SayHiResponse.java");
-
- for (String file : expectedFiles) {
- file = packageName + file;
- Assert.assertTrue(output.indexOf(file) > 0, "Expected " + file + " in " + output);
- File sourceFile = new File(outputDir, file);
- Assert.assertTrue(sourceFile.exists(), "Source file " + file + " does not exist");
- }
- }
-
- private File createUniqueDirectory(String targetDir, String prefix) {
- File dir = new File(targetDir, prefix + System.currentTimeMillis());
- if (!dir.mkdir()) {
- throw new RuntimeException("Failed to create unqiue directory " + dir);
- }
- return dir;
- }
-
-}
diff --git a/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/greeter_control.wsdl b/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/greeter_control.wsdl
deleted file mode 100644
index 3ea2259..0000000
--- a/testsuite/commands-testsuite/jaxws/src/test/java/org/apache/geronimo/testsuite/jaxws/greeter_control.wsdl
+++ /dev/null
@@ -1,183 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/greeter_control"
- xmlns:x1="http://apache.org/greeter_control/types"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/greeter_control" name="HelloWorld">
- <wsdl:types>
- <schema targetNamespace="http://apache.org/greeter_control/types"
- xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-
- <element name="sayHi">
- <complexType/>
- </element>
- <element name="sayHiResponse">
- <complexType>
- <sequence>
- <element name="responseType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMe">
- <complexType>
- <sequence>
- <element name="requestType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMeResponse">
- <complexType>
- <sequence>
- <element name="responseType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMeOneWay">
- <complexType>
- <sequence>
- <element name="requestType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="pingMe">
- <complexType/>
- </element>
- <element name="pingMeResponse">
- <complexType/>
- </element>
- <element name="faultDetail">
- <complexType>
- <sequence>
- <element name="minor" type="xsd:short"/>
- <element name="major" type="xsd:short"/>
- </sequence>
- </complexType>
- </element>
-
- </schema>
- </wsdl:types>
-
-
- <wsdl:message name="sayHiRequest">
- <wsdl:part element="x1:sayHi" name="in"/>
- </wsdl:message>
- <wsdl:message name="sayHiResponse">
- <wsdl:part element="x1:sayHiResponse" name="out"/>
- </wsdl:message>
- <wsdl:message name="greetMeRequest">
- <wsdl:part element="x1:greetMe" name="in"/>
- </wsdl:message>
- <wsdl:message name="greetMeResponse">
- <wsdl:part element="x1:greetMeResponse" name="out"/>
- </wsdl:message>
- <wsdl:message name="greetMeOneWayRequest">
- <wsdl:part element="x1:greetMeOneWay" name="in"/>
- </wsdl:message>
- <wsdl:message name="pingMeRequest">
- <wsdl:part name="in" element="x1:pingMe"/>
- </wsdl:message>
- <wsdl:message name="pingMeResponse">
- <wsdl:part name="out" element="x1:pingMeResponse"/>
- </wsdl:message>
- <wsdl:message name="pingMeFault">
- <wsdl:part name="faultDetail" element="x1:faultDetail"/>
- </wsdl:message>
-
- <wsdl:portType name="Greeter">
- <wsdl:operation name="sayHi">
- <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
- <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
- </wsdl:operation>
-
- <wsdl:operation name="greetMe">
- <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
- <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
- </wsdl:operation>
-
- <wsdl:operation name="greetMeOneWay">
- <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/>
- </wsdl:operation>
-
- <wsdl:operation name="pingMe">
- <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
- <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
- <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
- </wsdl:operation>
- </wsdl:portType>
-
-
- <wsdl:binding name="GreeterSOAPBinding" type="tns:Greeter">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <wsdl:operation name="sayHi">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="sayHiRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="sayHiResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="greetMe">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="greetMeRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="greetMeResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="greetMeOneWay">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="greetMeOneWayRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- </wsdl:operation>
-
- <wsdl:operation name="pingMe">
- <soap:operation style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="pingMeFault">
- <soap:fault name="pingMeFault" use="literal"/>
- </wsdl:fault>
- </wsdl:operation>
-
- </wsdl:binding>
-
- <wsdl:service name="GreeterService">
- <wsdl:port binding="tns:GreeterSOAPBinding" name="GreeterPort">
- <soap:address location="http://localhost:8080/SoapContext/GreeterPort"/>
- <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/08/addressing/wsdl"/>
- </wsdl:port>
- </wsdl:service>
-
-
-</wsdl:definitions>
-
diff --git a/testsuite/commands-testsuite/jaxws/src/test/resources/testng.xml b/testsuite/commands-testsuite/jaxws/src/test/resources/testng.xml
deleted file mode 100644
index 45de573..0000000
--- a/testsuite/commands-testsuite/jaxws/src/test/resources/testng.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 514087 $ $Date: 2007-03-03 14:13:40 +0800 (Sat, 03 Mar 2007) $ -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-
-<suite name="Suite1" verbose="1">
- <test name="commands-testsuite.jaxws">
- <packages>
- <package name="org.apache.geronimo.testsuite.jaxws"/>
- </packages>
- </test>
-</suite>
-
diff --git a/testsuite/commands-testsuite/pom.xml b/testsuite/commands-testsuite/pom.xml
index 2440b10..c9d51de 100644
--- a/testsuite/commands-testsuite/pom.xml
+++ b/testsuite/commands-testsuite/pom.xml
@@ -73,10 +73,6 @@
<modules>
<module>deploy</module>
-<!--
- <module>gshell</module>
- <module>jaxws</module>
--->
<module>shutdown</module>
</modules>
diff --git a/testsuite/console-testsuite/advanced/pom.xml b/testsuite/console-testsuite/advanced/pom.xml
deleted file mode 100644
index 49f47d1..0000000
--- a/testsuite/console-testsuite/advanced/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>console-testsuite</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>advanced</artifactId>
- <name>Geronimo TestSuite :: Console Testsuite :: Advanced Tests</name>
-
- <description>
- Advanced test for the Geronimo console.
- </description>
-
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java b/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java
deleted file mode 100644
index 5289bab..0000000
--- a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/ConsoleRealmTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class ConsoleRealmTest extends TestSupport {
- @Test
- public void testNewUser() throws Exception {
- selenium.click("link=Users and Groups");
- waitForPageLoad();
- selenium.click("link=Create New User");
- waitForPageLoad();
- selenium.type("userId", "myuser");
- selenium.type("password", "myuser");
- selenium.type("confirm-password", "myuser");
- selenium.click("//input[@value='Add']");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("myuser"));
- selenium.click("//a[@onclick=\"return confirm('Confirm Delete user myuser?');\"]");
- waitForPageLoad();
- assertTrue(selenium.getConfirmation().matches("^Confirm Delete user myuser[\\s\\S]$"));
- waitForPageLoad();
- assertFalse(selenium.isTextPresent("myuser"));
- }
-
- @Test
- public void testNewGroup() throws Exception {
- selenium.click("link=Users and Groups");
- waitForPageLoad();
- selenium.click("link=Create New Group");
- waitForPageLoad();
- selenium.type("group", "mygroup");
- selenium.click("//input[@value='Add']");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("mygroup"));
- selenium.click("//a[@onclick=\"return confirm('Confirm Delete group mygroup?');\"]");
- waitForPageLoad();
- assertTrue(selenium.getConfirmation().matches("^Confirm Delete group mygroup[\\s\\S]$"));
- waitForPageLoad();
- assertFalse(selenium.isTextPresent("mygroup"));
- }
-}
diff --git a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java b/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java
deleted file mode 100644
index 6ae7127..0000000
--- a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DBManagerTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DBManagerTest extends TestSupport {
- @Test
- public void testNewDB() throws Exception {
- selenium.click("link=DB Manager");
- waitForPageLoad();
- selenium.type("createDB", "MyUniqueDB");
- selenium.click("//input[@value = 'Create']");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("MyUniqueDB"));
- selenium.select("useDB", "label=MyUniqueDB");
- selenium.type("sqlStmts", "create table myTable ( id int primary key );");
- selenium.click("//input[@value = 'Run SQL']");
- waitForPageLoad();
- //selenium.click("link=Application");
- selenium.click("//a[contains(@href, 'db=MyUniqueDB')]");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("MYTABLE"));
- selenium.select("deleteDB", "label=MyUniqueDB");
- selenium.click("//input[@value = 'Delete']");
- waitForPageLoad();
- assertTrue(selenium.getConfirmation().matches("^Are you sure you want to delete this database[\\s\\S]$"));
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("Database deleted: MyUniqueDB"));
- }
-
- @Test
- public void testRunSQL() throws Exception {
- selenium.click("link=DB Manager");
- waitForPageLoad();
- selenium.select("useDB", "label=SystemDatabase");
- selenium.type("sqlStmts", "select * from SYS.SYSDEPENDS;");
- selenium.click("//input[@value = 'Run SQL']");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("SQL command(s) executed successfully"));
- }
-}
diff --git a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java b/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java
deleted file mode 100644
index a38006e..0000000
--- a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolTest.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DatabasePoolTest extends TestSupport {
- @Test
- public void testNewDBPool() throws Exception {
- String geronimoVersion = System.getProperty("geronimoVersion");
- assertNotNull(geronimoVersion);
-
- selenium.click("link=Database Pools");
- waitForPageLoad();
- selenium.click("link=Using the Geronimo database pool wizard");
- waitForPageLoad();
- selenium.type("name", "UniquePool");
- selenium.select("dbtype", "label=Derby embedded");
- selenium.click("//input[@value='Next']");
- waitForPageLoad();
- selenium.addSelection("jars", "label=org.apache.geronimo.configs/system-database/" + geronimoVersion + "/car");
- selenium.type("property-DatabaseName", "SystemDatabase");
- selenium.click("//input[@value='Deploy']");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("UniquePool"));
- selenium.click("//tr[td[1] = 'UniquePool']/td[4]/a[3]");
- waitForPageLoad();
- assertFalse(selenium.isTextPresent("UniquePool"));
- }
-
- @Test
- public void testRunSQLDS() throws Exception {
- selenium.click("link=Database Pools");
- waitForPageLoad();
- selenium.select("useDB", "label=SystemDatasource");
- selenium.type("sqlStmts", "select * from SYS.SYSDEPENDS;");
- selenium.click("//input[@value = 'Run SQL']");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("SQL command(s) executed successfully"));
- }
-
- /*
- // cannot test yet. jetty is having problems rending the page
-
- @Test
- public void testDatabasePoolEdit() throws Exception {
- selenium.click("link=Database Pools");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("running"));
- selenium.click("link=edit");
- waitForPageLoad();
- selenium.type("maxSize", "101");
- selenium.click("//input[@value='Save']");
- waitForPageLoad();
- selenium.click("link=edit");
- waitForPageLoad();
- assertEquals("101", selenium.getValue("maxSize"));
- selenium.type("maxSize", "100");
- selenium.click("//input[@value='Save']");
- waitForPageLoad();
- selenium.click("link=edit");
- waitForPageLoad();
- assertEquals("100", selenium.getValue("maxSize"));
- }*/
-}
diff --git a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java b/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java
deleted file mode 100644
index cbc3278..0000000
--- a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/DeploymentTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class DeploymentTest extends TestSupport {
- @Test
- public void testEmptyDeployment() throws Exception {
- selenium.click("link=Deploy New");
- waitForPageLoad();
- selenium.click("//input[@value='Install']");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("Deployment Failed"));
- }
-}
diff --git a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java b/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java
deleted file mode 100644
index 0e38301..0000000
--- a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcesTest.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JMSResourcesTest extends TestSupport {
- @Test
- public void testNewJMSResource() throws Exception {
- selenium.click("link=JMS Resources");
- waitForPageLoad();
- selenium.click("link=For ActiveMQ");
- waitForPageLoad();
- selenium.type("instanceName", "UniqueName");
- selenium.click("//input[@value='Next']");
- waitForPageLoad();
- selenium.click("//input[@value='Add Connection Factory']");
- waitForPageLoad();
- selenium.select("factoryType", "label=javax.jms.QueueConnectionFactory");
- selenium.click("//input[@value='Next']");
- waitForPageLoad();
- selenium.type("factory.0.instanceName", "ConnectionFactory");
- selenium.click("//input[@value='Next']");
- waitForPageLoad();
- selenium.click("//input[@value='Add Destination']");
- waitForPageLoad();
- selenium.click("//input[@value='Next']");
- waitForPageLoad();
- selenium.type("destination.0.name", "mdb/Unique");
- selenium.type("destination.0.instance-config-0", "mdb/Unique");
- selenium.click("//input[@value='Next']");
- waitForPageLoad();
- selenium.click("//input[@value='Deploy Now']");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("UniqueName (console.jms/UniqueName/1.0/car)"));
- selenium.click("link=J2EE Connectors");
- waitForPageLoad();
- selenium.click("link=Uninstall");
- assertTrue("timed out waiting for button", waitForButton());
- selenium.click("dijit_form_Button_0");
- waitForPageLoad();
- selenium.click("link=JMS Resources");
- waitForPageLoad();
- assertFalse(selenium.isTextPresent("UniqueName (console.jms/UniqueName/1.0/car)"));
- }
-
- private boolean waitForButton() throws InterruptedException {
- for (int i = 0; i < 12; i++) {
- if (selenium.isElementPresent("dijit_form_Button_0")) {
- return true;
- }
- Thread.sleep(10 * 1000);
- }
- return false;
- }
-
-}
diff --git a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java b/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java
deleted file mode 100644
index 30ed9a6..0000000
--- a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/JMSServerTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class JMSServerTest extends TestSupport {
- // @Test
- public void testNewListener() throws Exception {
- selenium.click("link=JMS Server");
- waitForPageLoad();
- selenium.click("link=Add new tcp listener");
- waitForPageLoad();
- selenium.type("name", "uniquename");
- selenium.type("host", "0.0.0.0");
- selenium.type("port", "2097");
- selenium.click("submit");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("uniquename"));
- //selenium.click("link=delete");
- selenium.click("//a[@onclick=\"return confirm('Are you sure you want to delete uniquename?');\"]");
- waitForPageLoad();
- assertTrue(selenium.getConfirmation().matches("^Are you sure you want to delete uniquename[\\s\\S]$"));
- }
-
- //@Test
- public void testStartStopListener() throws Exception {
- selenium.click("link=JMS Server");
- waitForPageLoad();
- selenium.click("//tr[3]/td[6]/a[1]");
- waitForPageLoad();
- assertEquals("stopped", selenium.getText("//tr[3]/td[5]"));
- selenium.click("//tr[3]/td[6]/a[1]");
- waitForPageLoad();
- assertEquals("running", selenium.getText("//tr[3]/td[5]"));
- }
-
- // @Test
- public void testEditNetworkListener() throws Exception {
- selenium.click("link=JMS Server");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("61613"));
- selenium.click("link=edit");
- waitForPageLoad();
- selenium.type("port", "6161");
- selenium.click("submit");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("6161"));
- selenium.click("link=edit");
- waitForPageLoad();
- selenium.type("port", "61612");
- selenium.click("submit");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("61612"));
- }
-}
diff --git a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java b/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
deleted file mode 100644
index f060757..0000000
--- a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/PluginsTest.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class PluginsTest extends TestSupport {
- @Test
- public void testListPlugins() throws Exception {
- String link = "http://geronimo-server:8080/plugin/maven-repo/";
- String actualLink = "http://localhost:8080/plugin/maven-repo/";
- String updatedLink = "http://geronimo.apache.org/plugins/geronimo-";
-
- selenium.click("link=Plugins");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent(link));
-
- selenium.click("link=Update Repository List");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent(updatedLink));
-
- selenium.click("link=Add Repository");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent(link));
-
- selenium.type("newRepository", actualLink);
- selenium.click("//input[@value='Add Repository']");
- waitForPageLoad();
-
- if (selenium.isTextPresent("Already have an entry for repository " + actualLink)) {
- selenium.click("link=Cancel");
- waitForPageLoad();
- }
-
- selenium.select("repository", "label=" + actualLink);
- selenium.type("username", "system");
- selenium.type("password", "manager");
- selenium.click("//input[@value = 'Show Plugins in selected repository']");
- waitForPageLoad();
-
- assertTrue(selenium.isTextPresent("Geronimo Assemblies :: Boilerplate"));
- selenium.click("link=Geronimo Assemblies :: Boilerplate");
- waitForPageLoad();
-
- assertTrue(selenium.isTextPresent("Geronimo-Versions"));
- }
-}
diff --git a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/TestSupport.java b/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/TestSupport.java
deleted file mode 100644
index a28aadb..0000000
--- a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/TestSupport.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-
-/**
- * Support for tests.
- *
- * @version $Rev$ $Date$
- */
-public class TestSupport
- extends ConsoleTestSupport
-{
- @BeforeMethod
- public void signIn() throws Exception {
- login();
- }
-
- @AfterMethod
- public void signOut() throws Exception {
- logout();
- }
-}
diff --git a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java b/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
deleted file mode 100644
index 03955ec..0000000
--- a/testsuite/console-testsuite/advanced/src/test/java/org/apache/geronimo/testsuite/console/WebServerTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class WebServerTest
- extends TestSupport
-{
- public static final String TOMCAT = "Tomcat";
- public static final String JETTY = "Jetty";
-
- @Test
- public void testNewConnector() throws Exception {
- String name = "uniquename";
- addConnector(name, 8081);
-
- deleteConnector(name);
- }
-
- @Test
- public void testEditConnector() throws Exception {
- String name = "uniquename2";
- addConnector(name, 8082);
-
- String connectorSelector = "//tr[td[1] = \"" + name + "\"]";
-
- selenium.click(connectorSelector + "/td[5]/a[3]");
- waitForPageLoad();
-
- selenium.type("port", "8008");
- selenium.click("submit");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("8008"));
-
- selenium.click(connectorSelector + "/td[5]/a[3]");
-
- waitForPageLoad();
- selenium.type("port", "8009");
- selenium.click("submit");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("8009"));
-
- deleteConnector(name);
- }
-
- @Test
- public void testStartStopConnector() throws Exception {
- String name = "uniquename3";
- addConnector(name, 8083);
-
- String connectorSelector = "//tr[td[1] = \"" + name + "\"]";
-
- assertEquals("running", selenium.getText(connectorSelector + "/td[4]"));
- selenium.click(connectorSelector + "/td[5]/a[1]");
- waitForPageLoad();
- assertEquals("stopped", selenium.getText(connectorSelector + "/td[4]"));
- selenium.click(connectorSelector + "/td[5]/a[1]");
- waitForPageLoad();
- assertEquals("running", selenium.getText(connectorSelector + "/td[4]"));
-
- deleteConnector(name);
- }
-
- private void addConnector(String name, int port) throws Exception {
- selenium.click("link=Web Server");
- waitForPageLoad();
- String container = JETTY;
- if (selenium.isTextPresent(TOMCAT)) {
- container = TOMCAT;
- }
-
- selenium.click("link=" + container + " BIO HTTP Connector");
- waitForPageLoad();
- selenium.type("uniqueName", name);
- selenium.type("port", String.valueOf(port));
- selenium.click("submit");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent(name));
- }
-
- private void deleteConnector(String name) throws Exception {
- selenium.click("//a[@onclick=\"return confirm('Are you sure you want to delete " + name + "?');\"]");
- waitForPageLoad();
- assertTrue(selenium.getConfirmation().matches("^Are you sure you want to delete " + name + "[\\s\\S]$"));
- }
-}
-
diff --git a/testsuite/console-testsuite/advanced/src/test/resources/testng.xml b/testsuite/console-testsuite/advanced/src/test/resources/testng.xml
deleted file mode 100644
index d6ccdb3..0000000
--- a/testsuite/console-testsuite/advanced/src/test/resources/testng.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-
-<suite name="Suite1" verbose="1">
- <test name="console-testsuite.advance-test">
- <packages>
- <package name="org.apache.geronimo.testsuite.console"/>
- </packages>
- </test>
-</suite>
-
diff --git a/testsuite/console-testsuite/basic/pom.xml b/testsuite/console-testsuite/basic/pom.xml
deleted file mode 100644
index 2fea034..0000000
--- a/testsuite/console-testsuite/basic/pom.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>console-testsuite</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>basic</artifactId>
- <name>Geronimo TestSuite :: Console Testsuite :: Basic Tests</name>
-
- <description>
- Basic test for the Geronimo console.
- </description>
-
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ApacheConfigPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ApacheConfigPortletTest.java
deleted file mode 100644
index 05351b4..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ApacheConfigPortletTest.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Apache mod_jk configuration portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class ApacheConfigPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testApacheConfigLink() throws Exception {
- selenium.click("link=Apache HTTP");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Apache mod_jk Configuration", selenium.getText(getPortletTitleLocation()));
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/AssemblyPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/AssemblyPortletTest.java
deleted file mode 100644
index bc6f20a..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/AssemblyPortletTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Assembly portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class AssemblyPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testAssemblyLink() throws Exception {
- selenium.click("link=Plugins");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Assemble Server",
- selenium.getText(getPortletTitleLocation(3)));
- // Test help link
- selenium.click(getPortletHelpLocation());
- waitForPageLoad();
- selenium.isTextPresent("Assemble a server from geronimo plugins in the current server.");
- }
-}
-
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java
deleted file mode 100644
index 3f85766..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/BasicConsoleTestSupport.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeMethod;
-
-public class BasicConsoleTestSupport extends ConsoleTestSupport {
-
- @BeforeMethod
- public void signIn() throws Exception {
- login();
- }
-
- @AfterMethod
- public void signOut() throws Exception {
- logout();
- }
-
- protected String getPortletTitleLocation() {
- return getPortletTitleLocation(1);
- }
-
- protected String getPortletTitleLocation(int index) {
- return "xpath=//div[@class = 'portlet'][" + index + "]/div/h2";
- }
-
- protected String getPortletHelpLocation() {
- return getPortletHelpLocation(1);
- }
-
- protected String getPortletHelpLocation(int index) {
- return "xpath=//div[@class = 'portlet'][" + index + "]/div/a[contains(@title, 'Help')]";
- }
-
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CertificationAuthorityPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CertificationAuthorityPortletTest.java
deleted file mode 100644
index 60a5a38..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CertificationAuthorityPortletTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Certification authority portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class CertificationAuthorityPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testCertificationAuthorityLink() throws Exception {
- selenium.click("link=Certificate Authority");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Certification Authority",
- selenium.getText(getPortletTitleLocation()));
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletAppClientTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletAppClientTest.java
deleted file mode 100644
index de0578a..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletAppClientTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Configuration manager (Application clients) portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class ConfigManagerPortletAppClientTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testConfigManagerAppClientLink() throws Exception {
- selenium.click("link=App Clients");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Installed Application Clients",
- selenium.getText(getPortletTitleLocation()));
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEARTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEARTest.java
deleted file mode 100644
index 3e43488..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEARTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Configuration manager (EARs) portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class ConfigManagerPortletEARTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testConfigManagerEARLink() throws Exception {
- selenium.click("link=Application EARs");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Installed Application EARs",
- selenium.getText(getPortletTitleLocation()));
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEJBTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEJBTest.java
deleted file mode 100644
index bca5dcc..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletEJBTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Configuration manager (EJB JARs) portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class ConfigManagerPortletEJBTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testConfigManagerEJBLink() throws Exception {
- selenium.click("link=EJB JARs");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Installed EJB JARs",
- selenium.getText(getPortletTitleLocation()));
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletRARTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletRARTest.java
deleted file mode 100644
index 049b12f..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletRARTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Configuration manager (J2EE Connectors) portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class ConfigManagerPortletRARTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testConfigManagerRARLink() throws Exception {
- selenium.click("link=J2EE Connectors");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Installed J2EE Connectors",
- selenium.getText(getPortletTitleLocation()));
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletSysModulesTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletSysModulesTest.java
deleted file mode 100644
index a618c9b..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletSysModulesTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Configuration manager (System modules) portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class ConfigManagerPortletSysModulesTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testConfigManagerSysModulesLink() throws Exception {
- selenium.click("link=System Modules");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Installed System Modules",
- selenium.getText(getPortletTitleLocation()));
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java
deleted file mode 100644
index 064d921..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConfigManagerPortletWARTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Configuration manager (Web applications) portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class ConfigManagerPortletWARTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testConfigManagerWARLink() throws Exception {
- selenium.click("link=Web App WARs");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Installed Web Applications",
- selenium.getText(getPortletTitleLocation()));
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConnectorPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConnectorPortletTest.java
deleted file mode 100644
index c3672ed..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ConnectorPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Web server connector portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class ConnectorPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testConnectorLink() throws Exception {
- selenium.click("link=Web Server");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Network Listeners",
- selenium.getText(getPortletTitleLocation(2)));
- // Test help link
- selenium.click(getPortletHelpLocation(2));
- waitForPageLoad();
- selenium.isTextPresent("The Connector Manager displays connections of all types");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CreatePluginPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CreatePluginPortletTest.java
deleted file mode 100644
index 948ac97..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/CreatePluginPortletTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Create Plugin portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class CreatePluginPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testCreatePluginLink() throws Exception {
- selenium.click("link=Plugins");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Create Plugin",
- selenium.getText(getPortletTitleLocation(2)));
- // Test help link
- selenium.click(getPortletHelpLocation());
- waitForPageLoad();
- selenium.isTextPresent("Choose a configuration in the current Geronimo server to export as Geronimo plugin.");
- }
-}
-
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DBViewerPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DBViewerPortletTest.java
deleted file mode 100644
index b850713..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DBViewerPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Database viewer portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class DBViewerPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testDBViewerLink() throws Exception {
- selenium.click("link=DB Manager");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("DB Viewer",
- selenium.getText(getPortletTitleLocation()));
- // Test help link
- selenium.click(getPortletHelpLocation());
- waitForPageLoad();
- selenium.isTextPresent("Displays all the available databases and their tables");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolPortletTest.java
deleted file mode 100644
index 265e18f..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DatabasePoolPortletTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Database pool portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class DatabasePoolPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testDatabasePoolLink() throws Exception {
- selenium.click("link=Database Pools");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Database Pools",
- selenium.getText(getPortletTitleLocation()));
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java
deleted file mode 100644
index 4b44bc8..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DeploymentPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Deployment portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class DeploymentPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testDeploymentLink() throws Exception {
- selenium.click("link=Deploy New");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Install New Applications",
- selenium.getText(getPortletTitleLocation()));
- // Test help link
- selenium.click(getPortletHelpLocation());
- waitForPageLoad();
- selenium.isTextPresent("This portlet allows the user to deploy new applications on Geronimo.");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java
deleted file mode 100644
index b0e8e11..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/DerbyLogViewerPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Derby log viewer portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class DerbyLogViewerPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testDerbyLogViewerLink() throws Exception {
- selenium.click("link=Server Logs");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Derby Log Viewer",
- selenium.getText(getPortletTitleLocation(4)));
- // Test help link
- selenium.click(getPortletHelpLocation(4));
- waitForPageLoad();
- selenium.isTextPresent("This portlet views the log file for Geronimo's internal database, Derby.");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ImportExportPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ImportExportPortletTest.java
deleted file mode 100644
index 5a43344..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ImportExportPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Import/export plugin portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class ImportExportPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testImportExportLink() throws Exception {
- selenium.click("link=Plugins");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Install Plugins",
- selenium.getText(getPortletTitleLocation()));
- // Test help link
- selenium.click(getPortletHelpLocation());
- waitForPageLoad();
- selenium.isTextPresent("Install geronimo plugins from a local or remote repository");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/InternalDBPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/InternalDBPortletTest.java
deleted file mode 100644
index d576235..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/InternalDBPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Internal DB portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class InternalDBPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testInternalDBLink() throws Exception {
- selenium.click("link=DB Info");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("DB Info",
- selenium.getText(getPortletTitleLocation()));
- // Test help link
- selenium.click(getPortletHelpLocation());
- waitForPageLoad();
- selenium.isTextPresent("This page provides information about the internal database");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSBrokerPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSBrokerPortletTest.java
deleted file mode 100644
index 67253c0..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSBrokerPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * JMS broker portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class JMSBrokerPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testJMSBrokerLink() throws Exception {
- selenium.click("link=JMS Server");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("JMS Server Manager",
- selenium.getText(getPortletTitleLocation()));
- // Test help link
- selenium.click(getPortletHelpLocation());
- waitForPageLoad();
- selenium.isTextPresent("Shows the available JMS brokers");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSConnectorPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSConnectorPortletTest.java
deleted file mode 100644
index 6490f5c..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSConnectorPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * JMS connector portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class JMSConnectorPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testJMSConnectorLink() throws Exception {
- selenium.click("link=JMS Server");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("JMS Network Listeners",
- selenium.getText(getPortletTitleLocation(2)));
- // Test help link
- selenium.click(getPortletHelpLocation(2));
- waitForPageLoad();
- selenium.isTextPresent("Shows all the network connectors configured for the currently available JMS brokers.");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcePortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcePortletTest.java
deleted file mode 100644
index 7b27d39..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMSResourcePortletTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * JMS resource portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class JMSResourcePortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testJMSResourceLink() throws Exception {
- selenium.click("link=JMS Resources");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("JMS Resources",
- selenium.getText(getPortletTitleLocation()));
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMXManagerPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMXManagerPortletTest.java
deleted file mode 100644
index 891510b..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JMXManagerPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * JMX manager portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class JMXManagerPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testJMXManagerLink() throws Exception {
- selenium.click("link=JMX Viewer");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("JMX Viewer",
- selenium.getText(getPortletTitleLocation()));
- // Test help link
- selenium.click(getPortletHelpLocation());
- waitForPageLoad();
- selenium.isTextPresent("JMX Viewer Portlet Help");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JavaSystemInfoPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JavaSystemInfoPortletTest.java
deleted file mode 100644
index f688e0c..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/JavaSystemInfoPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Java system information portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class JavaSystemInfoPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testJavaSystemInfoLink() throws Exception {
- selenium.click("link=Java System Info");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("System Property values for the Server JVM",
- selenium.getText(getPortletTitleLocation()));
- // Test help link
- selenium.click(getPortletHelpLocation());
- waitForPageLoad();
- selenium.isTextPresent("This page displays the values of the system properties available to the server process.");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/KeystoresPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/KeystoresPortletTest.java
deleted file mode 100644
index bd572f9..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/KeystoresPortletTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Keystore configuration portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class KeystoresPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testKeystoresLink() throws Exception {
- selenium.click("link=Keystores");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Keystore Configuration",
- selenium.getText(getPortletTitleLocation()));
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LDAPManagerPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LDAPManagerPortletTest.java
deleted file mode 100644
index 9555e05..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LDAPManagerPortletTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * LDAP manager portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class LDAPManagerPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testLDAPManagerLink() throws Exception {
- // TODO: Add a way to close problem connecting to server alert message.
-
- // selenium.click("link=LDAP Viewer");
- // waitForPageLoad();
- // assertEquals("Geronimo Console", selenium.getTitle());
- // assertEquals("LDAP Viewer", selenium.getText(
- // "xpath=/html/body/table[@id='rootfragment']/tbody/tr[2]/td/table/tbody/tr[2]/td[4]/table/tbody/tr[1]/td/table/tbody/tr[1]/td/div/table/tbody/tr/td[2]/table/tbody/tr/td[1]/strong"));
- // Test help link
- // selenium.click("link=help");
- // waitForPageLoad();
- // selenium.isTextPresent("The LDAP viewer portlet can be used to do the following");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
deleted file mode 100644
index f8df5a3..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LinkCheckTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * @version $Rev$ $Date$
- */
-public class LinkCheckTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testServerInfoLink() throws Exception {
- selenium.click("link=Information");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
-
- assertTrue(selenium.isTextPresent("Version"));
- assertTrue(selenium.isTextPresent("Start Time"));
- assertTrue(selenium.isTextPresent("Up Time"));
-
- assertEquals("Server Info",
- selenium.getText(getPortletTitleLocation()));
- }
-}
-
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogManagerPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogManagerPortletTest.java
deleted file mode 100644
index 3eef0c6..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogManagerPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Log manager portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class LogManagerPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testLogManagerLink() throws Exception {
- selenium.click("link=Server Logs");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Log Manager",
- selenium.getText(getPortletTitleLocation()));
- // Test help link
- selenium.click(getPortletHelpLocation());
- waitForPageLoad();
- selenium.isTextPresent("This portlet allows the user to select a configuration file for logging");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java
deleted file mode 100644
index 5c808b4..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/LogViewerPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Log viewer portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class LogViewerPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testLogViewerLink() throws Exception {
- selenium.click("link=Server Logs");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Server Log Viewer",
- selenium.getText(getPortletTitleLocation(2)));
- // Test help link
- selenium.click(getPortletHelpLocation(2));
- waitForPageLoad();
- selenium.isTextPresent("This portlet displays the Geronimo server log");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RepositoryViewPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RepositoryViewPortletTest.java
deleted file mode 100644
index 943dd3b..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RepositoryViewPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Repository viewer portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class RepositoryViewPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testRepositoryViewLink() throws Exception {
- selenium.click("link=Repository");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Repository Viewer",
- selenium.getText(getPortletTitleLocation()));
- // Test help link
- selenium.click(getPortletHelpLocation());
- waitForPageLoad();
- selenium.isTextPresent("This page displays the artifacts installed in the server's repository.");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RunSQLPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RunSQLPortletTest.java
deleted file mode 100644
index 6061a07..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/RunSQLPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Run SQL commands portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class RunSQLPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testRunSQLLink() throws Exception {
- selenium.click("link=DB Manager");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Run SQL",
- selenium.getText(getPortletTitleLocation(2)));
- // Test help link
- selenium.click(getPortletHelpLocation(2));
- waitForPageLoad();
- selenium.isTextPresent("Allows the user to run SQL commands");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEGroupsPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEGroupsPortletTest.java
deleted file mode 100644
index 6794052..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEGroupsPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Console realm group portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class SEGroupsPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testSEGroupsLink() throws Exception {
- selenium.click("link=Users and Groups");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Console Realm Groups",
- selenium.getText(getPortletTitleLocation(2)));
- // Test help link
- selenium.click(getPortletHelpLocation(2));
- waitForPageLoad();
- selenium.isTextPresent("This portlet lists all the Console Realm groups");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEUsersPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEUsersPortletTest.java
deleted file mode 100644
index f83220b..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SEUsersPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Console realm user portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class SEUsersPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testSEUsersLink() throws Exception {
- selenium.click("link=Users and Groups");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Console Realm Users",
- selenium.getText(getPortletTitleLocation()));
- // Test help link
- selenium.click(getPortletHelpLocation());
- waitForPageLoad();
- selenium.isTextPresent("This portlet lists all the console realm users");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SecurityRealmPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SecurityRealmPortletTest.java
deleted file mode 100644
index efaabc3..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SecurityRealmPortletTest.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Security realm portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class SecurityRealmPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testSecurityRealmLink() throws Exception {
- selenium.click("link=Security Realms");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Security Realms",
- selenium.getText(getPortletTitleLocation()));
- assertTrue(selenium.isTextPresent("geronimo-admin"));
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerInfoPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerInfoPortletTest.java
deleted file mode 100644
index 01299c7..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerInfoPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Server info portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class ServerInfoPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testServerInfoLink() throws Exception {
- selenium.click("link=Information");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Server Info",
- selenium.getText(getPortletTitleLocation()));
- // Test help link
- selenium.click(getPortletHelpLocation());
- waitForPageLoad();
- selenium.isTextPresent("This page provides information about the uptime of the server and the resources being used by the JVM.");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerManagerPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerManagerPortletTest.java
deleted file mode 100644
index 12b9b45..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ServerManagerPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Server manager portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class ServerManagerPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testServerManagerLink() throws Exception {
- selenium.click("link=Shutdown");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Server Manager",
- selenium.getText(getPortletTitleLocation()));
- // Test help link
- selenium.click(getPortletHelpLocation());
- waitForPageLoad();
- selenium.isTextPresent("This portlet give the admin the ability to remotely shutdown the Geronimo server.");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java
deleted file mode 100644
index 29635e2..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/SimpleLoginTest.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-import org.apache.geronimo.testsupport.console.ConsoleTestSupport;
-
-/**
- * @version $Rev$ $Date$
- */
-public class SimpleLoginTest
- extends ConsoleTestSupport
-{
- @Test
- public void testLoginAndLogout() throws Exception {
- login();
- logout();
- }
-
- @Test
- public void testClickSomeLinks() throws Exception {
- try {
- login();
-
- selenium.click("link=Information");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
-
- selenium.click("link=Java System Info");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
-
- selenium.click("link=DB Info");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- } finally {
- logout();
- }
- }
-}
-
-
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ThreadPoolPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ThreadPoolPortletTest.java
deleted file mode 100644
index c91a139..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/ThreadPoolPortletTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Thread pool portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class ThreadPoolPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testThreadPoolLink() throws Exception {
- selenium.click("link=Thread Pools");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Thread Pool Configuration",
- selenium.getText(getPortletTitleLocation()));
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebAccessLogViewerPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebAccessLogViewerPortletTest.java
deleted file mode 100644
index 1bb87dc..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebAccessLogViewerPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Web access log portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class WebAccessLogViewerPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testWebAccessLogViewerLink() throws Exception {
- selenium.click("link=Server Logs");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Web Access Log Viewer",
- selenium.getText(getPortletTitleLocation(3)));
- // Test help link
- selenium.click(getPortletHelpLocation(3));
- waitForPageLoad();
- selenium.isTextPresent("This portlet displays and filters the Jetty log file.");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebManagerPortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebManagerPortletTest.java
deleted file mode 100644
index 76ff2c0..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WebManagerPortletTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Web manager portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class WebManagerPortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testWebManagerLink() throws Exception {
- selenium.click("link=Web Server");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Web Server Manager",
- selenium.getText(getPortletTitleLocation()));
- // Test help link
- selenium.click(getPortletHelpLocation());
- waitForPageLoad();
- selenium.isTextPresent("Geronimo Console will collect statistics on the number of requests received");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java b/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java
deleted file mode 100644
index 3c321e6..0000000
--- a/testsuite/console-testsuite/basic/src/test/java/org/apache/geronimo/testsuite/console/WelcomePortletTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.console;
-
-import org.testng.annotations.Test;
-
-/**
- * Welcome portlet tests
- *
- * @version $Rev$ $Date$
- */
-public class WelcomePortletTest
- extends BasicConsoleTestSupport
-{
- @Test
- public void testWelcomeLink() throws Exception {
- selenium.click("link=Java System Info");
- waitForPageLoad();
- selenium.click("link=Welcome");
- waitForPageLoad();
- assertEquals("Geronimo Console", selenium.getTitle());
- assertEquals("Welcome", selenium.getText(getPortletTitleLocation()));
- // Test help link
- selenium.click(getPortletHelpLocation());
- waitForPageLoad();
- selenium.isTextPresent("This is the help for the Geronimo Administration Console Welcome.");
- }
-}
diff --git a/testsuite/console-testsuite/basic/src/test/resources/testng.xml b/testsuite/console-testsuite/basic/src/test/resources/testng.xml
deleted file mode 100644
index 63f3fd8..0000000
--- a/testsuite/console-testsuite/basic/src/test/resources/testng.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-
-<suite name="Suite1" verbose="1">
- <test name="console-testsuite.basic-console">
- <packages>
- <package name="org.apache.geronimo.testsuite.console"/>
- </packages>
- </test>
-</suite>
-
diff --git a/testsuite/console-testsuite/pom.xml b/testsuite/console-testsuite/pom.xml
deleted file mode 100644
index c7070b1..0000000
--- a/testsuite/console-testsuite/pom.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>testsuite</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>console-testsuite</artifactId>
- <name>Geronimo TestSuite :: Console Testsuite</name>
- <packaging>pom</packaging>
-
- <description>
- Geronimo console testsuite.
- </description>
-
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- <systemProperties>
- <property>
- <name>geronimoVersion</name>
- <value>${project.version}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
- </build>
- </profile>
- </profiles>
-
- <modules>
- <module>basic</module>
- <module>advanced</module>
- </modules>
-
-</project>
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
deleted file mode 100644
index 0128d89..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>corba-helloworld</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>corba-helloworld-client</artifactId>
- <name>Geronimo TestSuite :: CORBA TestSuite :: Hello World Client</name>
- <packaging>jar</packaging>
-
- <description>Example using CORBA to access a stateless EJB</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>corba-helloworld-ejb</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>corba-helloworld-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <description>Geronimo Hello World Enterprise Application CORBA Client JAR</description>
- <displayName>Geronimo Hello World Enterprise Application CORBA Client JAR</displayName>
- <archive>
- <manifest>
- <mainClass>org.apache.geronimo.testsuite.corba.helloworld.HelloWorldEJBClient</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBCallbackHandler.java b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBCallbackHandler.java
deleted file mode 100644
index 01c7114..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBCallbackHandler.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.testsuite.corba.helloworld;
-
-import java.io.IOException;
-
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-
-public class HelloWorldEJBCallbackHandler implements CallbackHandler {
-
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- Callback callback = callbacks[i];
- if (callback instanceof NameCallback) {
- ((NameCallback)callback).setName("system");
- }
- else if (callback instanceof PasswordCallback) {
- ((PasswordCallback)callback).setPassword("manager".toCharArray());
- }
- else {
- throw new UnsupportedCallbackException(callback);
- }
- }
- }
-}
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBClient.java b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBClient.java
deleted file mode 100644
index 8470806..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBClient.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.testsuite.corba.helloworld;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.rmi.PortableRemoteObject;
-
-public class HelloWorldEJBClient {
-
- public void displayGreetings() throws Exception {
- Context ctx = new InitialContext();
- Object o = ctx.lookup("java:comp/env/HelloWorldEJB");
- HelloWorldEJBHome HelloWorldEJBHome = (HelloWorldEJBHome) PortableRemoteObject.narrow(o, HelloWorldEJBHome.class);
- HelloWorldEJBRemote HelloWorldEJBRemote = HelloWorldEJBHome.create();
- String[] greetings = HelloWorldEJBRemote.getGreetings();
- System.out.println(" ");
- for (int i=0; i< greetings.length; i++) {
- System.out.println(" " + greetings[i]);
- }
- System.out.println(" ");
- }
-
- public static void main(String[] args) throws Exception{
- HelloWorldEJBClient HelloWorldEJBClient = new HelloWorldEJBClient();
- HelloWorldEJBClient.displayGreetings();
- }
-
-}
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBHome.java b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBHome.java
deleted file mode 100644
index 20b6da1..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBHome.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.testsuite.corba.helloworld;
-
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-import javax.ejb.EJBHome;
-
-public interface HelloWorldEJBHome extends EJBHome {
-
- HelloWorldEJBRemote create() throws javax.ejb.CreateException, java.rmi.RemoteException;
-
-}
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBRemote.java b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBRemote.java
deleted file mode 100644
index 9176081..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBRemote.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.testsuite.corba.helloworld;
-
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-import javax.ejb.EJBObject;
-
-public interface HelloWorldEJBRemote extends EJBObject {
-
- public String[] getGreetings() throws RemoteException;
-
-}
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/resources/META-INF/application-client.xml b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/resources/META-INF/application-client.xml
deleted file mode 100644
index 122de95..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-client/src/main/resources/META-INF/application-client.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<application-client 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/applicationclient_1_4.xsd"
- version="1.4">
-
- <display-name>Example using CORBA to access a stateless EJB</display-name>
- <ejb-ref>
- <ejb-ref-name>HelloWorldEJB</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>org.apache.geronimo.testsuite.corba.helloworld.HelloWorldEJBHome</home>
- <remote>org.apache.geronimo.testsuite.corba.helloworld.HelloWorldEJBRemote</remote>
- <ejb-link>corba-helloworld-ejb-${version}#HelloWorldEJB</ejb-link>
- </ejb-ref>
-</application-client>
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
deleted file mode 100644
index 2ebd24f..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/pom.xml
+++ /dev/null
@@ -1,217 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>corba-helloworld</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>corba-helloworld-ear</artifactId>
- <name>Geronimo TestSuite :: CORBA TestSuite :: Hello World EAR</name>
- <packaging>ear</packaging>
-
- <description>Example using CORBA to access a stateless EJB</description>
-
- <!--
- FIXME: Split this module up... one to build the ear, one to run the tests.
- -->
-
- <properties>
- <clientLogFile>${basedir}/target/client.log</clientLogFile>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>corba-helloworld-ejb</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>corba-helloworld-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>corba-helloworld-client</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <description>Geronimo Hello World Enterprise Application EAR</description>
- <displayName>Geronimo Hello World Enterprise Application EAR</displayName>
- <version>5</version>
- <modules>
- <webModule>
- <groupId>${pom.groupId}</groupId>
- <artifactId>corba-helloworld-war</artifactId>
- <contextRoot>/corba-helloworld</contextRoot>
- <bundleFileName>corba-helloworld-war-${project.version}.war</bundleFileName>
- </webModule>
- <ejbModule>
- <groupId>${pom.groupId}</groupId>
- <artifactId>corba-helloworld-ejb</artifactId>
- <bundleFileName>corba-helloworld-ejb-${project.version}.jar</bundleFileName>
- </ejbModule>
- <jarModule>
- <groupId>${pom.groupId}</groupId>
- <artifactId>corba-helloworld-client</artifactId>
- <bundleFileName>corba-helloworld-client-${project.version}.jar</bundleFileName>
- </jarModule>
- </modules>
- </configuration>
- </plugin>
-
-
- <!-- "ear" packaging doesn't compile test classes -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <plugins>
- <!-- Deploy the ear and invoke the imbedded CORBA app client -->
- <!-- ======================================================== -->
- <!-- ===================================================================== -->
- <!-- Setup the client log file location for access by the CORBA app client -->
- <!-- ===================================================================== -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>clientLogFile</name>
- <value>${clientLogFile}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <!-- ============================================================================= -->
- <!-- These modules must be running before deploying a CORBA module can be deployed -->
- <!-- ============================================================================= -->
- <execution>
- <id>start-j2ee-corba-yoko</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-module</goal>
- </goals>
- <configuration>
- <moduleId>org.apache.geronimo.configs/j2ee-corba-yoko/${project.version}/car</moduleId>
- </configuration>
- </execution>
- <execution>
- <id>openejb-corba-deployer</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>start-module</goal>
- </goals>
- <configuration>
- <moduleId>org.apache.geronimo.configs/openejb-corba-deployer/${project.version}/car</moduleId>
- </configuration>
- </execution>
-
- <!-- ======================= -->
- <!-- Deploy the CORBA module -->
- <!-- ======================= -->
- <execution>
- <id>deploy-ear</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
- </configuration>
- </execution>
-
- <!-- =========================== -->
- <!-- Invoke the CORBA app client -->
- <!-- =========================== -->
- <execution>
- <phase>pre-integration-test</phase>
- <id>run-client</id>
- <goals>
- <goal>run-client</goal>
- </goals>
- <configuration>
- <moduleId>org.apache.geronimo.testsuite/corba-helloworld-client/${project.version}/car</moduleId>
- <logOutput>true</logOutput>
- <logFile>${clientLogFile}</logFile>
- </configuration>
- </execution>
-
- <!-- ========================= -->
- <!-- Undeploy the CORBA module -->
- <!-- ========================= -->
- <execution>
- <id>undeploy-ear</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/application.xml b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/application.xml
deleted file mode 100644
index c6303e1..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/application.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<application
- 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"
- version="1.4">
-
- <module>
- <ejb>corba-helloworld-ejb-${version}.jar</ejb>
- </module>
-
- <module>
- <web>
- <web-uri>corba-helloworld-war-${version}.war</web-uri>
- <context-root>/HelloWorld</context-root>
- </web>
- </module>
-
- <module>
- <java>corba-helloworld-client-${version}.jar</java>
- </module>
-
-</application>
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/geronimo-application.xml b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
deleted file mode 100644
index 1595744..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- </dep:environment>
-
- <module>
- <ejb>corba-helloworld-ejb-${version}.jar</ejb>
- <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>corba-helloworld-ejb</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- <dep:dependencies>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>j2ee-corba-yoko</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>car</dep:type>
- </dep:dependency>
- </dep:dependencies>
- </dep:environment>
- <enterprise-beans>
- <session>
- <ejb-name>HelloWorldEJB</ejb-name>
- <jndi-name>HelloWorldEJB</jndi-name>
- <tss-link>IdentityTokenNoSecurity</tss-link>
- </session>
- </enterprise-beans>
-
- <gbean name="IdentityTokenNoSecurity" class="org.apache.geronimo.corba.TSSBeanGBean">
- <attribute name="POAName">IdentityTokenNoSecurity</attribute>
- <reference name="Server">
- <name>UnprotectedServer</name>
- </reference>
- <xml-attribute name="tssConfig">
- <tss:tss xmlns:tss="http://www.openejb.org/xml/ns/corba-tss-config-2.0" xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.1">
- <tss:compoundSecMechTypeList>
- <tss:compoundSecMech>
- <tss:sasMech>
- <tss:identityTokenTypes>
- <tss:ITTAnonymous/>
- <tss:ITTPrincipalNameGSSUP principal-class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"/>
- <tss:ITTDistinguishedName/>
- <tss:ITTX509CertChain/>
- </tss:identityTokenTypes>
- </tss:sasMech>
- </tss:compoundSecMech>
- </tss:compoundSecMechTypeList>
- </tss:tss>
- </xml-attribute>
- </gbean>
-
- </openejb-jar>
- </module>
-
- <module>
- <web>corba-helloworld-war-${version}.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"></web-app>
- </module>
-
- <module>
- <java>corba-helloworld-client-${version}.jar</java>
-
- <application-client xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.1"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
-
- <client-environment>
- <dep:moduleId>
- <dep:groupId>org.apache.geronimo.testsuite</dep:groupId>
- <dep:artifactId>corba-helloworld-client</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- <dep:dependencies>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>client-corba-yoko</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>car</dep:type>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>client-transaction-1_6</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>car</dep:type>
- </dep:dependency>
- </dep:dependencies>
- <dep:hidden-classes/>
- <dep:non-overridable-classes/>
- </client-environment>
-
- <server-environment>
- </server-environment>
-
- <ejb-ref>
- <ref-name>HelloWorldEJB</ref-name>
- <ns-corbaloc>corbaloc::localhost:1050/NameService</ns-corbaloc>
- <name>HelloWorldEJB</name>
- <css-link>NoSecurity</css-link>
- </ejb-ref>
-
- <gbean name="NoSecurity" class="org.apache.geronimo.corba.CSSBeanGBean">
- <reference name="TransactionManager">
- <name>TransactionManager</name>
- </reference>
- <reference name="ConfigAdapter">
- <name>ORBConfigAdapter</name>
- </reference>
- <reference name="SSLConfig">
- <name>CORBASSLConfig</name>
- </reference>
- <attribute name="description">NoSecurity</attribute>
- <xml-attribute name="cssConfig">
- <css:css xmlns:css="http://www.openejb.org/xml/ns/corba-css-config-2.0">
- <css:compoundSecMechTypeList>
- <css:compoundSecMech>
- <css:SSL>
- <css:supports>Integrity Confidentiality EstablishTrustInTarget EstablishTrustInClient</css:supports>
- <css:requires></css:requires>
- </css:SSL>
- </css:compoundSecMech>
- </css:compoundSecMechTypeList>
- </css:css>
- </xml-attribute>
- </gbean>
- </application-client>
- </module>
-
-</application>
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/test/java/org/apache/geronimo/testsuite/corba/helloworld/ClientCORBATest.java b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/test/java/org/apache/geronimo/testsuite/corba/helloworld/ClientCORBATest.java
deleted file mode 100644
index 52309c3..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ear/src/test/java/org/apache/geronimo/testsuite/corba/helloworld/ClientCORBATest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.testsuite.corba.helloworld;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.FileInputStream;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-
-public class ClientCORBATest extends TestSupport {
-
- @Test
- public void testClient() throws Exception {
- String clientLogFile = System.getProperty("clientLogFile");
- assertNotNull(clientLogFile);
- FileInputStream in = null;
-
- try {
- in = new FileInputStream(clientLogFile);
- BufferedReader reader = new BufferedReader(new InputStreamReader(in));
-
- String inputLine;
- boolean found = false;
-
- while ((inputLine = reader.readLine()) != null) {
- System.out.println(inputLine);
-
- if (found == false &&
- inputLine.indexOf("Hello World from Geronimo via CORBA !!") != -1) {
- found = true;
- }
- }
- in.close();
-
- assertTrue(found);
- }
- finally {
- if (in != null) {
- in.close();
- }
- }
- }
-
-}
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
deleted file mode 100644
index 0945378..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>corba-helloworld</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>corba-helloworld-ejb</artifactId>
- <name>Geronimo TestSuite :: CORBA TestSuite :: Hello World EJB</name>
- <packaging>ejb</packaging>
-
- <description>Geronimo Hello World Enterprise Stateless EJB</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBHome.java b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBHome.java
deleted file mode 100644
index 68593c8..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBHome.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.testsuite.corba.helloworld;
-
-import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-
-public interface HelloWorldEJBHome extends EJBHome {
-
- HelloWorldEJBRemote create() throws javax.ejb.CreateException, java.rmi.RemoteException;
-
-}
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBLocal.java b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBLocal.java
deleted file mode 100644
index 7cd012e..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBLocal.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.testsuite.corba.helloworld;
-
-import javax.ejb.EJBLocalObject;
-import java.util.ArrayList;
-
-public interface HelloWorldEJBLocal extends EJBLocalObject {
-
- public String [] getGreetings();
-
-}
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBLocalHome.java b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBLocalHome.java
deleted file mode 100644
index 640d615..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBLocalHome.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.testsuite.corba.helloworld;
-
-import javax.ejb.EJBLocalHome;
-import javax.ejb.CreateException;
-
-public interface HelloWorldEJBLocalHome extends EJBLocalHome {
-
- public HelloWorldEJBLocal create() throws CreateException;
-
-}
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBRemote.java b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBRemote.java
deleted file mode 100644
index 9176081..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBRemote.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.testsuite.corba.helloworld;
-
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-import javax.ejb.EJBObject;
-
-public interface HelloWorldEJBRemote extends EJBObject {
-
- public String[] getGreetings() throws RemoteException;
-
-}
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBSessionBean.java b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBSessionBean.java
deleted file mode 100644
index dbf315f..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/HelloWorldEJBSessionBean.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.testsuite.corba.helloworld;
-
-import javax.ejb.SessionContext;
-import javax.ejb.SessionBean;
-
-import java.util.ArrayList;
-
-
-public class HelloWorldEJBSessionBean implements SessionBean {
-
- private SessionContext ctx;
-
- public void setSessionContext(SessionContext ctx) {
- this.ctx = ctx;
- }
-
- public void ejbCreate() {
- }
-
- public void ejbActivate() {
- }
-
- public void ejbPassivate() {
- }
-
- public void ejbRemove() {
- }
-
- public String [] getGreetings() {
-
- String [] greetings = new String[5];
- greetings[0] = "##############################################";
- greetings[1] = "## ##";
- greetings[2] = "## Hello World from Geronimo via CORBA !! ##";
- greetings[3] = "## ##";
- greetings[4] = "##############################################";
-
- return greetings;
- }
-
-}
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/resources/META-INF/ejb-jar.xml b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/resources/META-INF/ejb-jar.xml
deleted file mode 100644
index 6187978..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-ejb/src/main/resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<ejb-jar 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"
- version="2.1">
-
- <display-name>Geronimo CORBA Hello World Interfaces</display-name>
-
- <enterprise-beans>
- <session id="HelloWorldEJB">
- <ejb-name>HelloWorldEJB</ejb-name>
- <home>org.apache.geronimo.testsuite.corba.helloworld.HelloWorldEJBHome</home>
- <remote>org.apache.geronimo.testsuite.corba.helloworld.HelloWorldEJBRemote</remote>
- <local-home>org.apache.geronimo.testsuite.corba.helloworld.HelloWorldEJBLocalHome</local-home>
- <local>org.apache.geronimo.testsuite.corba.helloworld.HelloWorldEJBLocal</local>
- <ejb-class>org.apache.geronimo.testsuite.corba.helloworld.HelloWorldEJBSessionBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
deleted file mode 100644
index 5a450db..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>corba-helloworld</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>corba-helloworld-war</artifactId>
- <name>Geronimo TestSuite :: CORBA TestSuite :: Hello World WAR</name>
- <packaging>war</packaging>
-
- <description>Geronimo Hello World Enterprise Web Application</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>corba-helloworld-ejb</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/ServletController.java b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/ServletController.java
deleted file mode 100644
index b91b3ba..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/src/main/java/org/apache/geronimo/testsuite/corba/helloworld/ServletController.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.testsuite.corba.helloworld;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.servlet.*;
-import javax.servlet.http.*;
-import java.util.*;
-import java.io.IOException;
-
-public class ServletController extends HttpServlet {
-
- protected static final String HOME_PAGE = "/greeting.jsp";
-
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
- HttpSession session = request.getSession(true);
- ServletContext context = getServletContext();
- HelloWorldEJBLocal ejbLocal = null;
-
- try {
- Context ic = new InitialContext();
- Object o = ic.lookup("java:comp/env/HelloWorldEJB");
- HelloWorldEJBLocalHome ejbLocalHome = (HelloWorldEJBLocalHome) o;
- ejbLocal = ejbLocalHome.create();
- }
- catch (Exception ex) {
- ex.printStackTrace();
- }
-
- String [] greetings = (String []) ejbLocal.getGreetings();
- session.setAttribute("greetings", greetings);
- context.getRequestDispatcher(HOME_PAGE).forward(request, response);
- }
-
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- doGet(request, response);
- }
-
-}
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/src/main/webapp/WEB-INF/web.xml b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 5409cb4..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<web-app 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"
- version="2.4">
-
- <description>Geronimo Hello World Web Application</description>
-
- <display-name>Geronimo Hello World Web Application</display-name>
-
- <servlet>
- <servlet-name>Show greetings</servlet-name>
- <servlet-class>org.apache.geronimo.testsuite.corba.helloworld.ServletController</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Show greetings</servlet-name>
- <url-pattern>/greet</url-pattern>
- </servlet-mapping>
-
- <ejb-local-ref>
- <ejb-ref-name>HelloWorldEJB</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>org.apache.geronimo.testsuite.corba.helloworld.HelloWorldEJBLocalHome</local-home>
- <local>org.apache.geronimo.testsuite.corba.helloworld.HelloWorldEJBLocal</local>
- </ejb-local-ref>
-
-</web-app>
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/src/main/webapp/greeting.css b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/src/main/webapp/greeting.css
deleted file mode 100644
index 46905e5..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/src/main/webapp/greeting.css
+++ /dev/null
@@ -1,40 +0,0 @@
-/*======================================================================
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-======================================================================*/
-td {
- font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
- font-size : 30;
- color : red;
- text-align: left;
- background-color: black;
-}
-
-li {
- font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
- font-size : 24;
- color : red;
- text-align: left;
- background-color: white;
-}
-
-.mainHead {
- font-family : Verdana, Geneva, Arial, Helvetica, sans-serif;
- font-size : 36;
- font-weight : bold;
- color : black;
- text-align: center;
- background-color: red;
-}
diff --git a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/src/main/webapp/greeting.jsp b/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/src/main/webapp/greeting.jsp
deleted file mode 100644
index dc6ae56..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/corba-helloworld-war/src/main/webapp/greeting.jsp
+++ /dev/null
@@ -1,43 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-
-
-<%@ page session="true" %>
-
-<html>
-<head>
- <title>Geronimo Hello World Enterprise Application</title>
- <c:url value="/greeting.css" var="stylesheet"/>
- <link rel="stylesheet" type="text/css" href="${stylesheet}">
-</head>
- <body>
- <table width="600">
- <tr>
- <td class="mainHead" colspan="6">Geronimo Hello World Enterprise Application</td>
- </tr>
- </table>
-
- <ol>
- <c:forEach var="greeting" items="${greetings}">
- <li width="500" align="left">${greeting}</li>
- </c:forEach>
- </ol>
-
- </body>
-</html>
diff --git a/testsuite/corba-testsuite/corba-helloworld/pom.xml b/testsuite/corba-testsuite/corba-helloworld/pom.xml
deleted file mode 100644
index fbdb881..0000000
--- a/testsuite/corba-testsuite/corba-helloworld/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>corba-testsuite</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>corba-helloworld</artifactId>
- <name>Geronimo TestSuite :: CORBA TestSuite :: Hello World</name>
- <packaging>pom</packaging>
- <description>Geronimo JEE5 CORBA Hello World Tests</description>
-
- <modules>
- <module>corba-helloworld-ejb</module>
- <module>corba-helloworld-war</module>
- <module>corba-helloworld-client</module>
- <module>corba-helloworld-ear</module>
- </modules>
-
-</project>
diff --git a/testsuite/corba-testsuite/pom.xml b/testsuite/corba-testsuite/pom.xml
index c59a622..5fcdc8b 100644
--- a/testsuite/corba-testsuite/pom.xml
+++ b/testsuite/corba-testsuite/pom.xml
@@ -39,11 +39,7 @@
</description>
<modules>
-<!--
- <module>corba-helloworld</module>
--->
<module>corba-marshal</module>
<module>corba-mytime</module>
</modules>
-
</project>
diff --git a/testsuite/deployment-testsuite/pom.xml b/testsuite/deployment-testsuite/pom.xml
index 68160c0..8c33f94 100644
--- a/testsuite/deployment-testsuite/pom.xml
+++ b/testsuite/deployment-testsuite/pom.xml
@@ -44,4 +44,16 @@
<module>manifestcp-tests</module>
</modules>
+ <profiles>
+ <profile>
+ <id>all-subprojects</id>
+ <!-- use for things like versions:set and perhaps release when build has to run on all projects -->
+ <modules>
+ <module>deployment-tests</module>
+ <module>jca-cms-tests</module>
+ <module>manifestcp-tests</module>
+ </modules>
+ </profile>
+ </profiles>
+
</project>
diff --git a/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml b/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
deleted file mode 100644
index a471dc5..0000000
--- a/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/pom.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 589258 $ $Date: 2007-10-27 21:41:57 -0400 (Sat, 27 Oct 2007) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>ejb-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>ejb-ear</artifactId>
- <name>Geronimo TestSuite :: Enterprise Testsuite :: EJB Tests EAR</name>
- <packaging>ear</packaging>
-
- <!--
- FIXME: Split this module up... one to build the ear, one to run the tests.
- -->
-
- <description>
- Geronimo test EAR for EJB Tests
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>ejb-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>ejb-ejb</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openejb</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <displayName>Geronimo EAR for EJB Tests</displayName>
- <description>Geronimo EAR for EJB Tests</description>
- <version>5</version>
- <modules>
- <ejbModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>ejb-ejb</artifactId>
- <bundleFileName>ejb-ejb-${project.version}.jar</bundleFileName>
- </ejbModule>
-
- <webModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>ejb-war</artifactId>
- <contextRoot>/ejbtests</contextRoot>
- <bundleFileName>ejb-war-${project.version}.war</bundleFileName>
- </webModule>
- </modules>
- </configuration>
- </plugin>
-
- <!-- "ear" packaging doesn't process test resources -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- "ear" packaging doesn't process test resources -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testResources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ears</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
- </configuration>
- </execution>
- <execution>
- <id>undeploy-ear-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
-
diff --git a/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/src/main/filtered-resources/META-INF/geronimo-application.xml b/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
deleted file mode 100644
index e3b2dd0..0000000
--- a/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 588764 $ $Date: 2007-10-26 16:06:00 -0400 (Fri, 26 Oct 2007) $ -->
-
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}</artifactId>
- <version>${version}</version>
- <type>ear</type>
- </moduleId>
- </environment>
-
-</application>
diff --git a/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/ejb/EJBTest.java b/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/ejb/EJBTest.java
deleted file mode 100644
index 56abb41..0000000
--- a/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/ejb/EJBTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.enterprise.ejb;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Properties;
-
-import javax.naming.InitialContext;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-
-import org.apache.geronimo.test.hello.ejb.HelloRemote;
-
-public class EJBTest extends TestSupport {
-
- private String baseURL = "http://localhost:8080/ejbtests";
-
- @Test
- public void testClientInvocation() throws Exception {
- Properties p = new Properties();
-
- p.put("java.naming.factory.initial",
- "org.apache.openejb.client.RemoteInitialContextFactory");
- p.put("java.naming.provider.url",
- "127.0.0.1:4201");
-
- InitialContext ctx = new InitialContext(p);
-
- HelloRemote bean = (HelloRemote)ctx.lookup("/HelloBeanRemote");
-
- String response = bean.sayHi("foo bar");
-
- System.out.println(response);
-
- assertEquals("Hello foo bar", response);
-
- bean.testTimerService();
- }
-
- @Test
- public void testInvocation1() throws Exception {
- testInvocation("/servlet1", "Hello foo");
- }
-
- @Test
- public void testInvocation2() throws Exception {
- testInvocation("/servlet2", "Hello bar");
- }
-
- private void testInvocation(String servlet, String expectedOutput) throws Exception {
- URL url = new URL(baseURL + servlet);
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = call(conn);
-
- assertEquals("responseCode", 200, conn.getResponseCode());
-
- assertTrue("expected message", reply.indexOf(expectedOutput) != -1);
-
- } finally {
- conn.disconnect();
- }
- }
-
- private String call(HttpURLConnection conn) throws IOException {
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- conn.setUseCaches(false);
-
- InputStream is = null;
-
- try {
- is = conn.getInputStream();
- } catch (IOException e) {
- is = conn.getErrorStream();
- }
-
- StringBuffer buf = new StringBuffer();
- BufferedReader in = new BufferedReader(new InputStreamReader(is));
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
- buf.append(inputLine);
- }
- in.close();
-
- return buf.toString();
- }
-
-
-}
diff --git a/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/src/test/resources/testng.xml b/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/src/test/resources/testng.xml
deleted file mode 100644
index fc40169..0000000
--- a/testsuite/enterprise-testsuite/ejb-tests/ejb-ear/src/test/resources/testng.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 514087 $ $Date: 2007-03-03 01:13:40 -0500 (Sat, 03 Mar 2007) $ -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-
-<suite name="Suite1" verbose="1">
- <test name="enterprise-testsuite.ejbtests">
- <packages>
- <package name="org.apache.geronimo.testsuite.enterprise.ejb"/>
- </packages>
- </test>
-</suite>
diff --git a/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml b/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml
deleted file mode 100644
index 5ff1fb7..0000000
--- a/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 589258 $ $Date: 2007-10-27 21:41:57 -0400 (Sat, 27 Oct 2007) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>ejb-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>ejb-ejb</artifactId>
- <name>Geronimo TestSuite :: Enterprise Testsuite :: EJB Tests EJB</name>
-
- <description>
- Geronimo test JAR for EJB Tests
- </description>
-
-</project>
-
diff --git a/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/src/main/java/org/apache/geronimo/test/hello/ejb/HelloBean.java b/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/src/main/java/org/apache/geronimo/test/hello/ejb/HelloBean.java
deleted file mode 100644
index 06a2db6..0000000
--- a/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/src/main/java/org/apache/geronimo/test/hello/ejb/HelloBean.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test.hello.ejb;
-
-import javax.annotation.Resource;
-import javax.ejb.Stateless;
-import javax.ejb.Timer;
-import javax.ejb.TimedObject;
-import javax.ejb.TimerService;
-
-@Stateless
-public class HelloBean implements HelloLocal, HelloRemote, TimedObject {
-
- @Resource TimerService ts;
-
- public String sayHi(String name) {
- return "Hello " + name;
- }
-
- public void testTimerService() {
- ts.getTimers();
- }
-
- public void ejbTimeout(Timer timer) {
- }
-}
diff --git a/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/src/main/java/org/apache/geronimo/test/hello/ejb/HelloLocal.java b/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/src/main/java/org/apache/geronimo/test/hello/ejb/HelloLocal.java
deleted file mode 100644
index a859f1d..0000000
--- a/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/src/main/java/org/apache/geronimo/test/hello/ejb/HelloLocal.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test.hello.ejb;
-
-import javax.ejb.Local;
-
-@Local
-public interface HelloLocal {
-
- public String sayHi(String name);
-
-}
-
-
diff --git a/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/src/main/java/org/apache/geronimo/test/hello/ejb/HelloRemote.java b/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/src/main/java/org/apache/geronimo/test/hello/ejb/HelloRemote.java
deleted file mode 100644
index 06ff47a..0000000
--- a/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/src/main/java/org/apache/geronimo/test/hello/ejb/HelloRemote.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test.hello.ejb;
-
-import javax.ejb.Remote;
-
-@Remote
-public interface HelloRemote {
-
- public String sayHi(String name);
-
- public void testTimerService();
-
-}
-
-
diff --git a/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/src/main/resources/META-INF/openejb-jar.xml b/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/src/main/resources/META-INF/openejb-jar.xml
deleted file mode 100644
index d47a651..0000000
--- a/testsuite/enterprise-testsuite/ejb-tests/ejb-ejb/src/main/resources/META-INF/openejb-jar.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements. See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership. The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License. You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, either express or implied. See the License for the
-specific language governing permissions and limitations
-under the License.
--->
-<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>jar</dep:type>
- </dep:moduleId>
- </dep:environment>
-</openejb-jar>
diff --git a/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml b/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
deleted file mode 100644
index 04ce65f..0000000
--- a/testsuite/enterprise-testsuite/ejb-tests/ejb-war/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 589258 $ $Date: 2007-10-27 21:41:57 -0400 (Sat, 27 Oct 2007) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>ejb-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>ejb-war</artifactId>
- <name>Geronimo TestSuite :: Enterprise Testsuite :: EJB Tests WAR</name>
- <packaging>war</packaging>
-
- <description>
- Geronimo test WAR for EJB Tests
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>ejb-ejb</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/testsuite/enterprise-testsuite/ejb-tests/ejb-war/src/main/java/org/apache/geronimo/test/hello/web/Servlet1.java b/testsuite/enterprise-testsuite/ejb-tests/ejb-war/src/main/java/org/apache/geronimo/test/hello/web/Servlet1.java
deleted file mode 100644
index 1cb7450..0000000
--- a/testsuite/enterprise-testsuite/ejb-tests/ejb-war/src/main/java/org/apache/geronimo/test/hello/web/Servlet1.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test.hello.web;
-
-import java.io.IOException;
-
-import javax.ejb.EJB;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.geronimo.test.hello.ejb.HelloLocal;
-
-public class Servlet1 extends HttpServlet {
-
- @EJB
- private HelloLocal bm = null;
-
- protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
- String msg = bm.sayHi("foo");
- res.getWriter().println(msg);
- }
-
- protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
- doGet(req,res);
- }
-
-}
diff --git a/testsuite/enterprise-testsuite/ejb-tests/ejb-war/src/main/java/org/apache/geronimo/test/hello/web/Servlet2.java b/testsuite/enterprise-testsuite/ejb-tests/ejb-war/src/main/java/org/apache/geronimo/test/hello/web/Servlet2.java
deleted file mode 100644
index dd96c53..0000000
--- a/testsuite/enterprise-testsuite/ejb-tests/ejb-war/src/main/java/org/apache/geronimo/test/hello/web/Servlet2.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test.hello.web;
-
-import java.io.IOException;
-
-import javax.ejb.EJB;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.geronimo.test.hello.ejb.HelloLocal;
-
-public class Servlet2 extends HttpServlet {
-
- @EJB
- private HelloLocal bm = null;
-
- protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
- String msg = bm.sayHi("bar");
- res.getWriter().println(msg);
- }
-
- protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
- doGet(req,res);
- }
-
-}
diff --git a/testsuite/enterprise-testsuite/ejb-tests/ejb-war/src/main/webapp/WEB-INF/web.xml b/testsuite/enterprise-testsuite/ejb-tests/ejb-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index ea5323a..0000000
--- a/testsuite/enterprise-testsuite/ejb-tests/ejb-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<web-app 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_5.xsd"
- version="2.5">
-
- <servlet>
- <display-name>Servlet1</display-name>
- <servlet-name>Servlet1</servlet-name>
- <servlet-class>org.apache.geronimo.test.hello.web.Servlet1</servlet-class>
- </servlet>
-
- <servlet>
- <display-name>Servlet2</display-name>
- <servlet-name>Servlet2</servlet-name>
- <servlet-class>org.apache.geronimo.test.hello.web.Servlet2</servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Servlet1</servlet-name>
- <url-pattern>/servlet1</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>Servlet2</servlet-name>
- <url-pattern>/servlet2</url-pattern>
- </servlet-mapping>
-</web-app>
diff --git a/testsuite/enterprise-testsuite/ejb-tests/pom.xml b/testsuite/enterprise-testsuite/ejb-tests/pom.xml
deleted file mode 100644
index f15b128..0000000
--- a/testsuite/enterprise-testsuite/ejb-tests/pom.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>enterprise-testsuite</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>ejb-tests</artifactId>
- <packaging>pom</packaging>
-
- <name>Geronimo TestSuite :: Enterprise Testsuite :: EJB Tests</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <modules>
- <module>ejb-ejb</module>
- <module>ejb-war</module>
- <module>ejb-ear</module>
- </modules>
-
-</project>
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml b/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
deleted file mode 100644
index 6135807..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ear/pom.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jms-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jms-ear</artifactId>
- <name>Geronimo TestSuite :: Enterprise Testsuite :: JMS EAR</name>
- <packaging>ear</packaging>
-
- <!--
- FIXME: Split this module up... one to build the ear, one to run the tests.
- -->
-
- <description>
- Geronimo test EAR for JMS.
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jms-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jms-ejb</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openejb</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <displayName>Geronimo Test EAR for JMS</displayName>
- <description>Test EAR for JMS testing</description>
- <version>1.4</version>
- <modules>
- <webModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jms-war</artifactId>
- <contextRoot>/testjms</contextRoot>
- <bundleFileName>web.war</bundleFileName>
- </webModule>
- <ejbModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jms-ejb</artifactId>
- <bundleFileName>ejb.jar</bundleFileName>
- </ejbModule>
- </modules>
- </configuration>
- </plugin>
-
- <!-- "ear" packaging doesn't compile test classes -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- "ear" packaging doesn't process test resources -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testResources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ears</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
- </configuration>
- </execution>
- <execution>
- <id>undeploy-ear-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml b/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
deleted file mode 100644
index 88a1f2b..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
-
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>ear</dep:type>
- </dep:moduleId>
- <dep:dependencies>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>activemq-broker</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>car</dep:type>
- </dep:dependency>
- </dep:dependencies>
- </dep:environment>
- <module>
- <web>web.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
- <context-root>/testjms</context-root>
- </web-app>
- </module>
- <module>
- <ejb>ejb.jar</ejb>
- <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1" xmlns:pkgen="http://www.openejb.org/xml/ns/pkgen-2.0"
- xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2" xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <enterprise-beans>
-
- <message-driven>
- <ejb-name>SimpleMessageReceiver</ejb-name>
- <resource-adapter>
- <nam:resource-link>MessageReceiversMDB</nam:resource-link>
- </resource-adapter>
- </message-driven>
-
- </enterprise-beans>
-
- </openejb-jar>
- </module>
- <ext-module>
- <connector>TestJMS</connector>
- <external-path xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:groupId>org.apache.geronimo.modules</dep:groupId>
- <dep:artifactId>geronimo-activemq-ra</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>rar</dep:type>
- </external-path>
- <connector xmlns="http://geronimo.apache.org/xml/ns/j2ee/connector-1.1">
- <resourceadapter>
- <resourceadapter-instance>
- <resourceadapter-name>MessageReceiversMDB</resourceadapter-name>
- <config-property-setting name="UseInboundSession">true</config-property-setting>
- <config-property-setting name="ServerUrl">vm://localhost?async=true</config-property-setting>
- <nam:workmanager xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
- <nam:gbean-link>DefaultWorkManager</nam:gbean-link>
- </nam:workmanager>
- </resourceadapter-instance>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>MRConnectionFactory</name>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>20</max-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <select-one-assume-match/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
- <resourceadapter>
- <resourceadapter-instance>
- <resourceadapter-name>MessageSender</resourceadapter-name>
- <config-property-setting name="ServerUrl">vm://localhost?async=true</config-property-setting>
- <nam:workmanager xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2">
- <nam:gbean-link>DefaultWorkManager</nam:gbean-link>
- </nam:workmanager>
- </resourceadapter-instance>
- <outbound-resourceadapter>
- <connection-definition>
- <connectionfactory-interface>javax.jms.ConnectionFactory</connectionfactory-interface>
- <connectiondefinition-instance>
- <name>MSConnectionFactory</name>
- <connectionmanager>
- <xa-transaction>
- <transaction-caching/>
- </xa-transaction>
- <single-pool>
- <max-size>20</max-size>
- <blocking-timeout-milliseconds>5000</blocking-timeout-milliseconds>
- <select-one-assume-match/>
- </single-pool>
- </connectionmanager>
- </connectiondefinition-instance>
- </connection-definition>
- </outbound-resourceadapter>
- </resourceadapter>
- <adminobject>
- <adminobject-interface>javax.jms.Topic</adminobject-interface>
- <adminobject-class>org.activemq.message.ActiveMQTopic</adminobject-class>
- <adminobject-instance>
- <message-destination-name>TestTopic</message-destination-name>
- <config-property-setting name="PhysicalName">TestTopic</config-property-setting>
- </adminobject-instance>
- <adminobject-instance>
- <message-destination-name>TxTopic</message-destination-name>
- <config-property-setting name="PhysicalName">TxTopic</config-property-setting>
- </adminobject-instance>
- </adminobject>
- <adminobject>
- <adminobject-interface>javax.jms.Queue</adminobject-interface>
- <adminobject-class>org.activemq.message.ActiveMQQueue</adminobject-class>
- <adminobject-instance>
- <message-destination-name>TestQueue</message-destination-name>
- <config-property-setting name="PhysicalName">TestQueue</config-property-setting>
- </adminobject-instance>
- <adminobject-instance>
- <message-destination-name>MRRequests</message-destination-name>
- <config-property-setting name="PhysicalName">MRRequests</config-property-setting>
- </adminobject-instance>
- <adminobject-instance>
- <message-destination-name>MRResponses</message-destination-name>
- <config-property-setting name="PhysicalName">MRResponses</config-property-setting>
- </adminobject-instance>
- <adminobject-instance>
- <message-destination-name>TxQueue</message-destination-name>
- <config-property-setting name="PhysicalName">TxQueue</config-property-setting>
- </adminobject-instance>
- </adminobject>
- </connector>
- </ext-module>
-</application>
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.java b/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.java
deleted file mode 100644
index ae08dbf..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/JMSTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.enterprise.jms;
-
-import org.apache.geronimo.testsupport.SeleniumTestSupport;
-
-import org.testng.annotations.Test;
-
-/**
- * ???
- *
- * @version $Rev$ $Date$
- */
-@Test
-public class JMSTest
-extends SeleniumTestSupport {
- @Test
- public void testIndexContent() throws Exception {
- selenium.open("/testjms/JMSQueueSender");
- waitForPageLoad();
- assertEquals("JMS Sender", selenium.getTitle());
- assertEquals("Sent JMS Queue Message", selenium.getText("xpath=/html/body"));
-
- selenium.open("/testjms/JMSQueueReceiver");
- waitForPageLoad();
- assertEquals("JMS Receiver", selenium.getTitle());
- assertEquals("Received JMS Queue Message", selenium.getText("xpath=/html/body"));
-
- selenium.open("/testjms/JMSTopicSenderReceiver");
- waitForPageLoad();
- assertEquals("JMS Topic Sender Receiver", selenium.getTitle());
- assertEquals("Received JMS Topic Message", selenium.getText("xpath=/html/body"));
-
- }
-}
-
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/MessageSenderTest.java b/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/MessageSenderTest.java
deleted file mode 100644
index ea43d00..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/MessageSenderTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.testsuite.enterprise.jms;
-
-import javax.naming.InitialContext;
-
-import org.apache.geronimo.jms.test.sb.JmsSenderRemote;
-import org.testng.annotations.Test;
-
-/**
- * @author <a href="mailto:tomasz[et]mazan[dot]pl">Tomasz Mazan</a>
- */
-@Test
-public class MessageSenderTest {
-
- /**
- * Initialize test configuration
- *
- * @throws Exception if exception occurs
- */
- public void setUp() throws Exception {
- }
-
- /**
- * Creates customer instance
- *
- * @throws Exception if exception occurs
- */
- @Test
- public void sendRequests() throws Exception {
- InitialContext ctx = new InitialContext();
- String totalShipStr = System.getProperty("total-shipment");
- String msgsPerShipStr = System.getProperty("requests-per-shipment");
-
- int totalShip = (totalShipStr == null ? 10 : Integer.parseInt(totalShipStr));
- int msgsPerShip = (msgsPerShipStr == null ? 20 : Integer.parseInt(msgsPerShipStr));
-
- JmsSenderRemote jmsSender = (JmsSenderRemote) ctx.lookup("JmsSenderRemote");
- if (jmsSender != null) {
- System.out.println("JmsSender initialized");
- for (int i = 0; i < totalShip; ++i) {
- String messageName = (i + 1) + ".Request";
-
- System.out.format("Sending (%1$s) request(s) with name %2$s%n", msgsPerShip, messageName);
- jmsSender.sendMessage(messageName, 0, msgsPerShip);
- System.out.println("Requests sent");
- }
- //enable is receiveMessage is modified to detect messages on request queue
-/*
- Thread.sleep(10000);
- Integer id = jmsSender.receiveMessage();
- if (id != null) {
- throw new Exception("received request message: " + id);
- }
-*/
- //uncomment to actually run test
- for (int i = 0; i < totalShip * msgsPerShip; i++) {
- Integer id = jmsSender.receiveMessage();
- if (id == null) {
- throw new Exception("did not receive message: " + i);
-// System.out.println("Did not receive message: " + i);
-// Thread.sleep(10000);
- }
- }
- } else {
- throw new Exception("Sender is null");
- }
- }
-
-}
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/RollbackTest.java b/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/RollbackTest.java
deleted file mode 100644
index 9d32f4d..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/java/org/apache/geronimo/testsuite/enterprise/jms/RollbackTest.java
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.testsuite.enterprise.jms;
-
-import javax.naming.InitialContext;
-
-import org.apache.geronimo.jms.test.bmt.JmsBmtRemote;
-import org.testng.annotations.Test;
-
-/**
- * @author <a href="mailto:tomasz[et]mazan[dot]pl">Tomasz Mazan</a>
- */
-@Test
-public class RollbackTest {
-
- /**
- * Initialize test configuration
- *
- * @throws Exception if exception occurs
- */
- public void setUp() throws Exception {
- }
-
- /**
- * Creates customer instance
- *
- * @throws Exception if exception occurs
- */
-// @Test
- public void XXtestRollbackQUeueAndTopic() throws Exception {
- InitialContext ctx = new InitialContext();
- String totalShipStr = System.getProperty("total-shipment");
- String msgsPerShipStr = System.getProperty("requests-per-shipment");
-
- int totalShip = (totalShipStr == null ? 10 : Integer.parseInt(totalShipStr));
- int msgsPerShip = (msgsPerShipStr == null ? 20 : Integer.parseInt(msgsPerShipStr));
-
- JmsBmtRemote jmsSender = (JmsBmtRemote) ctx.lookup("JmsBmtRemote");
- boolean pass = true;
- if (jmsSender != null) {
- System.out.println("JmsBmtRemote initialized");
- for (int i = 0; i < totalShip; ++i) {
- String messageName = (i + 1) + ".Request";
-
- System.out.format("Sending (%1$s) request(s) with name %2$s%n", msgsPerShip, messageName);
- String result = jmsSender.sendMessageQueue(messageName, 0, msgsPerShip);
- System.out.println("QUeue equests sent, result: " + result);
- if ("FAIL".equals(result)) pass = false;
- result = jmsSender.sendMessageTopic(messageName, 0, msgsPerShip);
- System.out.println("Topic requests sent, result: " + result);
- if ("FAIL".equals(result)) pass = false;
- }
- if (!pass) {
- throw new Exception("Failed, see out and logs");
- }
- } else {
- throw new Exception("Sender is null");
- }
- }
-
- /**
- * Creates customer instance
- *
- * @throws Exception if exception occurs
- */
- @Test
- public void testRollbackQueue() throws Exception {
- InitialContext ctx = new InitialContext();
- String totalShipStr = System.getProperty("total-shipment");
- String msgsPerShipStr = System.getProperty("requests-per-shipment");
-
- int totalShip = (totalShipStr == null ? 10 : Integer.parseInt(totalShipStr));
- int msgsPerShip = (msgsPerShipStr == null ? 20 : Integer.parseInt(msgsPerShipStr));
-
- JmsBmtRemote jmsSender = (JmsBmtRemote) ctx.lookup("JmsBmtRemote");
- boolean pass = true;
- if (jmsSender != null) {
- System.out.println("JmsBmtRemote initialized");
- for (int i = 0; i < totalShip; ++i) {
- String messageName = (i + 1) + ".Request";
-
- System.out.format("Sending (%1$s) request(s) with name %2$s%n", msgsPerShip, messageName);
- String result = jmsSender.sendMessageQueue(messageName, 0, msgsPerShip);
- System.out.println("QUeue equests sent, result: " + result);
- if ("FAIL".equals(result)) pass = false;
- }
- if (!pass) {
- throw new Exception("Failed, see out and logs");
- }
- } else {
- throw new Exception("Sender is null");
- }
- }
-
- /**
- * Creates customer instance
- *
- * @throws Exception if exception occurs
- */
- @Test
- public void testRollbackTopic() throws Exception {
- InitialContext ctx = new InitialContext();
- String totalShipStr = System.getProperty("total-shipment");
- String msgsPerShipStr = System.getProperty("requests-per-shipment");
-
- int totalShip = (totalShipStr == null ? 10 : Integer.parseInt(totalShipStr));
- int msgsPerShip = (msgsPerShipStr == null ? 20 : Integer.parseInt(msgsPerShipStr));
-
- JmsBmtRemote jmsSender = (JmsBmtRemote) ctx.lookup("JmsBmtRemote");
- boolean pass = true;
- if (jmsSender != null) {
- System.out.println("JmsBmtRemote initialized");
- for (int i = 0; i < totalShip; ++i) {
- String messageName = (i + 1) + ".Request";
-
- System.out.format("Sending (%1$s) request(s) with name %2$s%n", msgsPerShip, messageName);
- String result = jmsSender.sendMessageTopic(messageName, 0, msgsPerShip);
- System.out.println("Topic requests sent, result: " + result);
- if ("FAIL".equals(result)) pass = false;
- }
- if (!pass) {
- throw new Exception("Failed, see out and logs");
- }
- } else {
- throw new Exception("Sender is null");
- }
- }
-
-}
\ No newline at end of file
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/resources/jndi.properties b/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/resources/jndi.properties
deleted file mode 100644
index fa12f3a..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/resources/jndi.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-java.naming.factory.initial=org.apache.openejb.client.RemoteInitialContextFactory
-java.naming.provider.url=ejbd://localhost:4201
\ No newline at end of file
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/resources/testng.xml b/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/resources/testng.xml
deleted file mode 100644
index fe4d895..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ear/src/test/resources/testng.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-
-<suite name="Suite1" verbose="1">
- <test name="enterprise-testsuite.jms">
- <packages>
- <package name="org.apache.geronimo.testsuite.enterprise.jms"/>
- </packages>
- <!-- reverse what is commented out to just run the GERONIMO-4784 failing test -->
- <!--<classes>-->
- <!--<class name="org.apache.geronimo.testsuite.enterprise.jms.RollbackTest"/>-->
- <!--</classes>-->
- </test>
-</suite>
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml b/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
deleted file mode 100644
index dab7d06..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>jms-tests</artifactId>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <name>Geronimo TestSuite :: Enterprise Testsuite :: JMS EJB</name>
- <artifactId>jms-ejb</artifactId>
- <packaging>ejb</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- <configuration>
- <ejbVersion>3.0</ejbVersion>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/bmt/JmsBmtBean.java b/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/bmt/JmsBmtBean.java
deleted file mode 100644
index 6c5f23d..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/bmt/JmsBmtBean.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.geronimo.jms.test.bmt;
-
-import java.text.MessageFormat;
-
-import javax.ejb.Stateless;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.annotation.Resource;
-import javax.jms.ConnectionFactory;
-import javax.jms.Queue;
-import javax.jms.Connection;
-import javax.jms.Session;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Message;
-import javax.jms.JMSException;
-import javax.jms.Topic;
-import javax.jms.MessageConsumer;
-import javax.jms.Destination;
-import javax.transaction.UserTransaction;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.geronimo.jms.test.mdb.to.SimpleTransferObject;
-import org.apache.geronimo.jms.test.mdb.MessageReceiver;
-
-/**
- * @version $Rev$ $Date$
- */
-
-@Stateless(name = "JmsBmt")
-@TransactionManagement(value = TransactionManagementType.BEAN)
-public class JmsBmtBean implements JmsBmtRemote {
-
- /**
- * Logger
- */
- private static Logger logger = LoggerFactory.getLogger(JmsBmtBean.class);
-
- /**
- * Injected connection factory
- */
- @Resource(name = "MSConnectionFactory")
- private ConnectionFactory connFactory = null;
-
- @Resource(name="UserTransaction")
- private UserTransaction ut;
-
- /**
- * Injected jms destination
- */
- @Resource(name = "TxQueue")
- private Queue queue = null;
-
- /**
- * Injected jms destination
- */
- @Resource(name = "TxTopic")
- private Topic topic = null;
-
- public String sendMessageQueue(String requestName, int priority, int counter) {
-
- logger.info(MessageFormat.format("Receive task to send {0} message(s) with basename {1} (p={2})", counter, requestName, priority));
-
- return sendMessageToDestination(requestName, priority, counter, queue);
- }
-
- public String sendMessageTopic(String requestName, int priority, int counter) {
-
- logger.info(MessageFormat.format("Receive task to send {0} message(s) with basename {1} (p={2})", counter, requestName, priority));
-
- return sendMessageToDestination(requestName, priority, counter, topic);
- }
-
- private String sendMessageToDestination(String requestName, int priority, int counter, Destination destination) {
- Connection conn = null;
- Connection c2 = null;
- Session sess = null;
- Session s2 = null;
- MessageProducer prod = null;
- MessageConsumer consumer = null;
- Message received = null;
- try {
- conn = this.connFactory.createConnection();
- c2 = connFactory.createConnection();
- sess = conn.createSession(true, Session.SESSION_TRANSACTED);
- s2 = c2.createSession(true, Session.SESSION_TRANSACTED);
- prod = sess.createProducer(destination);
- consumer = sess.createConsumer(destination);
- conn.start();
-
- for (int i = 0; i < counter; ++i) {
- SimpleTransferObject to = new SimpleTransferObject(requestName, i);
-
- ObjectMessage msg = sess.createObjectMessage();
- msg.setObject(to);
-
- logger.info("Sending message with name " + to.getName());
- ut.begin();
- try {
- prod.send(msg, Message.DEFAULT_DELIVERY_MODE, priority, Message.DEFAULT_TIME_TO_LIVE);
- } finally {
- ut.commit();
- }
- logger.info("Message sent.");
- MessageReceiver.browse("After send", sess, destination, logger);
- ut.begin();
- try {
- received = consumer.receive(1000);
- if (received == null) throw new JMSException("Not received first time");
- if (!to.equals(((ObjectMessage)received).getObject())) throw new JMSException("Wrong object inside: " + ((ObjectMessage)received).getObject());
- } finally {
- ut.rollback();
- }
-
- ut.begin();
- try {
- received = consumer.receive(1000);
- if (received == null) throw new JMSException("Not received second time");
- if (!to.equals(((ObjectMessage)received).getObject())) throw new JMSException("Wrong object inside: " + ((ObjectMessage)received).getObject());
- } finally {
- ut.commit();
- }
-
- }
- return "OK";
-
- } catch (Exception e) {
- logger.error("Bad news! Sending failed due to exception: " + e.getMessage(), e);
- return "FAIL";
- } finally {
- try {
- if (prod != null) {
- prod.close();
- }
- if (consumer != null) consumer.close();
- if (sess != null) {
- sess.close();
- }
- if (conn != null) {
- conn.close();
- }
- if (s2 != null) s2.close();
- if (c2 != null) c2.close();;
- } catch (JMSException e) {
- logger.error("Could not finalize jms connections");
- }
- }
- }
-
-
-}
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/bmt/JmsBmtRemote.java b/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/bmt/JmsBmtRemote.java
deleted file mode 100644
index 285000e..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/bmt/JmsBmtRemote.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.geronimo.jms.test.bmt;
-
-import javax.ejb.Remote;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remote
-public interface JmsBmtRemote {
- String sendMessageQueue(String requestName, int priority, int counter);
- String sendMessageTopic(String requestName, int priority, int counter);
-}
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/mdb/MessageReceiver.java b/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/mdb/MessageReceiver.java
deleted file mode 100644
index 889ff5f..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/mdb/MessageReceiver.java
+++ /dev/null
@@ -1,252 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.jms.test.mdb;
-
-import java.text.MessageFormat;
-import java.util.Enumeration;
-
-import javax.ejb.MessageDrivenContext;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Session;
-import javax.jms.QueueBrowser;
-import javax.jms.Queue;
-
-import org.apache.geronimo.jms.test.mdb.exception.ProcessingException;
-import org.apache.geronimo.jms.test.mdb.to.TransferObject;
-import org.apache.geronimo.jms.test.mdb.to.SimpleTransferObject;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author <a href="mailto:tomasz[et]mazan[dot]pl">Tomasz Mazan</a>
- */
-public abstract class MessageReceiver implements MessageListener {
-
- /**
- * Class'es logger
- */
- private static Logger logger = LoggerFactory.getLogger(org.apache.geronimo.jms.test.mdb.SimpleMessageReceiver.class);
-
- /**
- * Returns instance of injected connection factory
- *
- * @return ConnectionFactory instance
- */
- protected abstract ConnectionFactory getConnectionFactory();
-
- /**
- * Returns instance of injected context
- *
- * @return MessagDrivenContext instance
- */
- protected abstract MessageDrivenContext getMessageDrivenContext();
-
- /**
- * Processes received object
- *
- * @param obj object to process
- * @return processed instance of object
- * @throws ProcessingException if message's processing fails
- */
- protected abstract TransferObject processMessage(TransferObject obj) throws ProcessingException;
-
- /**
- * Method to process delivered messages
- *
- * @param message instance of message
- */
- public void onMessage(Message message) {
- logger.info("MDB received message to process");
-
- ObjectMessage msg;
- if (ObjectMessage.class.isInstance(message)) {
- msg = (ObjectMessage) message;
- } else {
- logger.error(MessageFormat.format("Invalid class of message {0}. Only object messages are supported", message.getClass()));
- return;
- }
-
- Object obj = null;
- Destination replyToDest = null;
- try {
- obj = msg.getObject();
- replyToDest = msg.getJMSReplyTo();
- } catch (JMSException e) {
- logger.error("Could not process message due to exception " + e.getMessage());
- return;
- }
-
- try {
- if (obj == null) {
- logger.error("Object received in message is null");
- } else if (!TransferObject.class.isInstance(obj)) {
- logger.error(MessageFormat.format("Invalid class of object {0} included in received message", obj.getClass()));
- } else {
- TransferObject to = (TransferObject) obj;
- logger.info("Ready to process and return " + ((SimpleTransferObject)to).getName() + " id: " + ((SimpleTransferObject)to).getId());
- to = processMessage(to);
- try {
- sendResponse(to, replyToDest, message.getJMSPriority());
- } catch (JMSException e) {
- logger.error(MessageFormat.format("Response could not be sent and will be processed and delivered later. Cause: {0}",
- e.getMessage()));
- getMessageDrivenContext().setRollbackOnly();
- }
- }
- } catch (ProcessingException e) {
- logger.error("Could not process message due to exception: " + e.getMessage());
- }
-
- }
-
- /**
- * Method send response
- *
- * @param to transfer processed object
- * @param replyTo replyTo destination
- * @param priority message priority
- * @throws JMSException if any occurs while preparing or sending message
- */
- private void sendResponse(TransferObject to, Destination replyTo, int priority) throws JMSException {
- logger.debug("Preparing response to send");
-
- Connection conn = null;
- Session sess = null;
- MessageProducer producer = null;
- try {
- conn = this.createConnection();
- sess = this.createSession(conn);
- producer = this.createMessageProducer(sess, replyTo);
- conn.start();
-
- ObjectMessage msg = this.createMessage(sess);
- msg.setObject(to);
-
-// browse("Before reply", sess, replyTo, logger);
- producer.send(msg, Message.DEFAULT_DELIVERY_MODE, priority, Message.DEFAULT_TIME_TO_LIVE);
-
- logger.info("Success response - sent.");
- } finally {
- try {
- if (producer != null) {
- producer.close();
- }
- if (sess != null) {
- sess.close();
- }
- if (conn != null) {
- conn.close();
- }
- } catch (JMSException e) {
- e.printStackTrace();
- }
- }
- }
-
- /**
- * Creates new jms session
- *
- * @param conn connection
- * @return Session instance
- * @throws JMSException if can't create session
- */
- private Session createSession(Connection conn) throws JMSException {
- logger.debug("Creating new jms session");
-
- Session sess = conn.createSession(true, Session.SESSION_TRANSACTED);
-
- return sess;
- }
-
- /**
- * Creates new jms connection
- *
- * @return Connection instance
- * @throws JMSException if can't create session
- */
- private Connection createConnection() throws JMSException {
- logger.debug("Creating new jms connection");
-
- Connection conn = null;
-
- conn = this.getConnectionFactory().createConnection();
-
- return conn;
- }
-
- /**
- * Creates message producer for specified destination
- *
- * @param session the session
- * @param destination the destination
- * @return new instance of MessageProducer
- * @throws JMSException if can't create producer
- */
- private MessageProducer createMessageProducer(Session session, Destination destination) throws JMSException {
- logger.debug("Creating new message producer");
-
- return session.createProducer(destination);
- }
-
- /**
- * Creates jms message
- *
- * @param session the session
- * @return new instance of Message
- * @throws JMSException if error occurs while creating message
- */
- private ObjectMessage createMessage(Session session) throws JMSException {
- logger.debug("Creating new jms message");
-
- ObjectMessage msg = session.createObjectMessage();
- return msg;
- }
-
- public static void browse(String where, Session session, Destination destination, Logger logger) throws JMSException {
-/*
- StringBuilder b = new StringBuilder(where);
- b.append("\nqueue: " + destination).append("\n");
- QueueBrowser browser = session.createBrowser((Queue) destination);
- for (Enumeration e = browser.getEnumeration(); e.hasMoreElements();) {
- Message m = (Message) e.nextElement();
- if (m instanceof ObjectMessage) {
- ObjectMessage om = (ObjectMessage) m;
- if (om.getObject() instanceof SimpleTransferObject) {
- SimpleTransferObject to = (SimpleTransferObject) om.getObject();
- b.append(" name: " + to.getName() + " id: " + to.getId());
- } else {
- b.append(" not a SimpleTransferObject: " + om.getObject());
- }
- } else {
- b.append(" not an ObjectMessage: " + m);
- }
- b.append("\n");
- }
- browser.close();
- logger.info(b.toString());
-*/
- }
-
-}
\ No newline at end of file
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/mdb/SimpleMessageReceiver.java b/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/mdb/SimpleMessageReceiver.java
deleted file mode 100644
index 582f5ee..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/mdb/SimpleMessageReceiver.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.jms.test.mdb;
-
-import java.text.MessageFormat;
-
-import javax.annotation.Resource;
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.ejb.MessageDrivenContext;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.ejb.TransactionManagement;
-import javax.ejb.TransactionManagementType;
-import javax.jms.ConnectionFactory;
-import javax.jms.MessageListener;
-
-import org.apache.geronimo.jms.test.mdb.exception.ProcessingException;
-import org.apache.geronimo.jms.test.mdb.to.SimpleTransferObject;
-import org.apache.geronimo.jms.test.mdb.to.TransferObject;
-
-/**
- * @author <a href="mailto:tomasz[et]mazan[dot]pl">Tomasz Mazan</a>
- */
-@MessageDriven(name = "SimpleMessageReceiver",
- activationConfig = {
- @ActivationConfigProperty(propertyName = "destination", propertyValue = "MRRequests"),
- @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
- @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Auto-acknowledge"),
- @ActivationConfigProperty(propertyName = "InitialRedeliveryDelay", propertyValue = "30"),
- @ActivationConfigProperty(propertyName = "MaximumRedeliveries", propertyValue = "9999"),
- //prefetch size >=10 works for 100 total messages
- @ActivationConfigProperty(propertyName = "maxMessagesPerSessions", propertyValue = "1")
- })
-@TransactionManagement(value = TransactionManagementType.CONTAINER)
-@TransactionAttribute(value = TransactionAttributeType.REQUIRED)
-//No tx works...
-//@TransactionManagement(value = TransactionManagementType.BEAN)
-public class SimpleMessageReceiver extends MessageReceiver implements MessageListener {
-
- /**
- * Context injected by Container
- */
- @Resource
- private MessageDrivenContext mdc = null;
-
- /**
- * Injected connection factory
- */
- @Resource(name = "MRConnectionFactory")
- private ConnectionFactory jmsConnFactory = null;
-
- /**
- * {@inheritDoc}
- *
- * @see org.apache.geronimo.jms.test.mdb.MessageReceiver#getMessageDrivenContext()
- */
- @Override
- public MessageDrivenContext getMessageDrivenContext() {
- return mdc;
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.apache.geronimo.jms.test.mdb.MessageReceiver#getConnectionFactory()
- */
- @Override
- public ConnectionFactory getConnectionFactory() {
- return jmsConnFactory;
- }
-
- /**
- * {@inheritDoc}
- *
- * @see org.apache.geronimo.jms.test.mdb.MessageReceiver#processMessage(TransferObject)
- */
- @Override
- protected TransferObject processMessage(TransferObject obj) throws ProcessingException {
- if (obj == null) {
- throw new ProcessingException("Object received in message is null");
- } else if (!SimpleTransferObject.class.isInstance(obj)) {
- throw new ProcessingException(MessageFormat.format("Invalid class of object {0} included in received message", obj.getClass()));
- } else {
- SimpleTransferObject to = (SimpleTransferObject) obj;
- to.markProcessed();
- return to;
- }
- }
-}
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/mdb/exception/ProcessingException.java b/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/mdb/exception/ProcessingException.java
deleted file mode 100644
index 62da063..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/mdb/exception/ProcessingException.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.jms.test.mdb.exception;
-
-/**
- * @author <a href="mailto:tomasz[et]mazan[dot]pl">Tomasz Mazan</a>
- */
-public class ProcessingException extends Exception {
-
- /**
- *
- */
- private static final long serialVersionUID = 6724711926694539382L;
-
- /**
- * Default constructor
- */
- public ProcessingException() {
- }
-
- /**
- * @param message the message to construct exception instance
- */
- public ProcessingException(String message) {
- super(message);
- }
-
- /**
- * @param cause the cause
- */
- public ProcessingException(Throwable cause) {
- super(cause);
- }
-
- /**
- * @param message the message
- * @param cause the cause
- */
- public ProcessingException(String message, Throwable cause) {
- super(message, cause);
- }
-
-}
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/mdb/to/SimpleTransferObject.java b/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/mdb/to/SimpleTransferObject.java
deleted file mode 100644
index 0708d01..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/mdb/to/SimpleTransferObject.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.jms.test.mdb.to;
-
-import java.util.Date;
-
-/**
- * @author <a href="mailto:tomasz[et]mazan[dot]pl">Tomasz Mazan</a>
- */
-public class SimpleTransferObject extends TransferObject {
-
- /**
- * serialization version identifier
- */
- private static final long serialVersionUID = -1054412046957557066L;
-
- /**
- * Name
- */
- private String name;
-
- /**
- * id
- */
- private int id;
-
- /**
- * Processing flag
- */
- private Boolean processed;
-
- /**
- * Create's date
- */
- private Date created;
-
- /**
- * Default constructor
- *
- * @param name name of object
- * @param id id of the object
- */
- public SimpleTransferObject(String name, int id) {
- this.name = name;
- this.id = id;
- this.created = new Date();
- }
-
- /**
- * @return the name
- */
- public String getName() {
- return name;
- }
-
- /**
- * @return the id
- */
- public int getId() {
- return id;
- }
-
- /**
- * @return the processed
- */
- public Boolean getProcessed() {
- return processed;
- }
-
- /**
- */
- public void markProcessed() {
- this.processed = true;
- }
-
- /**
- * @return the created
- */
- public Date getCreated() {
- return created;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o) return true;
- if (o == null || getClass() != o.getClass()) return false;
-
- SimpleTransferObject that = (SimpleTransferObject) o;
-
- if (id != that.id) return false;
- if (created != null ? !created.equals(that.created) : that.created != null) return false;
- if (name != null ? !name.equals(that.name) : that.name != null) return false;
- if (processed != null ? !processed.equals(that.processed) : that.processed != null) return false;
-
- return true;
- }
-
- @Override
- public int hashCode() {
- int result = name != null ? name.hashCode() : 0;
- result = 31 * result + id;
- result = 31 * result + (processed != null ? processed.hashCode() : 0);
- result = 31 * result + (created != null ? created.hashCode() : 0);
- return result;
- }
-}
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/mdb/to/TransferObject.java b/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/mdb/to/TransferObject.java
deleted file mode 100644
index 7beb81a..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/mdb/to/TransferObject.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.jms.test.mdb.to;
-
-import java.io.Serializable;
-
-/**
- * @author <a href="mailto:tomasz[et]mazan[dot]pl">Tomasz Mazan</a>
- */
-public abstract class TransferObject implements Serializable {
-
-}
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/sb/JmsSenderBean.java b/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/sb/JmsSenderBean.java
deleted file mode 100644
index 971e0e2..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/sb/JmsSenderBean.java
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.jms.test.sb;
-
-import java.text.MessageFormat;
-
-import javax.annotation.Resource;
-import javax.ejb.Stateless;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.MessageConsumer;
-
-import org.apache.geronimo.jms.test.mdb.to.SimpleTransferObject;
-import org.apache.geronimo.jms.test.mdb.MessageReceiver;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author <a href="mailto:tomasz[et]mazan[dot]pl">Tomasz Mazan</a>
- */
-@Stateless(name = "JmsSender")
-public class JmsSenderBean implements JmsSenderRemote {
-
- /**
- * Logger
- */
- private static Logger logger = LoggerFactory.getLogger(JmsSenderBean.class);
-
- /**
- * Injected connection factory
- */
- @Resource(name = "MSConnectionFactory")
- private ConnectionFactory connFactory = null;
-
- /**
- * Injected jms destination
- */
- @Resource(name = "MRRequests")
- private Queue jmsRequestQueue = null;
-
- /**
- * Injected jms destination
- */
- @Resource(name = "MRResponses")
- private Queue jmsResponseQueue = null;
-
- /**
- * {@inheritDoc}
- *
- * @see org.apache.geronimo.jms.test.sb.JmsSenderRemote#sendMessage(java.lang.String, int, int)
- */
- @TransactionAttribute(value = TransactionAttributeType.REQUIRED)
- public String sendMessage(String requestName, int priority, int counter) {
-
- logger.info(MessageFormat.format("Receive task to send {0} message(s) with basename {1} (p={2})", counter, requestName, priority));
-
- Connection conn = null;
- Session sess = null;
- MessageProducer prod = null;
- try {
- conn = this.connFactory.createConnection();
- sess = conn.createSession(true, Session.SESSION_TRANSACTED);
- prod = sess.createProducer(jmsRequestQueue);
- conn.start();
-
- for (int i = 0; i < counter; ++i) {
- SimpleTransferObject to = new SimpleTransferObject(requestName, i);
-
- ObjectMessage msg = sess.createObjectMessage();
- msg.setJMSReplyTo(jmsResponseQueue);
- msg.setObject(to);
-
- logger.info("Sending message with name " + to.getName());
- prod.send(msg, Message.DEFAULT_DELIVERY_MODE, priority, Message.DEFAULT_TIME_TO_LIVE);
- logger.info("Message sent.");
- MessageReceiver.browse("After send", sess, jmsRequestQueue, logger);
- MessageReceiver.browse("After send", sess, jmsResponseQueue, logger);
- }
- return "OK";
-
- } catch (JMSException e) {
- logger.error("Bad news! Sending failed due to exception: " + e.getMessage());
- return "FAIL";
- } finally {
- try {
- if (prod != null) {
- prod.close();
- }
- if (sess != null) {
- sess.close();
- }
- if (conn != null) {
- conn.close();
- }
- } catch (JMSException e) {
- logger.error("Could not finalize jms connections");
- }
- }
- }
-
- @TransactionAttribute(value = TransactionAttributeType.REQUIRED)
- public Integer receiveMessage() {
- Connection conn = null;
- Session sess = null;
- MessageConsumer consumer = null;
- try {
- conn = this.connFactory.createConnection();
- sess = conn.createSession(true, Session.SESSION_TRANSACTED);
- //to test is messages are output from mdb.
- consumer = sess.createConsumer(jmsResponseQueue);
- //to test if messages are consumed by mdb
-// consumer = sess.createConsumer(jmsRequestQueue);
- conn.start();
- MessageReceiver.browse("Before receive", sess, jmsRequestQueue, logger);
- MessageReceiver.browse("Before receive", sess, jmsResponseQueue, logger);
- Message message = consumer.receive(1000);
- if (message != null) {
- ObjectMessage om = (ObjectMessage) message;
- SimpleTransferObject sto = (SimpleTransferObject) om.getObject();
- logger.info("Received message with name " + sto.getName() + sto.getId());
- return sto.getId();
- }
- return null;
- } catch (JMSException e) {
- logger.error("Bad news! Sending failed due to exception: " + e.getMessage());
- return null;
- } finally {
- try {
- if (consumer != null) {
- consumer.close();
- }
- if (sess != null) {
- sess.close();
- }
- if (conn != null) {
- conn.close();
- }
- } catch (JMSException e) {
- logger.error("Could not finalize jms connections");
- }
- }
-
- }
-
-}
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/sb/JmsSenderRemote.java b/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/sb/JmsSenderRemote.java
deleted file mode 100644
index 0d923bd..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-ejb/src/main/java/org/apache/geronimo/jms/test/sb/JmsSenderRemote.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.jms.test.sb;
-
-import javax.ejb.Remote;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-
-/**
- * @author <a href="mailto:tomasz[et]mazan[dot]pl">Tomasz Mazan</a>
- */
-@Remote
-public interface JmsSenderRemote {
-
- /**
- * Sends request with specified <code>requestName</code> indexed with current number between 0 (inclusive) and <code>counter</code> (exclusive)
- *
- * @param requestName name of request
- * @param priority message priority
- * @param counter number of requests to send
- * @return return confirmation code
- */
- String sendMessage(String requestName, int priority, int counter);
-
- /**
- * receives one message, returning its id
- * @return id of message received.
- */
- Integer receiveMessage();
-}
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml b/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
deleted file mode 100644
index a287319..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-war/pom.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jms-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jms-war</artifactId>
- <name>Geronimo TestSuite :: Enterprise Testsuite :: JMS WAR</name>
- <packaging>war</packaging>
-
- <description>
- Geronimo test WAR for JMS
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSQueueReceiver.java b/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSQueueReceiver.java
deleted file mode 100644
index 7888747..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSQueueReceiver.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.jms.test.simple;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.annotation.Resource;
-import javax.jms.Message;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueReceiver;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.jms.Connection;
-import javax.jms.MessageConsumer;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class JMSQueueReceiver extends HttpServlet implements Servlet {
-
-
- @Resource(name="MSConnectionFactory")
- QueueConnectionFactory qcf = null;
- @Resource(name="TestQueue")
- Queue queue = null;
-
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#HttpServlet()
- */
- public JMSQueueReceiver() {
- super();
- }
-
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest arg0, HttpServletResponse arg1)
- */
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- doPost(request,response);
- }
-
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest arg0, HttpServletResponse arg1)
- */
- protected void doPost(HttpServletRequest arg0, HttpServletResponse arg1) throws ServletException, IOException {
-
- try {
-
- PrintWriter out = arg1.getWriter();
- Connection conn = qcf.createConnection();
- Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- MessageConsumer consumer = sess.createConsumer(queue);
- conn.start();
- Message msg = consumer.receive(1000);
-
- out.println("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>");
- out.println("<head><title>JMS Receiver</title></head>");
- if ( msg instanceof TextMessage ) {
- TextMessage txtMsg = (TextMessage)msg;
- System.out.println("Message : "+txtMsg.getText());
- out.println("<body>Received JMS Queue Message</body></html>");
- }
- else {
- System.out.println("No Message");
- out.println("<body>Did Not Receive JMS Queue Message</body></html>");
- }
- consumer.close();
- sess.close();
- conn.close();
- }
- catch ( Exception e ) {
- e.printStackTrace();
- }
- }
-
-}
\ No newline at end of file
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSQueueSender.java b/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSQueueSender.java
deleted file mode 100644
index 54f378d..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSQueueSender.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.jms.test.simple;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.annotation.Resource;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.servlet.Servlet;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class JMSQueueSender extends HttpServlet implements Servlet {
-
- @Resource(name="MSConnectionFactory")
- QueueConnectionFactory qcf = null;
- @Resource(name="TestQueue")
- Queue queue = null;
-
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#HttpServlet()
- */
- public JMSQueueSender() {
- super();
- }
-
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest arg0, HttpServletResponse arg1)
- */
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- doPost(request,response);
- }
-
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest arg0, HttpServletResponse arg1)
- */
- protected void doPost(HttpServletRequest arg0, HttpServletResponse arg1) throws ServletException, IOException {
- try {
-
- PrintWriter out = arg1.getWriter();
- QueueConnection connection = qcf.createQueueConnection();
- connection.start();
- QueueSession sess = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
- QueueSender queueSender = sess.createSender(queue);
- TextMessage tmsg = sess.createTextMessage("JMS - Test Queue Message");
- queueSender.send(tmsg);
- queueSender.close();
- sess.close();
- connection.stop();
- out.println("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>");
- out.println("<head><title>JMS Sender</title></head>");
- out.println("<body>Sent JMS Queue Message</body></html>");
- }
- catch ( Exception e ) {
- e.printStackTrace();
- }
-
- }
-
-}
\ No newline at end of file
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSTopicSenderReceiver.java b/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSTopicSenderReceiver.java
deleted file mode 100644
index 6ca86c1..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/java/org/apache/geronimo/jms/test/simple/JMSTopicSenderReceiver.java
+++ /dev/null
@@ -1,132 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.jms.test.simple;
-
-import java.io.IOException;
-
-import javax.annotation.Resource;
-import javax.jms.Message;
-import javax.jms.Session;
-import javax.jms.MessageListener;
-import javax.jms.JMSException;
-import javax.jms.Topic;
-import javax.jms.TopicConnection;
-import javax.jms.TopicConnectionFactory;
-import javax.jms.TopicSubscriber;
-import javax.jms.TopicPublisher;
-import javax.jms.TopicSession;
-
-import javax.jms.TextMessage;
-import javax.servlet.Servlet;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.PrintWriter;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
-public class JMSTopicSenderReceiver extends HttpServlet implements Servlet {
-
-
- @Resource(name="MSConnectionFactory")
- TopicConnectionFactory tcf = null;
- @Resource(name="TestTopic")
- Topic topic = null;
-
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#HttpServlet()
- */
- public JMSTopicSenderReceiver() {
- super();
- }
-
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest arg0, HttpServletResponse arg1)
- */
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- doPost(request,response);
- }
-
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest arg0, HttpServletResponse arg1)
- */
- protected void doPost(HttpServletRequest arg0, HttpServletResponse arg1) throws ServletException, IOException {
- PrintWriter out = arg1.getWriter();
- CountDownLatch latch = new CountDownLatch(1);
- try {
-
- String type = arg0.getParameter("type");
-
- TopicConnection connection = tcf.createTopicConnection();
- TopicSession session = connection.createTopicSession(false, Session.AUTO_ACKNOWLEDGE);
- TopicSubscriber topicSubscriber = session.createSubscriber(topic);
- TestListener test = new TestListener(latch);
- topicSubscriber.setMessageListener(test);
- connection.start();
- TopicPublisher topicPublisher = session.createPublisher(topic);
- TextMessage tmsg = session.createTextMessage("JMS - Test Topic Message");
- topicPublisher.publish(tmsg);
- latch.await(1, TimeUnit.SECONDS);
- out.println("<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>");
- out.println("<head><title>JMS Topic Sender Receiver</title></head>");
- if ( test.getMsg() != null ) {
- out.println("<body>Received JMS Topic Message</body></html>");
- }
- else {
- out.println("<body>Did Not Receive JMS Topic Message</body></html>");
- }
- topicSubscriber.close();
- session.close();
- connection.stop();
-
- }
- catch ( Exception e ) {
- e.printStackTrace();
- }
- }
-
- private class TestListener implements MessageListener {
-
- private final CountDownLatch latch;
- private volatile String msg = null;
-
- private TestListener(CountDownLatch latch) {
- this.latch = latch;
- }
-
- public String getMsg() {
- return msg;
- }
-
- public void onMessage(Message message)
- {
- try {
- TextMessage textMessage = (TextMessage)message;
- msg = textMessage.getText( );
- latch.countDown();
- System.out.println("Message : "+msg);
-
- }
- catch ( JMSException jmse ) {
- jmse.printStackTrace( );
- }
- }
- }
-}
-
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/webapp/WEB-INF/web.xml b/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index e2158a1..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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">
- <display-name>JMSSample</display-name>
- <servlet>
- <description>
- </description>
- <display-name>JMSSender</display-name>
- <servlet-name>JMSQueueSender</servlet-name>
- <servlet-class>org.apache.geronimo.jms.test.simple.JMSQueueSender</servlet-class>
- </servlet>
- <servlet>
- <description>
- </description>
- <display-name>JMSReceiver</display-name>
- <servlet-name>JMSQueueReceiver</servlet-name>
- <servlet-class>org.apache.geronimo.jms.test.simple.JMSQueueReceiver</servlet-class>
- </servlet>
- <servlet>
- <description>
- </description>
- <display-name>TopicSenderReceiver</display-name>
- <servlet-name>JMSTopicSenderReceiver</servlet-name>
- <servlet-class>org.apache.geronimo.jms.test.simple.JMSTopicSenderReceiver</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>JMSQueueSender</servlet-name>
- <url-pattern>/JMSQueueSender</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>JMSQueueReceiver</servlet-name>
- <url-pattern>/JMSQueueReceiver</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>JMSTopicSenderReceiver</servlet-name>
- <url-pattern>/JMSTopicSenderReceiver</url-pattern>
- </servlet-mapping>
-
-<!--
- <resource-ref>
- <res-ref-name>jms/QCF</res-ref-name>
- <res-type>javax.jms.QueueConnectionFactory</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <res-ref-name>jms/TCF</res-ref-name>
- <res-type>javax.jms.TopicConnectionFactory</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
-
- <message-destination-ref>
- <message-destination-ref-name>jms/TestQ</message-destination-ref-name>
- <message-destination-type>javax.jms.Queue</message-destination-type>
- <message-destination-usage>Produces</message-destination-usage>
- <message-destination-link>TestQueue</message-destination-link>
- </message-destination-ref>
-
- <message-destination-ref>
- <message-destination-ref-name>jms/TestT</message-destination-ref-name>
- <message-destination-type>javax.jms.Topic</message-destination-type>
- <message-destination-usage>Produces</message-destination-usage>
- <message-destination-link>TestTopic</message-destination-link>
- </message-destination-ref>
--->
-
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/webapp/hello.txt b/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/webapp/hello.txt
deleted file mode 100644
index 557db03..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/webapp/hello.txt
+++ /dev/null
@@ -1 +0,0 @@
-Hello World
diff --git a/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/webapp/index.html b/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/webapp/index.html
deleted file mode 100644
index 2758807..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/jms-war/src/main/webapp/index.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!DOCTYPE html
- PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
- <head>
- <title>Hello J2EE 1.4</title>
- </head>
- <body>
- Hello J2EE 1.4
-
- </body>
-</html>
diff --git a/testsuite/enterprise-testsuite/jms-tests/pom.xml b/testsuite/enterprise-testsuite/jms-tests/pom.xml
deleted file mode 100644
index be36c5a..0000000
--- a/testsuite/enterprise-testsuite/jms-tests/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>enterprise-testsuite</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jms-tests</artifactId>
- <packaging>pom</packaging>
-
- <name>Geronimo TestSuite :: Enterprise Testsuite :: JMS Tests</name>
-
- <modules>
- <module>jms-ejb</module>
- <module>jms-war</module>
- <module>jms-ear</module>
- </modules>
-
-</project>
\ No newline at end of file
diff --git a/testsuite/enterprise-testsuite/pom.xml b/testsuite/enterprise-testsuite/pom.xml
index 67d498f..018592e 100644
--- a/testsuite/enterprise-testsuite/pom.xml
+++ b/testsuite/enterprise-testsuite/pom.xml
@@ -47,15 +47,9 @@
</description>
<modules>
-<!--
- <module>ejb-tests</module>
- <module>jms-tests</module>
- <module>sec-tests</module>
--->
<module>jpa-tests</module>
<module>sec-client-tests</module>
<module>datasource-test</module>
<module>appname-tests</module>
</modules>
-
</project>
diff --git a/testsuite/enterprise-testsuite/sec-tests/pom.xml b/testsuite/enterprise-testsuite/sec-tests/pom.xml
deleted file mode 100644
index 34b64c2..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>enterprise-testsuite</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>sec-tests</artifactId>
- <packaging>pom</packaging>
-
- <name>Geronimo TestSuite :: Enterprise Testsuite :: Security Tests</name>
-
- <modules>
- <module>sec-ejb</module>
- <module>sec-war</module>
- <module>sec-client</module>
- <module>sec-ear</module>
- </modules>
-
-</project>
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml b/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml
deleted file mode 100644
index 0c60731..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-client/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 653547 $ $Date: 2008-05-05 14:14:38 -0400 (Mon, 05 May 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>sec-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>sec-client</artifactId>
- <name>Geronimo TestSuite :: Enterprise Testsuite :: Security - Client</name>
- <packaging>jar</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <properties>
- <clientLogFile>${basedir}/target/client.log</clientLogFile>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>sec-ejb</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.geronimo.itest.TestClient</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/java/org/apache/geronimo/itest/TestCallbackHandler.java b/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/java/org/apache/geronimo/itest/TestCallbackHandler.java
deleted file mode 100644
index 0521566..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/java/org/apache/geronimo/itest/TestCallbackHandler.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.itest;
-
-import java.io.IOException;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-
-public class TestCallbackHandler implements CallbackHandler {
-
- public void handle(Callback[] callbacks) throws IOException, UnsupportedCallbackException {
- for (int i = 0; i < callbacks.length; i++) {
- Callback callback = callbacks[i];
- if (callback instanceof NameCallback) {
- ((NameCallback)callback).setName("bar");
- } else if (callback instanceof PasswordCallback) {
- ((PasswordCallback)callback).setPassword("bar".toCharArray());
- } else {
- throw new UnsupportedCallbackException(callback);
- }
- System.out.println("CallbackHandler set user=bar, password=bar");
- }
- }
-}
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/java/org/apache/geronimo/itest/TestClient.java b/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/java/org/apache/geronimo/itest/TestClient.java
deleted file mode 100644
index 25f0e02..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/java/org/apache/geronimo/itest/TestClient.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.itest;
-
-import java.rmi.AccessException;
-import java.rmi.RemoteException;
-
-import javax.ejb.EJB;
-
-import org.apache.geronimo.security.ContextManager;
-
-public class TestClient {
-
- @EJB(name="TestSession")
- private static TestSessionHome sessionHome;
-
- public static void main(String [] args) throws Exception {
-
- try {
- new TestClient().test();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- // needs to be forced because of a bug
- System.exit(0);
- }
-
- public void test() throws Exception {
- System.out.println("Hello World!");
- System.out.println("Context: " + ContextManager.getCurrentCaller());
- try {
- TestSession session = sessionHome.create();
- System.out.print(session.testAccessBar());
- try {
- System.out.println(session.testAccessFoo());
- } catch (AccessException e) {
- System.out.println("Correctly received security exception on testAccessFoo method");
- }
- } catch (RemoteException e) {
- e.printStackTrace();
- }
- }
-
-}
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/java/org/apache/geronimo/itest/TestSession.java b/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/java/org/apache/geronimo/itest/TestSession.java
deleted file mode 100644
index 83948f6..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/java/org/apache/geronimo/itest/TestSession.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.itest;
-
-import java.rmi.RemoteException;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface TestSession extends javax.ejb.EJBObject {
- String testAccessFoo() throws RemoteException;
- String testAccessBar() throws RemoteException;
-
-}
\ No newline at end of file
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/java/org/apache/geronimo/itest/TestSessionHome.java b/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/java/org/apache/geronimo/itest/TestSessionHome.java
deleted file mode 100644
index 393d182..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/java/org/apache/geronimo/itest/TestSessionHome.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.itest;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface TestSessionHome extends javax.ejb.EJBHome {
-
- public TestSession create( ) throws RemoteException, CreateException;
-
-}
\ No newline at end of file
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/resources/META-INF/application-client.xml b/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/resources/META-INF/application-client.xml
deleted file mode 100644
index 2456a51..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/resources/META-INF/application-client.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<application-client 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/applicationclient_1_4.xsd"
- version="1.4">
-
- <display-name>Test Client</display-name>
-
-</application-client>
-
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/resources/META-INF/geronimo-application-client.xml b/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/resources/META-INF/geronimo-application-client.xml
deleted file mode 100644
index e67c8c6..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-client/src/main/resources/META-INF/geronimo-application-client.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<application-client
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <dep:client-environment>
- <dep:moduleId>
- <dep:groupId>JEE5</dep:groupId>
- <dep:artifactId>SecClient</dep:artifactId>
- <dep:version>1.1</dep:version>
- <dep:type>jar</dep:type>
- </dep:moduleId>
- </dep:client-environment>
-
- <dep:server-environment>
- <dep:moduleId>
- <dep:groupId>JEE5</dep:groupId>
- <dep:artifactId>SecClientServer</dep:artifactId>
- <dep:version>1.1</dep:version>
- <dep:type>jar</dep:type>
- </dep:moduleId>
- </dep:server-environment>
-
- <realm-name>remote-openejb-realm</realm-name>
- <callback-handler>org.apache.geronimo.itest.TestCallbackHandler</callback-handler>
-
-
- <gbean name="remote-openejb-realm"
- class="org.apache.geronimo.security.realm.GenericSecurityRealm">
- <attribute name="realmName">remote-openejb-realm</attribute>
- <attribute name="global">true</attribute>
- <xml-reference name="LoginModuleConfiguration">
- <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-1.2">
- <lc:login-module control-flag="REQUIRED">
- <lc:login-domain-name>remote-openejb-realm</lc:login-domain-name>
- <lc:login-module-class>org.apache.geronimo.openejb.OpenejbRemoteLoginModule</lc:login-module-class>
- <lc:option name="RemoteSecurityRealm">test-realm</lc:option>
- <lc:option name="ServerURI">ejbd://localhost:4201</lc:option>
- </lc:login-module>
- </lc:login-config>
- </xml-reference>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
-</application-client>
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml b/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
deleted file mode 100644
index bb6f50f..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-ear/pom.xml
+++ /dev/null
@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>sec-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>sec-ear</artifactId>
- <name>Geronimo TestSuite :: Enterprise Testsuite :: Security - EAR</name>
- <packaging>ear</packaging>
-
- <properties>
- <clientLogFile>${basedir}/target/client.log</clientLogFile>
- </properties>
-
- <!--
- FIXME: Split this module up... one to build the ear, one to run the tests.
- -->
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>sec-ejb</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>sec-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>sec-client</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <displayName>security Itest ear</displayName>
- <description>security Itest ear</description>
- <version>1.4</version>
- <modules>
- <webModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>sec-war</artifactId>
- <contextRoot>/sec</contextRoot>
- <bundleFileName>web.war</bundleFileName>
- </webModule>
- <ejbModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>sec-ejb</artifactId>
- <bundleFileName>ejb.jar</bundleFileName>
- </ejbModule>
- <jarModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>sec-client</artifactId>
- <bundleFileName>client.jar</bundleFileName>
- </jarModule>
- </modules>
- </configuration>
- </plugin>
-
- <!-- "ear" packaging doesn't compile test classes -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- "ear" packaging doesn't process test resources -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testResources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- <systemProperties>
- <property>
- <name>clientLogFile</name>
- <value>${clientLogFile}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <phase>pre-integration-test</phase>
- <id>run-client</id>
- <goals>
- <goal>run-client</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/SecClient/1.1/jar</moduleId>
- <logOutput>true</logOutput>
- <logFile>${clientLogFile}</logFile>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/main/filtered-resources/META-INF/application.xml b/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/main/filtered-resources/META-INF/application.xml
deleted file mode 100644
index 2f13731..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/main/filtered-resources/META-INF/application.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<application 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" version="1.4">
- <description>security Itest ear</description>
- <display-name>security Itest ear</display-name>
- <module>
- <web>
- <web-uri>web.war</web-uri>
- <context-root>/sec</context-root>
- </web>
- </module>
- <module>
- <ejb>ejb.jar</ejb>
- </module>
- <module>
- <java>client.jar</java>
- </module>
-</application>
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/main/filtered-resources/META-INF/geronimo-application.xml b/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
deleted file mode 100644
index 019f979..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.1">
-
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
- <moduleId>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}</artifactId>
- <version>${version}</version>
- <type>ear</type>
- </moduleId>
- </environment>
-
-</application>
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/ClientTest.java b/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/ClientTest.java
deleted file mode 100644
index 1bee287..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/ClientTest.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.security;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.FileInputStream;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-
-public class ClientTest extends TestSupport {
-
- @Test
- public void testClient() throws Exception {
- String outputFile = System.getProperty("clientLogFile");
- assertNotNull(outputFile);
- FileInputStream in = null;
- try {
- in = new FileInputStream(outputFile);
- BufferedReader reader =
- new BufferedReader(new InputStreamReader(in));
- String output = toString(reader);
-
- assertTrue("Expected Hello World", output.indexOf("Hello World!") != -1);
- assertTrue("Expected Principal", output.indexOf("Principal: org.apache.geronimo.security.IdentificationPrincipal") != -1);
- assertTrue("Expected Private Credential", output.indexOf("Private Credential: org.apache.geronimo.openejb.ServerIdentityToken") != -1);
- assertTrue("wrong server response", output.endsWith("Test EJB principal: bar\n" +
- "TestSession isCallerInRole foo: false\n" +
- "TestSession isCallerInRole bar: true\n" +
- "TestSession isCallerInRole baz: false\n" +
- "Correctly received security exception on testAccessFoo method\n"));
- } finally {
- if (in != null) {
- in.close();
- }
- }
- }
-
- private String toString(BufferedReader reader)
- throws IOException {
- StringBuffer buf = new StringBuffer();
- String line = null;
- while ((line = reader.readLine()) != null) {
- System.out.println(line);
- buf.append(line).append("\n");
- }
- return buf.toString();
- }
-
-}
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/RunAsTest.java b/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/RunAsTest.java
deleted file mode 100644
index cfade34..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/java/org/apache/geronimo/testsuite/security/RunAsTest.java
+++ /dev/null
@@ -1,129 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.security;
-
-import org.apache.geronimo.testsupport.SeleniumTestSupport;
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.Test;
-
-/**
- * ???
- *
- * @version $Rev$ $Date$
- */
-@Test
-public class RunAsTest
- extends SeleniumTestSupport {
- private static final String SERVLET_FOO = "TestServlet principal: foo\n" +
- "TestServlet isUserInRole foo: true\n" +
- "TestServlet isUserInRole bar: false\n" +
- "TestServlet isUserInRole baz: false";
- private static final String SERVLET_BAR = "TestServlet principal: foo\n" +
- "TestServlet isUserInRole foo: false\n" +
- "TestServlet isUserInRole bar: true\n" +
- "TestServlet isUserInRole baz: false";
- private static final String SERVLET_BAZ = "TestServlet principal: foo\n" +
- "TestServlet isUserInRole foo: false\n" +
- "TestServlet isUserInRole bar: false\n" +
- "TestServlet isUserInRole baz: true";
- private static final String EJB_FOO = "\nTest EJB principal: foo\n" +
- "TestSession isCallerInRole foo: true\n" +
- "TestSession isCallerInRole bar: false\n" +
- "TestSession isCallerInRole baz: false\n" +
- "security exception on testAccessBar method\n" +
- "security exception on testAccessBaz method\n";
- private static final String EJB_BAR = "\nsecurity exception on testAccessFoo method\n" +
- "Test EJB principal: bar\n" +
- "TestSession isCallerInRole foo: false\n" +
- "TestSession isCallerInRole bar: true\n" +
- "TestSession isCallerInRole baz: false\n" +
- "security exception on testAccessBaz method\n";
- private static final String EJB_BAZ = "\nsecurity exception on testAccessFoo method\n" +
- "security exception on testAccessBar method\n" +
- "Test EJB principal: baz\n" +
- "TestSession isCallerInRole foo: false\n" +
- "TestSession isCallerInRole bar: false\n" +
- "TestSession isCallerInRole baz: true\n";
-
-
- @BeforeSuite
- protected void startSeleniumClient() throws Exception {
- log.info("Starting Selenium client");
-
- selenium = createSeleniumClient("http://foo:foo@localhost:8080/");
- selenium.start();
- }
-
- @Test
- public void testServletNoRunAs() throws Exception {
- String path = "/sec/noRunAsServlet";
- testPath(path, SERVLET_FOO + EJB_FOO + SERVLET_FOO);
- }
-
- @Test
- public void testServletRunAs() throws Exception {
- String path = "/sec/servlet";
- testPath(path, SERVLET_FOO + EJB_BAR + SERVLET_FOO);
- }
-
- @Test
- public void testInjectionServletRunAs() throws Exception {
- testPath("/sec/injectionServlet", SERVLET_FOO + EJB_BAR + SERVLET_FOO);
- }
-
- @Test
- public void testJspRunAs() throws Exception {
- testPath("/sec/jsp", (SERVLET_FOO + EJB_BAR + SERVLET_FOO).replace("\n", " "));
- }
-
- @Test
- public void testForwardServlet() throws Exception {
- String path = "/sec/forwardServlet";
- testPath(path, SERVLET_FOO + "\n" + SERVLET_FOO + EJB_FOO + SERVLET_FOO + "\n" + SERVLET_FOO);
- }
- @Test
- public void testForwardServletToRunAs() throws Exception {
- String path = "/sec/forwardServletToRunAs";
- testPath(path, SERVLET_FOO + "\n" + SERVLET_FOO + EJB_BAR + SERVLET_FOO + "\n" + SERVLET_FOO);
- }
- @Test
- public void testForwardRunAsServlet() throws Exception {
- String path = "/sec/forwardRunAsServlet";
- testPath(path, SERVLET_FOO + "\n" + SERVLET_BAZ + EJB_BAZ + SERVLET_BAZ + "\n" + SERVLET_FOO);
- }
- @Test
- public void testForwardRunAsServletToRunAs() throws Exception {
- String path = "/sec/forwardRunAsServletToRunAs";
- testPath(path, SERVLET_FOO + "\n" + SERVLET_BAZ + EJB_BAR + SERVLET_BAZ + "\n" + SERVLET_FOO);
- }
-
-
-
- private void testPath(String path, String expected) throws Exception {
- selenium.open(path);
- waitForPageLoad();
- System.out.println("----------------------------------------------");
- String result = selenium.getText("xpath=/html/body");
- System.out.println(result);
- assertEquals("expected:\n" + expected + "\n\nresult:\n" + result,expected, result);
- }
-
-}
-
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/resources/testng.xml b/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/resources/testng.xml
deleted file mode 100644
index eab17fa..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-ear/src/test/resources/testng.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-
-<suite name="Suite1" verbose="1">
- <test name="sec-testsuite.security">
- <packages>
- <package name="org.apache.geronimo.testsuite.security"/>
- </packages>
- </test>
-</suite>
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml b/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
deleted file mode 100644
index 7d72dfa..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>sec-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>sec-ejb</artifactId>
- <name>Geronimo TestSuite :: Enterprise Testsuite :: Security - JAR</name>
- <packaging>ejb</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_2.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ejb-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/filtered-resources/META-INF/openejb-jar.xml b/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/filtered-resources/META-INF/openejb-jar.xml
deleted file mode 100644
index 2c6b7b9..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/filtered-resources/META-INF/openejb-jar.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
- <environment>
- <moduleId>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}</artifactId>
- <version>${version}</version>
- <type>ejb</type>
- </moduleId>
- <dependencies>
-
- </dependencies>
- </environment>
- <enterprise-beans>
- <session>
- <ejb-name>TestSession</ejb-name>
- </session>
- </enterprise-beans>
- <s:security xmlns:s="http://geronimo.apache.org/xml/ns/security-2.0">
- <s:credential-store-ref>
- <d:name xmlns:d="http://geronimo.apache.org/xml/ns/deployment-1.2">TestCredentialStore</d:name>
- </s:credential-store-ref>
- <s:role-mappings>
- <s:role role-name="foo">
- <s:run-as-subject>
- <s:realm>test-realm</s:realm>
- <s:id>foo-subject</s:id>
- </s:run-as-subject>
- <s:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="foo"/>
- </s:role>
- <s:role role-name="bar">
- <s:run-as-subject>
- <s:realm>test-realm</s:realm>
- <s:id>bar-subject</s:id>
- </s:run-as-subject>
- <s:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="bar"/>
- </s:role>
- <s:role role-name="baz">
- <s:run-as-subject>
- <s:realm>test-realm</s:realm>
- <s:id>baz-subject</s:id>
- </s:run-as-subject>
- <s:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal" name="baz"/>
- </s:role>
- </s:role-mappings>
- </s:security>
- <gbean name="test-realm"
- class="org.apache.geronimo.security.realm.GenericSecurityRealm">
- <attribute name="realmName">test-realm</attribute>
- <attribute name="global">true</attribute>
- <xml-reference name="LoginModuleConfiguration">
- <lc:login-config xmlns:lc="http://geronimo.apache.org/xml/ns/loginconfig-${geronimoSchemaVersion}">
- <lc:login-module control-flag="REQUIRED" wrap-principals="false">
- <lc:login-domain-name>test-domain</lc:login-domain-name>
- <lc:login-module-class>org.apache.geronimo.itest.TestLoginModule</lc:login-module-class>
- <lc:option name="users">foo,bar,baz</lc:option>
- </lc:login-module>
- </lc:login-config>
- </xml-reference>
- <reference name="ServerInfo">
- <name>ServerInfo</name>
- </reference>
- </gbean>
- <gbean name="TestCredentialStore" class="org.apache.geronimo.security.credentialstore.SimpleCredentialStoreImpl">
- <xml-attribute name="credentialStore">
- <c:credential-store xmlns:c="http://geronimo.apache.org/xml/ns/credentialstore-1.0">
- <c:realm name="test-realm">
- <c:subject>
- <c:id>foo-subject</c:id>
- <c:credential>
- <c:type>org.apache.geronimo.security.credentialstore.NameCallbackHandler</c:type>
- <c:value>foo</c:value>
- </c:credential>
- <c:credential>
- <c:type>org.apache.geronimo.security.credentialstore.PasswordCallbackHandler</c:type>
- <c:value>foo</c:value>
- </c:credential>
- </c:subject>
- <c:subject>
- <c:id>bar-subject</c:id>
- <c:credential>
- <c:type>org.apache.geronimo.security.credentialstore.NameCallbackHandler</c:type>
- <c:value>bar</c:value>
- </c:credential>
- <c:credential>
- <c:type>org.apache.geronimo.security.credentialstore.PasswordCallbackHandler</c:type>
- <c:value>bar</c:value>
- </c:credential>
- </c:subject>
- <c:subject>
- <c:id>baz-subject</c:id>
- <c:credential>
- <c:type>org.apache.geronimo.security.credentialstore.NameCallbackHandler</c:type>
- <c:value>baz</c:value>
- </c:credential>
- <c:credential>
- <c:type>org.apache.geronimo.security.credentialstore.PasswordCallbackHandler</c:type>
- <c:value>baz</c:value>
- </c:credential>
- </c:subject>
- </c:realm>
- </c:credential-store>
- </xml-attribute>
- <dependency>
- <n:name xmlns:n="http://geronimo.apache.org/xml/ns/naming-1.2">test-realm</n:name>
- </dependency>
- </gbean>
-</openejb-jar>
-
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestLoginModule.java b/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestLoginModule.java
deleted file mode 100644
index 7a68cb3..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestLoginModule.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.geronimo.itest;
-
-import java.util.Map;
-import java.util.Set;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.io.IOException;
-import java.security.Principal;
-
-import javax.security.auth.spi.LoginModule;
-import javax.security.auth.Subject;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.NameCallback;
-import javax.security.auth.callback.PasswordCallback;
-import javax.security.auth.callback.UnsupportedCallbackException;
-
-import org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestLoginModule implements LoginModule {
- private Subject subject;
- private CallbackHandler callbackHandler;
- private Set<String> users;
- private String user;
-
- public void initialize(Subject subject, CallbackHandler callbackHandler, Map<String, ?> sharedState, Map<String, ?> options) {
- this.subject = subject;
- this.callbackHandler = callbackHandler;
- String userList = (String) options.get("users");
- String[] userArray = userList.split(",");
- users = new HashSet<String>(Arrays.asList(userArray));
- }
-
- public boolean login() throws LoginException {
- Callback[] callbacks = new Callback[] {
- new NameCallback("user"),
- new PasswordCallback("password", false)
- };
- try {
- callbackHandler.handle(callbacks);
- } catch (IOException e) {
- throw new LoginException(e.getMessage());
- } catch (UnsupportedCallbackException e) {
- throw new LoginException(e.getMessage());
- }
- user = ((NameCallback)callbacks[0]).getName();
- String password = new String(((PasswordCallback)callbacks[1]).getPassword());
- if (user.equals(password) && users.contains(user)) {
- return true;
- }
- throw new LoginException();
- }
-
- public boolean commit() throws LoginException {
- Principal principal = new GeronimoUserPrincipal(user);
- subject.getPrincipals().add(principal);
- return true;
- }
-
- public boolean abort() throws LoginException {
- return true;
- }
-
- public boolean logout() throws LoginException {
- return true;
- }
-}
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestSession.java b/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestSession.java
deleted file mode 100644
index 64a4f60..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestSession.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.itest;
-
-import java.rmi.RemoteException;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface TestSession extends javax.ejb.EJBObject {
- String testAccessFoo() throws RemoteException;
- String testAccessBar() throws RemoteException;
- String testAccessBaz() throws RemoteException;
-}
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestSessionBean.java b/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestSessionBean.java
deleted file mode 100644
index d3f991c..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestSessionBean.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.itest;
-
-import javax.annotation.security.DeclareRoles;
-import javax.ejb.EJBException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-
-/**
- * @version $Rev$ $Date$
- */
-@DeclareRoles({"foo", "bar", "baz"})
-public class TestSessionBean implements SessionBean {
-
- SessionContext sessionContext;
-
- public String testAccessBar() {
- return testAccess();
- }
-
- public String testAccessFoo() {
- return testAccess();
- }
-
- public String testAccessBaz() {
- return testAccess();
- }
-
- private String testAccess() {
- StringBuilder r = new StringBuilder("Test EJB principal: ").append(sessionContext.getCallerPrincipal().getName()).append("\n");
- r.append("TestSession isCallerInRole foo: ").append(sessionContext.isCallerInRole("foo")).append("\n");
- r.append("TestSession isCallerInRole bar: ").append(sessionContext.isCallerInRole("bar")).append("\n");
- r.append("TestSession isCallerInRole baz: ").append(sessionContext.isCallerInRole("baz")).append("\n");
- return r.toString();
- }
-
- public void ejbCreate() {
- System.out.println("TestSessionBean");
- }
-
- public void ejbActivate() throws EJBException {
- }
-
- public void ejbPassivate() throws EJBException {
- }
-
- public void ejbRemove() throws EJBException {
- }
-
- public void setSessionContext(SessionContext sessionContext) throws EJBException {
- this.sessionContext = sessionContext;
- }
-}
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestSessionHome.java b/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestSessionHome.java
deleted file mode 100644
index 93dfd3c..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/java/org/apache/geronimo/itest/TestSessionHome.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.itest;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-
-/**
- * @version $Rev$ $Date$
- */
-public interface TestSessionHome extends javax.ejb.EJBHome {
-
- public TestSession create( ) throws RemoteException, CreateException;
-
-}
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/ejb-jar.xml b/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/ejb-jar.xml
deleted file mode 100644
index 2dd49f3..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<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>jpa itest ejb</display-name>
- <enterprise-beans>
- <session>
- <description>Security Itest ejb</description>
- <display-name>TestSession</display-name>
- <ejb-name>TestSession</ejb-name>
- <home>org.apache.geronimo.itest.TestSessionHome</home>
- <remote>org.apache.geronimo.itest.TestSession</remote>
- <ejb-class>org.apache.geronimo.itest.TestSessionBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <method-permission>
- <role-name>foo</role-name>
- <method>
- <ejb-name>TestSession</ejb-name>
- <method-name>testAccessFoo</method-name>
- </method>
- </method-permission>
- <method-permission>
- <role-name>bar</role-name>
- <method>
- <ejb-name>TestSession</ejb-name>
- <method-name>testAccessBar</method-name>
- </method>
- </method-permission>
- <method-permission>
- <role-name>baz</role-name>
- <method>
- <ejb-name>TestSession</ejb-name>
- <method-name>testAccessBaz</method-name>
- </method>
- </method-permission>
- </assembly-descriptor>
-
-</ejb-jar>
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/persistence.xml b/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index c3860c7..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-ejb/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<persistence xmlns="http://java.sun.com/xml/ns/persistence" version="1.0">
-
- <persistence-unit transaction-type="JTA" name="test-unit">
-
-
- <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
- <jta-data-source>SystemDatasource</jta-data-source>
- <non-jta-data-source>NoTxDatasource</non-jta-data-source>
- <class>org.apache.geronimo.itest.jpa.AllFieldTypes</class>
- <exclude-unlisted-classes/>
- <properties>
- <property name="openjpa.jdbc.DBDictionary" value="org.apache.openjpa.jdbc.sql.DerbyDictionary"/>
- <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(ForeignKeys=true)"/>
- <property name="openjpa.Sequence" value="table(Table=OPENJPASEQ, Increment=100)"/>
- </properties>
- </persistence-unit>
-</persistence>
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml b/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
deleted file mode 100644
index 0ce47e8..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-war/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>sec-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>sec-war</artifactId>
- <name>Geronimo TestSuite :: Enterprise Testsuite :: Security - WAR</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>sec-ejb</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jta_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestForwardServlet.java b/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestForwardServlet.java
deleted file mode 100644
index 3665077..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestForwardServlet.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.itest;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.rmi.AccessException;
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.servlet.ServletException;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.geronimo.security.ContextManager;
-
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestForwardServlet extends TestServlet {
- private String forwardPath;
- public void init() {
- System.out.println("Test Servlet init");
- forwardPath = getInitParameter("forward-path");
- }
-
- protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- PrintWriter out = response.getWriter();
- showServletState(request, out);
-
- RequestDispatcher dispatcher = request.getRequestDispatcher(forwardPath);
- dispatcher.include(request, response);
-
- showServletState(request, out);
- out.flush();
- }
-
-
-}
\ No newline at end of file
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestInjectionServlet.java b/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestInjectionServlet.java
deleted file mode 100644
index 3e831c8..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestInjectionServlet.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.itest;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.rmi.AccessException;
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJB;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.naming.NamingException;
-
-import org.apache.geronimo.security.ContextManager;
-
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestInjectionServlet extends TestServlet {
-
- @EJB
- private TestSessionHome sessionHome;
-
-
- public void init() {
- System.out.println("Test Servlet init");
- }
-
- @Override
- protected TestSession getSession() throws NamingException, RemoteException, CreateException {
- return sessionHome.create();
- }
-}
\ No newline at end of file
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestServlet.java b/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestServlet.java
deleted file mode 100644
index c68ac6d..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/java/org/apache/geronimo/itest/TestServlet.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.geronimo.itest;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.rmi.AccessException;
-import java.rmi.RemoteException;
-
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.ejb.CreateException;
-
-import org.apache.geronimo.security.ContextManager;
-
-
-/**
- * @version $Rev$ $Date$
- */
-public class TestServlet extends HttpServlet {
-
- public void init() {
- System.out.println("Test Servlet init");
- }
-
- protected void service(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- PrintWriter out = response.getWriter();
- showServletState(request, out);
- try {
- TestSession session = getSession();
- try {
- out.print(session.testAccessFoo());
- } catch (AccessException e) {
- out.println("security exception on testAccessFoo method");
- }
- try {
- out.print(session.testAccessBar());
- } catch (AccessException e) {
- out.println("security exception on testAccessBar method");
- }
- try {
- out.print(session.testAccessBaz());
- } catch (AccessException e) {
- out.println("security exception on testAccessBaz method");
- }
-
- } catch (Exception e) {
- out.println("Exception:");
- e.printStackTrace(out);
- }
- showServletState(request, out);
- out.flush();
- }
-
- protected void showServletState(HttpServletRequest request, PrintWriter out) {
- if (request.getUserPrincipal() == null) {
- out.println("TestServlet principal is null, current caller Subject: " + ContextManager.getCurrentCaller());
- } else {
- out.println("TestServlet principal: " + request.getUserPrincipal().getName());
- }
- out.println("TestServlet isUserInRole foo: " + request.isUserInRole("foo"));
- out.println("TestServlet isUserInRole bar: " + request.isUserInRole("bar"));
- out.println("TestServlet isUserInRole baz: " + request.isUserInRole("baz"));
- }
-
- protected TestSession getSession() throws NamingException, RemoteException, CreateException {
- InitialContext ctx = new InitialContext();
-
- //test ejb access using geronimo plan refs
- TestSessionHome home = (TestSessionHome)ctx.lookup("java:comp/env/TestSession");
- TestSession session = home.create();
- return session;
- }
-
-
-}
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/TestJsp.jsp b/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/TestJsp.jsp
deleted file mode 100644
index 6e27369..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/TestJsp.jsp
+++ /dev/null
@@ -1,68 +0,0 @@
-<%--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
---%>
-<%@ page import="java.io.PrintWriter" %>
-<%@ page import="java.rmi.AccessException" %>
-<%@ page import="javax.naming.InitialContext" %>
-<%@ page import="org.apache.geronimo.itest.TestSession" %>
-<%@ page import="org.apache.geronimo.itest.TestSessionHome" %>
-<%@ page import="org.apache.geronimo.security.ContextManager" %>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%
- PrintWriter myout = response.getWriter();
- if (request.getUserPrincipal() == null) {
- myout.println("TestServlet principal is null, current caller Subject: " + ContextManager.getCurrentCaller());
- } else {
- myout.println("TestServlet principal: " + request.getUserPrincipal().getName());
- }
- myout.println("TestServlet isUserInRole foo: " + request.isUserInRole("foo"));
- myout.println("TestServlet isUserInRole bar: " + request.isUserInRole("bar"));
- myout.println("TestServlet isUserInRole baz: " + request.isUserInRole("baz"));
- try {
- InitialContext ctx = new InitialContext();
-
- //test ejb access using geronimo plan refs
- TestSessionHome home = (TestSessionHome)ctx.lookup("java:comp/env/TestSession");
- TestSession testSession = home.create();
- try {
- myout.print(testSession.testAccessFoo());
- } catch (AccessException e) {
- myout.println("security exception on testAccessFoo method");
- }
- try {
- myout.print(testSession.testAccessBar());
- } catch (AccessException e) {
- myout.println("security exception on testAccessBar method");
- }
- try {
- myout.print(testSession.testAccessBaz());
- } catch (AccessException e) {
- myout.println("security exception on testAccessBaz method");
- }
-
- } catch (Exception e) {
- myout.println("Exception:");
- e.printStackTrace(myout);
- }
- if (request.getUserPrincipal() == null) {
- myout.println("TestServlet principal is null, current caller Subject: " + ContextManager.getCurrentCaller());
- } else {
- myout.println("TestServlet principal: " + request.getUserPrincipal().getName());
- }
- myout.println("TestServlet isUserInRole foo: " + request.isUserInRole("foo"));
- myout.println("TestServlet isUserInRole bar: " + request.isUserInRole("bar"));
- myout.println("TestServlet isUserInRole baz: " + request.isUserInRole("baz"));
-%>
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 8631e23..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
- <environment>
- <moduleId>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}</artifactId>
- <version>${version}</version>
- <type>war</type>
- </moduleId>
- <dependencies>
-
- </dependencies>
- </environment>
-
- <context-root>/sec</context-root>
- <security-realm-name>test-realm</security-realm-name>
-</web-app>
diff --git a/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/web.xml b/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 589db2c..0000000
--- a/testsuite/enterprise-testsuite/sec-tests/sec-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app 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"
- version="2.5"
- >
-
- <display-name>Geronimo EJBRef Itest War</display-name>
-
- <servlet>
- <display-name>Security itest servlet</display-name>
- <servlet-name>noRunAsServlet</servlet-name>
- <servlet-class>org.apache.geronimo.itest.TestServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet>
- <display-name>Security itest servlet</display-name>
- <servlet-name>runAsServlet</servlet-name>
- <servlet-class>org.apache.geronimo.itest.TestServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- <run-as>
- <role-name>bar</role-name>
- </run-as>
- </servlet>
- <servlet>
- <display-name>Security itest servlet (injection)</display-name>
- <servlet-name>injectionServlet</servlet-name>
- <servlet-class>org.apache.geronimo.itest.TestInjectionServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- <run-as>
- <role-name>bar</role-name>
- </run-as>
- </servlet>
- <servlet>
- <display-name>Security itest jsp</display-name>
- <servlet-name>testjsp</servlet-name>
- <jsp-file>/TestJsp.jsp</jsp-file>
- <load-on-startup>1</load-on-startup>
- <run-as>
- <role-name>bar</role-name>
- </run-as>
- </servlet>
-
- <servlet>
- <display-name>Security itest servlet</display-name>
- <servlet-name>forwardServlet</servlet-name>
- <servlet-class>org.apache.geronimo.itest.TestForwardServlet</servlet-class>
- <init-param>
- <param-name>forward-path</param-name>
- <param-value>/noRunAsServlet</param-value>
- </init-param>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet>
- <display-name>Security itest servlet</display-name>
- <servlet-name>forwardServletToRunAs</servlet-name>
- <servlet-class>org.apache.geronimo.itest.TestForwardServlet</servlet-class>
- <init-param>
- <param-name>forward-path</param-name>
- <param-value>/servlet</param-value>
- </init-param>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet>
- <display-name>Security itest servlet</display-name>
- <servlet-name>forwardRunAsServlet</servlet-name>
- <servlet-class>org.apache.geronimo.itest.TestForwardServlet</servlet-class>
- <init-param>
- <param-name>forward-path</param-name>
- <param-value>/noRunAsServlet</param-value>
- </init-param>
- <load-on-startup>0</load-on-startup>
- <run-as>
- <role-name>baz</role-name>
- </run-as>
- </servlet>
- <servlet>
- <display-name>Security itest servlet</display-name>
- <servlet-name>forwardRunAsServletToRunAs</servlet-name>
- <servlet-class>org.apache.geronimo.itest.TestForwardServlet</servlet-class>
- <init-param>
- <param-name>forward-path</param-name>
- <param-value>/servlet</param-value>
- </init-param>
- <load-on-startup>0</load-on-startup>
- <run-as>
- <role-name>baz</role-name>
- </run-as>
- </servlet>
-
-
- <servlet-mapping>
- <servlet-name>noRunAsServlet</servlet-name>
- <url-pattern>/noRunAsServlet</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>runAsServlet</servlet-name>
- <url-pattern>/servlet</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>injectionServlet</servlet-name>
- <url-pattern>/injectionServlet</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>testjsp</servlet-name>
- <url-pattern>/jsp</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>forwardServlet</servlet-name>
- <url-pattern>/forwardServlet</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>forwardServletToRunAs</servlet-name>
- <url-pattern>/forwardServletToRunAs</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>forwardRunAsServlet</servlet-name>
- <url-pattern>/forwardRunAsServlet</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>forwardRunAsServletToRunAs</servlet-name>
- <url-pattern>/forwardRunAsServletToRunAs</url-pattern>
- </servlet-mapping>
-
- <ejb-ref>
- <ejb-ref-name>TestSession</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>org.apache.geronimo.itest.TestSessionHome</home>
- <remote>org.apache.geronimo.itest.TestSession</remote>
- </ejb-ref>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>secureServlet</web-resource-name>
- <url-pattern>/*</url-pattern>
- <!--<url-pattern>/jsp</url-pattern>-->
- <!--<url-pattern>/injectionServlet</url-pattern>-->
- <!--<url-pattern>/noRunAsServlet</url-pattern>-->
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- </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>BASIC</auth-method>
- <realm-name>TestRealm</realm-name>
- </login-config>
- <security-role>
- <role-name>foo</role-name>
- </security-role>
- <security-role>
- <role-name>bar</role-name>
- </security-role>
- <security-role>
- <role-name>baz</role-name>
- </security-role>
-
-</web-app>
diff --git a/testsuite/pom.xml b/testsuite/pom.xml
index 732027b..07e3ec9 100644
--- a/testsuite/pom.xml
+++ b/testsuite/pom.xml
@@ -183,10 +183,6 @@
<module>commands-testsuite</module>
<module>corba-testsuite</module>
<module>enterprise-testsuite</module>
-<!--
- <module>console-testsuite</module>
- <module>deployment-testsuite</module>
--->
<module>security-testsuite</module>
<module>web-testsuite</module>
<module>webservices-testsuite</module>
diff --git a/testsuite/web-testsuite/pom.xml b/testsuite/web-testsuite/pom.xml
index 493cc06..c5f6998 100644
--- a/testsuite/web-testsuite/pom.xml
+++ b/testsuite/web-testsuite/pom.xml
@@ -49,10 +49,6 @@
<module>test-2.5-servlets</module>
<module>test-tld</module>
<module>test-myfaces</module>
-<!--
- <module>test-web-forward</module>
- <module>test-web-references</module>
--->
</modules>
<profiles>
@@ -81,14 +77,6 @@
<module>test-tomcat</module>
</modules>
</profile>
-
- <profile>
- <id>all-subprojects</id>
- <modules>
- <module>test-jetty</module>
- <module>test-tomcat</module>
- </modules>
- </profile>
</profiles>
</project>
diff --git a/testsuite/web-testsuite/test-jetty/pom.xml b/testsuite/web-testsuite/test-jetty/pom.xml
deleted file mode 100644
index 2985b6e..0000000
--- a/testsuite/web-testsuite/test-jetty/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>web-testsuite</artifactId>
- <version>3.0-M1</version>
- </parent>
-
- <artifactId>test-jetty</artifactId>
- <name>Geronimo TestSuite :: Web Testsuite :: Test Jetty</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
- </configuration>
- </execution>
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 26d7928..0000000
--- a/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2" xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${pom.groupId}</sys:groupId>
- <sys:artifactId>${pom.artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>war</sys:type>
- </sys:moduleId>
- </sys:environment>
- <context-root>/JettyWeb</context-root>
- <web-container>
- <gbean-link>JettyWebContainer</gbean-link>
- </web-container>
- <container-config>
- <jetty xmlns="http://geronimo.apache.org/xml/ns/web/jetty/config-1.0">
- <virtual-host>testhost.com</virtual-host>
- </jetty>
- </container-config>
-</web-app>
diff --git a/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/web.xml b/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index e891a20..0000000
--- a/testsuite/web-testsuite/test-jetty/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-<web-app id="WebApp_ID" 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>
- JettyWeb</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
diff --git a/testsuite/web-testsuite/test-jetty/src/main/webapp/index.html b/testsuite/web-testsuite/test-jetty/src/main/webapp/index.html
deleted file mode 100644
index 209cf23..0000000
--- a/testsuite/web-testsuite/test-jetty/src/main/webapp/index.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Testing Jetty</title>
-</head>
-<body>
-Testing Jetty.
-</body>
-</html>
\ No newline at end of file
diff --git a/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java b/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java
deleted file mode 100644
index beeecf8..0000000
--- a/testsuite/web-testsuite/test-jetty/src/test/java/org/apache/geronimo/testsuite/jetty/TestJetty.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.jetty;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-
-public class TestJetty extends TestSupport
-{
- @Test
- public void testJettyHost() throws Exception {
- URL url = new URL("http://localhost:8080/JettyWeb/");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = doGET(conn, "testhost.com");
-
- assertEquals("responseCode", 200, conn.getResponseCode());
-
- assertTrue( reply.indexOf("Testing Jetty.") != -1 );
- } finally {
- conn.disconnect();
- }
- }
-
- @Test
- public void testJettyNoHost() throws Exception {
- URL url = new URL("http://localhost:8080/JettyWeb/");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = doGET(conn, null);
-
- assertEquals("responseCode", 404, conn.getResponseCode());
- } finally {
- conn.disconnect();
- }
- }
-
- private String doGET(HttpURLConnection conn, String host) throws IOException {
- conn.setConnectTimeout(1000 * 30);
- conn.setReadTimeout(1000 * 30);
- conn.setDoOutput(true);
- conn.setUseCaches(false);
- if (host != null) {
- conn.setRequestProperty("Host", host);
- }
-
- InputStream is = null;
-
- try {
- is = conn.getInputStream();
- } catch (IOException e) {
- is = conn.getErrorStream();
- }
-
- StringBuffer buf = new StringBuffer();
- BufferedReader in = new BufferedReader(new InputStreamReader(is));
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
- buf.append(inputLine);
- }
- in.close();
-
- return buf.toString();
- }
-
-}
diff --git a/testsuite/web-testsuite/test-tomcat/pom.xml b/testsuite/web-testsuite/test-tomcat/pom.xml
deleted file mode 100644
index 850754a..0000000
--- a/testsuite/web-testsuite/test-tomcat/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>web-testsuite</artifactId>
- <version>3.0-M1</version>
- </parent>
-
- <artifactId>test-tomcat</artifactId>
- <name>Geronimo TestSuite :: Web Testsuite :: Test Tomcat</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
- </configuration>
- </execution>
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 4c83646..0000000
--- a/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <sys:environment>
- <sys:moduleId>
- <sys:groupId>${pom.groupId}</sys:groupId>
- <sys:artifactId>${pom.artifactId}</sys:artifactId>
- <sys:version>${version}</sys:version>
- <sys:type>war</sys:type>
- </sys:moduleId>
- </sys:environment>
- <context-root>/TomcatWeb</context-root>
- <web-container>
- <gbean-link>TomcatWebContainer</gbean-link>
- </web-container>
- <container-config>
- <tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0">
- <host>testhost.com</host>
- <valve-chain>FirstValve</valve-chain>
- <!--<tomcat-realm>TomcatRealm</tomcat-realm>-->
- </tomcat>
- </container-config>
- <gbean name="NewVirtualHost"
- class="org.apache.geronimo.tomcat.HostGBean">
- <attribute name="className">
- org.apache.catalina.core.StandardHost
- </attribute>
- <attribute name="initParams">
- name=testhost.com
- appBase=
- workDir=work
- </attribute>
- <reference name="Engine">
- <name>TomcatEngine</name>
- </reference>
- </gbean>
- <gbean name="FirstValve"
- class="org.apache.geronimo.tomcat.ValveGBean">
- <attribute name="className">
- org.apache.catalina.authenticator.SingleSignOn
- </attribute>
- <reference name="NextValve">
- <name>SecondValve</name>
- </reference>
- </gbean>
- <gbean name="SecondValve"
- class="org.apache.geronimo.tomcat.ValveGBean">
- <attribute name="className">
- org.apache.catalina.valves.AccessLogValve
- </attribute>
- <attribute name="initParams">
- prefix=localhost_access_log.
- suffix=.txt
- pattern=common
- </attribute>
- </gbean>
- <!--<gbean name="TomcatRealm"-->
- <!--class="org.apache.geronimo.tomcat.RealmGBean">-->
- <!--<attribute name="className">-->
- <!--org.apache.geronimo.tomcat.realm.TomcatGeronimoRealm-->
- <!--</attribute>-->
- <!--<reference name="ConfigurationFactory">-->
- <!--<name>geronimo-admin</name>-->
- <!--</reference>-->
- <!--<attribute name="initParams">-->
- <!--userClassNames=org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal-->
- <!--roleClassNames=org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal-->
- <!--</attribute>-->
- <!--</gbean>-->
-</web-app>
diff --git a/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/web.xml b/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 6b90c6d..0000000
--- a/testsuite/web-testsuite/test-tomcat/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-<web-app id="WebApp_ID" 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>TomcatWeb</display-name>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
diff --git a/testsuite/web-testsuite/test-tomcat/src/main/webapp/index.html b/testsuite/web-testsuite/test-tomcat/src/main/webapp/index.html
deleted file mode 100644
index 73e884b..0000000
--- a/testsuite/web-testsuite/test-tomcat/src/main/webapp/index.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Testing Tomcat</title>
-</head>
-<body>
-Testing Tomcat.
-</body>
-</html>
\ No newline at end of file
diff --git a/testsuite/web-testsuite/test-tomcat/src/test/java/org/apache/geronimo/testsuite/tomcat/TestTomcat.java b/testsuite/web-testsuite/test-tomcat/src/test/java/org/apache/geronimo/testsuite/tomcat/TestTomcat.java
deleted file mode 100644
index 2513634..0000000
--- a/testsuite/web-testsuite/test-tomcat/src/test/java/org/apache/geronimo/testsuite/tomcat/TestTomcat.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.tomcat;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-
-public class TestTomcat extends TestSupport
-{
- @Test
- public void testTomcatHost() throws Exception {
- URL url = new URL("http://localhost:8080/TomcatWeb/");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = doGET(conn, "testhost.com");
-
- assertEquals("responseCode", 200, conn.getResponseCode());
-
- assertTrue( reply.indexOf("Testing Tomcat.") != -1 );
- } finally {
- conn.disconnect();
- }
- }
-
- @Test
- public void testTomcatNoHost() throws Exception {
- URL url = new URL("http://localhost:8080/TomcatWeb/");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = doGET(conn, null);
-
- assertEquals("responseCode", 404, conn.getResponseCode());
- } finally {
- conn.disconnect();
- }
- }
-
- private String doGET(HttpURLConnection conn, String host) throws IOException {
- conn.setConnectTimeout(1000 * 30);
- conn.setReadTimeout(1000 * 30);
- conn.setDoOutput(true);
- conn.setUseCaches(false);
- if (host != null) {
- conn.setRequestProperty("Host", host);
- }
-
- InputStream is = null;
-
- try {
- is = conn.getInputStream();
- } catch (IOException e) {
- is = conn.getErrorStream();
- }
-
- StringBuffer buf = new StringBuffer();
- BufferedReader in = new BufferedReader(new InputStreamReader(is));
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
- buf.append(inputLine);
- }
- in.close();
-
- return buf.toString();
- }
-
-}
diff --git a/testsuite/web-testsuite/test-web-forward/pom.xml b/testsuite/web-testsuite/test-web-forward/pom.xml
deleted file mode 100644
index ff06e26..0000000
--- a/testsuite/web-testsuite/test-web-forward/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 653498 $ $Date: 2008-05-05 22:11:20 +0700 (Mon, 05 May 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>web-testsuite</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>test-web-forward</artifactId>
- <name>Geronimo TestSuite :: Web Testsuite :: Test Servlet Forwarding</name>
- <packaging>pom</packaging>
-
- <description>
- Geronimo test for web testsuite. Testing Servlet forwarding
- </description>
-
- <modules>
- <module>web-forward-war-1</module>
- <module>web-forward-war-2</module>
- <module>web-forward-ear</module>
- </modules>
-
-</project>
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml b/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
deleted file mode 100644
index 6477d22..0000000
--- a/testsuite/web-testsuite/test-web-forward/web-forward-ear/pom.xml
+++ /dev/null
@@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 653498 $ $Date: 2008-05-05 22:11:20 +0700 (Mon, 05 May 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>test-web-forward</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>web-forward-ear</artifactId>
- <name>Geronimo Test Suite :: Test Servlet Forwarding :: EAR</name>
- <packaging>ear</packaging>
-
- <!--
- FIXME: Split this module up... one to build the ear, one to run the tests.
- -->
-
- <description>
- Geronimo test EAR for Servlet forwarding
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>web-forward-war-1</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>web-forward-war-2</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <modules>
- <webModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>web-forward-war-1</artifactId>
- <contextRoot>/dispatch1</contextRoot>
- <bundleFileName>web-forward-war-1.war</bundleFileName>
- </webModule>
- <webModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>web-forward-war-2</artifactId>
- <contextRoot>/dispatch2</contextRoot>
- <bundleFileName>web-forward-war-2.war</bundleFileName>
- </webModule>
- </modules>
- </configuration>
- </plugin>
-
- <!-- "ear" packaging doesn't compile test classes -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- "ear" packaging doesn't process test resources -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testResources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ears</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
- </configuration>
- </execution>
- <execution>
- <id>undeploy-ear-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/main/filtered-resources/META-INF/geronimo-application.xml b/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
deleted file mode 100644
index 6106ce2..0000000
--- a/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev: 577928 $ $Date: 2007-09-20 17:20:00 -0400 (Thu, 20 Sep 2007) $ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" application-name="TomcatApp">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>ear</dep:type>
- </dep:moduleId>
- </dep:environment>
-</application>
\ No newline at end of file
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/web/forward/ServletForwardTest.java b/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/web/forward/ServletForwardTest.java
deleted file mode 100644
index 967cd3d..0000000
--- a/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/java/org/apache/geronimo/testsuite/web/forward/ServletForwardTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.web.forward;
-
-import org.apache.geronimo.testsupport.SeleniumTestSupport;
-import org.testng.annotations.Test;
-
-@Test
-public class ServletForwardTest extends SeleniumTestSupport {
-
- @Test
- public void testServletForward() throws Exception {
- selenium.open("/dispatch1/TestServlet");
- waitForPageLoad();
- System.out.println(selenium.getBodyText());
- assertTrue("Servlet1", selenium.isTextPresent("TestServlet1: 10"));
-
- selenium.open("/dispatch2/TestServlet");
- waitForPageLoad();
- System.out.println(selenium.getBodyText());
- assertTrue("Servlet2", selenium.isTextPresent("TestServlet2: 20"));
-
- selenium.open("/dispatch2/TestServlet?mode=forward");
- waitForPageLoad();
- System.out.println(selenium.getBodyText());
- assertTrue("Servlet2->Servlet1 forward", selenium.isTextPresent("TestServlet1: 10"));
-
-
- }
-}
-
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/resources/testng.xml b/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/resources/testng.xml
deleted file mode 100644
index 4e629c2..0000000
--- a/testsuite/web-testsuite/test-web-forward/web-forward-ear/src/test/resources/testng.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 514087 $ $Date: 2007-03-03 01:13:40 -0500 (Sat, 03 Mar 2007) $ -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-
-<suite name="Suite1" verbose="1">
- <test name="web-testsuite.forward">
- <packages>
- <package name="org.apache.geronimo.testsuite.web.forward"/>
- </packages>
- </test>
-</suite>
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml b/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
deleted file mode 100644
index 5bb06fc..0000000
--- a/testsuite/web-testsuite/test-web-forward/web-forward-war-1/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 653498 $ $Date: 2008-05-05 22:11:20 +0700 (Mon, 05 May 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>test-web-forward</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>web-forward-war-1</artifactId>
- <name>Geronimo Test Suite :: Test Servlet Forwarding :: WAR I</name>
- <packaging>war</packaging>
-
- <description>
- Geronimo test WAR for Servlet forwarding
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/java/org/apache/geronimo/test/TestServlet.java b/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/java/org/apache/geronimo/test/TestServlet.java
deleted file mode 100644
index 74f101d..0000000
--- a/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/java/org/apache/geronimo/test/TestServlet.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class TestServlet extends HttpServlet {
-
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- PrintWriter out = response.getWriter();
- Integer value = lookup("java:comp/env/value", request);
-
- out.println("TestServlet1: " + value);
- }
-
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- }
-
-
- private Integer lookup(String name, HttpServletRequest request) {
- try {
- Context ctx = new InitialContext();
- Integer value = (Integer)ctx.lookup(name);
- return value;
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
-
-}
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 2c7f60d..0000000
--- a/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>war</dep:type>
- </dep:moduleId>
- </dep:environment>
- <context-root>/dispatch1</context-root>
-</web-app>
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/web.xml b/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f250646..0000000
--- a/testsuite/web-testsuite/test-web-forward/web-forward-war-1/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev: 561486 $ $Date: 2007-07-31 16:22:15 -0400 (Tue, 31 Jul 2007) $ -->
-
-<web-app id="WebApp_ID" 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>TestServlet</display-name>
-
- <servlet>
- <description></description>
- <display-name>TestServlet</display-name>
- <servlet-name>TestServlet</servlet-name>
- <servlet-class>
- org.apache.geronimo.test.TestServlet
- </servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestServlet</servlet-name>
- <url-pattern>/TestServlet</url-pattern>
- </servlet-mapping>
-
- <env-entry>
- <description>Value</description>
- <env-entry-name>value</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>10</env-entry-value>
- </env-entry>
-
-</web-app>
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml b/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
deleted file mode 100644
index 5094708..0000000
--- a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/pom.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 653498 $ $Date: 2008-05-05 22:11:20 +0700 (Mon, 05 May 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>test-web-forward</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>web-forward-war-2</artifactId>
- <name>Geronimo Test Suite :: Test Servlet Forwarding :: WAR II</name>
- <packaging>war</packaging>
-
- <description>
- Geronimo test WAR for Servlet forwarding
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/ContextListener.java b/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/ContextListener.java
deleted file mode 100644
index 56a19f3..0000000
--- a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/ContextListener.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test;
-
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
-public class ContextListener implements ServletContextListener {
-
- public void contextDestroyed(ServletContextEvent event) {
- TestServlet.testLookup("contextDestroyed");
- }
-
- public void contextInitialized(ServletContextEvent event) {
- TestServlet.testLookup("contextInitialized");
- }
-
-}
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/RequestListener.java b/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/RequestListener.java
deleted file mode 100644
index 2a0623a..0000000
--- a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/RequestListener.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test;
-
-import javax.servlet.ServletRequestEvent;
-import javax.servlet.ServletRequestListener;
-
-public class RequestListener implements ServletRequestListener {
-
- public void requestDestroyed(ServletRequestEvent event) {
- TestServlet.testLookup("requestDestroyed");
- }
-
- public void requestInitialized(ServletRequestEvent event) {
- TestServlet.testLookup("requestInitialized");
- }
-
-}
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/SessionListener.java b/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/SessionListener.java
deleted file mode 100644
index eaf5abd..0000000
--- a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/SessionListener.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test;
-
-import java.io.IOException;
-import javax.servlet.http.HttpSessionListener;
-import javax.servlet.http.HttpSessionEvent;
-
-public class SessionListener implements HttpSessionListener {
-
- public void sessionCreated(HttpSessionEvent se) {
- TestServlet.testLookup("sessionCreated");
- }
-
- public void sessionDestroyed(HttpSessionEvent se) {
- TestServlet.testLookup("sessionDestroyed");
- }
-
-}
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestFilter.java b/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestFilter.java
deleted file mode 100644
index dc1652d..0000000
--- a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestFilter.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test;
-
-import java.io.IOException;
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
-public class TestFilter implements Filter {
-
- public void init(FilterConfig filterConfig) {
- TestServlet.testLookup("filterInit");
- }
-
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException {
- TestServlet.testLookup("doFilter");
- chain.doFilter(request, response);
- }
-
- public void destroy() {
- TestServlet.testLookup("filterDestroy");
- }
-
-}
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestServlet.java b/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestServlet.java
deleted file mode 100644
index fc17129..0000000
--- a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/java/org/apache/geronimo/test/TestServlet.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.servlet.ServletException;
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-public class TestServlet extends HttpServlet {
-
- private static Integer expectedValue = new Integer(20);
-
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- String mode = request.getParameter("mode");
-
- if ("forward".equals(mode)) {
- getServletConfig().getServletContext().getContext("/dispatch1").getRequestDispatcher("/TestServlet").forward(request, response);
- } else {
- PrintWriter out = response.getWriter();
- Integer value = lookup("java:comp/env/value", request);
-
- out.println("TestServlet2: " + value);
-
- // create new session for testing
- HttpSession session = request.getSession(true);
- session.setAttribute("sessAttr1", "value21");
- }
- }
-
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- }
-
- public void init(ServletConfig config) throws ServletException {
- super.init(config);
- testLookup("servletInit");
- }
-
- public void destroy() {
- testLookup("servletDestroy");
- }
-
- private Integer lookup(String name, HttpServletRequest request) {
- try {
- Context ctx = new InitialContext();
- Integer value = (Integer)ctx.lookup(name);
- return value;
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
-
- public static void testLookup(String name) {
- System.out.println(name);
-
- Integer value;
- try {
- Context ctx = new InitialContext();
- value = (Integer)ctx.lookup("java:comp/env/value");
- } catch (Exception e) {
- e.printStackTrace();
- throw new RuntimeException(name, e);
- }
-
- if (!expectedValue.equals(value)) {
- throw new RuntimeException("Values do not match: " + expectedValue + " " + value);
- }
- }
-
-}
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 7349f44..0000000
--- a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>war</dep:type>
- </dep:moduleId>
- </dep:environment>
- <context-root>/dispatch2</context-root>
- <container-config>
- <tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0">
- <cross-context/>
- </tomcat>
- </container-config>
-</web-app>
diff --git a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/web.xml b/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 69cd2a5..0000000
--- a/testsuite/web-testsuite/test-web-forward/web-forward-war-2/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev: 561486 $ $Date: 2007-07-31 16:22:15 -0400 (Tue, 31 Jul 2007) $ -->
-
-<web-app id="WebApp_ID" 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>TestServlet</display-name>
-
- <listener>
- <listener-class>org.apache.geronimo.test.RequestListener</listener-class>
- </listener>
-
- <listener>
- <listener-class>org.apache.geronimo.test.ContextListener</listener-class>
- </listener>
-
- <listener>
- <listener-class>org.apache.geronimo.test.SessionListener</listener-class>
- </listener>
-
- <session-config>
- <session-timeout>1</session-timeout>
- </session-config>
-
- <filter>
- <filter-name>TestFilter</filter-name>
- <filter-class>org.apache.geronimo.test.TestFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>TestFilter</filter-name>
- <servlet-name>TestServlet</servlet-name>
- </filter-mapping>
-
- <servlet>
- <description></description>
- <display-name>TestServlet</display-name>
- <servlet-name>TestServlet</servlet-name>
- <servlet-class>
- org.apache.geronimo.test.TestServlet
- </servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestServlet</servlet-name>
- <url-pattern>/TestServlet</url-pattern>
- </servlet-mapping>
-
- <env-entry>
- <description>Value</description>
- <env-entry-name>value</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>20</env-entry-value>
- </env-entry>
-
-</web-app>
diff --git a/testsuite/web-testsuite/test-web-references/pom.xml b/testsuite/web-testsuite/test-web-references/pom.xml
deleted file mode 100644
index d2de502..0000000
--- a/testsuite/web-testsuite/test-web-references/pom.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>web-testsuite</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>test-web-references</artifactId>
- <name>Geronimo TestSuite :: Web Testsuite :: Test WebReferences</name>
- <packaging>pom</packaging>
-
- <description>
- Geronimo test for web testsuite. Testing web references
- </description>
-
- <modules>
- <module>web-references-ejb</module>
- <module>web-references-war</module>
- <module>web-references-ear</module>
- </modules>
-
-</project>
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml b/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
deleted file mode 100644
index 577b135..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-ear/pom.xml
+++ /dev/null
@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>test-web-references</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>web-references-ear</artifactId>
- <name>Geronimo TestSuite :: Test Web References :: EAR</name>
- <packaging>ear</packaging>
-
- <!--
- FIXME: Split this module up... one to build the ear, one to run the tests.
- -->
-
- <description>
- Geronimo test EAR for Web References
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>web-references-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>web-references-ejb</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <modules>
- <webModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>web-references-war</artifactId>
- <contextRoot>/webref</contextRoot>
- <bundleFileName>web-references-war.war</bundleFileName>
- </webModule>
- <ejbModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>web-references-ejb</artifactId>
- <bundleFileName>web-references-ejb.jar</bundleFileName>
- </ejbModule>
- </modules>
- </configuration>
- </plugin>
-
- <!-- "ear" packaging doesn't compile test classes -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- <!-- "ear" packaging doesn't process test resources -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testResources</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-failsafe-plugin</artifactId>
- <configuration>
- <suiteXmlFiles>
- <suiteXmlFile>${project.build.testOutputDirectory}/testng.xml</suiteXmlFile>
- </suiteXmlFiles>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>selenium-maven-plugin</artifactId>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ears</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
- </configuration>
- </execution>
- <execution>
- <id>undeploy-ear-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/filtered-resources/META-INF/geronimo-application.xml b/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
deleted file mode 100644
index 16046c8..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2" application-name="TomcatApp">
- <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>ear</dep:type>
- </dep:moduleId>
- <dep:dependencies>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>system-database</dep:artifactId>
- </dep:dependency>
- <dep:dependency>
- <dep:groupId>org.apache.geronimo.configs</dep:groupId>
- <dep:artifactId>activemq-ra</dep:artifactId>
- </dep:dependency>
- </dep:dependencies>
- </dep:environment>
- <module>
- <web>web-references-war.war</web>
- <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0">
- <context-root>/webref</context-root>
- <ejb-ref>
- <ref-name>ejb/TestBean</ref-name>
- <ejb-link>TestBean</ejb-link>
-<!--
- <pattern>
- <name>TestBean</name>
- </pattern>
--->
- </ejb-ref>
- <resource-ref>
- <ref-name>jdbc/MyDataSource</ref-name>
- <resource-link>SystemDatasource</resource-link>
- </resource-ref>
- <resource-ref>
- <ref-name>jms/DefaultActiveMQConnectionFactory</ref-name>
- <resource-link>DefaultActiveMQConnectionFactory</resource-link>
- </resource-ref>
- <resource-env-ref>
- <ref-name>jms/SendReceiveQueue</ref-name>
- <message-destination-link>SendReceiveQueue</message-destination-link>
- </resource-env-ref>
- <!-- <service-ref>
- <service-ref-name>service/HelloWorldService</service-ref-name>
- <port>
- <port-name>HelloWorld</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/webref/ws</uri>
- </port>
- </service-ref> -->
- </web-app>
- </module>
- <module>
- <ejb>web-references-ejb.jar</ejb>
- <openejb-jar xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1">
- <enterprise-beans>
- <session>
- <ejb-name>TestBean</ejb-name>
- <jndi-name>TestBean</jndi-name>
- </session>
- </enterprise-beans>
- </openejb-jar>
- </module>
-</application>
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java b/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java
deleted file mode 100644
index 2b474b0..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/java/org/apache/geronimo/testsuite/web/references/WebReferencesTest.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.testsuite.web.references;
-
-import org.apache.geronimo.testsupport.SeleniumTestSupport;
-import org.testng.annotations.Test;
-
-/**
- * ???
- *
- * @version $Rev$ $Date$
- */
-@Test
-public class WebReferencesTest
- extends SeleniumTestSupport
-{
- @Test
- public void testWebReferences() throws Exception {
- selenium.open("/webref/TomcatTestServlet");
- waitForPageLoad();
- assertEquals("Sample application to check references", selenium.getTitle());
- System.out.println(selenium.getText("xpath=/html/body/font"));
- assertEquals("Check EJB Reference : Call to bean method returned ->bean Test", selenium.getText("xpath=/html/body/font"));
- }
-}
-
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/resources/testng.xml b/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/resources/testng.xml
deleted file mode 100644
index 60bebcb..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-ear/src/test/resources/testng.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-
-<suite name="Suite1" verbose="1">
- <test name="web-testsuite.references">
- <packages>
- <package name="org.apache.geronimo.testsuite.web.references"/>
- </packages>
- </test>
-</suite>
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml b/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml
deleted file mode 100644
index e535011..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-ejb/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>test-web-references</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>web-references-ejb</artifactId>
- <name>Geronimo TestSuite :: Test Web References :: EJB</name>
- <packaging>ejb</packaging>
-
- <description>
- Geronimo test EJBs for J2EE 1.4.
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/local/TestLocal.java b/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/local/TestLocal.java
deleted file mode 100644
index 9fc9ab5..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/local/TestLocal.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test.local;
-
-import java.rmi.RemoteException;
-
-public interface TestLocal extends javax.ejb.EJBLocalObject {
- public String echoLocal(String name) throws RemoteException;
-}
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/local/TestLocalBean.java b/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/local/TestLocalBean.java
deleted file mode 100644
index 321b1be..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/local/TestLocalBean.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test.local;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-
-public class TestLocalBean implements SessionBean {
-
- public void ejbActivate() throws EJBException, RemoteException {
- }
-
- public void ejbPassivate() throws EJBException, RemoteException {
- }
-
- public void ejbRemove() throws EJBException, RemoteException {
- }
-
- public void ejbCreate() throws EJBException {
- }
-
- public void setSessionContext(SessionContext arg0) throws EJBException, RemoteException {
- }
-
- public String echoLocal(String name)
- {
- System.out.println("Bean local class " + name);
- return "local bean "+name;
- }
-
-}
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/local/TestLocalHome.java b/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/local/TestLocalHome.java
deleted file mode 100644
index 6eb659b..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/local/TestLocalHome.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test.local;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBLocalHome;
-
-public interface TestLocalHome extends EJBLocalHome {
- public TestLocal create() throws CreateException;
-
-}
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/remote/Test.java b/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/remote/Test.java
deleted file mode 100644
index 04c9370..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/remote/Test.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test.remote;
-
-import java.rmi.RemoteException;
-
-public interface Test extends javax.ejb.EJBObject {
-
- public String echo(String name) throws RemoteException;
-}
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/remote/TestBean.java b/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/remote/TestBean.java
deleted file mode 100644
index cb91f98..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/remote/TestBean.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test.remote;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-
-public class TestBean implements SessionBean {
-
- public void ejbActivate() throws EJBException, RemoteException {
- }
-
- public void ejbPassivate() throws EJBException, RemoteException {
- }
-
- public void ejbRemove() throws EJBException, RemoteException {
- }
-
- public void ejbCreate() throws EJBException {
- }
-
- public void setSessionContext(SessionContext arg0) throws EJBException, RemoteException {
- }
-
- public String echo(String name)
- {
- System.out.println("Bean class " + name);
- return "bean "+name;
- }
-}
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/remote/TestHome.java b/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/remote/TestHome.java
deleted file mode 100644
index c6e2c28..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/org/apache/geronimo/test/remote/TestHome.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test.remote;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-
-public interface TestHome extends EJBHome {
-
- public Test create() throws RemoteException, CreateException;
-
-}
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/test/Test.java b/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/test/Test.java
deleted file mode 100644
index ff126ab..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/test/Test.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test;
-
-import java.rmi.RemoteException;
-
-public interface Test extends javax.ejb.EJBObject {
-
- public String echo(String name) throws RemoteException;
-}
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/test/TestBean.java b/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/test/TestBean.java
deleted file mode 100644
index 327714e..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/test/TestBean.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.EJBException;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-
-public class TestBean implements SessionBean {
-
- public void ejbActivate() throws EJBException, RemoteException {
- }
-
- public void ejbPassivate() throws EJBException, RemoteException {
- }
-
- public void ejbRemove() throws EJBException, RemoteException {
- }
-
- public void ejbCreate() throws EJBException {
- }
-
- public void setSessionContext(SessionContext arg0) throws EJBException, RemoteException {
- }
-
- public String echo(String name)
- {
- System.out.println("Bean class " + name);
- return "bean "+name;
- }
-}
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/test/TestHome.java b/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/test/TestHome.java
deleted file mode 100644
index a3200be..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/java/test/TestHome.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package test;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.CreateException;
-import javax.ejb.EJBHome;
-
-public interface TestHome extends EJBHome {
-
- public Test create() throws RemoteException, CreateException;
-}
diff --git a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/resources/META-INF/ejb-jar.xml b/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/resources/META-INF/ejb-jar.xml
deleted file mode 100644
index 55e948c..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-ejb/src/main/resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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>Test</display-name>
- <enterprise-beans>
- <session>
- <display-name>Test</display-name>
- <ejb-name>TestBean</ejb-name>
- <home>org.apache.geronimo.test.remote.TestHome</home>
- <remote>org.apache.geronimo.test.remote.Test</remote>
- <ejb-class>org.apache.geronimo.test.remote.TestBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- <session>
- <display-name>TestLocal</display-name>
- <ejb-name>TestLocalBean</ejb-name>
- <local-home>org.apache.geronimo.test.local.TestLocalHome</local-home>
- <local>org.apache.geronimo.test.local.TestLocal</local>
- <ejb-class>org.apache.geronimo.test.local.TestLocalBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml b/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
deleted file mode 100644
index 7d3aaf0..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-war/pom.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>test-web-references</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>web-references-war</artifactId>
- <name>Geronimo TestSuite :: Test Web References :: WAR</name>
- <packaging>war</packaging>
-
- <description>
- Geronimo test WAR for web references
- </description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>web-references-ejb</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- <type>ejb</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jms_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxrpc_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/TomcatTestServlet.java b/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/TomcatTestServlet.java
deleted file mode 100644
index 1b41e64..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/TomcatTestServlet.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.sql.Connection;
-
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.sql.DataSource;
-
-import org.apache.geronimo.test.local.TestLocal;
-import org.apache.geronimo.test.local.TestLocalHome;
-import org.apache.geronimo.test.remote.Test;
-import org.apache.geronimo.test.remote.TestHome;
-import org.apache.geronimo.test.ws.HelloWorld;
-import org.apache.geronimo.test.ws.HelloWorldService;
-
-
-/**
- * Servlet implementation class for Servlet: TomcatTestServlet
- *
- */
- public class TomcatTestServlet extends javax.servlet.http.HttpServlet implements javax.servlet.Servlet {
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#HttpServlet()
- */
- public TomcatTestServlet() {
- super();
- }
-
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#doGet(HttpServletRequest request, HttpServletResponse response)
- */
- protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
- PrintWriter out = response.getWriter();
- out.println("<html><head><title>Sample application to check references</title></head></html>");
- out.println("<body>");
-
- try
- {
- Context ctx = new InitialContext();
- TestHome result = (TestHome)ctx.lookup("java:comp/env/ejb/TestBean");
- //TestHome testHome = (TestHome) PortableRemoteObject.narrow(result, TestHome.class);
- Test test = result.create();
- String echo = test.echo("Test");
- out.println("<font align=Center face=\"Garamond\"> Check EJB Reference : Call to bean method returned ->"+echo+" </font><br>");
-
- DataSource ds = (DataSource) ctx.lookup("java:comp/env/jdbc/MyDataSource");
- Connection con = ds.getConnection();
- out.println("<font align=Center face=\"Garamond\"> Check Resource Reference : Got Connection ->"+con+" </font><br>");
-
- QueueConnectionFactory qcf = (QueueConnectionFactory)ctx.lookup("java:comp/env/jms/DefaultActiveMQConnectionFactory");
- QueueConnection qCon = qcf.createQueueConnection();
- out.println("<font align=Center face=\"Garamond\"> Check JMS Resource Reference : Got Queue Connection ->"+qCon+" </font><br>");
-
- Queue q = (Queue) ctx.lookup("java:comp/env/jms/SendReceiveQueue");
- out.println("<font align=Center face=\"Garamond\"> Check JMS Resource Env Reference : Got Queue ->"+q.getQueueName()+" </font><br>");
-
- HelloWorldService hello = (HelloWorldService) ctx.lookup("java:comp/env/service/HelloWorldService");
- HelloWorld port = hello.getHelloWorld();
- out.println("<font align=Center face=\"Garamond\"> Check Service Reference : Called Web Service ->"+port.getHelloWorld("Test")+" </font><br>");
-
- TestLocalHome resultLocal = (TestLocalHome)ctx.lookup("java:comp/env/ejb/TestLocalBean");
- TestLocal testLocal = resultLocal.create();
- String echoLocal = testLocal.echoLocal("Test");
- out.println("<font align=Center face=\"Garamond\"> Check EJB Local Reference : Call to bean method returned ->"+echoLocal+" </font><br>");
-
- }catch(Exception e)
- {
- e.printStackTrace();
- }
-
-
-
- out.println("</body></html>");
-
- }
-
- /* (non-Java-doc)
- * @see javax.servlet.http.HttpServlet#doPost(HttpServletRequest request, HttpServletResponse response)
- */
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
-
- }
-}
\ No newline at end of file
diff --git a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/ws/HelloWorld.java b/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/ws/HelloWorld.java
deleted file mode 100644
index 5830b09..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/ws/HelloWorld.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test.ws;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-import javax.xml.rpc.Service;
-
-public interface HelloWorld extends Remote
-{
-
- public abstract String getHelloWorld(String s)
- throws RemoteException;
-}
\ No newline at end of file
diff --git a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/ws/HelloWorldService.java b/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/ws/HelloWorldService.java
deleted file mode 100644
index ae412ac..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/ws/HelloWorldService.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test.ws;
-
-import javax.xml.rpc.Service;
-
-public interface HelloWorldService extends Service {
-
- public java.lang.String getHelloWorldAddress();
-
- public HelloWorld getHelloWorld() throws javax.xml.rpc.ServiceException;
-
- public HelloWorld getHelloWorld(java.net.URL portAddress) throws javax.xml.rpc.ServiceException;
-}
diff --git a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/ws/HelloWorldWS.java b/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/ws/HelloWorldWS.java
deleted file mode 100644
index 60a6d24..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/java/org/apache/geronimo/test/ws/HelloWorldWS.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.geronimo.test.ws;
-
-import java.rmi.RemoteException;
-import javax.xml.rpc.ServiceException;
-import javax.xml.rpc.server.ServiceLifecycle;
-
-
-public class HelloWorldWS
- implements HelloWorld, ServiceLifecycle
-{
-
- public HelloWorldWS()
- {
- }
-
- public String getHelloWorld(String name)
- throws RemoteException
- {
- return "Hello world, " + name;
- }
-
- public void init(Object obj)
- throws ServiceException
- {
- }
-
- public void destroy()
- {
- }
-}
\ No newline at end of file
diff --git a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/hello-mapping.xml b/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/hello-mapping.xml
deleted file mode 100644
index 6e141db..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/hello-mapping.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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>org.apache.geronimo.test.ws</package-type>
- <namespaceURI>http://ws.geronimo.apache.org</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
diff --git a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/web.xml b/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index d9c6985..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<web-app id="WebApp_ID" 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>TomcatWeb</display-name>
- <servlet>
- <description></description>
- <display-name>TomcatTestServlet</display-name>
- <servlet-name>TomcatTestServlet</servlet-name>
- <servlet-class>
- org.apache.geronimo.test.TomcatTestServlet
- </servlet-class>
- </servlet>
-
- <servlet>
- <servlet-name>HelloWorldServlet</servlet-name>
- <servlet-class>
- org.apache.geronimo.test.ws.HelloWorldWS
- </servlet-class>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>HelloWorldServlet</servlet-name>
- <url-pattern>/ws</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>TomcatTestServlet</servlet-name>
- <url-pattern>/TomcatTestServlet</url-pattern>
- </servlet-mapping>
- <ejb-ref>
- <ejb-ref-name>ejb/TestBean</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>org.apache.geronimo.test.remote.TestHome</home>
- <remote>org.apache.geronimo.test.remote.Test</remote>
- <ejb-link>TestBean</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <ejb-ref-name>ejb/TestLocalBean</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>org.apache.geronimo.test.local.TestLocalHome</local-home>
- <local>org.apache.geronimo.test.local.TestLocal</local>
- <ejb-link>TestLocalBean</ejb-link>
- </ejb-local-ref>
- <resource-ref>
- <res-ref-name>jdbc/MyDataSource</res-ref-name>
- <res-type>javax.sql.DataSource</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <res-ref-name>
- jms/DefaultActiveMQConnectionFactory
- </res-ref-name>
- <res-type>javax.jms.QueueConnectionFactory</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <message-destination-ref>
- <message-destination-ref-name>
- jms/SendReceiveQueue
- </message-destination-ref-name>
- <message-destination-type>
- javax.jms.Queue
- </message-destination-type>
- <message-destination-usage>Produces</message-destination-usage>
- <message-destination-link>
- SendReceiveQueue
- </message-destination-link>
- </message-destination-ref>
- <service-ref>
- <service-ref-name>service/HelloWorldService</service-ref-name>
- <service-interface>org.apache.geronimo.test.ws.HelloWorldService</service-interface>
- <wsdl-file>WEB-INF/wsdl/hello.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/hello-mapping.xml</jaxrpc-mapping-file>
- <service-qname xmlns:pfx="http://ws.geronimo.apache.org">pfx:HelloWorldService</service-qname>
- <port-component-ref>
- <service-endpoint-interface>org.apache.geronimo.test.ws.HelloWorld</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
- <welcome-file-list>
- <welcome-file>index.html</welcome-file>
- <welcome-file>index.htm</welcome-file>
- <welcome-file>index.jsp</welcome-file>
- <welcome-file>default.html</welcome-file>
- <welcome-file>default.htm</welcome-file>
- <welcome-file>default.jsp</welcome-file>
- </welcome-file-list>
-</web-app>
diff --git a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/webservices.xml b/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/webservices.xml
deleted file mode 100644
index 4177da8..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/webservices.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<webservices
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:impl="http://com.myapp/ws4ee"
- 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">
-
- <webservice-description>
- <webservice-description-name>HelloWorldService</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/hello.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/hello-mapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>HelloWorld</port-component-name>
- <wsdl-port>HelloWorld</wsdl-port>
- <service-endpoint-interface>org.apache.geronimo.test.ws.HelloWorld</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>HelloWorldServlet</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/wsdl/hello.wsdl b/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/wsdl/hello.wsdl
deleted file mode 100644
index e7d131b..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/WEB-INF/wsdl/hello.wsdl
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<wsdl:definitions targetNamespace="http://ws.geronimo.apache.org" xmlns:impl="http://ws.geronimo.apache.org" xmlns:intf="http://ws.geronimo.apache.org" xmlns:apachesoap="http://xml.apache.org/xml-soap" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://schemas.xmlsoap.org/wsdl/">
- <wsdl:message name="getHelloWorldResponse">
-
- <wsdl:part name="getHelloWorldReturn" type="xsd:string"/>
-
- </wsdl:message>
-
- <wsdl:message name="getHelloWorldRequest">
-
- <wsdl:part name="in0" type="xsd:string"/>
-
- </wsdl:message>
-
- <wsdl:portType name="HelloWorld">
-
- <wsdl:operation name="getHelloWorld" parameterOrder="in0">
-
- <wsdl:input name="getHelloWorldRequest" message="impl:getHelloWorldRequest"/>
-
- <wsdl:output name="getHelloWorldResponse" message="impl:getHelloWorldResponse"/>
-
- </wsdl:operation>
-
- </wsdl:portType>
-
- <wsdl:binding name="HelloWorldSoapBinding" type="impl:HelloWorld">
-
- <wsdlsoap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <wsdl:operation name="getHelloWorld">
-
- <wsdlsoap:operation soapAction=""/>
-
- <wsdl:input name="getHelloWorldRequest">
-
- <wsdlsoap:body use="literal" namespace="http://ws.geronimo.apache.org"/>
-
- </wsdl:input>
-
- <wsdl:output name="getHelloWorldResponse">
-
- <wsdlsoap:body use="literal" namespace="http://ws.geronimo.apache.org"/>
-
- </wsdl:output>
-
- </wsdl:operation>
-
- </wsdl:binding>
-
- <wsdl:service name="HelloWorldService">
-
- <wsdl:port name="HelloWorld" binding="impl:HelloWorldSoapBinding">
-
- <wsdlsoap:address location="http://localhost:8080/webref/ws"/>
-
- </wsdl:port>
-
- </wsdl:service>
-
-</wsdl:definitions>
diff --git a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/index.html b/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/index.html
deleted file mode 100644
index 785299f..0000000
--- a/testsuite/web-testsuite/test-web-references/web-references-war/src/main/webapp/index.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Insert title here</title>
-</head>
-<body>
-Hello
-</body>
-</html>
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxr-tests/goals.txt b/testsuite/webservices-testsuite/jaxr-tests/goals.txt
deleted file mode 100644
index 9cb8855..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/goals.txt
+++ /dev/null
@@ -1 +0,0 @@
-clean install
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml b/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
deleted file mode 100644
index 878bd59..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/pom.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxr-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxr-client</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAXR Client</name>
- <packaging>jar</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <properties>
- <clientLogFile>${basedir}/target/client.log</clientLogFile>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxr_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.geronimo.test.JAXRClient</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>clientLogFile</name>
- <value>${clientLogFile}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-client</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <phase>pre-integration-test</phase>
- <id>run-client</id>
- <goals>
- <goal>run-client</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXRClient/1.1/car</moduleId>
- <logOutput>true</logOutput>
- <logFile>${clientLogFile}</logFile>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-client-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXRClientServer/1.1/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
-
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/src/main/java/org/apache/geronimo/test/JAXRClient.java b/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/src/main/java/org/apache/geronimo/test/JAXRClient.java
deleted file mode 100644
index d00b025..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/src/main/java/org/apache/geronimo/test/JAXRClient.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-public class JAXRClient {
-
- public static void main(String [] args) throws Exception {
- try {
- test();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- // needs to be forced because of a bug
- System.exit(0);
- }
-
- public static void test() throws Exception {
- JAXRTest test = new JAXRTest();
- System.out.println(test.getImplementation());
- test.test();
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/src/main/java/org/apache/geronimo/test/JAXRTest.java b/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/src/main/java/org/apache/geronimo/test/JAXRTest.java
deleted file mode 100644
index 5194b48..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/src/main/java/org/apache/geronimo/test/JAXRTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import javax.xml.registry.ConnectionFactory;
-
-public class JAXRTest {
-
- private ConnectionFactory connFactory;
-
- public JAXRTest() throws Exception {
- this.connFactory = ConnectionFactory.newInstance();
- }
-
- public String getImplementation() {
- return this.connFactory.getClass().getName();
- }
-
- public void test() throws Exception {
- // Not sure what to do here
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/src/main/resources/META-INF/application-client.xml b/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/src/main/resources/META-INF/application-client.xml
deleted file mode 100644
index 65016b2..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/src/main/resources/META-INF/application-client.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<application-client 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/applicationclient_1_4.xsd"
- version="1.4">
-
- <display-name>JAXR Client</display-name>
-
-</application-client>
-
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/src/main/resources/META-INF/geronimo-application-client.xml b/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/src/main/resources/META-INF/geronimo-application-client.xml
deleted file mode 100644
index bdb7f7d..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/src/main/resources/META-INF/geronimo-application-client.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<application-client
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <dep:client-environment>
- <dep:moduleId>
- <dep:groupId>JEE5</dep:groupId>
- <dep:artifactId>JAXRClient</dep:artifactId>
- <dep:version>1.1</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- </dep:client-environment>
-
- <dep:server-environment>
- <dep:moduleId>
- <dep:groupId>JEE5</dep:groupId>
- <dep:artifactId>JAXRClientServer</dep:artifactId>
- <dep:version>1.1</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- </dep:server-environment>
-
-</application-client>
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/src/test/java/org/apache/geronimo/testsuite/testset/ClientJAXRTest.java b/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/src/test/java/org/apache/geronimo/testsuite/testset/ClientJAXRTest.java
deleted file mode 100644
index f42a459..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-client/src/test/java/org/apache/geronimo/testsuite/testset/ClientJAXRTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.FileInputStream;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-
-public class ClientJAXRTest extends TestSupport {
-
- @Test
- public void testClient() throws Exception {
- String outputFile = System.getProperty("clientLogFile");
- assertNotNull(outputFile);
- FileInputStream in = null;
- try {
- in = new FileInputStream(outputFile);
- BufferedReader reader =
- new BufferedReader(new InputStreamReader(in));
- assertTrue("Factory",
- find(reader, "org.apache.ws.scout.registry.ConnectionFactoryImpl"));
- } finally {
- if (in != null) {
- in.close();
- }
- }
- }
-
- private boolean find(BufferedReader reader, String text)
- throws IOException {
- String line = null;
- while ((line = reader.readLine()) != null) {
- System.out.println(line);
- if (line.indexOf(text) != -1) {
- return true;
- }
- }
- return false;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml b/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
deleted file mode 100644
index 162a3a3..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/pom.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxr-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxr-ejb</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAXR EJB</name>
- <packaging>jar</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openejb</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxr_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ejb</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-ejb-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXREJB/1.1/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRBean.java b/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRBean.java
deleted file mode 100644
index 7fe6dac..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRBean.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.rmi.RemoteException;
-import java.util.List;
-import java.util.ArrayList;
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-
-public class JAXRBean implements SessionBean {
-
- private SessionContext sessionContext;
-
- public void ejbCreate() {
- }
-
- public void ejbRemove() {
- }
-
- public void ejbActivate() {
- }
-
- public void ejbPassivate() {
- }
-
- public void setSessionContext(SessionContext sessionContext) {
- this.sessionContext = sessionContext;
- }
-
- public List testJAXR() throws RemoteException {
- List output = new ArrayList();
- try {
- JAXRTest t = new JAXRTest();
- output.add(t.getImplementation());
- t.test();
- } catch (Exception e) {
- e.printStackTrace();
- throw new RemoteException("Error", e);
- }
-
- return output;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRHome.java b/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRHome.java
deleted file mode 100644
index 540d302..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRHome.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
-
-public interface JAXRHome extends EJBHome {
-
- public JAXRObject create() throws RemoteException, CreateException;
-
-}
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRObject.java b/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRObject.java
deleted file mode 100644
index 90f0d0a..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRObject.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.rmi.RemoteException;
-import java.util.List;
-import javax.ejb.EJBObject;
-
-public interface JAXRObject extends EJBObject {
-
- public List testJAXR() throws RemoteException;
-
-}
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRTest.java b/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRTest.java
deleted file mode 100644
index 5194b48..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/java/org/apache/geronimo/test/JAXRTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import javax.xml.registry.ConnectionFactory;
-
-public class JAXRTest {
-
- private ConnectionFactory connFactory;
-
- public JAXRTest() throws Exception {
- this.connFactory = ConnectionFactory.newInstance();
- }
-
- public String getImplementation() {
- return this.connFactory.getClass().getName();
- }
-
- public void test() throws Exception {
- // Not sure what to do here
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/ejb-jar.xml b/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/ejb-jar.xml
deleted file mode 100644
index 40b042f..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<ejb-jar 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" version="2.1">
- <enterprise-beans>
- <session>
- <ejb-name>JAXR</ejb-name>
- <home>org.apache.geronimo.test.JAXRHome</home>
- <remote>org.apache.geronimo.test.JAXRObject</remote>
- <ejb-class>org.apache.geronimo.test.JAXRBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/openejb-jar.xml b/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/openejb-jar.xml
deleted file mode 100644
index d4f4be0..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/main/resources/META-INF/openejb-jar.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
- xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <environment>
- <moduleId>
- <groupId>JEE5</groupId>
- <artifactId>JAXREJB</artifactId>
- <version>1.1</version>
- <type>car</type>
- </moduleId>
- </environment>
-
- <enterprise-beans>
- <session>
- <ejb-name>JAXR</ejb-name>
- <jndi-name>JAXR</jndi-name>
- </session>
- </enterprise-beans>
-
-</openejb-jar>
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXRTest.java b/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXRTest.java
deleted file mode 100644
index 4d991b1..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-ejb/src/test/java/org/apache/geronimo/testsuite/testset/EJBJAXRTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.util.Properties;
-import java.util.List;
-import javax.naming.InitialContext;
-import javax.rmi.PortableRemoteObject;
-
-import org.apache.geronimo.test.JAXRHome;
-import org.apache.geronimo.test.JAXRObject;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-
-public class EJBJAXRTest extends TestSupport {
-
- @Test
- public void testEJB() throws Exception {
- Properties p = new Properties();
-
- p.put("java.naming.factory.initial",
- "org.apache.openejb.client.RemoteInitialContextFactory");
- p.put("java.naming.provider.url",
- "127.0.0.1:4201");
-
- InitialContext ctx = new InitialContext(p);
-
- Object obj = ctx.lookup("/JAXR");
-
- JAXRHome ejbHome =
- (JAXRHome)PortableRemoteObject.narrow(obj, JAXRHome.class);
-
- JAXRObject ejbObject = ejbHome.create();
-
- List factoryList = ejbObject.testJAXR();
-
- assertEquals(1, factoryList.size());
- assertEquals("Implementation",
- "org.apache.ws.scout.registry.ConnectionFactoryImpl",
- factoryList.get(0));
-
- System.out.println( factoryList );
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml b/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
deleted file mode 100644
index 9fcbf03..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/pom.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxr-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxr-war</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAXR WAR</name>
- <packaging>war</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <dependencies>
- <!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- -->
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxr_1.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}-${project.version}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXRServlet/1.1/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRServlet.java b/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRServlet.java
deleted file mode 100644
index 0538c18..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRServlet.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class JAXRServlet extends HttpServlet {
-
- public void doGet(HttpServletRequest theRequest,
- HttpServletResponse theResponse)
- throws IOException {
-
- PrintWriter pw = theResponse.getWriter();
-
- theResponse.setContentType("text/html");
- pw.println("<html><head><title>Servlet</title></head>");
- pw.println("<body>");
-
- try {
- JAXRTest test = new JAXRTest();
- pw.println(test.getImplementation());
- test.test();
- } catch (Exception e) {
- e.printStackTrace();
- IOException exception = new IOException("Error");
- exception.initCause(e);
- throw exception;
- }
-
- pw.println("</body></html>");
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRTest.java b/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRTest.java
deleted file mode 100644
index 5194b48..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/java/org/apache/geronimo/test/JAXRTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.io.StringReader;
-import java.io.StringWriter;
-
-import javax.xml.registry.ConnectionFactory;
-
-public class JAXRTest {
-
- private ConnectionFactory connFactory;
-
- public JAXRTest() throws Exception {
- this.connFactory = ConnectionFactory.newInstance();
- }
-
- public String getImplementation() {
- return this.connFactory.getClass().getName();
- }
-
- public void test() throws Exception {
- // Not sure what to do here
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/JAXRJSP.jsp b/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/JAXRJSP.jsp
deleted file mode 100644
index f175000..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/JAXRJSP.jsp
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
- version="1.2">
-<jsp:directive.page contentType="text/html"/>
-<jsp:directive.page import="java.io.IOException"/>
-<jsp:directive.page import="org.apache.geronimo.test.JAXRTest"/>
-
-<html><head><title>JSP</title></head>
-<body>
-
-<jsp:scriptlet>
-// Note we need to declare CDATA because we don't escape the less than symbol
-<![CDATA[
- try {
- JAXRTest test = new JAXRTest();
- out.println(test.getImplementation());
- test.test();
- } catch (Exception e) {
- e.printStackTrace();
- IOException exception = new IOException("Error");
- exception.initCause(e);
- throw exception;
- }
-]]>
-</jsp:scriptlet>
-
-</body></html>
-</jsp:root>
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 8d15c69..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>JEE5</dep:groupId>
- <dep:artifactId>JAXRServlet</dep:artifactId>
- <dep:version>1.1</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- </dep:environment>
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/web.xml b/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 7944649..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<web-app 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"
- version="2.4">
- <servlet>
- <servlet-name>JAXRServlet</servlet-name>
- <servlet-class>org.apache.geronimo.test.JAXRServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>JAXRServlet</servlet-name>
- <url-pattern>/JAXRServlet</url-pattern>
- </servlet-mapping>
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/org/apache/geronimo/testsuite/testset/WebJAXRTest.java b/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/org/apache/geronimo/testsuite/testset/WebJAXRTest.java
deleted file mode 100644
index b3955d9..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/jaxr-war/src/test/java/org/apache/geronimo/testsuite/testset/WebJAXRTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-
-public class WebJAXRTest extends TestSupport {
-
- private String baseURL = "http://localhost:8080/";
-
- @Test
- public void testServlet() throws Exception {
- checkReply("/JAXRServlet");
- }
-
- @Test
- public void testJSP() throws Exception {
- checkReply("/JAXRJSP.jsp");
- }
-
- private void checkReply(String address)
- throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull(warName);
- URL url = new URL(baseURL + warName + address);
- HttpURLConnection connection = (HttpURLConnection)url.openConnection();
- connection.setConnectTimeout(30 * 1000);
- connection.setReadTimeout(30 * 1000);
- try {
- BufferedReader reader =
- new BufferedReader(new InputStreamReader(connection.getInputStream()));
- assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
- assertTrue("Factory",
- find(reader, "org.apache.ws.scout.registry.ConnectionFactoryImpl"));
- } finally {
- connection.disconnect();
- }
- }
-
- private boolean find(BufferedReader reader, String text)
- throws IOException {
- String line = null;
- while ((line = reader.readLine()) != null) {
- System.out.println(line);
- if (line.indexOf(text) != -1) {
- return true;
- }
- }
- return false;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxr-tests/pom.xml b/testsuite/webservices-testsuite/jaxr-tests/pom.xml
deleted file mode 100644
index e68bd39..0000000
--- a/testsuite/webservices-testsuite/jaxr-tests/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>webservices-testsuite</artifactId>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxr-tests</artifactId>
- <packaging>pom</packaging>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAXR</name>
-
- <description>Geronimo jee5-testsuite testsuite created from an archetype.</description>
-
- <modules>
- <module>jaxr-war</module>
- <module>jaxr-ejb</module>
- <module>jaxr-client</module>
- </modules>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/goals.txt b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/goals.txt
deleted file mode 100644
index 9cb8855..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/goals.txt
+++ /dev/null
@@ -1 +0,0 @@
-clean install
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
deleted file mode 100644
index 2d1eba1..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/pom.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxrpc-jaxws-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxrpc-jaxws-war</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-RPC - JAX-WS WAR</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxb_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}-${project.version}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXRPC-JAXWS/1.1/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/FaultDetail.java b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/FaultDetail.java
deleted file mode 100644
index 660b6f5..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/FaultDetail.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.greeter_control;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="minor" type="{http://www.w3.org/2001/XMLSchema}short"/>
- * <element name="major" type="{http://www.w3.org/2001/XMLSchema}short"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "minor",
- "major"
-})
-@XmlRootElement(name = "faultDetail")
-public class FaultDetail {
-
- protected short minor;
- protected short major;
-
- /**
- * Gets the value of the minor property.
- *
- */
- public short getMinor() {
- return minor;
- }
-
- /**
- * Sets the value of the minor property.
- *
- */
- public void setMinor(short value) {
- this.minor = value;
- }
-
- /**
- * Gets the value of the major property.
- *
- */
- public short getMajor() {
- return major;
- }
-
- /**
- * Sets the value of the major property.
- *
- */
- public void setMajor(short value) {
- this.major = value;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/Greeter.java b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/Greeter.java
deleted file mode 100644
index cb556a0..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/Greeter.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.greeter_control;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-@WebService(name = "Greeter", targetNamespace = "http://apache.org/greeter_control")
-public interface Greeter {
-
- /**
- *
- * @param requestType
- * @return
- * returns java.lang.String
- */
- @WebMethod
- @WebResult(name = "responseType", targetNamespace = "http://apache.org/greeter_control/types")
- @RequestWrapper(localName = "greetMe", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.GreetMe")
- @ResponseWrapper(localName = "greetMeResponse", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.GreetMeResponse")
- public String greetMe(
- @WebParam(name = "requestType", targetNamespace = "http://apache.org/greeter_control/types")
- String requestType);
-
-}
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/GreeterImpl.java b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/GreeterImpl.java
deleted file mode 100644
index ec6e15e..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/GreeterImpl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.greeter_control;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceContext;
-
-/* serviceName, portName specified in webservices.xml */
-@WebService(serviceName = "SOAPService",
- portName = "SoapPort",
- endpointInterface = "org.apache.greeter_control.Greeter",
- targetNamespace = "http://apache.org/greeter_control")
-public class GreeterImpl implements Greeter {
-
- @Resource
- private WebServiceContext context;
-
- public WebServiceContext getContext() {
- return context;
- }
-
- public String greetMe(String me) {
- return "Hello " + me;
- }
-
- public String sayHi() {
- return "Hi";
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/GreeterImpl2.java b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/GreeterImpl2.java
deleted file mode 100644
index 5f44419..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/GreeterImpl2.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.greeter_control;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceContext;
-
-/* serviceName, portName, sei specified in webservices.xml */
-@WebService(serviceName = "SOAPService",
- portName = "SoapPort",
- targetNamespace = "http://apache.org/greeter_control")
-public class GreeterImpl2 {
-
- @Resource
- private WebServiceContext context;
-
- public WebServiceContext getContext() {
- return context;
- }
-
- @WebMethod
- public String greetMe(String me) {
- return "Hello " + me;
- }
-
- @WebMethod
- public String sayHi() {
- return "Hi";
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/PingMeFault.java b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/PingMeFault.java
deleted file mode 100644
index 6b833f4..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/greeter_control/PingMeFault.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.greeter_control;
-
-import javax.xml.ws.WebFault;
-import org.apache.greeter_control.FaultDetail;
-
-
-@WebFault(name = "faultDetail", targetNamespace = "http://apache.org/greeter_control/types")
-public class PingMeFault
- extends Exception
-{
-
- /**
- * Java type that goes as soapenv:Fault detail element.
- *
- */
- private FaultDetail faultInfo;
-
- /**
- *
- * @param faultInfo
- * @param message
- */
- public PingMeFault(String message, FaultDetail faultInfo) {
- super(message);
- this.faultInfo = faultInfo;
- }
-
- /**
- *
- * @param faultInfo
- * @param message
- * @param cause
- */
- public PingMeFault(String message, FaultDetail faultInfo, Throwable cause) {
- super(message, cause);
- this.faultInfo = faultInfo;
- }
-
- /**
- *
- * @return
- * returns fault bean: org.apache.greeter_control.types.FaultDetail
- */
- public FaultDetail getFaultInfo() {
- return faultInfo;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/hello_world_soap_http/Greeter.java b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/hello_world_soap_http/Greeter.java
deleted file mode 100644
index d3b2d0f..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/hello_world_soap_http/Greeter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.hello_world_soap_http;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-public interface Greeter extends Remote {
-
- public String greetMe(String requestType) throws RemoteException;
-
-}
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java
deleted file mode 100644
index 90bc23b..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.hello_world_soap_http;
-
-import java.rmi.RemoteException;
-
-public class GreeterImpl implements Greeter {
-
- public String greetMe(String me) throws RemoteException {
- return "Hello " + me;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index cb1b341..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1"
- >
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>JEE5</dep:groupId>
- <dep:artifactId>JAXRPC-JAXWS</dep:artifactId>
- <dep:version>1.1</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- </dep:environment>
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/jaxrpcmapping.xml b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/jaxrpcmapping.xml
deleted file mode 100644
index e711c27..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/jaxrpcmapping.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<java-wsdl-mapping
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="1.1">
-</java-wsdl-mapping>
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/web.xml b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index cc6e8d3..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee">
-
- <display-name>Geronimo JAX-RPC - JAX-WS POJO WS War</display-name>
-
- <servlet>
- <display-name>Geronimo JAX-RPC POJO WS</display-name>
- <servlet-name>JAXRPCServlet</servlet-name>
- <servlet-class>org.apache.hello_world_soap_http.GreeterImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet>
- <display-name>Geronimo JAX-WS POJO WS</display-name>
- <servlet-name>JAXWSServlet1</servlet-name>
- <servlet-class>org.apache.greeter_control.GreeterImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet>
- <display-name>Geronimo JAX-WS POJO WS II</display-name>
- <servlet-name>JAXWSServlet2</servlet-name>
- <servlet-class>org.apache.greeter_control.GreeterImpl2</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>JAXRPCServlet</servlet-name>
- <url-pattern>/servlet1</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>JAXWSServlet1</servlet-name>
- <url-pattern>/servlet2</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>JAXWSServlet2</servlet-name>
- <url-pattern>/servlet3</url-pattern>
- </servlet-mapping>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/webservices.xml b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/webservices.xml
deleted file mode 100644
index e29e262..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/webservices.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 514087 $ $Date: 2007-03-03 01:13:40 -0500 (Sat, 03 Mar 2007) $ -->
-
-<webservices xmlns="http://java.sun.com/xml/ns/javaee" version="1.2"
- xmlns:greeter="http://apache.org/greeter_control" >
-
- <webservice-description>
- <webservice-description-name>Geronimo JAX-RPC POJO WS</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/greeter.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpcmapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>JAXRPCPort</port-component-name>
- <wsdl-port>GreeterPort</wsdl-port>
- <service-endpoint-interface>org.apache.hello_world_soap_http.Greeter</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>JAXRPCServlet</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-
- <webservice-description>
- <webservice-description-name>Geronimo JAX-WS POJO WS I</webservice-description-name>
- <port-component>
- <port-component-name>JAXWSPort1</port-component-name>
- <wsdl-service>greeter:GreeterService</wsdl-service>
- <wsdl-port>greeter:GreeterPort</wsdl-port>
- <enable-mtom>false</enable-mtom>
- <service-endpoint-interface>org.apache.greeter_control.Greeter</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>JAXWSServlet1</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-
- <webservice-description>
- <webservice-description-name>Geronimo JAX-WS POJO WS II</webservice-description-name>
- <port-component>
- <port-component-name>JAXWSPort2</port-component-name>
- <wsdl-service>greeter:GreeterService</wsdl-service>
- <wsdl-port>greeter:GreeterPort</wsdl-port>
- <enable-mtom>false</enable-mtom>
- <service-endpoint-interface>org.apache.greeter_control.Greeter</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>JAXWSServlet2</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-
-</webservices>
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/wsdl/greeter.wsdl b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/wsdl/greeter.wsdl
deleted file mode 100644
index 5315bc5..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/main/webapp/WEB-INF/wsdl/greeter.wsdl
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://org.apache.org/greeter"
- xmlns:x1="http://org.apache.org/greeter/types"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://org.apache.org/greeter" name="HelloWorld">
-
- <wsdl:message name="greetMeRequest">
- <wsdl:part name="in" type="xsd:string" />
- </wsdl:message>
- <wsdl:message name="greetMeResponse">
- <wsdl:part name="out" type="xsd:string" />
- </wsdl:message>
-
- <wsdl:portType name="Greeter">
- <wsdl:operation name="greetMe">
- <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
- <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="GreeterSOAPBinding" type="tns:Greeter">
- <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <wsdl:operation name="greetMe">
- <soap:operation soapAction="" style="rpc"/>
- <wsdl:input name="greetMeRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="greetMeResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- </wsdl:binding>
-
- <wsdl:service name="GreeterService">
- <wsdl:port binding="tns:GreeterSOAPBinding" name="GreeterPort">
- <soap:address location="http://localhost:9020/SoapContext/GreeterPort"/>
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
-
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/java/org/apache/geronimo/testsuite/testset/WSTest.java b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/java/org/apache/geronimo/testsuite/testset/WSTest.java
deleted file mode 100644
index e0fb789..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/java/org/apache/geronimo/testsuite/testset/WSTest.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.StringReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.PortType;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.InputSource;
-
-public class WSTest extends TestSupport {
-
- private String baseURL = "http://localhost:8080/";
-
- @Test
- public void testJAXRPCInvocation() throws Exception {
- Document doc = getResponse("/servlet1", "/request1.xml");
- Text replyText = findText(doc.getDocumentElement(), "Hello foo bar");
- assertTrue("reply message", replyText != null);
- }
-
- @Test
- public void testJAXWSInvocation() throws Exception {
- Document doc = getResponse("/servlet1", "/request2.xml");
- Text replyText = findText(doc.getDocumentElement(), "Hello foo bar");
- if (replyText == null) {
- // XXX: work-around for CXF, wants <requestType> to be unqualified
- doc = getResponse("/servlet1", "/request3.xml");
- replyText = findText(doc.getDocumentElement(), "Hello foo bar");
- }
- assertTrue("reply message", replyText != null);
- }
-
- private Document getResponse(String servlet, String requestFile) throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull("Web application name not specified", warName);
-
- InputStream requestInput = WSTest.class.getResourceAsStream(requestFile);
- assertNotNull("SOAP request not specified", requestInput);
-
- URL url = new URL(baseURL + warName + servlet);
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = call(requestInput, conn);
-
- assertEquals("responseCode", 200, conn.getResponseCode());
- String contentType = conn.getHeaderField("Content-Type");
- assertTrue("contentType", contentType.indexOf("text/xml") != -1);
-
- InputSource is = new InputSource(new StringReader(reply));
- Document doc = parseMessage(is);
-
- return doc;
-
- } finally {
- conn.disconnect();
- }
- }
-
- private Document parseMessage(InputSource is) throws Exception {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
-
- Document doc = db.parse(is);
- return doc;
- }
-
- private Text findText(Element element, String value) {
- NodeList list = element.getChildNodes();
- for (int i = 0; i < list.getLength(); i++) {
- Node child = (Node)list.item(i);
- if (child instanceof Text) {
- Text text = (Text)child;
- if (text.getData().indexOf(value) != -1) {
- return text;
- }
- } else if (child instanceof Element) {
- Element childEl = (Element)child;
- Text text = findText(childEl, value);
- if (text != null) {
- return text;
- }
- }
- }
- return null;
- }
-
- private String call(InputStream requestInput, HttpURLConnection conn) throws IOException {
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- conn.setDoOutput(true);
- conn.setDoInput(true);
- conn.setUseCaches(false);
- conn.setRequestMethod("POST");
- conn.setRequestProperty("Content-Type", "text/xml");
-
- OutputStream out = conn.getOutputStream();
-
- byte[] data = new byte[1024];
- int read = 0;
- while ((read = requestInput.read(data, 0, data.length)) != -1) {
- out.write(data, 0, read);
- }
-
- requestInput.close();
-
- out.flush();
- out.close();
-
- InputStream is = null;
-
- try {
- is = conn.getInputStream();
- } catch (IOException e) {
- is = conn.getErrorStream();
- }
-
- StringBuffer buf = new StringBuffer();
- BufferedReader in = new BufferedReader(new InputStreamReader(is));
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
- buf.append(inputLine);
- }
- in.close();
- System.out.println("--");
-
- return buf.toString();
- }
-
- @Test
- public void testJAXRPCWSDL() throws Exception {
- testWSDL("servlet1", new String [] {"greetMe"});
- }
-
- @Test
- public void testJAXWSWSDL1() throws Exception {
- testWSDL("servlet2", new String [] {"greetMe"});
- }
-
- /*
- @Test
- public void testJAXWSWSDL2() throws Exception {
- testWSDL("servlet3", new String [] {"greetMe"});
- }
- */
-
- private void testWSDL(String servlet, String[] operations) throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull("Web application name not specified", warName);
-
- URL url = new URL(baseURL + warName + "/" + servlet + "?wsdl");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- try {
- conn.setUseCaches(false);
-
- WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- Definition def =
- wsdlReader.readWSDL(null, new InputSource(conn.getInputStream()));
-
- System.out.println("WSDL: " + def);
-
- assertEquals(1, def.getPortTypes().size());
-
- Iterator iter = def.getPortTypes().entrySet().iterator();
-
- PortType portType =
- (PortType)((Map.Entry)iter.next()).getValue();
-
- assertEquals("Number of operations", operations.length, portType.getOperations().size());
-
- for (String opName : operations) {
- if (portType.getOperation(opName, null, null) == null) {
- fail("Operation " + opName + " not found");
- }
- }
-
- } finally {
- conn.disconnect();
- }
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/resources/request1.xml b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/resources/request1.xml
deleted file mode 100644
index 0ed4b73..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/resources/request1.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Body>
- <greetMe xmlns="http://org.apache.org/greeter">
- <in>foo bar</in>
- </greetMe>
- </soap:Body>
-</soap:Envelope>
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/resources/request2.xml b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/resources/request2.xml
deleted file mode 100644
index b3a79ba..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/resources/request2.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Body>
- <x:greetMe xmlns:x="http://apache.org/greeter_control/types">
- <requestType>foo bar</requestType>
- </x:greetMe>
- </soap:Body>
-</soap:Envelope>
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/resources/request3.xml b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/resources/request3.xml
deleted file mode 100644
index e7c043d..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/jaxrpc-jaxws-war/src/test/resources/request3.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Body>
- <greetMe xmlns="http://apache.org/greeter_control/types">
- <requestType>foo bar</requestType>
- </greetMe>
- </soap:Body>
-</soap:Envelope>
diff --git a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/pom.xml b/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/pom.xml
deleted file mode 100644
index a5b2b41..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-jaxws-tests/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>webservices-testsuite</artifactId>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxrpc-jaxws-tests</artifactId>
- <packaging>pom</packaging>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-RPC - JAX-WS</name>
-
- <description>Geronimo JEE5 Webservices JAX-RPC - JAX-WS tests</description>
-
- <modules>
- <module>jaxrpc-jaxws-war</module>
- </modules>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/goals.txt b/testsuite/webservices-testsuite/jaxrpc-tests/goals.txt
deleted file mode 100644
index 9cb8855..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/goals.txt
+++ /dev/null
@@ -1 +0,0 @@
-clean install
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
deleted file mode 100644
index d0eefec..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/pom.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxrpc-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxrpc-ejb</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-RPC EJB</name>
- <packaging>jar</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openejb</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>greeter</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ejb</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-ejb-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXRPCEJB/1.1/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/java/org/apache/hello_world_soap_http/Greeter.java b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/java/org/apache/hello_world_soap_http/Greeter.java
deleted file mode 100644
index d3b2d0f..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/java/org/apache/hello_world_soap_http/Greeter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.hello_world_soap_http;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-public interface Greeter extends Remote {
-
- public String greetMe(String requestType) throws RemoteException;
-
-}
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/java/org/apache/hello_world_soap_http/GreeterBean.java b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/java/org/apache/hello_world_soap_http/GreeterBean.java
deleted file mode 100644
index 8b00bf0..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/java/org/apache/hello_world_soap_http/GreeterBean.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.hello_world_soap_http;
-
-import java.rmi.RemoteException;
-import java.util.List;
-import java.util.ArrayList;
-
-import javax.ejb.SessionBean;
-import javax.ejb.SessionContext;
-
-public class GreeterBean implements Greeter, SessionBean {
-
- private SessionContext sessionContext;
-
- public void ejbCreate() {
- }
-
- public void ejbRemove() {
- }
-
- public void ejbActivate() {
- }
-
- public void ejbPassivate() {
- }
-
- public void setSessionContext(SessionContext sessionContext) {
- this.sessionContext = sessionContext;
- }
-
- public String greetMe(String input) throws RemoteException {
- System.out.println("called: " + input);
- return "Hello " + input;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/java/org/apache/hello_world_soap_http/GreeterHome.java b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/java/org/apache/hello_world_soap_http/GreeterHome.java
deleted file mode 100644
index 3c327ed..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/java/org/apache/hello_world_soap_http/GreeterHome.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.hello_world_soap_http;
-
-import java.rmi.RemoteException;
-import javax.ejb.EJBHome;
-import javax.ejb.CreateException;
-
-public interface GreeterHome extends EJBHome {
-
- public GreeterObject create() throws RemoteException, CreateException;
-
-}
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/java/org/apache/hello_world_soap_http/GreeterObject.java b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/java/org/apache/hello_world_soap_http/GreeterObject.java
deleted file mode 100644
index 54828db..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/java/org/apache/hello_world_soap_http/GreeterObject.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.hello_world_soap_http;
-
-import java.rmi.RemoteException;
-import java.util.List;
-import javax.ejb.EJBObject;
-
-public interface GreeterObject extends EJBObject {
-
- public String greetMe(String input) throws RemoteException;
-
-}
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/resources/META-INF/ejb-jar.xml b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/resources/META-INF/ejb-jar.xml
deleted file mode 100644
index b791cf9..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<ejb-jar xmlns="http://java.sun.com/xml/ns/j2ee" version="2.1">
- <enterprise-beans>
- <session>
- <ejb-name>Greeter</ejb-name>
- <home>org.apache.hello_world_soap_http.GreeterHome</home>
- <remote>org.apache.hello_world_soap_http.GreeterObject</remote>
- <service-endpoint>org.apache.hello_world_soap_http.Greeter</service-endpoint>
- <ejb-class>org.apache.hello_world_soap_http.GreeterBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/resources/META-INF/jaxrpcmapping.xml b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/resources/META-INF/jaxrpcmapping.xml
deleted file mode 100644
index e711c27..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/resources/META-INF/jaxrpcmapping.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<java-wsdl-mapping
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- version="1.1">
-</java-wsdl-mapping>
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/resources/META-INF/openejb-jar.xml b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/resources/META-INF/openejb-jar.xml
deleted file mode 100644
index 2ace584..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/resources/META-INF/openejb-jar.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
- xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <environment>
- <moduleId>
- <groupId>JEE5</groupId>
- <artifactId>JAXRPCEJB</artifactId>
- <version>1.1</version>
- <type>car</type>
- </moduleId>
- </environment>
-
- <enterprise-beans>
- <session>
- <ejb-name>Greeter</ejb-name>
- <jndi-name>Greeter</jndi-name>
- <web-service-address>/greeter</web-service-address>
- </session>
- </enterprise-beans>
-
-</openejb-jar>
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/resources/META-INF/webservices.xml b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/resources/META-INF/webservices.xml
deleted file mode 100644
index ce36b07..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/resources/META-INF/webservices.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 494533 $ $Date: 2007-01-09 14:28:09 -0500 (Tue, 09 Jan 2007) $ -->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- version="1.1">
- <webservice-description>
- <webservice-description-name>Geronimo JAX-RPC EJB WS</webservice-description-name>
- <wsdl-file>META-INF/wsdl/greeter.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/jaxrpcmapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>GreeterPort</port-component-name>
- <wsdl-port>GreeterPort</wsdl-port>
- <service-endpoint-interface>org.apache.hello_world_soap_http.Greeter</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>Greeter</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-
-</webservices>
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/resources/META-INF/wsdl/greeter.wsdl b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/resources/META-INF/wsdl/greeter.wsdl
deleted file mode 100644
index 5315bc5..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/main/resources/META-INF/wsdl/greeter.wsdl
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://org.apache.org/greeter"
- xmlns:x1="http://org.apache.org/greeter/types"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://org.apache.org/greeter" name="HelloWorld">
-
- <wsdl:message name="greetMeRequest">
- <wsdl:part name="in" type="xsd:string" />
- </wsdl:message>
- <wsdl:message name="greetMeResponse">
- <wsdl:part name="out" type="xsd:string" />
- </wsdl:message>
-
- <wsdl:portType name="Greeter">
- <wsdl:operation name="greetMe">
- <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
- <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="GreeterSOAPBinding" type="tns:Greeter">
- <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <wsdl:operation name="greetMe">
- <soap:operation soapAction="" style="rpc"/>
- <wsdl:input name="greetMeRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="greetMeResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- </wsdl:binding>
-
- <wsdl:service name="GreeterService">
- <wsdl:port binding="tns:GreeterSOAPBinding" name="GreeterPort">
- <soap:address location="http://localhost:9020/SoapContext/GreeterPort"/>
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
-
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/test/java/org/apache/geronimo/testsuite/testset/JaxRPCTest.java b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/test/java/org/apache/geronimo/testsuite/testset/JaxRPCTest.java
deleted file mode 100644
index 39d5caa..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/test/java/org/apache/geronimo/testsuite/testset/JaxRPCTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.Definition;
-import javax.wsdl.Operation;
-import javax.wsdl.PortType;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Element;
-
-import org.xml.sax.InputSource;
-
-import javax.naming.InitialContext;
-import javax.rmi.PortableRemoteObject;
-
-import org.apache.hello_world_soap_http.GreeterHome;
-import org.apache.hello_world_soap_http.GreeterObject;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-
-public class JaxRPCTest extends TestSupport {
-
- private String baseURL = "http://localhost:8080/";
-
- @Test
- public void testInvocation() throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull("Web application name not specified", warName);
-
- InputStream requestInput = JaxRPCTest.class.getResourceAsStream("/request1.xml");
- assertNotNull("SOAP request not specified", requestInput);
-
- URL url = new URL(baseURL + warName + "/");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- try {
- conn.setDoOutput(true);
- conn.setDoInput(true);
- conn.setUseCaches(false);
- conn.setRequestMethod("POST");
- conn.setRequestProperty("Content-Type", "text/xml");
-
- OutputStream out = conn.getOutputStream();
-
- byte[] data = new byte[1024];
- int read = 0;
- while ((read = requestInput.read(data, 0, data.length)) != -1) {
- out.write(data, 0, read);
- }
-
- requestInput.close();
-
- out.flush();
- out.close();
-
- boolean found = false;
-
- // FIXME: Simple test is required for now, as CXF has problems
- BufferedReader in =
- new BufferedReader(new InputStreamReader(conn.getInputStream()));
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
-
- if (found == false &&
- inputLine.indexOf("Hello foo bar") != -1) {
- found = true;
- }
- }
- in.close();
-
- assertTrue("Reply", found);
-
- } finally {
- conn.disconnect();
- }
- }
-
- @Test
- public void testWSDL() throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull("Web application name not specified", warName);
-
- URL url = new URL(baseURL + warName + "?wsdl");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- try {
- conn.setUseCaches(false);
-
- WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- Definition def =
- wsdlReader.readWSDL(null, new InputSource(conn.getInputStream()));
-
- System.out.println("WSDL: " + def);
-
- assertTrue(def.getPortTypes().size() > 0);
-
- boolean found = false;
-
- Iterator iter = def.getPortTypes().entrySet().iterator();
- while (iter.hasNext()) {
- PortType portType =
- (PortType)((Map.Entry)iter.next()).getValue();
-
- if (found == false &&
- portType.getOperation("greetMe", null, null) != null) {
- found = true;
- }
- }
-
- assertTrue("Operation not found", found);
-
- } finally {
- conn.disconnect();
- }
-
- }
-
- @Test
- public void testEJB() throws Exception {
- Properties p = new Properties();
-
- p.put("java.naming.factory.initial",
- "org.apache.openejb.client.RemoteInitialContextFactory");
- p.put("java.naming.provider.url",
- "127.0.0.1:4201");
-
- InitialContext ctx = new InitialContext(p);
-
- Object obj = ctx.lookup("/Greeter");
-
- GreeterHome ejbHome =
- (GreeterHome)PortableRemoteObject.narrow(obj, GreeterHome.class);
-
- GreeterObject ejbObject = ejbHome.create();
-
- String response = ejbObject.greetMe("foo");
-
- assertEquals("Hello foo", response);
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/test/resources/request1.xml b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/test/resources/request1.xml
deleted file mode 100644
index 0ed4b73..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-ejb/src/test/resources/request1.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Body>
- <greetMe xmlns="http://org.apache.org/greeter">
- <in>foo bar</in>
- </greetMe>
- </soap:Body>
-</soap:Envelope>
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
deleted file mode 100644
index face293..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/pom.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxrpc-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxrpc-war</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-RPC WAR</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}-${project.version}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXRPCServlet/1.1/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/java/org/apache/hello_world_soap_http/Greeter.java b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/java/org/apache/hello_world_soap_http/Greeter.java
deleted file mode 100644
index d3b2d0f..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/java/org/apache/hello_world_soap_http/Greeter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.hello_world_soap_http;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-public interface Greeter extends Remote {
-
- public String greetMe(String requestType) throws RemoteException;
-
-}
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java
deleted file mode 100644
index 90bc23b..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/java/org/apache/hello_world_soap_http/GreeterImpl.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.hello_world_soap_http;
-
-import java.rmi.RemoteException;
-
-public class GreeterImpl implements Greeter {
-
- public String greetMe(String me) throws RemoteException {
- return "Hello " + me;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/JAXRPCClient.jsp b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/JAXRPCClient.jsp
deleted file mode 100644
index fc7b975..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/JAXRPCClient.jsp
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="1.2">
-<jsp:directive.page contentType="text/html"/>
-
-<jsp:directive.page import="java.io.IOException"/>
-<jsp:directive.page import="javax.naming.InitialContext"/>
-<jsp:directive.page import="javax.xml.rpc.Service"/>
-<jsp:directive.page import="org.apache.hello_world_soap_http.Greeter"/>
-
-<html><head><title>JAX-RPC Client JSP</title></head>
-<body>
-
-<jsp:scriptlet>
- try {
- String name = request.getParameter("name");
- if (name == null) {
- name = "Unknown";
- }
- System.out.println(name);
- InitialContext ctx = new InitialContext();
- Service service = (Service)ctx.lookup("java:comp/env/services/Greeter");
- Greeter greeter = (Greeter)service.getPort(Greeter.class);
- out.println("WebService returned: " + greeter.greetMe(name));
- } catch (Exception e) {
- e.printStackTrace();
- IOException exception = new IOException("Error");
- exception.initCause(e);
- throw exception;
- }
-</jsp:scriptlet>
-
-</body></html>
-</jsp:root>
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 7718781..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1"
- >
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>JEE5</dep:groupId>
- <dep:artifactId>JAXRPCServlet</dep:artifactId>
- <dep:version>1.1</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- </dep:environment>
-
- <service-ref>
- <service-ref-name>services/Greeter</service-ref-name>
- <port>
- <port-name>GreeterPort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/jaxrpc-war-3.0-SNAPSHOT/servlet</uri>
- </port>
- </service-ref>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/jaxrpcmapping.xml b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/jaxrpcmapping.xml
deleted file mode 100644
index 56165e4..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/jaxrpcmapping.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<java-wsdl-mapping
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:greeter="http://org.apache.org/greeter"
- version="1.1">
- <package-mapping>
- <package-type>org.apache.hello_world_soap_http</package-type>
- <namespaceURI>urn:geronimo-samples</namespaceURI>
- </package-mapping>
- <service-interface-mapping>
- <service-interface>
- org.apache.hello_world_soap_http.Greeter;
- </service-interface>
- <wsdl-service-name>greeter:GreeterService</wsdl-service-name>
- <port-mapping>
- <port-name>GreeterPort</port-name>
- <java-port-name>GreeterPort</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>org.apache.hello_world_soap_http.Greeter</service-endpoint-interface>
- <wsdl-port-type>greeter:Greeter</wsdl-port-type>
- <wsdl-binding>greeter:GreeterSOAPBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>greetMe</java-method-name>
- <wsdl-operation>greetMe</wsdl-operation>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message>greeter:greetMeRequest</wsdl-message>
- <wsdl-message-part-name>in</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.lang.String</method-return-value>
- <wsdl-message>greeter:greetMeResponse</wsdl-message>
- <wsdl-message-part-name>out</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
-
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/web.xml b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 77f5a1b..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- >
-
- <display-name>Geronimo JAX-RPC POJO WS War</display-name>
-
- <servlet>
- <display-name>Geronimo JAX-RPC POJO WS</display-name>
- <servlet-name>JAXRPCServlet</servlet-name>
- <servlet-class>org.apache.hello_world_soap_http.GreeterImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>JAXRPCServlet</servlet-name>
- <url-pattern>/servlet</url-pattern>
- </servlet-mapping>
-
- <service-ref>
- <service-ref-name>services/Greeter</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/greeter.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpcmapping.xml</jaxrpc-mapping-file>
- </service-ref>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/webservices.xml b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/webservices.xml
deleted file mode 100644
index 45b60ae..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/webservices.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- version="1.1">
- <webservice-description>
- <webservice-description-name>Geronimo JAX-RPC POJO WS</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/greeter.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/jaxrpcmapping.xml</jaxrpc-mapping-file>
- <port-component>
- <port-component-name>GreeterPort</port-component-name>
- <wsdl-port>GreeterPort</wsdl-port>
- <service-endpoint-interface>org.apache.hello_world_soap_http.Greeter</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>JAXRPCServlet</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-
-</webservices>
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/wsdl/greeter.wsdl b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/wsdl/greeter.wsdl
deleted file mode 100644
index 5315bc5..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/main/webapp/WEB-INF/wsdl/greeter.wsdl
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://org.apache.org/greeter"
- xmlns:x1="http://org.apache.org/greeter/types"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://org.apache.org/greeter" name="HelloWorld">
-
- <wsdl:message name="greetMeRequest">
- <wsdl:part name="in" type="xsd:string" />
- </wsdl:message>
- <wsdl:message name="greetMeResponse">
- <wsdl:part name="out" type="xsd:string" />
- </wsdl:message>
-
- <wsdl:portType name="Greeter">
- <wsdl:operation name="greetMe">
- <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
- <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="GreeterSOAPBinding" type="tns:Greeter">
- <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <wsdl:operation name="greetMe">
- <soap:operation soapAction="" style="rpc"/>
- <wsdl:input name="greetMeRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="greetMeResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- </wsdl:binding>
-
- <wsdl:service name="GreeterService">
- <wsdl:port binding="tns:GreeterSOAPBinding" name="GreeterPort">
- <soap:address location="http://localhost:9020/SoapContext/GreeterPort"/>
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
-
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxRPCTest.java b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxRPCTest.java
deleted file mode 100644
index eb6d984..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxRPCTest.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.Definition;
-import javax.wsdl.Operation;
-import javax.wsdl.PortType;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.namespace.QName;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Element;
-
-import org.xml.sax.InputSource;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-
-public class JaxRPCTest extends TestSupport {
-
- private String baseURL = "http://localhost:8080/";
-
- @Test
- public void testInvocation() throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull("Web application name not specified", warName);
-
- InputStream requestInput = JaxRPCTest.class.getResourceAsStream("/request1.xml");
- assertNotNull("SOAP request not specified", requestInput);
-
- URL url = new URL(baseURL + warName + "/servlet");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- try {
- conn.setDoOutput(true);
- conn.setDoInput(true);
- conn.setUseCaches(false);
- conn.setRequestMethod("POST");
- conn.setRequestProperty("Content-Type", "text/xml");
-
- OutputStream out = conn.getOutputStream();
-
- byte[] data = new byte[1024];
- int read = 0;
- while ((read = requestInput.read(data, 0, data.length)) != -1) {
- out.write(data, 0, read);
- }
-
- requestInput.close();
-
- out.flush();
- out.close();
-
- boolean found = false;
-
- // FIXME: Simple test is required for now, as CXF has problems
- BufferedReader in =
- new BufferedReader(new InputStreamReader(conn.getInputStream()));
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
-
- if (found == false &&
- inputLine.indexOf("Hello foo bar") != -1) {
- found = true;
- }
- }
- in.close();
-
- assertTrue("Reply", found);
-
- } finally {
- conn.disconnect();
- }
- }
-
- @Test
- public void testWSDL() throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull("Web application name not specified", warName);
-
- URL url = new URL(baseURL + warName + "/servlet?wsdl");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- try {
- conn.setUseCaches(false);
-
- WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- Definition def =
- wsdlReader.readWSDL(null, new InputSource(conn.getInputStream()));
-
- System.out.println("WSDL: " + def);
-
- assertTrue(def.getPortTypes().size() > 0);
-
- boolean found = false;
-
- Iterator iter = def.getPortTypes().entrySet().iterator();
- while (iter.hasNext()) {
- PortType portType =
- (PortType)((Map.Entry)iter.next()).getValue();
-
- if (found == false &&
- portType.getOperation("greetMe", null, null) != null) {
- found = true;
- }
- }
-
- assertTrue("Operation not found", found);
-
- } finally {
- conn.disconnect();
- }
-
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/test/resources/request1.xml b/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/test/resources/request1.xml
deleted file mode 100644
index 0ed4b73..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/jaxrpc-war/src/test/resources/request1.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Body>
- <greetMe xmlns="http://org.apache.org/greeter">
- <in>foo bar</in>
- </greetMe>
- </soap:Body>
-</soap:Envelope>
diff --git a/testsuite/webservices-testsuite/jaxrpc-tests/pom.xml b/testsuite/webservices-testsuite/jaxrpc-tests/pom.xml
deleted file mode 100644
index ad45f09..0000000
--- a/testsuite/webservices-testsuite/jaxrpc-tests/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>webservices-testsuite</artifactId>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxrpc-tests</artifactId>
- <packaging>pom</packaging>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-RPC</name>
- <description>Geronimo JEE5 Webservices JAX-RPC tests</description>
-
- <modules>
- <module>jaxrpc-war</module>
- <module>jaxrpc-ejb</module>
- </modules>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml
deleted file mode 100644
index 6b4bdde..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/pom.xml
+++ /dev/null
@@ -1,130 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-catalog-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>catalog-ear</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Catalog EAR</name>
- <packaging>ear</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>catalog-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>catalog-ejb</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openejb</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <displayName>JAX-WS Catalog TestSuite EAR</displayName>
- <description>JAX-WS Catalog TestSuite EAR</description>
- <version>5</version>
- <modules>
- <webModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>catalog-war</artifactId>
- <contextRoot>/catalog</contextRoot>
- <bundleFileName>catalog-war-${project.version}.war</bundleFileName>
- </webModule>
- <ejbModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>catalog-ejb</artifactId>
- <bundleFileName>catalog-ejb-${project.version}.jar</bundleFileName>
- </ejbModule>
- </modules>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- </plugin>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${plugin.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/main/filtered-resources/META-INF/geronimo-application.xml b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
deleted file mode 100644
index 8305b19..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
-
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}</artifactId>
- <version>${version}</version>
- <type>ear</type>
- </moduleId>
- </environment>
-
-</application>
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/CatalogTest.java b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/CatalogTest.java
deleted file mode 100644
index 938d3fd..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/CatalogTest.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.catalog;
-
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.Import;
-import javax.wsdl.PortType;
-import javax.wsdl.Types;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.extensions.schema.Schema;
-import javax.wsdl.extensions.schema.SchemaImport;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
-public abstract class CatalogTest extends TestSupport {
-
- protected String baseURL = "http://localhost:8080";
-
- abstract String getTestServletContext();
-
- @Test
- public void testWSDL() throws Exception {
- String context = getTestServletContext();
- assertNotNull("Test servlet context is not specified", context);
-
- URL url = new URL(baseURL + context + "/greeter?wsdl");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- try {
- conn.setUseCaches(false);
-
- WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- wsdlReader.setFeature("javax.wsdl.importDocuments", true);
- Definition def =
- wsdlReader.readWSDL(null, new InputSource(conn.getInputStream()));
-
- System.out.println("WSDL: " + def);
-
- assertTrue("Operation not found", checkForOperation(def));
- assertTrue("Element not found", checkForElement(def));
-
- } finally {
- conn.disconnect();
- }
- }
-
- private boolean checkForOperation(Definition def) throws Exception {
- Iterator iter = def.getPortTypes().entrySet().iterator();
- while (iter.hasNext()) {
- PortType portType =
- (PortType)((Map.Entry)iter.next()).getValue();
-
- if (portType.getOperation("greetMe", null, null) != null) {
- return true;
- }
- }
-
- Collection<List> imports = def.getImports().values();
- for (List lst : imports) {
- List<Import> impLst = lst;
- for (Import imp : impLst) {
- boolean rs = checkForOperation(imp.getDefinition());
- if (rs) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- private boolean checkForElement(Definition def) throws Exception {
- Types types = def.getTypes();
- if (types != null) {
- for (ExtensibilityElement el : (List<ExtensibilityElement>)types.getExtensibilityElements()) {
- if (el instanceof Schema) {
- Schema schema = (Schema)el;
- boolean rs = checkForElement(schema);
- if (rs) {
- return true;
- }
- }
- }
- }
-
- Collection<List> imports = def.getImports().values();
- for (List lst : imports) {
- List<Import> impLst = lst;
- for (Import imp : impLst) {
- boolean rs = checkForElement(imp.getDefinition());
- if (rs) {
- return true;
- }
- }
- }
-
- return false;
- }
-
- private boolean checkForElement(Schema schema) throws Exception {
- Element element = schema.getElement();
-
- NodeList nodes = element.getElementsByTagNameNS("http://www.w3.org/2001/XMLSchema", "element");
- if (nodes != null) {
- for (int i = 0; i < nodes.getLength(); i++) {
- Element el = (Element)nodes.item(i);
- if ("Account".equals(el.getAttribute("name"))) {
- return true;
- }
- }
- }
-
- Collection<List> imports = schema.getImports().values();
- for (List list : imports) {
- List<SchemaImport> impList = list;
- for (SchemaImport imp : impList) {
- Schema importedSchema = imp.getReferencedSchema();
- if (importedSchema == null) {
- continue;
- }
- boolean rs = checkForElement(importedSchema);
- if (rs) {
- return true;
- }
- }
- }
-
- return false;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/EJBCatalogTest.java b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/EJBCatalogTest.java
deleted file mode 100644
index 9952c3b..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/EJBCatalogTest.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.catalog;
-
-import java.util.Properties;
-
-import javax.naming.InitialContext;
-
-import org.apache.geronimo.jaxws.test.GreeterRemote;
-
-import org.testng.annotations.Test;
-
-public class EJBCatalogTest extends CatalogTest {
-
- protected String getTestServletContext() {
- return "/catalog-ejb";
- }
-
- @Test
- public void testClient() throws Exception {
- Properties p = new Properties();
-
- p.put("java.naming.factory.initial",
- "org.apache.openejb.client.RemoteInitialContextFactory");
- p.put("java.naming.provider.url",
- "127.0.0.1:4201");
-
- InitialContext ctx = new InitialContext(p);
-
- GreeterRemote greeter = (GreeterRemote)ctx.lookup("/GreeterClientRemote");
-
- String response = greeter.test();
-
- assertEquals("OK", response);
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/WebCatalogTest.java b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/WebCatalogTest.java
deleted file mode 100644
index 5bf23f5..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ear/src/test/java/org/apache/geronimo/jaxws/catalog/WebCatalogTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.catalog;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import org.testng.annotations.Test;
-
-public class WebCatalogTest extends CatalogTest {
-
- protected String getTestServletContext() {
- return "/catalog-war";
- }
-
- @Test
- public void testClient() throws Exception {
- URL url = new URL(baseURL + getTestServletContext() + "/greeter-client");
- HttpURLConnection connection = (HttpURLConnection)url.openConnection();
- try {
- String reply = doGET(connection);
-
- assertEquals("responseCode", 200, connection.getResponseCode());
- assertTrue(reply.indexOf("OK") != -1);
- } finally {
- connection.disconnect();
- }
-
- }
-
- private String doGET(HttpURLConnection conn) throws IOException {
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
-
- InputStream is = null;
-
- try {
- is = conn.getInputStream();
- } catch (IOException e) {
- is = conn.getErrorStream();
- }
-
- StringBuffer buf = new StringBuffer();
- BufferedReader in = new BufferedReader(new InputStreamReader(is));
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
- buf.append(inputLine);
- }
- in.close();
-
- return buf.toString();
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/pom.xml b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/pom.xml
deleted file mode 100644
index d85e5fc..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/pom.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-catalog-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>catalog-ejb</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Catalog EJB</name>
- <packaging>jar</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
-
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/ejb-jar.xml b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/ejb-jar.xml
deleted file mode 100644
index 9416e46..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<ejb-jar 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/ejb-jar_3_0.xsd">
- <display-name>JAX-WS Catalog Test</display-name>
-
- <enterprise-beans>
- <session>
- <display-name>GreeterBean</display-name>
- <ejb-name>GreeterBean</ejb-name>
- <ejb-class>org.apache.geronimo.jaxws.test.GreeterBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-
-</ejb-jar>
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/jax-ws-catalog.xml b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/jax-ws-catalog.xml
deleted file mode 100644
index ba17f6b..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/jax-ws-catalog.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-
- <uri name="http://foo1/greeter_binding.wsdl"
- uri="wsdl/greeter_binding.wsdl"/>
-
- <uri name="http://foo2/greeter_porttype.wsdl"
- uri="wsdl/greeter_porttype.wsdl"/>
-
- <uri name="http://foo3/greeter.xsd"
- uri="wsdl/xsd/greeter.xsd"/>
-
- <uri name="http://foo4/account.xsd"
- uri="wsdl/xsd/account.xsd"/>
-
-</catalog>
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/openejb-jar.xml b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/openejb-jar.xml
deleted file mode 100644
index 34d6da7..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/openejb-jar.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
- xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <environment>
- <moduleId>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}</artifactId>
- <version>${version}</version>
- <type>jar</type>
- </moduleId>
- </environment>
-
- <enterprise-beans>
- <session>
- <ejb-name>GreeterBean</ejb-name>
- <web-service-address>/${pom.artifactId}/greeter</web-service-address>
-
- <service-ref>
- <service-ref-name>services/Greeter</service-ref-name>
- <port>
- <port-name>GreeterPort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/${pom.artifactId}/greeter</uri>
- </port>
- </service-ref>
- </session>
- </enterprise-beans>
-
-</openejb-jar>
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/wsdl/greeter_binding.wsdl b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/wsdl/greeter_binding.wsdl
deleted file mode 100644
index c805523..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/wsdl/greeter_binding.wsdl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/greeter_control"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- targetNamespace="http://apache.org/greeter_control" name="HelloWorld">
-
- <wsdl:import namespace="http://apache.org/greeter_control"
- location="http://foo2/greeter_porttype.wsdl" />
-
- <wsdl:binding name="GreeterSOAPBinding" type="tns:Greeter">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <wsdl:operation name="sayHi">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="sayHiRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="sayHiResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="greetMe">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="greetMeRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="greetMeResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- </wsdl:binding>
-
-</wsdl:definitions>
-
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/wsdl/greeter_porttype.wsdl b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/wsdl/greeter_porttype.wsdl
deleted file mode 100644
index ffe6a49..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/wsdl/greeter_porttype.wsdl
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/greeter_control"
- xmlns:x1="http://apache.org/greeter_control/types"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/greeter_control" name="HelloWorld">
-
- <wsdl:types>
- <schema targetNamespace="http://apache.org/greeter_control/types"
- xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-
- <import namespace="http://apache.org/greeter_control/types"
- schemaLocation="http://foo3/greeter.xsd" />
-
- <import namespace="http://schemas.ggf.org/jsdl/2005/11/jsdl"/>
-
- </schema>
- </wsdl:types>
-
-
- <wsdl:message name="sayHiRequest">
- <wsdl:part element="x1:sayHi" name="in"/>
- </wsdl:message>
- <wsdl:message name="sayHiResponse">
- <wsdl:part element="x1:sayHiResponse" name="out"/>
- </wsdl:message>
- <wsdl:message name="greetMeRequest">
- <wsdl:part element="x1:greetMe" name="in"/>
- </wsdl:message>
- <wsdl:message name="greetMeResponse">
- <wsdl:part element="x1:greetMeResponse" name="out"/>
- </wsdl:message>
-
- <wsdl:portType name="Greeter">
- <wsdl:operation name="sayHi">
- <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
- <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
- </wsdl:operation>
-
- <wsdl:operation name="greetMe">
- <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
- <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
- </wsdl:operation>
- </wsdl:portType>
-
-</wsdl:definitions>
-
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/wsdl/greeter_service.wsdl b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/wsdl/greeter_service.wsdl
deleted file mode 100644
index a1db304..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/wsdl/greeter_service.wsdl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/greeter_control"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- targetNamespace="http://apache.org/greeter_control" name="HelloWorld">
-
- <wsdl:import namespace="http://apache.org/greeter_control"
- location="http://foo1/greeter_binding.wsdl" />
-
- <wsdl:service name="GreeterService">
- <wsdl:port binding="tns:GreeterSOAPBinding" name="GreeterPort">
- <soap:address location="http://localhost:8080/SoapContext/GreeterPort"/>
- </wsdl:port>
- </wsdl:service>
-
-
-</wsdl:definitions>
-
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/wsdl/xsd/account.xsd b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/wsdl/xsd/account.xsd
deleted file mode 100644
index e62baeb..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/wsdl/xsd/account.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://geronimo.apache.org/account" targetNamespace="http://geronimo.apache.org/account">
-
- <xsd:import namespace="http://apache.org/greeter_control/types"
- schemaLocation="greeter.xsd"/>
-
- <xsd:element name="Account">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="FirstName" type="xsd:string" minOccurs="1" maxOccurs="1"/>
- <xsd:element name="LastName" type="xsd:string" minOccurs="1" maxOccurs="1"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-</xsd:schema>
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/wsdl/xsd/greeter.xsd b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/wsdl/xsd/greeter.xsd
deleted file mode 100644
index 66a33fd..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/filtered-resources/META-INF/wsdl/xsd/greeter.xsd
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://apache.org/greeter_control/types" elementFormDefault="qualified">
-
- <import namespace="http://geronimo.apache.org/account"
- schemaLocation="http://foo4/account.xsd"/>
-
- <element name="sayHi">
- <complexType/>
- </element>
- <element name="sayHiResponse">
- <complexType>
- <sequence>
- <element name="responseType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMe">
- <complexType>
- <sequence>
- <element name="requestType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMeResponse">
- <complexType>
- <sequence>
- <element name="responseType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-</schema>
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterBean.java b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterBean.java
deleted file mode 100644
index d019e3d..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterBean.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.test;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.ejb.Stateless;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceContext;
-
-@WebService(serviceName = "GreeterService",
- portName = "GreeterPort",
- name = "Greeter",
- targetNamespace = "http://apache.org/greeter_control",
- wsdlLocation = "META-INF/wsdl/greeter_service.wsdl")
-@Stateless(name="GreeterBean")
-public class GreeterBean {
-
- @Resource
- private WebServiceContext context;
-
- public String greetMe(String me) {
- return "Hello " + me;
- }
-
- public String sayHi() {
- return "Hi!";
- }
-
- @PostConstruct
- private void myInit() {
- System.out.println(this + " PostConstruct");
- }
-
- @PreDestroy()
- private void myDestroy() {
- System.out.println(this + " PreDestroy");
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterEjbClient.java b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterEjbClient.java
deleted file mode 100644
index de6d223..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterEjbClient.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.test;
-
-import javax.ejb.Stateless;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceRef;
-
-@Stateless(name="GreeterClient")
-public class GreeterEjbClient implements GreeterRemote {
-
- @WebServiceRef(name="services/Greeter",
- wsdlLocation="META-INF/wsdl/greeter_service.wsdl")
- private Service service;
-
- public String test() {
- return (service != null) ? "OK" : "FAILED";
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterRemote.java b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterRemote.java
deleted file mode 100644
index dff976e..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-ejb/src/main/java/org/apache/geronimo/jaxws/test/GreeterRemote.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.test;
-
-import javax.ejb.Remote;
-
-@Remote
-public interface GreeterRemote {
-
- public String test();
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/pom.xml b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/pom.xml
deleted file mode 100644
index 5eab9de..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/pom.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-catalog-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>catalog-war</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Catalog WAR</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/java/org/apache/geronimo/jaxws/test/GreeterImpl.java b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/java/org/apache/geronimo/jaxws/test/GreeterImpl.java
deleted file mode 100644
index 30c0944..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/java/org/apache/geronimo/jaxws/test/GreeterImpl.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.test;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.jws.WebService;
-import javax.xml.ws.WebServiceContext;
-
-@WebService(serviceName = "GreeterService",
- portName = "GreeterPort",
- name = "Greeter",
- targetNamespace = "http://apache.org/greeter_control",
- wsdlLocation = "WEB-INF/wsdl/greeter_service.wsdl")
-public class GreeterImpl {
-
- @Resource
- private WebServiceContext context;
-
- public String greetMe(String me) {
- return "Hello " + me;
- }
-
- public String sayHi() {
- return "Hi!";
- }
-
- @PostConstruct
- private void myInit() {
- System.out.println(this + " PostConstruct");
- }
-
- @PreDestroy()
- private void myDestroy() {
- System.out.println(this + " PreDestroy");
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/java/org/apache/geronimo/jaxws/test/GreeterWebClient.java b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/java/org/apache/geronimo/jaxws/test/GreeterWebClient.java
deleted file mode 100644
index 3303188..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/java/org/apache/geronimo/jaxws/test/GreeterWebClient.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.test;
-
-import java.io.IOException;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceRef;
-
-public class GreeterWebClient extends HttpServlet {
-
- @WebServiceRef(name="services/Greeter",
- wsdlLocation="WEB-INF/wsdl/greeter_service.wsdl")
- private Service service;
-
- @Override
- public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- response.setContentType("text/plain");
- response.getWriter().println((service != null) ? "OK" : "FAILED");
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 02a54aa..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
-
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>war</dep:type>
- </dep:moduleId>
- </dep:environment>
-
- <context-root>/${pom.artifactId}</context-root>
-
- <service-ref>
- <service-ref-name>services/Greeter</service-ref-name>
- <port>
- <port-name>GreeterPort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/${pom.artifactId}/greeter</uri>
- </port>
- </service-ref>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/jax-ws-catalog.xml b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/jax-ws-catalog.xml
deleted file mode 100644
index ba17f6b..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/jax-ws-catalog.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-
- <uri name="http://foo1/greeter_binding.wsdl"
- uri="wsdl/greeter_binding.wsdl"/>
-
- <uri name="http://foo2/greeter_porttype.wsdl"
- uri="wsdl/greeter_porttype.wsdl"/>
-
- <uri name="http://foo3/greeter.xsd"
- uri="wsdl/xsd/greeter.xsd"/>
-
- <uri name="http://foo4/account.xsd"
- uri="wsdl/xsd/account.xsd"/>
-
-</catalog>
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/web.xml b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 6e6ff8b..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app 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/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
- version="2.5"
- >
-
- <display-name>JAX-WS Catalog Test</display-name>
-
- <servlet>
- <display-name>GreeterServlet</display-name>
- <servlet-name>GreeterServlet</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.test.GreeterImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>GreeterServlet</servlet-name>
- <url-pattern>/greeter</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <display-name>GreeterClientServlet</display-name>
- <servlet-name>GreeterClientServlet</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.test.GreeterWebClient</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>GreeterClientServlet</servlet-name>
- <url-pattern>/greeter-client</url-pattern>
- </servlet-mapping>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/greeter_binding.wsdl b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/greeter_binding.wsdl
deleted file mode 100644
index c805523..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/greeter_binding.wsdl
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/greeter_control"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- targetNamespace="http://apache.org/greeter_control" name="HelloWorld">
-
- <wsdl:import namespace="http://apache.org/greeter_control"
- location="http://foo2/greeter_porttype.wsdl" />
-
- <wsdl:binding name="GreeterSOAPBinding" type="tns:Greeter">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <wsdl:operation name="sayHi">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="sayHiRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="sayHiResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="greetMe">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="greetMeRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="greetMeResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- </wsdl:binding>
-
-</wsdl:definitions>
-
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/greeter_porttype.wsdl b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/greeter_porttype.wsdl
deleted file mode 100644
index ffe6a49..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/greeter_porttype.wsdl
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/greeter_control"
- xmlns:x1="http://apache.org/greeter_control/types"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/greeter_control" name="HelloWorld">
-
- <wsdl:types>
- <schema targetNamespace="http://apache.org/greeter_control/types"
- xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-
- <import namespace="http://apache.org/greeter_control/types"
- schemaLocation="http://foo3/greeter.xsd" />
-
- <import namespace="http://schemas.ggf.org/jsdl/2005/11/jsdl"/>
-
- </schema>
- </wsdl:types>
-
-
- <wsdl:message name="sayHiRequest">
- <wsdl:part element="x1:sayHi" name="in"/>
- </wsdl:message>
- <wsdl:message name="sayHiResponse">
- <wsdl:part element="x1:sayHiResponse" name="out"/>
- </wsdl:message>
- <wsdl:message name="greetMeRequest">
- <wsdl:part element="x1:greetMe" name="in"/>
- </wsdl:message>
- <wsdl:message name="greetMeResponse">
- <wsdl:part element="x1:greetMeResponse" name="out"/>
- </wsdl:message>
-
- <wsdl:portType name="Greeter">
- <wsdl:operation name="sayHi">
- <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
- <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
- </wsdl:operation>
-
- <wsdl:operation name="greetMe">
- <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
- <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
- </wsdl:operation>
- </wsdl:portType>
-
-</wsdl:definitions>
-
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/greeter_service.wsdl b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/greeter_service.wsdl
deleted file mode 100644
index a1db304..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/greeter_service.wsdl
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/greeter_control"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- targetNamespace="http://apache.org/greeter_control" name="HelloWorld">
-
- <wsdl:import namespace="http://apache.org/greeter_control"
- location="http://foo1/greeter_binding.wsdl" />
-
- <wsdl:service name="GreeterService">
- <wsdl:port binding="tns:GreeterSOAPBinding" name="GreeterPort">
- <soap:address location="http://localhost:8080/SoapContext/GreeterPort"/>
- </wsdl:port>
- </wsdl:service>
-
-
-</wsdl:definitions>
-
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/xsd/account.xsd b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/xsd/account.xsd
deleted file mode 100644
index e62baeb..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/xsd/account.xsd
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:tns="http://geronimo.apache.org/account" targetNamespace="http://geronimo.apache.org/account">
-
- <xsd:import namespace="http://apache.org/greeter_control/types"
- schemaLocation="greeter.xsd"/>
-
- <xsd:element name="Account">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="FirstName" type="xsd:string" minOccurs="1" maxOccurs="1"/>
- <xsd:element name="LastName" type="xsd:string" minOccurs="1" maxOccurs="1"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-</xsd:schema>
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/xsd/greeter.xsd b/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/xsd/greeter.xsd
deleted file mode 100644
index 66a33fd..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/catalog-war/src/main/webapp/WEB-INF/wsdl/xsd/greeter.xsd
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://apache.org/greeter_control/types" elementFormDefault="qualified">
-
- <import namespace="http://geronimo.apache.org/account"
- schemaLocation="http://foo4/account.xsd"/>
-
- <element name="sayHi">
- <complexType/>
- </element>
- <element name="sayHiResponse">
- <complexType>
- <sequence>
- <element name="responseType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMe">
- <complexType>
- <sequence>
- <element name="requestType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMeResponse">
- <complexType>
- <sequence>
- <element name="responseType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-</schema>
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/goals.txt b/testsuite/webservices-testsuite/jaxws-catalog-tests/goals.txt
deleted file mode 100644
index 9cb8855..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/goals.txt
+++ /dev/null
@@ -1 +0,0 @@
-clean install
diff --git a/testsuite/webservices-testsuite/jaxws-catalog-tests/pom.xml b/testsuite/webservices-testsuite/jaxws-catalog-tests/pom.xml
deleted file mode 100644
index 999802b..0000000
--- a/testsuite/webservices-testsuite/jaxws-catalog-tests/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>webservices-testsuite</artifactId>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxws-catalog-tests</artifactId>
- <packaging>pom</packaging>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Catalog</name>
-
- <description>Geronimo JEE5 Webservices JAX tests</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxb_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <modules>
- <module>catalog-war</module>
- <module>catalog-ejb</module>
- <module>catalog-ear</module>
- </modules>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/goals.txt b/testsuite/webservices-testsuite/jaxws-mtom-tests/goals.txt
deleted file mode 100644
index 9cb8855..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/goals.txt
+++ /dev/null
@@ -1 +0,0 @@
-clean install
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml
deleted file mode 100644
index 36c1a0e..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/pom.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-mtom-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>mtom-ear</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS MTOM EAR</name>
- <packaging>ear</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>mtom-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>mtom-ejb</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>mtom-test-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <displayName>JAX-WS MTOM TestSuite EAR</displayName>
- <description>JAX-WS MTOM TestSuite EAR</description>
- <version>5</version>
- <modules>
- <webModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>mtom-war</artifactId>
- <contextRoot>/mtom</contextRoot>
- <bundleFileName>mtom-war-${project.version}.war</bundleFileName>
- </webModule>
- <ejbModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>mtom-ejb</artifactId>
- <bundleFileName>mtom-ejb-${project.version}.jar</bundleFileName>
- </ejbModule>
- </modules>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>mtom-test-war</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <modules>
- <module>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>mtom-test-war</artifactId>
- <type>war</type>
- <version>${project.version}</version>
- </module>
- </modules>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <modules>
- <module>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>mtom-test-war</artifactId>
- <type>war</type>
- <version>${project.version}</version>
- </module>
- </modules>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/src/main/filtered-resources/META-INF/geronimo-application.xml b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
deleted file mode 100644
index 2030c67..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
-
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}</artifactId>
- <version>${version}</version>
- <type>ear</type>
- </moduleId>
- </environment>
-
-</application>
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/src/test/java/org/apache/geronimo/jaxws/mtom/EJBMTOMTest.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/src/test/java/org/apache/geronimo/jaxws/mtom/EJBMTOMTest.java
deleted file mode 100644
index 3940969..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/src/test/java/org/apache/geronimo/jaxws/mtom/EJBMTOMTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.mtom;
-
-public class EJBMTOMTest extends MTOMTest {
-
- protected String getTestServlet() {
- return "/test-ejb";
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/src/test/java/org/apache/geronimo/jaxws/mtom/MTOMTest.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/src/test/java/org/apache/geronimo/jaxws/mtom/MTOMTest.java
deleted file mode 100644
index f712440..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/src/test/java/org/apache/geronimo/jaxws/mtom/MTOMTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.mtom;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-
-public abstract class MTOMTest extends TestSupport {
-
- private String baseURL = "http://localhost:8080/";
-
- abstract String getTestServlet();
-
- private String doGET(HttpURLConnection conn) throws IOException {
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- InputStream is = null;
- try {
- is = conn.getInputStream();
- } catch (IOException e) {
- is = conn.getErrorStream();
- }
- StringBuffer buf = new StringBuffer();
- BufferedReader in = new BufferedReader(new InputStreamReader(is));
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
- buf.append(inputLine);
- }
- in.close();
- return buf.toString();
- }
-
- @Test
- public void testEchoBytesWithMTOMSupport() throws Exception {
- runTest("testEchoBytesWithMTOMSupport");
- }
-
- @Test
- public void testEchoBytesWithoutMTOMSupport() throws Exception {
- runTest("testEchoBytesWithoutMTOMSupport");
- }
-
- @Test
- public void testEchoImageWithMTOMSupport() throws Exception {
- runTest("testEchoImageWithMTOMSupport");
- }
-
- @Test
- public void testEchoImageWithoutMTOMSupport() throws Exception {
- runTest("testEchoImageWithoutMTOMSupport");
- }
-
- protected void runTest(String testName) throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull(warName);
- URL url = new URL(baseURL + warName + getTestServlet() + "?test=" + testName);
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
- try {
- String reply = doGET(connection);
- assertEquals("responseCode", 200, connection.getResponseCode());
- } finally {
- connection.disconnect();
- }
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/src/test/java/org/apache/geronimo/jaxws/mtom/WebMTOMTest.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/src/test/java/org/apache/geronimo/jaxws/mtom/WebMTOMTest.java
deleted file mode 100644
index 8632bb9..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ear/src/test/java/org/apache/geronimo/jaxws/mtom/WebMTOMTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.mtom;
-
-public class WebMTOMTest extends MTOMTest {
-
- protected String getTestServlet() {
- return "/test-web";
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/pom.xml b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/pom.xml
deleted file mode 100644
index 4272647..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-mtom-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>mtom-ejb</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS MTOM EJB</name>
- <packaging>jar</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/src/main/java/org/apache/geronimo/jaxws/test/AttachmentHandler.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/src/main/java/org/apache/geronimo/jaxws/test/AttachmentHandler.java
deleted file mode 100644
index 2322241..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/src/main/java/org/apache/geronimo/jaxws/test/AttachmentHandler.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.test;
-
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-
-import junit.framework.Assert;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AttachmentHandler implements SOAPHandler<SOAPMessageContext> {
-
- private static final Logger LOG = LoggerFactory.getLogger(AttachmentHandler.class);
-
- public void close(MessageContext messageContext) {
- // TODO Auto-generated method stub
- }
-
- public boolean handleFault(SOAPMessageContext soapMessageContext) {
- // TODO Auto-generated method stub
- return false;
- }
-
- public boolean handleMessage(SOAPMessageContext soapMessageContext) {
- boolean outbound = (Boolean) soapMessageContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
- SOAPMessage soapMessage = soapMessageContext.getMessage();
- try {
- if (outbound) {
- //MTOM is always enabled
- Element xopInclude = findElementNode(soapMessage.getSOAPBody(), "include");
- //include element should be find in the soap message
- Assert.assertNotNull(xopInclude);
- //Attachment size should be 1
- int attachments = soapMessage.countAttachments();
- if (attachments == 0) {
- LOG.warn("Expected 1 attachment but got 0");
- } else if (attachments == 1) {
- // that's what we expect
- } else {
- Assert.fail("Unexpected number of attachments: " + attachments);
- }
- } else {
- Element useMTOMElement = findElementNode(soapMessage.getSOAPBody(), "useMTOM");
- if (useMTOMElement != null) {
- String sUseMTOM = getSubTextChildValue(useMTOMElement);
- //If the useMTOM is true, the attachment size should be 1, or the attachment size should be 0
- if (Boolean.parseBoolean(sUseMTOM))
- Assert.assertEquals(soapMessage.countAttachments(), 1);
- else
- Assert.assertEquals(soapMessage.countAttachments(), 0);
- }
- }
- } catch (Exception e) {
- return false;
- }
- return true;
- }
-
- private String getSubTextChildValue(Element element) {
- NodeList childrenList = element.getChildNodes();
- if (childrenList.getLength() == 0)
- return null;
- for (int i = 0; i < childrenList.getLength(); i++) {
- Node node = childrenList.item(i);
- if (node.getNodeType() == Node.TEXT_NODE)
- return ((Text) node).getNodeValue();
- }
- return null;
- }
-
- private Element findElementNode(Element rootElement, String elementName) {
- if (rootElement.getLocalName().equalsIgnoreCase(elementName))
- return rootElement;
- NodeList childrenList = rootElement.getChildNodes();
- if (childrenList.getLength() > 0) {
- for (int i = 0; i < childrenList.getLength(); i++) {
- Node node = childrenList.item(i);
- if (node.getNodeType() == Node.ELEMENT_NODE) {
- Element findElement = findElementNode((Element) node, elementName);
- if (findElement != null)
- return findElement;
- }
- }
- }
- return null;
- }
-
- public Set<QName> getHeaders() {
- // TODO Auto-generated method stub
- return null;
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/src/main/java/org/apache/geronimo/jaxws/test/EchoBean.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/src/main/java/org/apache/geronimo/jaxws/test/EchoBean.java
deleted file mode 100644
index 257cbf0..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/src/main/java/org/apache/geronimo/jaxws/test/EchoBean.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.test;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.ejb.Stateless;
-import javax.jws.HandlerChain;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.soap.MTOM;
-import javax.xml.ws.soap.SOAPBinding;
-
-@WebService(serviceName = "EchoService", portName = "EchoPort", name = "Echo", targetNamespace = "http://geronimo.apache.org/echo")
-@MTOM(enabled = true)
-@HandlerChain(file = "handlers.xml")
-@Stateless(mappedName = "EchoBean")
-@BindingType(value = SOAPBinding.SOAP11HTTP_BINDING)
-public class EchoBean {
-
- @Resource
- private WebServiceContext context;
-
- public String hello(String name) {
- return "Hello, " + name;
- }
-
- public byte[] echoBytes(
- @WebParam(name = "useMTOM", targetNamespace = "") boolean useMTOM,
- @WebParam(name = "bytes", targetNamespace = "") byte[] bytes) {
- return bytes;
- }
-
- public byte[] echoImage(
- @WebParam(name = "useMTOM", targetNamespace = "") boolean useMTOM,
- @WebParam(name = "imageBytes", targetNamespace = "") byte[] imageBytes) {
- return imageBytes;
- }
-
- @PostConstruct
- private void myInit() {
- System.out.println(this + " PostConstruct");
- }
-
- @PreDestroy()
- private void myDestroy() {
- System.out.println(this + " PreDestroy");
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/src/main/java/org/apache/geronimo/jaxws/test/handlers.xml b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/src/main/java/org/apache/geronimo/jaxws/test/handlers.xml
deleted file mode 100644
index 1893878..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/src/main/java/org/apache/geronimo/jaxws/test/handlers.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<jws:handler-chains xmlns:jws="http://java.sun.com/xml/ns/javaee">
- <jws:handler-chain>
- <jws:handler>
- <jws:handler-name>Handler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.jaxws.test.AttachmentHandler</jws:handler-class>
- </jws:handler>
- </jws:handler-chain>
-</jws:handler-chains>
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/src/main/resources/META-INF/ejb-jar.xml b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/src/main/resources/META-INF/ejb-jar.xml
deleted file mode 100644
index 3c45115..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/src/main/resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<ejb-jar 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/ejb-jar_3_0.xsd">
- <display-name>JAX-WS MTOM Test</display-name>
-
- <enterprise-beans>
- <session>
- <display-name>EchoBean</display-name>
- <ejb-name>EchoBean</ejb-name>
- <ejb-class>org.apache.geronimo.jaxws.test.EchoBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-
-</ejb-jar>
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/src/main/resources/META-INF/openejb-jar.xml b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/src/main/resources/META-INF/openejb-jar.xml
deleted file mode 100644
index a563996..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-ejb/src/main/resources/META-INF/openejb-jar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
- xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <environment>
- <moduleId>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}</artifactId>
- <version>${version}</version>
- <type>jar</type>
- </moduleId>
- </environment>
-
-</openejb-jar>
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/pom.xml b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/pom.xml
deleted file mode 100644
index 13bd85e..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/pom.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-mtom-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
- <artifactId>mtom-test-war</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS MTOM WAR Test Client</name>
- <packaging>war</packaging>
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/Echo.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/Echo.java
deleted file mode 100644
index 1a1e256..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/Echo.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.geronimo.echo;
-
-import java.awt.Image;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-@WebService(name = "Echo", targetNamespace = "http://geronimo.apache.org/echo")
-@XmlSeeAlso({
- ObjectFactory.class
-})
-public interface Echo {
-
-
- /**
- *
- * @param arg0
- * @return
- * returns java.lang.String
- */
- @WebMethod
- @WebResult(targetNamespace = "")
- @RequestWrapper(localName = "hello", targetNamespace = "http://geronimo.apache.org/echo", className = "org.apache.geronimo.echo.Hello")
- @ResponseWrapper(localName = "helloResponse", targetNamespace = "http://geronimo.apache.org/echo", className = "org.apache.geronimo.echo.HelloResponse")
- public String hello(
- @WebParam(name = "arg0", targetNamespace = "")
- String arg0);
-
- /**
- *
- * @param bytes
- * @param useMTOM
- * @return
- * returns byte[]
- */
- @WebMethod
- @WebResult(targetNamespace = "")
- @RequestWrapper(localName = "echoBytes", targetNamespace = "http://geronimo.apache.org/echo", className = "org.apache.geronimo.echo.EchoBytes")
- @ResponseWrapper(localName = "echoBytesResponse", targetNamespace = "http://geronimo.apache.org/echo", className = "org.apache.geronimo.echo.EchoBytesResponse")
- public byte[] echoBytes(
- @WebParam(name = "useMTOM", targetNamespace = "")
- boolean useMTOM,
- @WebParam(name = "bytes", targetNamespace = "")
- byte[] bytes);
-
- /**
- *
- * @param imageBytes
- * @param useMTOM
- * @return
- * returns java.awt.Image
- */
- @WebMethod
- @WebResult(targetNamespace = "")
- @RequestWrapper(localName = "echoImage", targetNamespace = "http://geronimo.apache.org/echo", className = "org.apache.geronimo.echo.EchoImage")
- @ResponseWrapper(localName = "echoImageResponse", targetNamespace = "http://geronimo.apache.org/echo", className = "org.apache.geronimo.echo.EchoImageResponse")
- public Image echoImage(
- @WebParam(name = "useMTOM", targetNamespace = "")
- boolean useMTOM,
- @WebParam(name = "imageBytes", targetNamespace = "")
- Image imageBytes);
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/EchoBytes.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/EchoBytes.java
deleted file mode 100644
index a9d593a..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/EchoBytes.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.echo;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for echoBytes complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="echoBytes">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="useMTOM" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- * <element name="bytes" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "echoBytes", namespace = "http://geronimo.apache.org/echo", propOrder = {
- "useMTOM",
- "bytes"
-})
-public class EchoBytes {
-
- protected boolean useMTOM;
- @XmlElement(required = true)
- protected byte[] bytes;
-
- /**
- * Gets the value of the useMTOM property.
- *
- */
- public boolean isUseMTOM() {
- return useMTOM;
- }
-
- /**
- * Sets the value of the useMTOM property.
- *
- */
- public void setUseMTOM(boolean value) {
- this.useMTOM = value;
- }
-
- /**
- * Gets the value of the bytes property.
- *
- * @return
- * possible object is
- * byte[]
- */
- public byte[] getBytes() {
- return bytes;
- }
-
- /**
- * Sets the value of the bytes property.
- *
- * @param value
- * allowed object is
- * byte[]
- */
- public void setBytes(byte[] value) {
- this.bytes = ((byte[]) value);
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/EchoBytesResponse.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/EchoBytesResponse.java
deleted file mode 100644
index c80d5b6..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/EchoBytesResponse.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.geronimo.echo;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for echoBytesResponse complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="echoBytesResponse">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="return" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "echoBytesResponse", namespace = "http://geronimo.apache.org/echo", propOrder = {
- "_return"
-})
-public class EchoBytesResponse {
-
- @XmlElement(name = "return", required = true)
- protected byte[] _return;
-
- /**
- * Gets the value of the return property.
- *
- * @return
- * possible object is
- * byte[]
- */
- public byte[] getReturn() {
- return _return;
- }
-
- /**
- * Sets the value of the return property.
- *
- * @param value
- * allowed object is
- * byte[]
- */
- public void setReturn(byte[] value) {
- this._return = ((byte[]) value);
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/EchoImage.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/EchoImage.java
deleted file mode 100644
index d1cbc9e..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/EchoImage.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.geronimo.echo;
-
-import java.awt.Image;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlMimeType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for echoImage complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="echoImage">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="useMTOM" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
- * <element name="imageBytes" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "echoImage", namespace = "http://geronimo.apache.org/echo", propOrder = {
- "useMTOM",
- "imageBytes"
-})
-public class EchoImage {
-
- protected boolean useMTOM;
- @XmlElement(required = true)
- @XmlMimeType("image/jpeg")
- protected Image imageBytes;
-
- /**
- * Gets the value of the useMTOM property.
- *
- */
- public boolean isUseMTOM() {
- return useMTOM;
- }
-
- /**
- * Sets the value of the useMTOM property.
- *
- */
- public void setUseMTOM(boolean value) {
- this.useMTOM = value;
- }
-
- /**
- * Gets the value of the imageBytes property.
- *
- * @return
- * possible object is
- * {@link Image }
- *
- */
- public Image getImageBytes() {
- return imageBytes;
- }
-
- /**
- * Sets the value of the imageBytes property.
- *
- * @param value
- * allowed object is
- * {@link Image }
- *
- */
- public void setImageBytes(Image value) {
- this.imageBytes = value;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/EchoImageResponse.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/EchoImageResponse.java
deleted file mode 100644
index fa37aaa..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/EchoImageResponse.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.echo;
-
-import java.awt.Image;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlMimeType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for echoImageResponse complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="echoImageResponse">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="return" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "echoImageResponse", namespace = "http://geronimo.apache.org/echo", propOrder = {
- "_return"
-})
-public class EchoImageResponse {
-
- @XmlElement(name = "return", required = true)
- @XmlMimeType("image/jpeg")
- protected Image _return;
-
- /**
- * Gets the value of the return property.
- *
- * @return
- * possible object is
- * {@link Image }
- *
- */
- public Image getReturn() {
- return _return;
- }
-
- /**
- * Sets the value of the return property.
- *
- * @param value
- * allowed object is
- * {@link Image }
- *
- */
- public void setReturn(Image value) {
- this._return = value;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/EchoService.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/EchoService.java
deleted file mode 100644
index fda6e23..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/EchoService.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.echo;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-@WebServiceClient(name = "EchoService", targetNamespace = "http://geronimo.apache.org/echo", wsdlLocation = "http://localhost:8080/mtom-war/echo?wsdl")
-public class EchoService
- extends Service
-{
-
- private final static URL ECHOSERVICE_WSDL_LOCATION;
-
- static {
- URL url = null;
- try {
- url = new URL("http://localhost:8080/mtom-war/echo?wsdl");
- } catch (MalformedURLException e) {
- e.printStackTrace();
- }
- ECHOSERVICE_WSDL_LOCATION = url;
- }
-
- public EchoService(URL wsdlLocation, QName serviceName) {
- super(wsdlLocation, serviceName);
- }
-
- public EchoService() {
- super(ECHOSERVICE_WSDL_LOCATION, new QName("http://geronimo.apache.org/echo", "EchoService"));
- }
-
- /**
- *
- * @return
- * returns Echo
- */
- @WebEndpoint(name = "EchoPort")
- public Echo getEchoPort() {
- return (Echo)super.getPort(new QName("http://geronimo.apache.org/echo", "EchoPort"), Echo.class);
- }
-
- /**
- *
- * @param features
- * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
- * @return
- * returns Echo
- */
- @WebEndpoint(name = "EchoPort")
- public Echo getEchoPort(WebServiceFeature... features) {
- return (Echo)super.getPort(new QName("http://geronimo.apache.org/echo", "EchoPort"), Echo.class, features);
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/Hello.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/Hello.java
deleted file mode 100644
index 912ce90..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/Hello.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.geronimo.echo;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for hello complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="hello">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "hello", namespace = "http://geronimo.apache.org/echo", propOrder = {
- "arg0"
-})
-public class Hello {
-
- @XmlElement(required = true)
- protected String arg0;
-
- /**
- * Gets the value of the arg0 property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getArg0() {
- return arg0;
- }
-
- /**
- * Sets the value of the arg0 property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setArg0(String value) {
- this.arg0 = value;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/HelloResponse.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/HelloResponse.java
deleted file mode 100644
index a730297..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/HelloResponse.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.geronimo.echo;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for helloResponse complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="helloResponse">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="return" type="{http://www.w3.org/2001/XMLSchema}string"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "helloResponse", namespace = "http://geronimo.apache.org/echo", propOrder = {
- "_return"
-})
-public class HelloResponse {
-
- @XmlElement(name = "return", required = true)
- protected String _return;
-
- /**
- * Gets the value of the return property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getReturn() {
- return _return;
- }
-
- /**
- * Sets the value of the return property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setReturn(String value) {
- this._return = value;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/ObjectFactory.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/ObjectFactory.java
deleted file mode 100644
index baed398..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/ObjectFactory.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-
-package org.apache.geronimo.echo;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.apache.geronimo.echo package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
- * provided in this class.
- *
- */
-@XmlRegistry
-public class ObjectFactory {
-
- private final static QName _EchoBytes_QNAME = new QName("http://geronimo.apache.org/echo", "echoBytes");
- private final static QName _EchoImage_QNAME = new QName("http://geronimo.apache.org/echo", "echoImage");
- private final static QName _EchoBytesResponse_QNAME = new QName("http://geronimo.apache.org/echo", "echoBytesResponse");
- private final static QName _EchoImageResponse_QNAME = new QName("http://geronimo.apache.org/echo", "echoImageResponse");
- private final static QName _Hello_QNAME = new QName("http://geronimo.apache.org/echo", "hello");
- private final static QName _HelloResponse_QNAME = new QName("http://geronimo.apache.org/echo", "helloResponse");
-
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.geronimo.echo
- *
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link EchoImageResponse }
- *
- */
- public EchoImageResponse createEchoImageResponse() {
- return new EchoImageResponse();
- }
-
- /**
- * Create an instance of {@link EchoImage }
- *
- */
- public EchoImage createEchoImage() {
- return new EchoImage();
- }
-
- /**
- * Create an instance of {@link EchoBytes }
- *
- */
- public EchoBytes createEchoBytes() {
- return new EchoBytes();
- }
-
- /**
- * Create an instance of {@link EchoBytesResponse }
- *
- */
- public EchoBytesResponse createEchoBytesResponse() {
- return new EchoBytesResponse();
- }
-
- /**
- * Create an instance of {@link HelloResponse }
- *
- */
- public HelloResponse createHelloResponse() {
- return new HelloResponse();
- }
-
- /**
- * Create an instance of {@link Hello }
- *
- */
- public Hello createHello() {
- return new Hello();
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link EchoBytes }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://geronimo.apache.org/echo", name = "echoBytes")
- public JAXBElement<EchoBytes> createEchoBytes(EchoBytes value) {
- return new JAXBElement<EchoBytes>(_EchoBytes_QNAME, EchoBytes.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link EchoImage }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://geronimo.apache.org/echo", name = "echoImage")
- public JAXBElement<EchoImage> createEchoImage(EchoImage value) {
- return new JAXBElement<EchoImage>(_EchoImage_QNAME, EchoImage.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link EchoBytesResponse }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://geronimo.apache.org/echo", name = "echoBytesResponse")
- public JAXBElement<EchoBytesResponse> createEchoBytesResponse(EchoBytesResponse value) {
- return new JAXBElement<EchoBytesResponse>(_EchoBytesResponse_QNAME, EchoBytesResponse.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link EchoImageResponse }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://geronimo.apache.org/echo", name = "echoImageResponse")
- public JAXBElement<EchoImageResponse> createEchoImageResponse(EchoImageResponse value) {
- return new JAXBElement<EchoImageResponse>(_EchoImageResponse_QNAME, EchoImageResponse.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link Hello }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://geronimo.apache.org/echo", name = "hello")
- public JAXBElement<Hello> createHello(Hello value) {
- return new JAXBElement<Hello>(_Hello_QNAME, Hello.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link HelloResponse }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://geronimo.apache.org/echo", name = "helloResponse")
- public JAXBElement<HelloResponse> createHelloResponse(HelloResponse value) {
- return new JAXBElement<HelloResponse>(_HelloResponse_QNAME, HelloResponse.class, null, value);
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/package-info.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/package-info.java
deleted file mode 100644
index d269fb8..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/echo/package-info.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://geronimo.apache.org/echo")
-package org.apache.geronimo.echo;
-
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/jaxws/mtom/TestServlet.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/jaxws/mtom/TestServlet.java
deleted file mode 100644
index 151ff5f..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/jaxws/mtom/TestServlet.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.mtom;
-
-import java.awt.Graphics2D;
-import java.awt.Image;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.Iterator;
-
-import javax.imageio.ImageIO;
-import javax.imageio.IIOImage;
-import javax.imageio.ImageReader;
-import javax.imageio.ImageWriter;
-import javax.imageio.stream.ImageInputStream;
-import javax.imageio.stream.ImageOutputStream;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Service;
-import javax.xml.ws.soap.MTOMFeature;
-
-import junit.framework.Assert;
-
-import org.apache.geronimo.echo.Echo;
-
-public abstract class TestServlet extends HttpServlet {
-
- protected String address;
- protected Service service;
-
- @Override
- public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- String testName = request.getParameter("test");
- if (testName == null || !testName.startsWith("test")) {
- throw new ServletException("Invalid test name");
- }
- Method testMethod = null;
- try {
- testMethod = getClass().getMethod(testName, new Class[] {});
- } catch (Exception e1) {
- throw new ServletException("No such test: " + testName);
- }
- try {
- testMethod.invoke(this, (Object[]) null);
- } catch (IllegalArgumentException e) {
- throw new ServletException("Error invoking test: " + e.getMessage());
- } catch (IllegalAccessException e) {
- throw new ServletException("Error invoking test: " + e.getMessage());
- } catch (InvocationTargetException e) {
- Throwable root = e.getTargetException();
- ServletException ex = new ServletException("Test '" + testName + "' failed");
- ex.initCause(root);
- throw ex;
- }
- response.setContentType("text/plain");
- response.getWriter().println("Test '" + testName + "' passed");
- }
-
- public void testEchoBytesWithMTOMSupport() throws Exception {
- testEchoBytes(true);
- }
-
- public void testEchoBytesWithoutMTOMSupport() throws Exception {
- testEchoBytes(false);
- }
-
- private void testEchoBytes(boolean mtomSupport) throws Exception {
- Echo echo = null;
- if (mtomSupport)
- echo = service.getPort(Echo.class, new MTOMFeature());
- else
- echo = service.getPort(Echo.class);
-
- byte[] expectedBytes = loadImageAsBytes();
- byte[] echoBytes = echo.echoBytes(mtomSupport, expectedBytes);
- Assert.assertEquals(expectedBytes.length, echoBytes.length);
- for (int i=0;i<expectedBytes.length;i++) {
- Assert.assertEquals("" + i, expectedBytes[i], echoBytes[i]);
- }
- }
-
- public void testEchoImageWithMTOMSupport() throws Exception {
- testEchoImage(true);
- }
-
- public void testEchoImageWithoutMTOMSupport() throws Exception {
- testEchoImage(false);
- }
-
- private void testEchoImage(boolean mtomSupport) throws Exception {
- Echo echo = null;
- if (mtomSupport)
- echo = service.getPort(Echo.class, new MTOMFeature());
- else
- echo = service.getPort(Echo.class);
-
- BufferedImage expectedImage = loadImage();
- Image echoImage = echo.echoImage(mtomSupport, expectedImage);
- byte[] actualImageBytes = convertImagetoBytes(echoImage);
- byte[] expectedImageBytes = convertImagetoBytes(reserializeImage(expectedImage));
- Assert.assertEquals(expectedImageBytes.length, actualImageBytes.length);
- for (int i=0; i<expectedImageBytes.length; i++) {
- Assert.assertEquals("" + i, expectedImageBytes[i], actualImageBytes[i]);
- }
- }
-
- private BufferedImage loadImage() throws Exception {
- URL source = this.getClass().getResource("/image.jpg");
- return ImageIO.read(source);
- }
-
- private Image reserializeImage(BufferedImage image) throws Exception {
- byte [] beforeBytes = convertImagetoBytes(image);
- return ImageIO.read(new ByteArrayInputStream(beforeBytes));
- }
-
- private byte[] loadImageAsBytes() throws Exception {
- ByteArrayOutputStream imageBytes = new ByteArrayOutputStream();
- InputStream in = null;
- int iCurrentReadBytes = -1;
- byte[] bytesBuffer = new byte[512];
- try {
- in = getClass().getResourceAsStream("/image.jpg");
- while ((iCurrentReadBytes = in.read(bytesBuffer)) != -1)
- imageBytes.write(bytesBuffer, 0, iCurrentReadBytes);
- return imageBytes.toByteArray();
- } finally {
- if (in != null)
- try {
- in.close();
- } catch (Exception e) {
- }
- }
- }
-
- private byte[] convertImagetoBytes(Image image) throws Exception {
- ByteArrayOutputStream imageBytes = new ByteArrayOutputStream();
- Iterator iterator = ImageIO.getImageWritersByMIMEType("image/jpeg");
- ImageWriter imageWriter = (ImageWriter) iterator.next();
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- ImageOutputStream ios = ImageIO.createImageOutputStream(baos);
- imageWriter.setOutput(ios);
- imageWriter.write(new IIOImage((BufferedImage)image, null, null));
- ios.flush();
- imageWriter.dispose();
- return baos.toByteArray();
- }
-
- protected void updateAddress() {
- Echo echo = service.getPort(Echo.class);
- BindingProvider binding = (BindingProvider) echo;
- this.address = (String) binding.getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
- System.out.println("Set address: " + this.address);
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/jaxws/mtom/TestServletEJB.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/jaxws/mtom/TestServletEJB.java
deleted file mode 100644
index 46abc3c..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/jaxws/mtom/TestServletEJB.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.mtom;
-
-import javax.annotation.PostConstruct;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceRef;
-
-public class TestServletEJB extends TestServlet {
-
- private static final long serialVersionUID = -4549214200709703333L;
- @WebServiceRef(name = "services/ejb/Echo")
- private Service myService;
-
- @PostConstruct
- private void myInit() {
-
- this.service = myService;
- updateAddress();
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/jaxws/mtom/TestServletWeb.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/jaxws/mtom/TestServletWeb.java
deleted file mode 100644
index 3dcb898..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/java/org/apache/geronimo/jaxws/mtom/TestServletWeb.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.mtom;
-
-import javax.annotation.PostConstruct;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceRef;
-
-
-public class TestServletWeb extends TestServlet {
-
- private static final long serialVersionUID = -1129892302183943809L;
- @WebServiceRef(name = "services/Echo")
- private Service myService;
-
- @PostConstruct
- private void myInit() {
- this.service = myService;
- updateAddress();
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/resources/image.jpg b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/resources/image.jpg
deleted file mode 100644
index 52f85d9..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/resources/image.jpg
+++ /dev/null
Binary files differ
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 316e733..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>war</dep:type>
- </dep:moduleId>
- </dep:environment>
-
- <context-root>/${pom.artifactId}</context-root>
-
- <service-ref>
- <service-ref-name>services/Echo</service-ref-name>
- <port>
- <port-name>EchoPort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/mtom-war/echo</uri>
- </port>
- </service-ref>
-
- <service-ref>
- <service-ref-name>services/ejb/Echo</service-ref-name>
- <port>
- <port-name>EchoPort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/EchoService/Echo</uri>
- </port>
- </service-ref>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/webapp/WEB-INF/web.xml b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index c597b70..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app 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/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
- version="2.5"
- >
-
- <display-name>JAX-WS MTOM Test</display-name>
-
- <servlet>
- <display-name>TestServletWeb</display-name>
- <servlet-name>TestServletWeb</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.mtom.TestServletWeb</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestServletWeb</servlet-name>
- <url-pattern>/test-web</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <display-name>TestServletEJB</display-name>
- <servlet-name>TestServletEJB</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.mtom.TestServletEJB</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestServletEJB</servlet-name>
- <url-pattern>/test-ejb</url-pattern>
- </servlet-mapping>
-
- <service-ref>
- <service-ref-name>services/Echo</service-ref-name>
- <service-interface>javax.xml.ws.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/echo.wsdl</wsdl-file>
- </service-ref>
-
- <service-ref>
- <service-ref-name>services/ejb/Echo</service-ref-name>
- <service-interface>javax.xml.ws.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/echo.wsdl</wsdl-file>
- </service-ref>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/webapp/WEB-INF/wsdl/echo.wsdl b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/webapp/WEB-INF/wsdl/echo.wsdl
deleted file mode 100644
index d312b7f..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-test-war/src/main/webapp/WEB-INF/wsdl/echo.wsdl
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://geronimo.apache.org/echo" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- name="EchoService" targetNamespace="http://geronimo.apache.org/echo">
- <wsdl:types>
- <xs:schema xmlns:tns="http://geronimo.apache.org/echo" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xmime="http://www.w3.org/2005/05/xmlmime" attributeFormDefault="unqualified"
- elementFormDefault="unqualified" targetNamespace="http://geronimo.apache.org/echo">
- <xs:element name="hello" type="tns:hello"/>
- <xs:element name="helloResponse" type="tns:helloResponse"/>
- <xs:element name="echoBytes" type="tns:echoBytes"/>
- <xs:element name="echoBytesResponse" type="tns:echoBytesResponse"/>
- <xs:element name="echoImage" type="tns:echoImage"/>
- <xs:element name="echoImageResponse" type="tns:echoImageResponse"/>
- <xs:complexType name="hello">
- <xs:sequence>
- <xs:element name="arg0" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="helloResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="echoBytes">
- <xs:sequence>
- <xs:element name="useMTOM" type="xs:boolean"/>
- <xs:element name="bytes" type="xs:base64Binary"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="echoBytesResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:base64Binary"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="echoImage">
- <xs:sequence>
- <xs:element name="useMTOM" type="xs:boolean"/>
- <xs:element name="imageBytes" type="xs:base64Binary" xmime:expectedContentTypes="image/jpeg"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="echoImageResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:base64Binary" xmime:expectedContentTypes="image/jpeg"/>
- </xs:sequence>
- </xs:complexType>
- </xs:schema>
- </wsdl:types>
- <wsdl:message name="hello">
- <wsdl:part element="tns:hello" name="parameters">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="helloResponse">
- <wsdl:part element="tns:helloResponse" name="parameters">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="echoBytesResponse">
- <wsdl:part element="tns:echoBytesResponse" name="parameters">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="echoBytes">
- <wsdl:part element="tns:echoBytes" name="parameters">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="echoImageResponse">
- <wsdl:part element="tns:echoImageResponse" name="parameters">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="echoImage">
- <wsdl:part element="tns:echoImage" name="parameters">
- </wsdl:part>
- </wsdl:message>
- <wsdl:portType name="Echo">
- <wsdl:operation name="hello">
- <wsdl:input message="tns:hello">
- </wsdl:input>
- <wsdl:output message="tns:helloResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="echoBytes">
- <wsdl:input message="tns:echoBytes">
- </wsdl:input>
- <wsdl:output message="tns:echoBytesResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="echoImage">
- <wsdl:input message="tns:echoImage">
- </wsdl:input>
- <wsdl:output message="tns:echoImageResponse">
- </wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="EchoServiceSoapBinding" type="tns:Echo">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="hello">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="echoBytes">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="echoImage">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="EchoService">
- <wsdl:port binding="tns:EchoServiceSoapBinding" name="EchoPort">
- <soap:address location="http://localhost:8080/mtom-war/echo"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/pom.xml b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/pom.xml
deleted file mode 100644
index ed6e5c7..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/pom.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-mtom-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>mtom-war</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS MTOM WAR</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </build>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/src/main/java/org/apache/geronimo/jaxws/test/AttachmentHandler.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/src/main/java/org/apache/geronimo/jaxws/test/AttachmentHandler.java
deleted file mode 100644
index 2322241..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/src/main/java/org/apache/geronimo/jaxws/test/AttachmentHandler.java
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.test;
-
-import java.util.Set;
-
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-
-import junit.framework.Assert;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class AttachmentHandler implements SOAPHandler<SOAPMessageContext> {
-
- private static final Logger LOG = LoggerFactory.getLogger(AttachmentHandler.class);
-
- public void close(MessageContext messageContext) {
- // TODO Auto-generated method stub
- }
-
- public boolean handleFault(SOAPMessageContext soapMessageContext) {
- // TODO Auto-generated method stub
- return false;
- }
-
- public boolean handleMessage(SOAPMessageContext soapMessageContext) {
- boolean outbound = (Boolean) soapMessageContext.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
- SOAPMessage soapMessage = soapMessageContext.getMessage();
- try {
- if (outbound) {
- //MTOM is always enabled
- Element xopInclude = findElementNode(soapMessage.getSOAPBody(), "include");
- //include element should be find in the soap message
- Assert.assertNotNull(xopInclude);
- //Attachment size should be 1
- int attachments = soapMessage.countAttachments();
- if (attachments == 0) {
- LOG.warn("Expected 1 attachment but got 0");
- } else if (attachments == 1) {
- // that's what we expect
- } else {
- Assert.fail("Unexpected number of attachments: " + attachments);
- }
- } else {
- Element useMTOMElement = findElementNode(soapMessage.getSOAPBody(), "useMTOM");
- if (useMTOMElement != null) {
- String sUseMTOM = getSubTextChildValue(useMTOMElement);
- //If the useMTOM is true, the attachment size should be 1, or the attachment size should be 0
- if (Boolean.parseBoolean(sUseMTOM))
- Assert.assertEquals(soapMessage.countAttachments(), 1);
- else
- Assert.assertEquals(soapMessage.countAttachments(), 0);
- }
- }
- } catch (Exception e) {
- return false;
- }
- return true;
- }
-
- private String getSubTextChildValue(Element element) {
- NodeList childrenList = element.getChildNodes();
- if (childrenList.getLength() == 0)
- return null;
- for (int i = 0; i < childrenList.getLength(); i++) {
- Node node = childrenList.item(i);
- if (node.getNodeType() == Node.TEXT_NODE)
- return ((Text) node).getNodeValue();
- }
- return null;
- }
-
- private Element findElementNode(Element rootElement, String elementName) {
- if (rootElement.getLocalName().equalsIgnoreCase(elementName))
- return rootElement;
- NodeList childrenList = rootElement.getChildNodes();
- if (childrenList.getLength() > 0) {
- for (int i = 0; i < childrenList.getLength(); i++) {
- Node node = childrenList.item(i);
- if (node.getNodeType() == Node.ELEMENT_NODE) {
- Element findElement = findElementNode((Element) node, elementName);
- if (findElement != null)
- return findElement;
- }
- }
- }
- return null;
- }
-
- public Set<QName> getHeaders() {
- // TODO Auto-generated method stub
- return null;
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/src/main/java/org/apache/geronimo/jaxws/test/EchoImpl.java b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/src/main/java/org/apache/geronimo/jaxws/test/EchoImpl.java
deleted file mode 100644
index 4f39828..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/src/main/java/org/apache/geronimo/jaxws/test/EchoImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.test;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.jws.HandlerChain;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.soap.MTOM;
-import javax.xml.ws.soap.SOAPBinding;
-
-@WebService(serviceName = "EchoService", portName = "EchoPort", name = "Echo", targetNamespace = "http://geronimo.apache.org/echo")
-@MTOM(enabled = true)
-@HandlerChain(file = "handlers.xml")
-@BindingType(value = SOAPBinding.SOAP11HTTP_BINDING)
-public class EchoImpl {
-
- @Resource
- private WebServiceContext context;
-
- public String hello(String name) {
- return "Hello, " + name;
- }
-
- public byte[] echoBytes(
- @WebParam(name = "useMTOM", targetNamespace = "") boolean useMTOM,
- @WebParam(name = "bytes", targetNamespace = "") byte[] bytes) {
- return bytes;
- }
-
- public byte[] echoImage(
- @WebParam(name = "useMTOM", targetNamespace = "") boolean useMTOM,
- @WebParam(name = "imageBytes", targetNamespace = "") byte[] imageBytes) {
- return imageBytes;
- }
-
- @PostConstruct
- private void myInit() {
- System.out.println(this + " PostConstruct");
- }
-
- @PreDestroy()
- private void myDestroy() {
- System.out.println(this + " PreDestroy");
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/src/main/java/org/apache/geronimo/jaxws/test/handlers.xml b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/src/main/java/org/apache/geronimo/jaxws/test/handlers.xml
deleted file mode 100644
index 0e3dbac..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/src/main/java/org/apache/geronimo/jaxws/test/handlers.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-
-<jws:handler-chains xmlns:jws="http://java.sun.com/xml/ns/javaee">
- <jws:handler-chain>
- <jws:handler>
- <jws:handler-name>Handler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.jaxws.test.AttachmentHandler</jws:handler-class>
- </jws:handler>
- </jws:handler-chain>
-</jws:handler-chains>
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index fe72988..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>war</dep:type>
- </dep:moduleId>
- </dep:environment>
-
- <context-root>/${pom.artifactId}</context-root>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/src/main/webapp/WEB-INF/web.xml b/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 983ff52..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/mtom-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app 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/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
- version="2.5"
- >
-
- <display-name>JAX-WS MTOM Support Test</display-name>
-
- <servlet>
- <display-name>EchoServlet</display-name>
- <servlet-name>EchoServlet</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.test.EchoImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>EchoServlet</servlet-name>
- <url-pattern>/echo</url-pattern>
- </servlet-mapping>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-mtom-tests/pom.xml b/testsuite/webservices-testsuite/jaxws-mtom-tests/pom.xml
deleted file mode 100644
index 0e22325..0000000
--- a/testsuite/webservices-testsuite/jaxws-mtom-tests/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>webservices-testsuite</artifactId>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxws-mtom-tests</artifactId>
- <packaging>pom</packaging>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS MTOM Support</name>
-
- <description>Geronimo JEE5 Webservices MTOM tests</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxb_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <modules>
- <module>mtom-test-war</module>
- <module>mtom-war</module>
- <module>mtom-ejb</module>
- <module>mtom-ear</module>
- </modules>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/goals.txt b/testsuite/webservices-testsuite/jaxws-provider-tests/goals.txt
deleted file mode 100644
index 9cb8855..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/goals.txt
+++ /dev/null
@@ -1 +0,0 @@
-clean install
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/pom.xml b/testsuite/webservices-testsuite/jaxws-provider-tests/pom.xml
deleted file mode 100644
index 429deed..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/pom.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>webservices-testsuite</artifactId>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxws-provider-tests</artifactId>
- <packaging>pom</packaging>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Provider Support</name>
-
- <description>Geronimo JEE5 Webservices Provider tests</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxb_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <modules>
- <module>provider-test-war</module>
- <module>provider-war</module>
- <module>provider-ejb</module>
- <module>provider-ear</module>
- <module>provider-common</module>
- </modules>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-common/pom.xml b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-common/pom.xml
deleted file mode 100644
index 2c9710e..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-common/pom.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-provider-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>provider-common</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Provider Common</name>
- <packaging>jar</packaging>
- <description>This project executes testcases for your testsuite</description>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-common/src/main/java/org/apache/geronimo/jaxws/greeter_provider/common/MessageUtils.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-common/src/main/java/org/apache/geronimo/jaxws/greeter_provider/common/MessageUtils.java
deleted file mode 100644
index fb8c560..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-common/src/main/java/org/apache/geronimo/jaxws/greeter_provider/common/MessageUtils.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.common;
-
-import java.io.File;
-import java.io.IOException;
-import java.io.StringReader;
-
-import javax.activation.DataSource;
-import javax.activation.FileDataSource;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.ws.Service;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-
-public class MessageUtils {
-
- public static final String GERONIMO = "geronimo";
-
- public static final String RequestMessagePayload = "<p:sayHi xmlns:p=\"http://geronimo.apache.org/greeter_provider\">"
- + "<p:requestarg>" + GERONIMO + "</p:requestarg>" + "</p:sayHi>";
-
- public static final String ResponseMessagePayload = "<p:sayHiResponse xmlns:p=\"http://geronimo.apache.org/greeter_provider\">"
- + "<p:responsearg>" + GERONIMO + "</p:responsearg>" + "</p:sayHiResponse>";
-
- public static final String SOAP11RequestMessage = "<?xml version=\"1.0\"?><S:Envelope "
- + "xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\">" + "<S:Body>" + RequestMessagePayload
- + "</S:Body></S:Envelope>";
-
- public static final String SOAP11ResponseMessage = "<?xml version=\"1.0\"?><S:Envelope "
- + "xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\">" + "<S:Body>" + ResponseMessagePayload
- + "</S:Body></S:Envelope>";
-
- public static final String SOAP12RequestMessage = "<?xml version=\"1.0\"?><S:Envelope "
- + "xmlns:S=\"http://www.w3.org/2003/05/soap-envelope\">" + "<S:Body>" + RequestMessagePayload
- + "</S:Body></S:Envelope>";
-
- public static final String SOAP12ResponseMessage = "<?xml version=\"1.0\"?><S:Envelope "
- + "xmlns:S=\"http://www.w3.org/2003/05/soap-envelope\">" + "<S:Body>" + ResponseMessagePayload
- + "</S:Body></S:Envelope>";
-
- public static SOAPMessage createResponseSOAPMessage(String soapVersion) throws SOAPException {
- SOAPMessage responseSoapMessage = MessageFactory.newInstance(soapVersion).createMessage();
- if (soapVersion.equals(SOAPConstants.SOAP_1_1_PROTOCOL)) {
- responseSoapMessage.getSOAPPart().setContent(new StreamSource(new StringReader(SOAP11ResponseMessage)));
- } else if (soapVersion.equals(SOAPConstants.SOAP_1_2_PROTOCOL)) {
- responseSoapMessage.getSOAPPart().setContent(new StreamSource(new StringReader(SOAP12ResponseMessage)));
- } else
- throw new SOAPException("Unrecognized SOAP version [" + soapVersion + "]");
- responseSoapMessage.saveChanges();
- return responseSoapMessage;
- }
-
- public static SOAPMessage createRequestSOAPMessage(String soapVersion) throws SOAPException {
- SOAPMessage responseSoapMessage = MessageFactory.newInstance(soapVersion).createMessage();
- if (soapVersion.equals(SOAPConstants.SOAP_1_1_PROTOCOL)) {
- responseSoapMessage.getSOAPPart().setContent(new StreamSource(new StringReader(SOAP11RequestMessage)));
- } else if (soapVersion.equals(SOAPConstants.SOAP_1_2_PROTOCOL)) {
- responseSoapMessage.getSOAPPart().setContent(new StreamSource(new StringReader(SOAP12RequestMessage)));
- } else
- throw new SOAPException("Unrecognized SOAP version [" + soapVersion + "]");
- responseSoapMessage.saveChanges();
- return responseSoapMessage;
- }
-
- public static Source createResponseSOAPSource(String soapVersion, Service.Mode mode) throws SOAPException {
- if (mode.equals(Service.Mode.MESSAGE)) {
- if (soapVersion.equals(SOAPConstants.SOAP_1_1_PROTOCOL))
- return new StreamSource(new StringReader(SOAP11ResponseMessage));
- else if (soapVersion.equals(SOAPConstants.SOAP_1_2_PROTOCOL))
- return new StreamSource(new StringReader(SOAP12ResponseMessage));
- } else if (mode.equals(Service.Mode.PAYLOAD)) {
- return new StreamSource(new StringReader(ResponseMessagePayload));
- }
- throw new SOAPException("Unrecognized SOAP version [" + soapVersion + "] Service.Mode = [" + mode + "]");
- }
-
- public static Source createRequestSOAPSource(String soapVersion, Service.Mode mode) throws SOAPException {
- if (mode.equals(Service.Mode.MESSAGE)) {
- if (soapVersion.equals(SOAPConstants.SOAP_1_1_PROTOCOL)) {
- return new StreamSource(new StringReader(SOAP11RequestMessage));
- } else if (soapVersion.equals(SOAPConstants.SOAP_1_2_PROTOCOL)) {
- return new StreamSource(new StringReader(SOAP12RequestMessage));
- }
- } else if (mode.equals(Service.Mode.PAYLOAD)) {
- return new StreamSource(new StringReader(RequestMessagePayload));
- }
- throw new SOAPException("Unrecognized SOAP version [" + soapVersion + "] Service.Mode = [" + mode + "]");
- }
-
- public static Source createRequestHTTPSource() {
- return new StreamSource(new StringReader(RequestMessagePayload));
- }
-
- public static Source createResponseHTTPSource() {
- return new StreamSource(new StringReader(ResponseMessagePayload));
- }
-
- public static DataSource createRequestHTTPDataSource() throws IOException {
- return new FileDataSource(new File(MessageUtils.class.getResource("/geronimo.txt").getFile()));
- }
-
- public static DataSource createResponseHTTPDataSource() throws IOException {
- return new FileDataSource(new File(MessageUtils.class.getResource("/geronimo.txt").getFile()));
- }
-
- public static String getSubTextChildValue(Node parentNode) {
- NodeList childrenList = parentNode.getChildNodes();
- if (childrenList.getLength() == 0)
- return null;
- for (int i = 0; i < childrenList.getLength(); i++) {
- Node node = childrenList.item(i);
- if (node.getNodeType() == Node.TEXT_NODE)
- return ((Text) node).getNodeValue();
- }
- return null;
- }
-
- public static Node findNode(Node rootNode, String nodeName) {
- if (rootNode.getLocalName().equalsIgnoreCase(nodeName))
- return rootNode;
- NodeList childrenList = rootNode.getChildNodes();
- if (childrenList.getLength() > 0) {
- for (int i = 0; i < childrenList.getLength(); i++) {
- Node node = childrenList.item(i);
- if (node.getNodeType() == Node.ELEMENT_NODE) {
- Node findElement = findNode(node, nodeName);
- if (findElement != null)
- return findElement;
- }
- }
- }
- return null;
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml
deleted file mode 100644
index 5df212b..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/pom.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-provider-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>provider-ear</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Provider EAR</name>
- <packaging>ear</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>provider-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>provider-ejb</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>provider-test-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>provider-common</artifactId>
- <version>${project.version}</version>
- <type>jar</type>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <displayName>JAX-WS Provider TestSuite EAR</displayName>
- <description>JAX-WS Provider TestSuite EAR</description>
- <version>5</version>
- <modules>
- <webModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>provider-war</artifactId>
- <contextRoot>/provider</contextRoot>
- <bundleFileName>provider-war-${project.version}.war</bundleFileName>
- </webModule>
- <ejbModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>provider-ejb</artifactId>
- <bundleFileName>provider-ejb-${project.version}.jar</bundleFileName>
- </ejbModule>
- </modules>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>provider-test-war</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <!-- modules>
- <module>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>provider-test-war</artifactId>
- <type>war</type>
- <version>${project.version}</version>
- </module>
- </modules-->
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <modules>
- <!--module>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>provider-test-war</artifactId>
- <type>war</type>
- <version>${project.version}</version>
- </module-->
- </modules>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/main/filtered-resources/META-INF/geronimo-application.xml b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
deleted file mode 100644
index 2030c67..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
-
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}</artifactId>
- <version>${version}</version>
- <type>ear</type>
- </moduleId>
- </environment>
-
-</application>
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/main/resources/geronimo.txt b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/main/resources/geronimo.txt
deleted file mode 100644
index 99ff4a2..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/main/resources/geronimo.txt
+++ /dev/null
@@ -1 +0,0 @@
-GERONIMO is a J2EE server ?
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/test/java/org/apache/geronimo/jaxws/provider/EJBProviderTest.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/test/java/org/apache/geronimo/jaxws/provider/EJBProviderTest.java
deleted file mode 100644
index 153ff48..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/test/java/org/apache/geronimo/jaxws/provider/EJBProviderTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.provider;
-
-public class EJBProviderTest extends ProviderTest {
-
- protected String getTestServlet() {
- return "/test-provider-ejb";
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/test/java/org/apache/geronimo/jaxws/provider/ProviderTest.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/test/java/org/apache/geronimo/jaxws/provider/ProviderTest.java
deleted file mode 100644
index 172de3d..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/test/java/org/apache/geronimo/jaxws/provider/ProviderTest.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.provider;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-
-public abstract class ProviderTest extends TestSupport {
-
- private String baseURL = "http://localhost:8080/";
-
- abstract String getTestServlet();
-
- private String doGET(HttpURLConnection conn) throws IOException {
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- InputStream is = null;
- try {
- is = conn.getInputStream();
- } catch (IOException e) {
- is = conn.getErrorStream();
- }
- StringBuffer buf = new StringBuffer();
- BufferedReader in = new BufferedReader(new InputStreamReader(is));
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
- buf.append(inputLine);
- }
- in.close();
- return buf.toString();
- }
-
- @Test
- public void testHTTPDataSource() throws Exception {
- runTest("testHTTPDataSource");
- }
-
- @Test
- public void testHTTPSourceMessageMode() throws Exception {
- runTest("testHTTPSourceMessageMode");
- }
-
- @Test
- public void testHTTPSourcePayloadMode() throws Exception {
- runTest("testHTTPSourcePayloadMode");
- }
-
- @Test
- public void testSOAP11SOAPMessage() throws Exception {
- runTest("testSOAP11SOAPMessage");
- }
-
- @Test
- public void testSOAP11SourceMessageMode() throws Exception {
- runTest("testSOAP11SourceMessageMode");
- }
-
- @Test
- public void testSOAP11SourcePayloadMode() throws Exception {
- runTest("testSOAP11SourcePayloadMode");
- }
-
- @Test
- public void testSOAP12SOAPMessage() throws Exception {
- runTest("testSOAP12SOAPMessage");
- }
-
- @Test
- public void testSOAP12SourceMessageMode() throws Exception {
- runTest("testSOAP12SourceMessageMode");
- }
-
- @Test
- public void testSOAP12SourcePayloadMode() throws Exception {
- runTest("testSOAP12SourcePayloadMode");
- }
-
- protected void runTest(String testName) throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull(warName);
- URL url = new URL(baseURL + warName + getTestServlet() + "?test=" + testName);
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
- try {
- doGET(connection);
- assertEquals("responseCode", 200, connection.getResponseCode());
- } finally {
- connection.disconnect();
- }
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/test/java/org/apache/geronimo/jaxws/provider/WebProviderTest.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/test/java/org/apache/geronimo/jaxws/provider/WebProviderTest.java
deleted file mode 100644
index 078d4b7..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ear/src/test/java/org/apache/geronimo/jaxws/provider/WebProviderTest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.provider;
-
-public class WebProviderTest extends ProviderTest {
-
- protected String getTestServlet() {
- return "/test-provider-web";
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/pom.xml b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/pom.xml
deleted file mode 100644
index b9fc809..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-provider-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>provider-ejb</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Provider EJB</name>
- <packaging>jar</packaging>
- <description>This project executes testcases for your testsuite</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>provider-common</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
-
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/EchoLocal.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/EchoLocal.java
deleted file mode 100644
index a2c57e7..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/EchoLocal.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.ejb;
-
-public interface EchoLocal {
-
- public String echo(String words);
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/EchoRemote.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/EchoRemote.java
deleted file mode 100644
index f38199d..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/EchoRemote.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.ejb;
-
-public interface EchoRemote {
-
- public String echo(String words);
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterHTTPDataSourceProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterHTTPDataSourceProvider.java
deleted file mode 100644
index f0a5279..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterHTTPDataSourceProvider.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.ejb;
-
-import java.io.IOException;
-
-import javax.activation.DataSource;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.http.HTTPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = HTTPBinding.HTTP_BINDING)
-@ServiceMode(value = Service.Mode.MESSAGE)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterHTTPDataSourcePort", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-@Stateless(name = "GreeterHTTPDataSourceProvider")
-@Local(value = { EchoLocal.class, Provider.class })
-@Remote(value = { EchoRemote.class })
-public class GreeterHTTPDataSourceProvider implements Provider<DataSource>, EchoLocal, EchoRemote {
-
- @Resource(type = WebServiceContext.class)
- protected WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- public String echo(String words) {
- return words;
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public DataSource invoke(DataSource dataSource) {
- try {
- return MessageUtils.createResponseHTTPDataSource();
- } catch (IOException e) {
- throw new WebServiceException(e);
- }
- }
-}
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterHTTPSourceMessageModeProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterHTTPSourceMessageModeProvider.java
deleted file mode 100644
index 2fcf440..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterHTTPSourceMessageModeProvider.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.ejb;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.xml.transform.Source;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.http.HTTPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = HTTPBinding.HTTP_BINDING)
-@ServiceMode(value = Service.Mode.MESSAGE)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterHTTPSourceMessageModePort", wsdlLocation = "wsdl/greeter_provider.wsdl", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-@Stateless(name = "GreeterHTTPSourceMessageModeProvider")
-@Local(value = { EchoLocal.class, Provider.class })
-@Remote(value = { EchoRemote.class })
-public class GreeterHTTPSourceMessageModeProvider implements Provider<Source>, EchoLocal, EchoRemote {
-
- @Resource(type = WebServiceContext.class)
- private WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- public String echo(String words) {
- return words;
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public Source invoke(Source source) {
- return MessageUtils.createResponseHTTPSource();
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterHTTPSourcePayloadModeProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterHTTPSourcePayloadModeProvider.java
deleted file mode 100644
index edc50b5..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterHTTPSourcePayloadModeProvider.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.ejb;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.xml.transform.Source;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.http.HTTPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = HTTPBinding.HTTP_BINDING)
-@ServiceMode(value = Service.Mode.PAYLOAD)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterHTTPSourcePayloadModePort", wsdlLocation = "wsdl/greeter_provider.wsdl", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-@Stateless(name = "GreeterHTTPSourcePayloadModeProvider")
-@Local(value = { EchoLocal.class, Provider.class })
-@Remote(value = { EchoRemote.class })
-public class GreeterHTTPSourcePayloadModeProvider implements Provider<Source>, EchoLocal, EchoRemote {
-
- @Resource(type = WebServiceContext.class)
- private WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- public String echo(String words) {
- return words;
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public Source invoke(Source source) {
- return MessageUtils.createResponseHTTPSource();
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP11SOAPMessageProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP11SOAPMessageProvider.java
deleted file mode 100644
index 49de269..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP11SOAPMessageProvider.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.ejb;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = SOAPBinding.SOAP11HTTP_BINDING)
-@ServiceMode(value = Service.Mode.MESSAGE)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterSOAP11SOAPMessagePort", wsdlLocation = "wsdl/greeter_provider.wsdl", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-@Stateless(name = "GreeterSOAP11SOAPMessageProvider")
-@Local(value = { EchoLocal.class, Provider.class })
-@Remote(value = { EchoRemote.class })
-public class GreeterSOAP11SOAPMessageProvider implements Provider<SOAPMessage>, EchoLocal, EchoRemote {
-
- @Resource(type = WebServiceContext.class)
- protected WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- public String echo(String words) {
- return words;
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public SOAPMessage invoke(SOAPMessage soapMessage) throws WebServiceException {
- try {
- return MessageUtils.createResponseSOAPMessage(SOAPConstants.SOAP_1_1_PROTOCOL);
- } catch (SOAPException e) {
- throw new WebServiceException(e);
- }
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP11SourceMessageModeProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP11SourceMessageModeProvider.java
deleted file mode 100644
index 720371f..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP11SourceMessageModeProvider.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.ejb;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPException;
-import javax.xml.transform.Source;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = SOAPBinding.SOAP11HTTP_BINDING)
-@ServiceMode(value = Service.Mode.MESSAGE)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterSOAP11SourceMessageModePort", wsdlLocation = "wsdl/greeter_provider.wsdl", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-@Stateless(name = "GreeterSOAP11SourceMessageModeProvider")
-@Local(value = { EchoLocal.class, Provider.class })
-@Remote(value = { EchoRemote.class })
-public class GreeterSOAP11SourceMessageModeProvider implements Provider<Source>, EchoLocal, EchoRemote {
-
- @Resource(type = WebServiceContext.class)
- private WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- public String echo(String words) {
- return words;
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public Source invoke(Source source) throws WebServiceException {
- try {
- return MessageUtils.createResponseSOAPSource(SOAPConstants.SOAP_1_1_PROTOCOL, Service.Mode.MESSAGE);
- } catch (SOAPException e) {
- throw new WebServiceException(e);
- }
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP11SourcePayloadModeProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP11SourcePayloadModeProvider.java
deleted file mode 100644
index 01cd986..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP11SourcePayloadModeProvider.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.ejb;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPException;
-import javax.xml.transform.Source;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = SOAPBinding.SOAP11HTTP_BINDING)
-@ServiceMode(value = Service.Mode.PAYLOAD)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterSOAP11SourcePayloadModePort", wsdlLocation = "wsdl/greeter_provider.wsdl", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-@Stateless(name = "GreeterSOAP11SourcePayloadModeProvider")
-@Local(value = { EchoLocal.class, Provider.class })
-@Remote(value = { EchoRemote.class })
-public class GreeterSOAP11SourcePayloadModeProvider implements Provider<Source>, EchoLocal, EchoRemote {
-
- @Resource(type = WebServiceContext.class)
- private WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- public String echo(String words) {
- return words;
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public Source invoke(Source source) throws WebServiceException {
- try {
- return MessageUtils.createResponseSOAPSource(SOAPConstants.SOAP_1_1_PROTOCOL, Service.Mode.PAYLOAD);
- } catch (SOAPException e) {
- throw new WebServiceException(e);
- }
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP12SOAPMessageProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP12SOAPMessageProvider.java
deleted file mode 100644
index 4e3c5b2..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP12SOAPMessageProvider.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.ejb;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)
-@ServiceMode(value = Service.Mode.MESSAGE)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterSOAP12SOAPMessagePort", wsdlLocation = "wsdl/greeter_provider.wsdl", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-@Stateless(name = "GreeterSOAP12SOAPMessageProvider")
-@Local(value = { EchoLocal.class, Provider.class })
-@Remote(value = { EchoRemote.class })
-public class GreeterSOAP12SOAPMessageProvider implements Provider<SOAPMessage>, EchoLocal, EchoRemote {
-
- @Resource(type = WebServiceContext.class)
- private WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- public String echo(String words) {
- return words;
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public SOAPMessage invoke(SOAPMessage soapMessage) {
- try {
- return MessageUtils.createResponseSOAPMessage(SOAPConstants.SOAP_1_2_PROTOCOL);
- } catch (SOAPException e) {
- throw new WebServiceException(e);
- }
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP12SourceMessageModeProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP12SourceMessageModeProvider.java
deleted file mode 100644
index c3dcf55..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP12SourceMessageModeProvider.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.ejb;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPException;
-import javax.xml.transform.Source;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)
-@ServiceMode(value = Service.Mode.MESSAGE)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterSOAP12SourceMessageModePort", wsdlLocation = "wsdl/greeter_provider.wsdl", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-@Stateless(name = "GreeterSOAP12SourceMessageModeProvider")
-@Local(value = { EchoLocal.class, Provider.class })
-@Remote(value = { EchoRemote.class })
-public class GreeterSOAP12SourceMessageModeProvider implements Provider<Source>, EchoLocal, EchoRemote {
-
- @Resource(type = WebServiceContext.class)
- private WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- public String echo(String words) {
- return words;
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public Source invoke(Source source) {
- try {
- return MessageUtils.createResponseSOAPSource(SOAPConstants.SOAP_1_2_PROTOCOL, Service.Mode.MESSAGE);
- } catch (SOAPException e) {
- throw new WebServiceException(e);
- }
- }
-}
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP12SourcePayloadModeProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP12SourcePayloadModeProvider.java
deleted file mode 100644
index f3b23d9..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/java/org/apache/geronimo/jaxws/greeter_provider/ejb/GreeterSOAP12SourcePayloadModeProvider.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.ejb;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.ejb.Local;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPException;
-import javax.xml.transform.Source;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)
-@ServiceMode(value = Service.Mode.PAYLOAD)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterSOAP12SourcePayloadModePort", wsdlLocation = "wsdl/greeter_provider.wsdl", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-@Stateless(name = "GreeterSOAP12SourcePayloadModeProvider")
-@Local(value = { EchoLocal.class, Provider.class })
-@Remote(value = { EchoRemote.class })
-public class GreeterSOAP12SourcePayloadModeProvider implements Provider<Source>, EchoLocal, EchoRemote {
-
- @Resource(type = WebServiceContext.class)
- private WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- public String echo(String words) {
- return words;
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public Source invoke(Source source) {
- try {
- return MessageUtils.createResponseSOAPSource(SOAPConstants.SOAP_1_2_PROTOCOL, Service.Mode.PAYLOAD);
- } catch (SOAPException e) {
- throw new WebServiceException(e);
- }
- }
-}
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/resources/META-INF/ejb-jar.xml b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/resources/META-INF/ejb-jar.xml
deleted file mode 100644
index fa5ca5b..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<ejb-jar 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/ejb-jar_3_0.xsd">
- <display-name>JAX-WS Provider Test</display-name>
-</ejb-jar>
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/resources/META-INF/openejb-jar.xml b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/resources/META-INF/openejb-jar.xml
deleted file mode 100644
index d08c486..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/resources/META-INF/openejb-jar.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
- xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <environment>
- <moduleId>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}</artifactId>
- <version>${version}</version>
- <type>jar</type>
- </moduleId>
- </environment>
-
- <enterprise-beans>
- <session>
- <ejb-name>GreeterHTTPSourceMessageModeProvider</ejb-name>
- <jndi-name>GreeterHTTPSourceMessageModeProviderRemote</jndi-name>
- </session>
-
- <session>
- <ejb-name>GreeterHTTPSourcePayloadModeProvider</ejb-name>
- <jndi-name>GreeterHTTPSourcePayloadModeProviderRemote</jndi-name>
- </session>
-
- <session>
- <ejb-name>GreeterHTTPDataSourceProvider</ejb-name>
- <jndi-name>GreeterHTTPDataSourceProviderRemote</jndi-name>
- </session>
-
- <session>
- <ejb-name>GreeterSOAP11SOAPMessageProvider</ejb-name>
- <jndi-name>GreeterSOAP11SOAPMessageProviderRemote</jndi-name>
- </session>
-
- <session>
- <ejb-name>GreeterSOAP11SourceMessageModeProvider</ejb-name>
- <jndi-name>GreeterSOAP11SourceMessageModeProviderRemote</jndi-name>
- </session>
-
- <session>
- <ejb-name>GreeterSOAP11SourcePayloadModeProvider</ejb-name>
- <jndi-name>GreeterSOAP11SourcePayloadModeProviderRemote</jndi-name>
- </session>
-
- <session>
- <ejb-name>GreeterSOAP12SOAPMessageProvider</ejb-name>
- <jndi-name>GreeterSOAP12SOAPMessageProviderRemote</jndi-name>
- </session>
-
- <session>
- <ejb-name>GreeterSOAP12SourceMessageModeProvider</ejb-name>
- <jndi-name>GreeterSOAP12SourceMessageModeProviderRemote</jndi-name>
- </session>
-
- <session>
- <ejb-name>GreeterSOAP12SourcePayloadModeProvider</ejb-name>
- <jndi-name>GreeterSOAP12SourcePayloadModeProviderRemote</jndi-name>
- </session>
- </enterprise-beans>
-
-
-</openejb-jar>
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/resources/wsdl/greeter_provider.wsdl b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/resources/wsdl/greeter_provider.wsdl
deleted file mode 100644
index ff452de..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-ejb/src/main/resources/wsdl/greeter_provider.wsdl
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<wsdl:definitions xmlns:soap11="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
- xmlns:tns="http://geronimo.apache.org/greeter_provider" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
- xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="http://geronimo.apache.org/greeter_provider" name="Greeter">
- <wsdl:types>
- <schema targetNamespace="http://geronimo.apache.org/greeter_provider" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
- <element name="sayHi">
- <complexType>
- <sequence>
- <element name="requestarg" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="sayHiResponse">
- <complexType>
- <sequence>
- <element name="responsearg" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- </schema>
- </wsdl:types>
- <wsdl:message name="sayHiRequest">
- <wsdl:part element="tns:sayHi" name="sayHiRequestPart"/>
- </wsdl:message>
- <wsdl:message name="sayHiResponse">
- <wsdl:part element="tns:sayHiResponse" name="sayHiResponsePart"/>
- </wsdl:message>
- <wsdl:portType name="Greeter">
- <wsdl:operation name="sayHi">
- <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
- <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="GreeterSOAP11Binding" type="tns:Greeter">
- <soap11:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="sayHi">
- <soap11:operation soapAction="" style="document"/>
- <wsdl:input name="sayHiRequest">
- <soap11:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="sayHiResponse">
- <soap11:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="GreeterSOAP12Binding" type="tns:Greeter">
- <soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="sayHi">
- <soap12:operation soapAction="" style="document"/>
- <wsdl:input name="sayHiRequest">
- <soap12:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="sayHiResponse">
- <soap12:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="GreeterHTTPBinding" type="tns:Greeter">
- <http:binding verb="POST"/>
- <wsdl:operation name="sayHi">
- <http:operation location="sayHi"/>
- <wsdl:input name="sayHiRequest">
- <mime:content type="text/xml"/>
- </wsdl:input>
- <wsdl:output name="sayHiResponse">
- <mime:content type="text/xml"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="GreeterService">
- <wsdl:port binding="tns:GreeterHTTPBinding" name="GreeterHTTPSourceMessageModePort">
- <http:address location="http://localhost:8080/jaxws-provider/provider/http/source/message"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterHTTPBinding" name="GreeterHTTPSourcePayloadModePort">
- <http:address location="http://localhost:8080/jaxws-provider/provider/http/source/payload"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP11Binding" name="GreeterSOAP11SOAPMessagePort">
- <soap11:address location="http://localhost:8080/jaxws-provider/provider/soap11/soapmessage"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP11Binding" name="GreeterSOAP11SourceMessageModePort">
- <soap11:address location="http://localhost:8080/jaxws-provider/provider/soap11/source/message"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP11Binding" name="GreeterSOAP11SourcePayloadModePort">
- <soap11:address location="http://localhost:8080/jaxws-provider/provider/soap11/source/payload"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP12Binding" name="GreeterSOAP12SOAPMessagePort">
- <soap12:address location="http://localhost:8080/jaxws-provider/provider/soap12/soapmessage"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP12Binding" name="GreeterSOAP12SourceMessageModePort">
- <soap12:address location="http://localhost:8080/jaxws-provider/provider/soap12/source/message"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP12Binding" name="GreeterSOAP12SourcePayloadModePort">
- <soap12:address location="http://localhost:8080/jaxws-provider/provider/soap12/source/payload"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/pom.xml b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/pom.xml
deleted file mode 100644
index edf3ac6..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/pom.xml
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-provider-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>provider-test-war</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Provider WAR Test Client</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>provider-common</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>provider-ejb</artifactId>
- <scope>provided</scope>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/AssertUtils.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/AssertUtils.java
deleted file mode 100644
index c347951..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/AssertUtils.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider;
-
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-
-import javax.activation.DataSource;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMResult;
-import javax.xml.ws.Service;
-
-import junit.framework.Assert;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-import org.w3c.dom.Document;
-import org.w3c.dom.Node;
-
-public class AssertUtils {
-
- public static void assertResponseSOAPMessage(SOAPMessage soapMessage, String soapVersion) throws SOAPException {
- Assert.assertNotNull(soapMessage);
- assertResponseNode(soapMessage.getSOAPBody());
- assertSOAPVersion(soapMessage.getSOAPBody(), soapVersion);
- }
-
- public static void assertResponseSOAPSource(Source source, String soapVersion, Service.Mode mode) throws Exception {
- Transformer transformer = TransformerFactory.newInstance().newTransformer();
- DOMResult result = new DOMResult();
- transformer.transform(source, result);
- Node node = ((Document) result.getNode()).getDocumentElement();
- assertResponseNode(node);
- if (mode.equals(Service.Mode.MESSAGE))
- assertSOAPVersion(node, soapVersion);
- }
-
- public static void assertResponseHTTPSource(Source source) throws Exception {
- Transformer transformer = TransformerFactory.newInstance().newTransformer();
- DOMResult result = new DOMResult();
- transformer.transform(source, result);
- Node node = ((Document) result.getNode()).getDocumentElement();
- assertResponseNode(node);
- }
-
- public static void assertResponseNode(Node node) {
- Node requestArg = MessageUtils.findNode(node, "responsearg");
- Assert.assertNotNull(requestArg);
- String sResponseText = MessageUtils.getSubTextChildValue(requestArg);
- Assert.assertEquals(MessageUtils.GERONIMO, sResponseText);
- }
-
- public static void assertSOAPVersion(Node node, String soapVersion) {
- String sNameSpaceURI = node.getNamespaceURI();
- if (soapVersion.equals(SOAPConstants.SOAP_1_1_PROTOCOL))
- Assert.assertEquals(sNameSpaceURI, "http://schemas.xmlsoap.org/soap/envelope/");
- else if (soapVersion.equals(SOAPConstants.SOAP_1_2_PROTOCOL))
- Assert.assertEquals(sNameSpaceURI, "http://www.w3.org/2003/05/soap-envelope");
- }
-
- public static void assertResponseHTTPDataSource(DataSource dataSource) throws Exception {
- DataSource requestDataSource = MessageUtils.createRequestHTTPDataSource();
- Assert.assertEquals(requestDataSource.getContentType(), dataSource.getContentType());
- byte[] expectedBytes = loadBytesFromDataSource(requestDataSource);
- byte[] actualBytes = loadBytesFromDataSource(dataSource);
- Assert.assertEquals(expectedBytes.length, actualBytes.length);
- for (int i = 0; i < expectedBytes.length; i++)
- Assert.assertEquals("Check byte array [" + i + "]", expectedBytes[i], actualBytes[i]);
- }
-
- public static byte[] loadBytesFromDataSource(DataSource dataSource) throws Exception {
- ByteArrayOutputStream out = null;
- InputStream in = null;
- try {
- in = dataSource.getInputStream();
- out = new ByteArrayOutputStream();
- byte[] bytesBuffer = new byte[512];
- int iCurrentReadBytes = 0;
- while ((iCurrentReadBytes = in.read(bytesBuffer)) != -1)
- out.write(bytesBuffer, 0, iCurrentReadBytes);
- return out.toByteArray();
- } finally {
- if (in != null)
- try {
- in.close();
- } catch (Exception e) {
- }
- }
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/TestServlet.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/TestServlet.java
deleted file mode 100644
index 7ee1335..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/TestServlet.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.activation.DataSource;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.transform.Source;
-import javax.xml.ws.Dispatch;
-import javax.xml.ws.Service;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-public abstract class TestServlet extends HttpServlet {
-
- protected Service service;
-
- public static final QName GREETER_SERVICE = new QName("http://geronimo.apache.org/greeter_provider",
- "GreeterService");
-
- public static final QName GreeterHTTPDataSourcePort = new QName("http://geronimo.apache.org/greeter_provider",
- "GreeterHTTPDataSourcePort");
-
- public static final QName GreeterHTTPSourceMessageModePort = new QName(
- "http://geronimo.apache.org/greeter_provider", "GreeterHTTPSourceMessageModePort");
-
- public static final QName GreeterHTTPSourcePayloadModePort = new QName(
- "http://geronimo.apache.org/greeter_provider", "GreeterHTTPSourcePayloadModePort");
-
- public static final QName GreeterSOAP11SOAPMessagePort = new QName("http://geronimo.apache.org/greeter_provider",
- "GreeterSOAP11SOAPMessagePort");
-
- public static final QName GreeterSOAP11SourceMessageModePort = new QName(
- "http://geronimo.apache.org/greeter_provider", "GreeterSOAP11SourceMessageModePort");
-
- public static final QName GreeterSOAP11SourcePayloadModePort = new QName(
- "http://geronimo.apache.org/greeter_provider", "GreeterSOAP11SourcePayloadModePort");
-
- public static final QName GreeterSOAP12SOAPMessagePort = new QName("http://geronimo.apache.org/greeter_provider",
- "GreeterSOAP12SOAPMessagePort");
-
- public static final QName GreeterSOAP12SourceMessageModePort = new QName(
- "http://geronimo.apache.org/greeter_provider", "GreeterSOAP12SourceMessageModePort");
-
- public static final QName GreeterSOAP12SourcePayloadModePort = new QName(
- "http://geronimo.apache.org/greeter_provider", "GreeterSOAP12SourcePayloadModePort");
-
- @Override
- public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- String testName = request.getParameter("test");
- if (testName == null || !testName.startsWith("test")) {
- throw new ServletException("Invalid test name");
- }
- Method testMethod = null;
- try {
- testMethod = getClass().getMethod(testName, new Class[] {});
- } catch (Exception e1) {
- throw new ServletException("No such test: " + testName);
- }
- try {
- testMethod.invoke(this, (Object[]) null);
- } catch (IllegalArgumentException e) {
- throw new ServletException("Error invoking test: " + e.getMessage());
- } catch (IllegalAccessException e) {
- throw new ServletException("Error invoking test: " + e.getMessage());
- } catch (InvocationTargetException e) {
- Throwable root = e.getTargetException();
- ServletException ex = new ServletException("Test '" + testName + "' failed");
- ex.initCause(root);
- throw ex;
- }
- response.setContentType("text/plain");
- response.getWriter().println("Test '" + testName + "' passed");
- }
-
- public void testHTTPDataSource() throws Exception {
- Dispatch<DataSource> dispatch = service.createDispatch(GreeterHTTPDataSourcePort,
- DataSource.class,
- Service.Mode.MESSAGE);
- DataSource responseDataSource = dispatch.invoke(MessageUtils.createRequestHTTPDataSource());
- AssertUtils.assertResponseHTTPDataSource(responseDataSource);
- }
-
- public void testHTTPSourceMessageMode() throws Exception {
- Dispatch<Source> dispatch = service.createDispatch(GreeterHTTPSourceMessageModePort, Source.class,
- Service.Mode.MESSAGE);
- Source source = dispatch.invoke(MessageUtils.createRequestHTTPSource());
- AssertUtils.assertResponseHTTPSource(source);
- }
-
- public void testHTTPSourcePayloadMode() throws Exception {
- Dispatch<Source> dispatch = service.createDispatch(GreeterHTTPSourcePayloadModePort, Source.class,
- Service.Mode.PAYLOAD);
- Source source = dispatch.invoke(MessageUtils.createRequestHTTPSource());
- AssertUtils.assertResponseHTTPSource(source);
- }
-
- public void testSOAP11SOAPMessage() throws Exception {
- Dispatch<SOAPMessage> dispatch = service.createDispatch(GreeterSOAP11SOAPMessagePort, SOAPMessage.class,
- Service.Mode.MESSAGE);
- SOAPMessage soapMessage = dispatch.invoke(MessageUtils
- .createRequestSOAPMessage(SOAPConstants.SOAP_1_1_PROTOCOL));
- AssertUtils.assertResponseSOAPMessage(soapMessage, SOAPConstants.SOAP_1_1_PROTOCOL);
- }
-
- public void testSOAP11SourceMessageMode() throws Exception {
- Dispatch<Source> dispatch = service.createDispatch(GreeterSOAP11SourceMessageModePort, Source.class,
- Service.Mode.MESSAGE);
- Source source = dispatch.invoke(MessageUtils.createRequestSOAPSource(SOAPConstants.SOAP_1_1_PROTOCOL,
- Service.Mode.MESSAGE));
- AssertUtils.assertResponseSOAPSource(source, SOAPConstants.SOAP_1_1_PROTOCOL, Service.Mode.MESSAGE);
- }
-
- public void testSOAP11SourcePayloadMode() throws Exception {
- Dispatch<Source> dispatch = service.createDispatch(GreeterSOAP11SourcePayloadModePort, Source.class,
- Service.Mode.PAYLOAD);
- Source source = dispatch.invoke(MessageUtils.createRequestSOAPSource(SOAPConstants.SOAP_1_1_PROTOCOL,
- Service.Mode.PAYLOAD));
- AssertUtils.assertResponseSOAPSource(source, SOAPConstants.SOAP_1_1_PROTOCOL, Service.Mode.PAYLOAD);
- }
-
- public void testSOAP12SOAPMessage() throws Exception {
- Dispatch<SOAPMessage> dispatch = service.createDispatch(GreeterSOAP12SOAPMessagePort, SOAPMessage.class,
- Service.Mode.MESSAGE);
- SOAPMessage soapMessage = dispatch.invoke(MessageUtils
- .createRequestSOAPMessage(SOAPConstants.SOAP_1_2_PROTOCOL));
- AssertUtils.assertResponseSOAPMessage(soapMessage, SOAPConstants.SOAP_1_2_PROTOCOL);
- }
-
- public void testSOAP12SourceMessageMode() throws Exception {
- Dispatch<Source> dispatch = service.createDispatch(GreeterSOAP12SourceMessageModePort, Source.class,
- Service.Mode.MESSAGE);
- Source source = dispatch.invoke(MessageUtils.createRequestSOAPSource(SOAPConstants.SOAP_1_2_PROTOCOL,
- Service.Mode.MESSAGE));
- AssertUtils.assertResponseSOAPSource(source, SOAPConstants.SOAP_1_2_PROTOCOL, Service.Mode.MESSAGE);
- }
-
- public void testSOAP12SourcePayloadMode() throws Exception {
- Dispatch<Source> dispatch = service.createDispatch(GreeterSOAP12SourcePayloadModePort, Source.class,
- Service.Mode.PAYLOAD);
- Source source = dispatch.invoke(MessageUtils.createRequestSOAPSource(SOAPConstants.SOAP_1_2_PROTOCOL,
- Service.Mode.PAYLOAD));
- AssertUtils.assertResponseSOAPSource(source, SOAPConstants.SOAP_1_2_PROTOCOL, Service.Mode.PAYLOAD);
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/TestServletEJB.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/TestServletEJB.java
deleted file mode 100644
index 9ec2029..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/TestServletEJB.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider;
-
-import java.util.Properties;
-
-import javax.activation.DataSource;
-import javax.annotation.PostConstruct;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.transform.Source;
-import javax.xml.ws.Dispatch;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceRef;
-import javax.xml.ws.http.HTTPBinding;
-
-import junit.framework.Assert;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-import org.apache.geronimo.jaxws.greeter_provider.ejb.EchoLocal;
-import org.apache.geronimo.jaxws.greeter_provider.ejb.EchoRemote;
-
-/**
- * For each type provider, the test items include :
- * a. Invoke the extra method via local interface
- * b. Invoke the extra method via remote interface
- * c. Invoke the invoke method of the Provider interface via local interface
- */
-public class TestServletEJB extends TestServlet {
-
- public static final String ECHO_WORDS = "Geronimo";
-
- private InitialContext localContext;
-
- private InitialContext remoteContext;
-
- @WebServiceRef(name = "services/ejb/Provider")
- private Service myService;
-
- private void assertEchoInvocation(String beanName) throws Exception {
- EchoLocal echoLocal = lookupEchoLocal(beanName);
- Assert.assertEquals(echoLocal.echo(ECHO_WORDS), ECHO_WORDS);
- EchoRemote echoRemote = null;
- echoRemote = lookupEchoRemote(beanName);
- Assert.assertEquals(echoRemote.echo(ECHO_WORDS), ECHO_WORDS);
- }
-
- private EchoLocal lookupEchoLocal(String beanName) throws Exception {
- return (EchoLocal) localContext.lookup(beanName + "Local");
- }
-
- private EchoRemote lookupEchoRemote(String beanName) throws Exception {
- return (EchoRemote) remoteContext.lookup(beanName + "Remote");
- }
-
- private Provider<?> lookupProvider(String beanName) throws Exception {
- return (Provider<?>) localContext.lookup(beanName + "Local");
- }
-
- @PostConstruct
- private void myInit() throws Exception {
- this.service = myService;
- Properties localProps = new Properties();
- localProps.setProperty(Context.INITIAL_CONTEXT_FACTORY, "org.apache.openejb.client.LocalInitialContextFactory");
- localContext = new InitialContext(localProps);
- Properties remoteProps = new Properties();
- remoteProps.setProperty(Context.INITIAL_CONTEXT_FACTORY,
- "org.apache.openejb.client.RemoteInitialContextFactory");
- remoteProps.setProperty(Context.PROVIDER_URL, "ejbd://localhost:4201");
- remoteContext = new InitialContext(remoteProps);
- }
-
- @Override
- public void testHTTPDataSource() throws Exception {
- super.testHTTPDataSource();
- assertEchoInvocation("GreeterHTTPDataSourceProvider");
- Provider<DataSource> provider = (Provider<DataSource>) lookupProvider("GreeterHTTPDataSourceProvider");
- DataSource ejbResponseDataSource = provider.invoke(MessageUtils.createRequestHTTPDataSource());
- AssertUtils.assertResponseHTTPDataSource(ejbResponseDataSource);
- }
-
- @Override
- public void testHTTPSourceMessageMode() throws Exception {
- super.testHTTPSourceMessageMode();
- assertEchoInvocation("GreeterHTTPSourceMessageModeProvider");
- Provider<Source> provider = (Provider<Source>) lookupProvider("GreeterHTTPSourceMessageModeProvider");
- Source source = provider.invoke(MessageUtils.createRequestHTTPSource());
- AssertUtils.assertResponseHTTPSource(source);
- }
-
- @Override
- public void testHTTPSourcePayloadMode() throws Exception {
- super.testHTTPSourcePayloadMode();
- assertEchoInvocation("GreeterHTTPSourcePayloadModeProvider");
- Provider<Source> provider = (Provider<Source>) lookupProvider("GreeterHTTPSourcePayloadModeProvider");
- Source source = provider.invoke(MessageUtils.createRequestHTTPSource());
- AssertUtils.assertResponseHTTPSource(source);
- }
-
- @Override
- public void testSOAP11SOAPMessage() throws Exception {
- super.testSOAP11SOAPMessage();
- assertEchoInvocation("GreeterSOAP11SOAPMessageProvider");
- Provider<SOAPMessage> provider = (Provider<SOAPMessage>) lookupProvider("GreeterSOAP11SOAPMessageProvider");
- SOAPMessage soapMessage = provider.invoke(MessageUtils
- .createRequestSOAPMessage(SOAPConstants.SOAP_1_1_PROTOCOL));
- AssertUtils.assertResponseSOAPMessage(soapMessage, SOAPConstants.SOAP_1_1_PROTOCOL);
- }
-
- @Override
- public void testSOAP11SourceMessageMode() throws Exception {
- super.testSOAP11SourceMessageMode();
- assertEchoInvocation("GreeterSOAP11SourceMessageModeProvider");
- Provider<Source> provider = (Provider<Source>) lookupProvider("GreeterSOAP11SourceMessageModeProvider");
- Source source = provider.invoke(MessageUtils.createRequestSOAPSource(SOAPConstants.SOAP_1_1_PROTOCOL,
- Service.Mode.MESSAGE));
- AssertUtils.assertResponseSOAPSource(source, SOAPConstants.SOAP_1_1_PROTOCOL, Service.Mode.MESSAGE);
- }
-
- @Override
- public void testSOAP11SourcePayloadMode() throws Exception {
- super.testSOAP11SourcePayloadMode();
- assertEchoInvocation("GreeterSOAP11SourcePayloadModeProvider");
- Provider<Source> provider = (Provider<Source>) lookupProvider("GreeterSOAP11SourcePayloadModeProvider");
- Source source = provider.invoke(MessageUtils.createRequestSOAPSource(SOAPConstants.SOAP_1_1_PROTOCOL,
- Service.Mode.PAYLOAD));
- AssertUtils.assertResponseSOAPSource(source, SOAPConstants.SOAP_1_1_PROTOCOL, Service.Mode.PAYLOAD);
- }
-
- @Override
- public void testSOAP12SOAPMessage() throws Exception {
- super.testSOAP12SOAPMessage();
- assertEchoInvocation("GreeterSOAP12SOAPMessageProvider");
- Provider<SOAPMessage> provider = (Provider<SOAPMessage>) lookupProvider("GreeterSOAP12SOAPMessageProvider");
- SOAPMessage soapMessage = provider.invoke(MessageUtils
- .createRequestSOAPMessage(SOAPConstants.SOAP_1_2_PROTOCOL));
- AssertUtils.assertResponseSOAPMessage(soapMessage, SOAPConstants.SOAP_1_2_PROTOCOL);
- }
-
- @Override
- public void testSOAP12SourceMessageMode() throws Exception {
- super.testSOAP12SourceMessageMode();
- assertEchoInvocation("GreeterSOAP12SourceMessageModeProvider");
- Provider<Source> provider = (Provider<Source>) lookupProvider("GreeterSOAP12SourceMessageModeProvider");
- Source source = provider.invoke(MessageUtils.createRequestSOAPSource(SOAPConstants.SOAP_1_2_PROTOCOL,
- Service.Mode.MESSAGE));
- AssertUtils.assertResponseSOAPSource(source, SOAPConstants.SOAP_1_2_PROTOCOL, Service.Mode.MESSAGE);
- }
-
- @Override
- public void testSOAP12SourcePayloadMode() throws Exception {
- super.testSOAP12SourcePayloadMode();
- assertEchoInvocation("GreeterSOAP12SourcePayloadModeProvider");
- Provider<Source> provider = (Provider<Source>) lookupProvider("GreeterSOAP12SourcePayloadModeProvider");
- Source source = provider.invoke(MessageUtils.createRequestSOAPSource(SOAPConstants.SOAP_1_2_PROTOCOL,
- Service.Mode.PAYLOAD));
- AssertUtils.assertResponseSOAPSource(source, SOAPConstants.SOAP_1_2_PROTOCOL, Service.Mode.PAYLOAD);
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/TestServletWeb.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/TestServletWeb.java
deleted file mode 100644
index 1a1c69a..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/TestServletWeb.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider;
-
-import javax.annotation.PostConstruct;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceRef;
-
-public class TestServletWeb extends TestServlet {
-
- @WebServiceRef(name = "services/Provider")
- private Service myService;
-
- @PostConstruct
- private void myInit() {
- this.service = myService;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 73674f2..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>war</dep:type>
- </dep:moduleId>
- </dep:environment>
-
- <context-root>/${pom.artifactId}</context-root>
-
- <service-ref>
- <service-ref-name>services/Provider</service-ref-name>
- <port>
- <port-name>GreeterHTTPDataSourcePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/provider-war/provider/http/datasource</uri>
- </port>
- <port>
- <port-name>GreeterHTTPSourceMessageModePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/provider-war/provider/http/source/message</uri>
- </port>
- <port>
- <port-name>GreeterHTTPSourcePayloadModePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/provider-war/provider/http/source/payload</uri>
- </port>
- <port>
- <port-name>GreeterSOAP11SOAPMessagePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/provider-war/provider/soap11/soapmessage</uri>
- </port>
- <port>
- <port-name>GreeterSOAP11SourceMessageModePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/provider-war/provider/soap11/source/message</uri>
- </port>
- <port>
- <port-name>GreeterSOAP11SourcePayloadModePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/provider-war/provider/soap11/source/payload</uri>
- </port>
- <port>
- <port-name>GreeterSOAP12SOAPMessagePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/provider-war/provider/soap12/soapmessage</uri>
- </port>
- <port>
- <port-name>GreeterSOAP12SourceMessageModePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/provider-war/provider/soap12/source/message</uri>
- </port>
- <port>
- <port-name>GreeterSOAP12SourcePayloadModePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/provider-war/provider/soap12/source/payload</uri>
- </port>
- </service-ref>
-
- <service-ref>
- <service-ref-name>services/ejb/Provider</service-ref-name>
- <port>
- <port-name>GreeterHTTPDataSourcePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/GreeterService/GreeterHTTPDataSourceProvider</uri>
- </port>
- <port>
- <port-name>GreeterHTTPSourceMessageModePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/GreeterService/GreeterHTTPSourceMessageModeProvider</uri>
- </port>
- <port>
- <port-name>GreeterHTTPSourcePayloadModePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/GreeterService/GreeterHTTPSourcePayloadModeProvider</uri>
- </port>
- <port>
- <port-name>GreeterSOAP11SOAPMessagePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/GreeterService/GreeterSOAP11SOAPMessageProvider</uri>
- </port>
- <port>
- <port-name>GreeterSOAP11SourceMessageModePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/GreeterService/GreeterSOAP11SourceMessageModeProvider</uri>
- </port>
- <port>
- <port-name>GreeterSOAP11SourcePayloadModePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/GreeterService/GreeterSOAP11SourcePayloadModeProvider</uri>
- </port>
- <port>
- <port-name>GreeterSOAP12SOAPMessagePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/GreeterService/GreeterSOAP12SOAPMessageProvider</uri>
- </port>
- <port>
- <port-name>GreeterSOAP12SourceMessageModePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/GreeterService/GreeterSOAP12SourceMessageModeProvider</uri>
- </port>
- <port>
- <port-name>GreeterSOAP12SourcePayloadModePort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/GreeterService/GreeterSOAP12SourcePayloadModeProvider</uri>
- </port>
- </service-ref>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/web.xml b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index c8636ec..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app 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/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
- version="2.5">
- <display-name>JAX-WS Provider Test</display-name>
- <servlet>
- <display-name>TestServletWeb</display-name>
- <servlet-name>TestServletWeb</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.greeter_provider.TestServletWeb</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>TestServletWeb</servlet-name>
- <url-pattern>/test-provider-web</url-pattern>
- </servlet-mapping>
- <servlet>
- <display-name>TestServletEJB</display-name>
- <servlet-name>TestServletEJB</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.greeter_provider.TestServletEJB</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>TestServletEJB</servlet-name>
- <url-pattern>/test-provider-ejb</url-pattern>
- </servlet-mapping>
- <service-ref>
- <service-ref-name>services/Provider</service-ref-name>
- <service-interface>javax.xml.ws.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/greeter_provider.wsdl</wsdl-file>
- </service-ref>
- <service-ref>
- <service-ref-name>services/ejb/Provider</service-ref-name>
- <service-interface>javax.xml.ws.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/greeter_provider.wsdl</wsdl-file>
- </service-ref>
- <service-ref>
- <service-ref-name>services/GenericProvider</service-ref-name>
- <service-interface>javax.xml.ws.Service</service-interface>
- </service-ref>
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/wsdl/greeter_provider.wsdl b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/wsdl/greeter_provider.wsdl
deleted file mode 100644
index c36f68d..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-test-war/src/main/webapp/WEB-INF/wsdl/greeter_provider.wsdl
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<wsdl:definitions xmlns:soap11="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
- xmlns:tns="http://geronimo.apache.org/greeter_provider" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
- xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="http://geronimo.apache.org/greeter_provider" name="Greeter">
- <wsdl:types>
- <schema targetNamespace="http://geronimo.apache.org/greeter_provider" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
- <element name="sayHi">
- <complexType>
- <sequence>
- <element name="requestarg" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="sayHiResponse">
- <complexType>
- <sequence>
- <element name="responsearg" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- </schema>
- </wsdl:types>
- <wsdl:message name="sayHiRequest">
- <wsdl:part element="tns:sayHi" name="sayHiRequestPart"/>
- </wsdl:message>
- <wsdl:message name="sayHiResponse">
- <wsdl:part element="tns:sayHiResponse" name="sayHiResponsePart"/>
- </wsdl:message>
- <wsdl:portType name="Greeter">
- <wsdl:operation name="sayHi">
- <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
- <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="GreeterSOAP11Binding" type="tns:Greeter">
- <soap11:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="sayHi">
- <soap11:operation soapAction="" style="document"/>
- <wsdl:input name="sayHiRequest">
- <soap11:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="sayHiResponse">
- <soap11:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="GreeterSOAP12Binding" type="tns:Greeter">
- <soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="sayHi">
- <soap12:operation soapAction="" style="document"/>
- <wsdl:input name="sayHiRequest">
- <soap12:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="sayHiResponse">
- <soap12:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="GreeterHTTPBinding" type="tns:Greeter">
- <http:binding verb="POST"/>
- <wsdl:operation name="sayHi">
- <http:operation location="sayHi"/>
- <wsdl:input name="sayHiRequest">
- <mime:content type="text/xml"/>
- </wsdl:input>
- <wsdl:output name="sayHiResponse">
- <mime:content type="text/xml"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="GreeterService">
- <wsdl:port binding="tns:GreeterHTTPBinding" name="GreeterHTTPDataSourcePort">
- <http:address location="http://localhost:8080/provider-war/provider/http/datasource"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterHTTPBinding" name="GreeterHTTPSourceMessageModePort">
- <http:address location="http://localhost:8080/provider-war/provider/http/source/message"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterHTTPBinding" name="GreeterHTTPSourcePayloadModePort">
- <http:address location="http://localhost:8080/provider-war/provider/http/source/payload"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP11Binding" name="GreeterSOAP11SOAPMessagePort">
- <soap11:address location="http://localhost:8080/provider-war/provider/soap11/soapmessage"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP11Binding" name="GreeterSOAP11SourceMessageModePort">
- <soap11:address location="http://localhost:8080/provider-war/provider/soap11/source/message"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP11Binding" name="GreeterSOAP11SourcePayloadModePort">
- <soap11:address location="http://localhost:8080/provider-war/provider/soap11/source/payload"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP12Binding" name="GreeterSOAP12SOAPMessagePort">
- <soap12:address location="http://localhost:8080/provider-war/provider/soap12/soapmessage"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP12Binding" name="GreeterSOAP12SourceMessageModePort">
- <soap12:address location="http://localhost:8080/provider-war/provider/soap12/source/message"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP12Binding" name="GreeterSOAP12SourcePayloadModePort">
- <soap12:address location="http://localhost:8080/provider-war/provider/soap12/source/payload"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/pom.xml b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/pom.xml
deleted file mode 100644
index 500d516..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/pom.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-provider-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
- <artifactId>provider-war</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Provider WAR</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>provider-common</artifactId>
- <version>${project.version}</version>
- <optional>true</optional>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterHTTPDataSourceProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterHTTPDataSourceProvider.java
deleted file mode 100644
index 8998932..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterHTTPDataSourceProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.web;
-
-import java.io.IOException;
-
-import javax.activation.DataSource;
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.http.HTTPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = HTTPBinding.HTTP_BINDING)
-@ServiceMode(value = Service.Mode.MESSAGE)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterHTTPDataSourcePort", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-public class GreeterHTTPDataSourceProvider implements Provider<DataSource> {
-
- @Resource(type = WebServiceContext.class)
- protected WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public DataSource invoke(DataSource dataSource) {
- try {
- return MessageUtils.createResponseHTTPDataSource();
- } catch (IOException e) {
- throw new WebServiceException(e);
- }
- }
-}
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterHTTPSourceMessageModeProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterHTTPSourceMessageModeProvider.java
deleted file mode 100644
index 13a5e25..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterHTTPSourceMessageModeProvider.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.web;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.xml.transform.Source;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.http.HTTPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = HTTPBinding.HTTP_BINDING)
-@ServiceMode(value = Service.Mode.MESSAGE)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterHTTPSourceMessageModePort", wsdlLocation = "WEB-INF/wsdl/greeter_provider.wsdl", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-public class GreeterHTTPSourceMessageModeProvider implements Provider<Source> {
-
- @Resource(type = WebServiceContext.class)
- private WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public Source invoke(Source source) {
- return MessageUtils.createResponseHTTPSource();
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterHTTPSourcePayloadModeProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterHTTPSourcePayloadModeProvider.java
deleted file mode 100644
index 84f041a..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterHTTPSourcePayloadModeProvider.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.web;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.xml.transform.Source;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.http.HTTPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = HTTPBinding.HTTP_BINDING)
-@ServiceMode(value = Service.Mode.PAYLOAD)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterHTTPSourcePayloadModePort", wsdlLocation = "WEB-INF/wsdl/greeter_provider.wsdl", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-public class GreeterHTTPSourcePayloadModeProvider implements Provider<Source> {
-
- @Resource(type = WebServiceContext.class)
- private WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public Source invoke(Source source) {
- return MessageUtils.createResponseHTTPSource();
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP11SOAPMessageProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP11SOAPMessageProvider.java
deleted file mode 100644
index 749aa2a..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP11SOAPMessageProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.web;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = SOAPBinding.SOAP11HTTP_BINDING)
-@ServiceMode(value = Service.Mode.MESSAGE)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterSOAP11SOAPMessagePort", wsdlLocation = "WEB-INF/wsdl/greeter_provider.wsdl", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-public class GreeterSOAP11SOAPMessageProvider implements Provider<SOAPMessage> {
-
- @Resource(type = WebServiceContext.class)
- protected WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public SOAPMessage invoke(SOAPMessage soapMessage) throws WebServiceException {
- try {
- return MessageUtils.createResponseSOAPMessage(SOAPConstants.SOAP_1_1_PROTOCOL);
- } catch (SOAPException e) {
- throw new WebServiceException(e);
- }
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP11SourceMessageModeProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP11SourceMessageModeProvider.java
deleted file mode 100644
index dffd637..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP11SourceMessageModeProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.web;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPException;
-import javax.xml.transform.Source;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = SOAPBinding.SOAP11HTTP_BINDING)
-@ServiceMode(value = Service.Mode.MESSAGE)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterSOAP11SourceMessageModePort", wsdlLocation = "WEB-INF/wsdl/greeter_provider.wsdl", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-public class GreeterSOAP11SourceMessageModeProvider implements Provider<Source> {
-
- @Resource(type = WebServiceContext.class)
- private WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public Source invoke(Source source) throws WebServiceException {
- try {
- return MessageUtils.createResponseSOAPSource(SOAPConstants.SOAP_1_1_PROTOCOL, Service.Mode.MESSAGE);
- } catch (SOAPException e) {
- throw new WebServiceException(e);
- }
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP11SourcePayloadModeProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP11SourcePayloadModeProvider.java
deleted file mode 100644
index ed66ed2..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP11SourcePayloadModeProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.web;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPException;
-import javax.xml.transform.Source;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = SOAPBinding.SOAP11HTTP_BINDING)
-@ServiceMode(value = Service.Mode.PAYLOAD)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterSOAP11SourcePayloadModePort", wsdlLocation = "WEB-INF/wsdl/greeter_provider.wsdl", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-public class GreeterSOAP11SourcePayloadModeProvider implements Provider<Source> {
-
- @Resource(type = WebServiceContext.class)
- private WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public Source invoke(Source source) throws WebServiceException {
- try {
- return MessageUtils.createResponseSOAPSource(SOAPConstants.SOAP_1_1_PROTOCOL, Service.Mode.PAYLOAD);
- } catch (SOAPException e) {
- throw new WebServiceException(e);
- }
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP12SOAPMessageProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP12SOAPMessageProvider.java
deleted file mode 100644
index aa110d1..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP12SOAPMessageProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.web;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)
-@ServiceMode(value = Service.Mode.MESSAGE)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterSOAP12SOAPMessagePort", wsdlLocation = "WEB-INF/wsdl/greeter_provider.wsdl", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-public class GreeterSOAP12SOAPMessageProvider implements Provider<SOAPMessage> {
-
- @Resource(type = WebServiceContext.class)
- private WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public SOAPMessage invoke(SOAPMessage soapMessage) {
- try {
- return MessageUtils.createResponseSOAPMessage(SOAPConstants.SOAP_1_2_PROTOCOL);
- } catch (SOAPException e) {
- throw new WebServiceException(e);
- }
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP12SourceMessageModeProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP12SourceMessageModeProvider.java
deleted file mode 100644
index 591c194..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP12SourceMessageModeProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.web;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPException;
-import javax.xml.transform.Source;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)
-@ServiceMode(value = Service.Mode.MESSAGE)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterSOAP12SourceMessageModePort", wsdlLocation = "WEB-INF/wsdl/greeter_provider.wsdl", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-public class GreeterSOAP12SourceMessageModeProvider implements Provider<Source> {
-
- @Resource(type = WebServiceContext.class)
- private WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public Source invoke(Source source) {
- try {
- return MessageUtils.createResponseSOAPSource(SOAPConstants.SOAP_1_2_PROTOCOL, Service.Mode.MESSAGE);
- } catch (SOAPException e) {
- throw new WebServiceException(e);
- }
- }
-}
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP12SourcePayloadModeProvider.java b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP12SourcePayloadModeProvider.java
deleted file mode 100644
index 100c18a..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/java/org/apache/geronimo/jaxws/greeter_provider/web/GreeterSOAP12SourcePayloadModeProvider.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.geronimo.jaxws.greeter_provider.web;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.xml.soap.SOAPConstants;
-import javax.xml.soap.SOAPException;
-import javax.xml.transform.Source;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.Service;
-import javax.xml.ws.ServiceMode;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceException;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.soap.SOAPBinding;
-
-import org.apache.geronimo.jaxws.greeter_provider.common.MessageUtils;
-
-@BindingType(value = SOAPBinding.SOAP12HTTP_BINDING)
-@ServiceMode(value = Service.Mode.PAYLOAD)
-@WebServiceProvider(serviceName = "GreeterService", portName = "GreeterSOAP12SourcePayloadModePort", wsdlLocation = "WEB-INF/wsdl/greeter_provider.wsdl", targetNamespace = "http://geronimo.apache.org/greeter_provider")
-public class GreeterSOAP12SourcePayloadModeProvider implements Provider<Source> {
-
- @Resource(type = WebServiceContext.class)
- private WebServiceContext webServiceContext;
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- public Source invoke(Source source) {
- try {
- return MessageUtils.createResponseSOAPSource(SOAPConstants.SOAP_1_2_PROTOCOL, Service.Mode.PAYLOAD);
- } catch (SOAPException e) {
- throw new WebServiceException(e);
- }
- }
-}
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index c81eeb2..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>war</dep:type>
- </dep:moduleId>
- </dep:environment>
- <context-root>/${pom.artifactId}</context-root>
-</web-app>
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/webapp/WEB-INF/web.xml b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f75df19..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app 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/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
- version="2.5">
- <display-name>Geronimo WS Provider</display-name>
- <servlet>
- <display-name>Provider SOAP11 SOAPMessage</display-name>
- <servlet-name>providerSOAP11SoapMessage</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.greeter_provider.web.GreeterSOAP11SOAPMessageProvider</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>providerSOAP11SoapMessage</servlet-name>
- <url-pattern>/provider/soap11/soapmessage</url-pattern>
- </servlet-mapping>
- <servlet>
- <display-name>Provider SOAP11 Message Mode Source</display-name>
- <servlet-name>providerSOAP11SourceMessageMode</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.greeter_provider.web.GreeterSOAP11SourceMessageModeProvider
- </servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>providerSOAP11SourceMessageMode</servlet-name>
- <url-pattern>/provider/soap11/source/message</url-pattern>
- </servlet-mapping>
- <servlet>
- <display-name>Provider SOAP11 Payload Mode Source</display-name>
- <servlet-name>providerSOAP11SourcePayloadMode</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.greeter_provider.web.GreeterSOAP11SourcePayloadModeProvider
- </servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>providerSOAP11SourcePayloadMode</servlet-name>
- <url-pattern>/provider/soap11/source/payload</url-pattern>
- </servlet-mapping>
- <servlet>
- <display-name>Provider SOAP12 SOAPMessage</display-name>
- <servlet-name>providerSOAP12SoapMessage</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.greeter_provider.web.GreeterSOAP12SOAPMessageProvider</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>providerSOAP12SoapMessage</servlet-name>
- <url-pattern>/provider/soap12/soapmessage</url-pattern>
- </servlet-mapping>
- <servlet>
- <display-name>Provider SOAP12 Message Mode Source</display-name>
- <servlet-name>providerSOAP12SourceMessageMode</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.greeter_provider.web.GreeterSOAP12SourceMessageModeProvider
- </servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>providerSOAP12SourceMessageMode</servlet-name>
- <url-pattern>/provider/soap12/source/message</url-pattern>
- </servlet-mapping>
- <servlet>
- <display-name>Provider SOAP12 Payload Mode Source</display-name>
- <servlet-name>providerSOAP12SourcePayloadMode</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.greeter_provider.web.GreeterSOAP12SourcePayloadModeProvider
- </servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>providerSOAP12SourcePayloadMode</servlet-name>
- <url-pattern>/provider/soap12/source/payload</url-pattern>
- </servlet-mapping>
- <servlet>
- <display-name>Provider HTTP DataSource</display-name>
- <servlet-name>providerHTTPDataSource</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.greeter_provider.web.GreeterHTTPDataSourceProvider</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>providerHTTPDataSource</servlet-name>
- <url-pattern>/provider/http/datasource</url-pattern>
- </servlet-mapping>
- <servlet>
- <display-name>Provider HTTP Source Message Mode</display-name>
- <servlet-name>providerHTTPSourceMessageMode</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.greeter_provider.web.GreeterHTTPSourceMessageModeProvider</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>providerHTTPSourceMessageMode</servlet-name>
- <url-pattern>/provider/http/source/message</url-pattern>
- </servlet-mapping>
- <servlet>
- <display-name>Provider HTTP Source Payload Mode</display-name>
- <servlet-name>providerHTTPSourcePayloadMode</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.greeter_provider.web.GreeterHTTPSourcePayloadModeProvider</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>providerHTTPSourcePayloadMode</servlet-name>
- <url-pattern>/provider/http/source/payload</url-pattern>
- </servlet-mapping>
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/webapp/WEB-INF/wsdl/greeter_provider.wsdl b/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/webapp/WEB-INF/wsdl/greeter_provider.wsdl
deleted file mode 100644
index 4c5096c..0000000
--- a/testsuite/webservices-testsuite/jaxws-provider-tests/provider-war/src/main/webapp/WEB-INF/wsdl/greeter_provider.wsdl
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<wsdl:definitions xmlns:soap11="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl"
- xmlns:tns="http://geronimo.apache.org/greeter_provider" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:http="http://schemas.xmlsoap.org/wsdl/http/"
- xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" targetNamespace="http://geronimo.apache.org/greeter_provider" name="Greeter">
- <wsdl:types>
- <schema targetNamespace="http://geronimo.apache.org/greeter_provider" xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
- <element name="sayHi">
- <complexType>
- <sequence>
- <element name="requestarg" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="sayHiResponse">
- <complexType>
- <sequence>
- <element name="responsearg" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- </schema>
- </wsdl:types>
- <wsdl:message name="sayHiRequest">
- <wsdl:part element="tns:sayHi" name="sayHiRequestPart"/>
- </wsdl:message>
- <wsdl:message name="sayHiResponse">
- <wsdl:part element="tns:sayHiResponse" name="sayHiResponsePart"/>
- </wsdl:message>
- <wsdl:portType name="Greeter">
- <wsdl:operation name="sayHi">
- <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
- <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="GreeterSOAP11Binding" type="tns:Greeter">
- <soap11:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="sayHi">
- <soap11:operation soapAction="" style="document"/>
- <wsdl:input name="sayHiRequest">
- <soap11:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="sayHiResponse">
- <soap11:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="GreeterSOAP12Binding" type="tns:Greeter">
- <soap12:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="sayHi">
- <soap12:operation soapAction="" style="document"/>
- <wsdl:input name="sayHiRequest">
- <soap12:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="sayHiResponse">
- <soap12:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:binding name="GreeterHTTPBinding" type="tns:Greeter">
- <http:binding verb="POST"/>
- <wsdl:operation name="sayHi">
- <http:operation location="sayHi"/>
- <wsdl:input name="sayHiRequest">
- <mime:content type="text/xml"/>
- </wsdl:input>
- <wsdl:output name="sayHiResponse">
- <mime:content type="text/xml"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="GreeterService">
- <!--wsdl:port binding="tns:GreeterHTTPBinding" name="GreeterHTTPDataSourcePort">
- <http:address location="http://localhost:8080/provider-war/provider/http/datasource"/>
- </wsdl:port-->
- <wsdl:port binding="tns:GreeterHTTPBinding" name="GreeterHTTPSourceMessageModePort">
- <http:address location="http://localhost:8080/provider-war/provider/http/source/message"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterHTTPBinding" name="GreeterHTTPSourcePayloadModePort">
- <http:address location="http://localhost:8080/provider-war/provider/http/source/payload"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP11Binding" name="GreeterSOAP11SOAPMessagePort">
- <soap11:address location="http://localhost:8080/provider-war/provider/soap11/soapmessage"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP11Binding" name="GreeterSOAP11SourceMessageModePort">
- <soap11:address location="http://localhost:8080/provider-war/provider/soap11/source/message"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP11Binding" name="GreeterSOAP11SourcePayloadModePort">
- <soap11:address location="http://localhost:8080/provider-war/provider/soap11/source/payload"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP12Binding" name="GreeterSOAP12SOAPMessagePort">
- <soap12:address location="http://localhost:8080/provider-war/provider/soap12/soapmessage"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP12Binding" name="GreeterSOAP12SourceMessageModePort">
- <soap12:address location="http://localhost:8080/provider-war/provider/soap12/source/message"/>
- </wsdl:port>
- <wsdl:port binding="tns:GreeterSOAP12Binding" name="GreeterSOAP12SourcePayloadModePort">
- <soap12:address location="http://localhost:8080/provider-war/provider/soap12/source/payload"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxws-tests/goals.txt b/testsuite/webservices-testsuite/jaxws-tests/goals.txt
deleted file mode 100644
index 9cb8855..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/goals.txt
+++ /dev/null
@@ -1 +0,0 @@
-clean install
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
deleted file mode 100644
index a0ec70d..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/pom.xml
+++ /dev/null
@@ -1,155 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxws-client</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Client</name>
- <packaging>jar</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <properties>
- <clientLogFile>${basedir}/target/client.log</clientLogFile>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-war</artifactId>
- <type>war</type>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.geronimo.test.JAXWSClient</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>clientLogFile</name>
- <value>${clientLogFile}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-service</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <modules>
- <module>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-war</artifactId>
- <type>war</type>
- <version>${project.version}</version>
- </module>
- </modules>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar
- </moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <phase>pre-integration-test</phase>
- <id>run-client</id>
- <goals>
- <goal>run-client</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXWSClient/1.1/car</moduleId>
- <logOutput>true</logOutput>
- <logFile>${clientLogFile}</logFile>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-client-as-modules</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <modules>
- <module>
- <groupId>JEE5</groupId>
- <artifactId>JAXWSClientServer</artifactId>
- <version>1.1</version>
- <type>car</type>
- </module>
- <module>
- <groupId>JEE5</groupId>
- <artifactId>JAXWSServlet</artifactId>
- <version>1.1</version>
- <type>car</type>
- </module>
- </modules>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/java/org/apache/geronimo/test/JAXWSClient.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/java/org/apache/geronimo/test/JAXWSClient.java
deleted file mode 100644
index 000de04..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/java/org/apache/geronimo/test/JAXWSClient.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.naming.InitialContext;
-import javax.xml.ws.Service;
-import org.apache.greeter_control.Greeter;
-
-public class JAXWSClient {
-
- public static void main(String [] args) throws Exception {
- try {
- test("Tester");
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- // needs to be forced because of a bug
- System.exit(0);
- }
-
- public static void test(String name) throws Exception {
- if (name == null) {
- name = "Unknown";
- }
- InitialContext ctx = new InitialContext();
- Service service = (Service)ctx.lookup("java:comp/env/services/Greeter");
- Greeter greeter = service.getPort(Greeter.class);
- System.out.println("WebService returned: " + greeter.greetMe(name));
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/java/org/apache/greeter_control/FaultDetail.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/java/org/apache/greeter_control/FaultDetail.java
deleted file mode 100644
index 660b6f5..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/java/org/apache/greeter_control/FaultDetail.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.greeter_control;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="minor" type="{http://www.w3.org/2001/XMLSchema}short"/>
- * <element name="major" type="{http://www.w3.org/2001/XMLSchema}short"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "minor",
- "major"
-})
-@XmlRootElement(name = "faultDetail")
-public class FaultDetail {
-
- protected short minor;
- protected short major;
-
- /**
- * Gets the value of the minor property.
- *
- */
- public short getMinor() {
- return minor;
- }
-
- /**
- * Sets the value of the minor property.
- *
- */
- public void setMinor(short value) {
- this.minor = value;
- }
-
- /**
- * Gets the value of the major property.
- *
- */
- public short getMajor() {
- return major;
- }
-
- /**
- * Sets the value of the major property.
- *
- */
- public void setMajor(short value) {
- this.major = value;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/java/org/apache/greeter_control/Greeter.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/java/org/apache/greeter_control/Greeter.java
deleted file mode 100644
index 519b73e..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/java/org/apache/greeter_control/Greeter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.greeter_control;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-@WebService(name = "Greeter", targetNamespace = "http://apache.org/greeter_control")
-public interface Greeter {
-
-
- /**
- *
- * @return
- * returns java.lang.String
- */
- @WebMethod
- @WebResult(name = "responseType", targetNamespace = "http://apache.org/greeter_control/types")
- @RequestWrapper(localName = "sayHi", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.SayHi")
- @ResponseWrapper(localName = "sayHiResponse", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.SayHiResponse")
- public String sayHi();
-
- /**
- *
- * @param requestType
- * @return
- * returns java.lang.String
- */
- @WebMethod
- @WebResult(name = "responseType", targetNamespace = "http://apache.org/greeter_control/types")
- @RequestWrapper(localName = "greetMe", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.GreetMe")
- @ResponseWrapper(localName = "greetMeResponse", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.GreetMeResponse")
- public String greetMe(
- @WebParam(name = "requestType", targetNamespace = "http://apache.org/greeter_control/types")
- String requestType);
-
- /**
- *
- * @param requestType
- */
- @WebMethod
- @Oneway
- @RequestWrapper(localName = "greetMeOneWay", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.GreetMeOneWay")
- public void greetMeOneWay(
- @WebParam(name = "requestType", targetNamespace = "http://apache.org/greeter_control/types")
- String requestType);
-
- /**
- *
- * @throws PingMeFault
- */
- @WebMethod
- @RequestWrapper(localName = "pingMe", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.PingMe")
- @ResponseWrapper(localName = "pingMeResponse", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.PingMeResponse")
- public void pingMe()
- throws PingMeFault
- ;
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/java/org/apache/greeter_control/PingMeFault.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/java/org/apache/greeter_control/PingMeFault.java
deleted file mode 100644
index 6b833f4..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/java/org/apache/greeter_control/PingMeFault.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.greeter_control;
-
-import javax.xml.ws.WebFault;
-import org.apache.greeter_control.FaultDetail;
-
-
-@WebFault(name = "faultDetail", targetNamespace = "http://apache.org/greeter_control/types")
-public class PingMeFault
- extends Exception
-{
-
- /**
- * Java type that goes as soapenv:Fault detail element.
- *
- */
- private FaultDetail faultInfo;
-
- /**
- *
- * @param faultInfo
- * @param message
- */
- public PingMeFault(String message, FaultDetail faultInfo) {
- super(message);
- this.faultInfo = faultInfo;
- }
-
- /**
- *
- * @param faultInfo
- * @param message
- * @param cause
- */
- public PingMeFault(String message, FaultDetail faultInfo, Throwable cause) {
- super(message, cause);
- this.faultInfo = faultInfo;
- }
-
- /**
- *
- * @return
- * returns fault bean: org.apache.greeter_control.types.FaultDetail
- */
- public FaultDetail getFaultInfo() {
- return faultInfo;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/resources/META-INF/application-client.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/resources/META-INF/application-client.xml
deleted file mode 100644
index 9ad093b..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/resources/META-INF/application-client.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<application-client xmlns="http://java.sun.com/xml/ns/javaee" version="5">
-
- <display-name>JAXWS Client</display-name>
-
- <service-ref>
- <service-ref-name>services/Greeter</service-ref-name>
- <service-interface>javax.xml.ws.Service</service-interface>
- <wsdl-file>META-INF/wsdl/greeter_control.wsdl</wsdl-file>
- </service-ref>
-
-</application-client>
-
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/resources/META-INF/geronimo-application-client.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/resources/META-INF/geronimo-application-client.xml
deleted file mode 100644
index f5f3167..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/resources/META-INF/geronimo-application-client.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<application-client
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <dep:client-environment>
- <dep:moduleId>
- <dep:groupId>JEE5</dep:groupId>
- <dep:artifactId>JAXWSClient</dep:artifactId>
- <dep:version>1.1</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- </dep:client-environment>
-
- <dep:server-environment>
- <dep:moduleId>
- <dep:groupId>JEE5</dep:groupId>
- <dep:artifactId>JAXWSClientServer</dep:artifactId>
- <dep:version>1.1</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- </dep:server-environment>
-
- <service-ref>
- <service-ref-name>services/Greeter</service-ref-name>
- <port>
- <port-name>GreeterPort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/jaxws-war/servlet2</uri>
- </port>
- </service-ref>
-
-</application-client>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/resources/META-INF/wsdl/greeter_control.wsdl b/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/resources/META-INF/wsdl/greeter_control.wsdl
deleted file mode 100644
index fff3c93..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/main/resources/META-INF/wsdl/greeter_control.wsdl
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/greeter_control"
- xmlns:x1="http://apache.org/greeter_control/types"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/greeter_control" name="HelloWorld">
- <wsdl:types>
- <schema targetNamespace="http://apache.org/greeter_control/types"
- xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
- <element name="sayHi">
- <complexType/>
- </element>
- <element name="sayHiResponse">
- <complexType>
- <sequence>
- <element name="responseType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMe">
- <complexType>
- <sequence>
- <element name="requestType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMeResponse">
- <complexType>
- <sequence>
- <element name="responseType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMeOneWay">
- <complexType>
- <sequence>
- <element name="requestType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="pingMe">
- <complexType/>
- </element>
- <element name="pingMeResponse">
- <complexType/>
- </element>
- <element name="faultDetail">
- <complexType>
- <sequence>
- <element name="minor" type="xsd:short"/>
- <element name="major" type="xsd:short"/>
- </sequence>
- </complexType>
- </element>
-
- </schema>
- </wsdl:types>
-
-
- <wsdl:message name="sayHiRequest">
- <wsdl:part element="x1:sayHi" name="in"/>
- </wsdl:message>
- <wsdl:message name="sayHiResponse">
- <wsdl:part element="x1:sayHiResponse" name="out"/>
- </wsdl:message>
- <wsdl:message name="greetMeRequest">
- <wsdl:part element="x1:greetMe" name="in"/>
- </wsdl:message>
- <wsdl:message name="greetMeResponse">
- <wsdl:part element="x1:greetMeResponse" name="out"/>
- </wsdl:message>
- <wsdl:message name="greetMeOneWayRequest">
- <wsdl:part element="x1:greetMeOneWay" name="in"/>
- </wsdl:message>
- <wsdl:message name="pingMeRequest">
- <wsdl:part name="in" element="x1:pingMe"/>
- </wsdl:message>
- <wsdl:message name="pingMeResponse">
- <wsdl:part name="out" element="x1:pingMeResponse"/>
- </wsdl:message>
- <wsdl:message name="pingMeFault">
- <wsdl:part name="faultDetail" element="x1:faultDetail"/>
- </wsdl:message>
-
- <wsdl:portType name="Greeter">
- <wsdl:operation name="sayHi">
- <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
- <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
- </wsdl:operation>
-
- <wsdl:operation name="greetMe">
- <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
- <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
- </wsdl:operation>
-
- <wsdl:operation name="greetMeOneWay">
- <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/>
- </wsdl:operation>
-
- <wsdl:operation name="pingMe">
- <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
- <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
- <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
- </wsdl:operation>
- </wsdl:portType>
-
-
- <wsdl:binding name="GreeterSOAPBinding" type="tns:Greeter">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <wsdl:operation name="sayHi">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="sayHiRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="sayHiResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="greetMe">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="greetMeRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="greetMeResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="greetMeOneWay">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="greetMeOneWayRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- </wsdl:operation>
-
- <wsdl:operation name="pingMe">
- <soap:operation style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="pingMeFault">
- <soap:fault name="pingMeFault" use="literal"/>
- </wsdl:fault>
- </wsdl:operation>
-
- </wsdl:binding>
-
- <wsdl:service name="GreeterService">
- <wsdl:port binding="tns:GreeterSOAPBinding" name="GreeterPort">
- <soap:address location="http://localhost:8080/SoapContext/GreeterPort"/>
- <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/08/addressing/wsdl"/>
- </wsdl:port>
- </wsdl:service>
-
-
-</wsdl:definitions>
-
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/test/java/org/apache/geronimo/testsuite/testset/ClientJAXWSTest.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/test/java/org/apache/geronimo/testsuite/testset/ClientJAXWSTest.java
deleted file mode 100644
index e6fc599..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-client/src/test/java/org/apache/geronimo/testsuite/testset/ClientJAXWSTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.FileInputStream;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-
-public class ClientJAXWSTest extends TestSupport {
-
- @Test
- public void testClient() throws Exception {
- String expected = "Hello Tester";
-
- String outputFile = System.getProperty("clientLogFile");
- assertNotNull(outputFile);
- FileInputStream in = null;
- try {
- in = new FileInputStream(outputFile);
- BufferedReader reader =
- new BufferedReader(new InputStreamReader(in));
-
- String inputLine;
- boolean found = false;
- while ((inputLine = reader.readLine()) != null) {
- System.out.println(inputLine);
-
- if (found == false &&
- inputLine.indexOf("WebService returned: " + expected) != -1) {
- found = true;
- }
- }
- in.close();
-
- assertTrue("Reply", found);
-
- } finally {
- if (in != null) {
- in.close();
- }
- }
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml
deleted file mode 100644
index f2d67d2..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/pom.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxws-ejb-sec</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: Secure JAX-WS EJB</name>
- <packaging>jar</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openejb</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}-${project.version}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ejb</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-ejb-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/jar</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/main/filtered-resources/META-INF/ejb-jar.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/main/filtered-resources/META-INF/ejb-jar.xml
deleted file mode 100644
index 3d5f991..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/main/filtered-resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<ejb-jar 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/ejb-jar_3_0.xsd">
- <display-name>JAXWSBean</display-name>
- <enterprise-beans>
- <session>
- <display-name>BeanBasic</display-name>
- <ejb-name>BeanBasic</ejb-name>
- <ejb-class>org.apache.geronimo.test.JAXWSBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
-
- <session>
- <display-name>BeanBasicAllowGet</display-name>
- <ejb-name>BeanBasicAllowGet</ejb-name>
- <ejb-class>org.apache.geronimo.test.JAXWSBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
-
- <session>
- <display-name>BeanHttps</display-name>
- <ejb-name>BeanHttps</ejb-name>
- <ejb-class>org.apache.geronimo.test.JAXWSBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
-
- <session>
- <display-name>BeanHttpsAllowGet</display-name>
- <ejb-name>BeanHttpsAllowGet</ejb-name>
- <ejb-class>org.apache.geronimo.test.JAXWSBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-
- <assembly-descriptor>
- <security-role>
- <role-name>admin</role-name>
- </security-role>
- <method-permission>
- <role-name>admin</role-name>
- <method>
- <ejb-name>BeanBasic</ejb-name>
- <method-name>greetMe</method-name>
- </method>
- <method>
- <ejb-name>BeanBasicAllowGet</ejb-name>
- <method-name>greetMe</method-name>
- </method>
- </method-permission>
- <method-permission>
- <unchecked/>
- <method>
- <ejb-name>BeanHttps</ejb-name>
- <method-name>greetMe</method-name>
- </method>
- <method>
- <ejb-name>BeanHttpsAllowGet</ejb-name>
- <method-name>greetMe</method-name>
- </method>
- </method-permission>
- </assembly-descriptor>
-
-</ejb-jar>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/main/filtered-resources/META-INF/openejb-jar.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/main/filtered-resources/META-INF/openejb-jar.xml
deleted file mode 100644
index 6a4aba0..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/main/filtered-resources/META-INF/openejb-jar.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
- xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2"
- xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0">
-
- <environment>
- <moduleId>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}</artifactId>
- <version>${version}</version>
- <type>jar</type>
- </moduleId>
- </environment>
-
- <enterprise-beans>
- <session>
- <ejb-name>BeanBasic</ejb-name>
- <web-service-address>/BeanBasic/ejb</web-service-address>
- <web-service-security>
- <security-realm-name>geronimo-admin</security-realm-name>
- <transport-guarantee>NONE</transport-guarantee>
- <auth-method>BASIC</auth-method>
- </web-service-security>
- </session>
-
- <session>
- <ejb-name>BeanBasicAllowGet</ejb-name>
- <web-service-address>/BeanBasicAllowGet/ejb</web-service-address>
- <web-service-security>
- <security-realm-name>geronimo-admin</security-realm-name>
- <transport-guarantee>NONE</transport-guarantee>
- <auth-method>BASIC</auth-method>
- <properties>getProtected=false
- getSecured=false</properties>
- </web-service-security>
- </session>
-
- <session>
- <ejb-name>BeanHttps</ejb-name>
- <web-service-address>/BeanHttps/ejb</web-service-address>
- <web-service-security>
- <security-realm-name>geronimo-admin</security-realm-name>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- <auth-method>NONE</auth-method>
- <!--<properties>getSecured=false</properties>-->
- </web-service-security>
- </session>
-
- <session>
- <ejb-name>BeanHttpsAllowGet</ejb-name>
- <web-service-address>/BeanHttpsAllowGet/ejb</web-service-address>
- <web-service-security>
- <security-realm-name>geronimo-admin</security-realm-name>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- <auth-method>NONE</auth-method>
- <properties>getProtected=false</properties>
- </web-service-security>
- </session>
- </enterprise-beans>
-
- <sec:security>
- <sec:role-mappings>
- <sec:role role-name="admin">
- <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
- name="admin"/>
- </sec:role>
- </sec:role-mappings>
- </sec:security>
-</openejb-jar>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/main/filtered-resources/wsdl/greeter.wsdl b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/main/filtered-resources/wsdl/greeter.wsdl
deleted file mode 100644
index 46d6137..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/main/filtered-resources/wsdl/greeter.wsdl
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://test.geronimo.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="JAXWSBeanService" targetNamespace="http://test.geronimo.apache.org/">
- <types>
- <schema targetNamespace="http://test.geronimo.apache.org/"
- xmlns="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified">
- </schema>
- </types>
- <message name="greetMeResponse">
- <part name="return" type="xsd:string">
- </part>
- </message>
- <message name="greetMe">
- <part name="arg0" type="xsd:string">
- </part>
- </message>
- <message name="greetMeEjbResponse">
- <part name="return" type="xsd:string">
- </part>
- </message>
- <message name="greetMeEjb">
- <part name="arg0" type="xsd:string">
- </part>
- </message>
- <portType name="JAXWSBean">
- <operation name="greetMe">
- <input message="tns:greetMe">
- </input>
- <output message="tns:greetMeResponse">
- </output>
- </operation>
- <operation name="greetMeEjb">
- <input message="tns:greetMeEjb">
- </input>
- <output message="tns:greetMeEjbResponse">
- </output>
- </operation>
- </portType>
- <binding name="JAXWSBeanPortBinding" type="tns:JAXWSBean">
- <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="greetMe">
- <soap:operation soapAction=""/>
- <input>
- <soap:body namespace="http://test.geronimo.apache.org/" use="literal"/>
- </input>
- <output>
- <soap:body namespace="http://test.geronimo.apache.org/" use="literal"/>
- </output>
- </operation>
- <operation name="greetMeEjb">
- <soap:operation soapAction=""/>
- <input>
- <soap:body namespace="http://test.geronimo.apache.org/" use="literal"/>
- </input>
- <output>
- <soap:body namespace="http://test.geronimo.apache.org/" use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="JAXWSBeanService">
- <port binding="tns:JAXWSBeanPortBinding" name="JAXWSBeanPort">
- <soap:address location="http://localhost:8080/JAXWSBean1/ejb"/>
- </port>
- </service>
-</definitions>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/main/java/org/apache/geronimo/test/JAXWSBean.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/main/java/org/apache/geronimo/test/JAXWSBean.java
deleted file mode 100644
index 83b61ca..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/main/java/org/apache/geronimo/test/JAXWSBean.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.util.logging.Logger;
-
-import javax.annotation.Resource;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.WebServiceContext;
-
-@WebService(wsdlLocation="wsdl/greeter.wsdl")
-@Stateless
-@Remote(JAXWSGreeter.class)
-@SOAPBinding(style=SOAPBinding.Style.RPC,
- use=SOAPBinding.Use.LITERAL,
- parameterStyle=SOAPBinding.ParameterStyle.WRAPPED
-)
-public class JAXWSBean implements JAXWSGreeter {
-
- private static final Logger LOG =
- Logger.getLogger(JAXWSBean.class.getName());
-
- @Resource
- private WebServiceContext context;
-
- public String greetMe(String me) {
- LOG.info("WebServiceContext: " + context);
- LOG.info("Principal: " + context.getUserPrincipal());
- LOG.info("Context: " + context.getMessageContext());
-
- System.out.println("i'm a ejb ws: " + me);
-
- return "Hello " + me;
- }
-
- public String greetMeEjb(String me) {
- return "Hello EJB " + me;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/main/java/org/apache/geronimo/test/JAXWSGreeter.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/main/java/org/apache/geronimo/test/JAXWSGreeter.java
deleted file mode 100644
index 02de5a8..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/main/java/org/apache/geronimo/test/JAXWSGreeter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-public interface JAXWSGreeter {
-
- public String greetMeEjb(String me);
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java
deleted file mode 100644
index 67fed3f..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java
+++ /dev/null
@@ -1,274 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.net.ssl.HttpsURLConnection;
-import javax.wsdl.Definition;
-import javax.wsdl.PortType;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Text;
-import org.xml.sax.InputSource;
-
-public class JaxWSTest extends TestSupport {
-
- private String baseHttpUrl = "http://localhost:8080/";
- private String baseHttpsUrl = "https://localhost:8443/";
-
- @Test
- public void testInvokeBasic() throws Exception {
- invokeBasic("BeanBasic/ejb");
- }
-
- @Test
- public void testInvokeBasicAllowGet() throws Exception {
- invokeBasic("BeanBasicAllowGet/ejb");
- }
-
- private void invokeBasic(String address) throws Exception {
- URL url = new URL(baseHttpUrl + address);
-
- InputStream requestInput;
- HttpURLConnection conn;
-
- // send request WITHOUT basic authentication info
- requestInput = JaxWSTest.class.getResourceAsStream("/request1.xml");
- assertNotNull("SOAP request not specified", requestInput);
-
- conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = TestUtils.call(requestInput, conn);
- assertEquals("responseCode", 401, conn.getResponseCode());
- } finally {
- conn.disconnect();
- }
-
- // send request WITH basic authentication info
- requestInput = JaxWSTest.class.getResourceAsStream("/request1.xml");
- assertNotNull("SOAP request not specified", requestInput);
-
- conn = (HttpURLConnection) url.openConnection();
- conn.setRequestProperty("Authorization", TestUtils.getAuthorizationValue());
- try {
- checkResponse(requestInput, conn);
- } finally {
- conn.disconnect();
- }
- }
-
- @Test
- public void testInvokeHttps() throws Exception {
- invokeHttps("BeanHttps/ejb");
- }
-
- @Test
- public void testInvokeHttpsAllowGet() throws Exception {
- invokeHttps("BeanHttpsAllowGet/ejb");
- }
-
- private void invokeHttps(String address) throws Exception {
- URL url;
- InputStream requestInput;
-
- // send request over http
- url = new URL(baseHttpUrl + address);
-
- requestInput = JaxWSTest.class.getResourceAsStream("/request1.xml");
- assertNotNull("SOAP request not specified", requestInput);
-
- HttpURLConnection conn1 = (HttpURLConnection) url.openConnection();
- try {
- String reply = TestUtils.call(requestInput, conn1);
- assertEquals("responseCode", 403, conn1.getResponseCode());
- } finally {
- conn1.disconnect();
- }
-
- // send requests over https
- String oldTrustStore = System.getProperty("javax.net.ssl.trustStore");
- String oldTrustStorePassword = System.getProperty("javax.net.ssl.trustStorePassword");
-
- File keyStore = new File(TestUtils.getGeronimoHome(), "var/security/keystores/geronimo-default");
- System.setProperty("javax.net.ssl.trustStore", keyStore.getAbsolutePath());
- System.setProperty("javax.net.ssl.trustStorePassword", "secret");
-
- url = new URL(baseHttpsUrl + address);
-
- requestInput = JaxWSTest.class.getResourceAsStream("/request1.xml");
- assertNotNull("SOAP request not specified", requestInput);
-
- HttpsURLConnection conn2 = (HttpsURLConnection) url.openConnection();
- conn2.setHostnameVerifier(new TestUtils.TestHostnameVerifier());
- try {
- checkResponse(requestInput, conn2);
- } finally {
- TestUtils.unset("javax.net.ssl.trustStore", oldTrustStore);
- TestUtils.unset("javax.net.ssl.trustStorePassword", oldTrustStorePassword);
-
- conn2.disconnect();
- }
- }
-
- private void checkResponse(InputStream requestInput, HttpURLConnection conn) throws Exception {
- String reply = TestUtils.call(requestInput, conn);
-
- assertEquals("responseCode", 200, conn.getResponseCode());
- String contentType = conn.getHeaderField("Content-Type");
- assertTrue("contentType", contentType.indexOf("text/xml") != -1);
-
- InputSource is = new InputSource(new StringReader(reply));
- Document doc = TestUtils.parseMessage(is);
-
- Text replyMsg = TestUtils.findText(doc.getDocumentElement(), "Hello foo bar");
- assertTrue("reply message", replyMsg != null);
- }
-
- @Test
- public void testWSDLBasic() throws Exception {
- URL url = new URL(baseHttpUrl + "BeanBasic/ejb?wsdl");
-
- HttpURLConnection conn;
-
- // get wsdl WITHOUT basic authentication info
- conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = TestUtils.call(conn);
- assertEquals("responseCode", 401, conn.getResponseCode());
- } finally {
- conn.disconnect();
- }
-
- // get wsdl WITH basic authentication info
- conn = (HttpURLConnection) url.openConnection();
- conn.setRequestProperty("Authorization", TestUtils.getAuthorizationValue());
- try {
- checkWSDL(conn);
- } finally {
- conn.disconnect();
- }
- }
-
- @Test
- public void testWSDLBasicAllowGet() throws Exception {
- URL url = new URL(baseHttpUrl + "BeanBasicAllowGet/ejb?wsdl");
-
- HttpURLConnection conn;
-
- // get wsdl WITHOUT basic authentication info
- conn = (HttpURLConnection) url.openConnection();
- try {
- checkWSDL(conn);
- } finally {
- conn.disconnect();
- }
- }
-
- @Test
- public void testWSDLHttps() throws Exception {
- URL url;
-
- // get wsdl over http
- url = new URL(baseHttpUrl + "BeanHttps/ejb?wsdl");
-
- HttpURLConnection conn1 = (HttpURLConnection) url.openConnection();
- try {
- String reply = TestUtils.call(conn1);
- assertEquals("responseCode", 403, conn1.getResponseCode());
- } finally {
- conn1.disconnect();
- }
-
- // get wsdl over https
- String oldTrustStore = System.getProperty("javax.net.ssl.trustStore");
- String oldTrustStorePassword = System.getProperty("javax.net.ssl.trustStorePassword");
-
- File keyStore = new File(TestUtils.getGeronimoHome(), "var/security/keystores/geronimo-default");
- System.setProperty("javax.net.ssl.trustStore", keyStore.getAbsolutePath());
- System.setProperty("javax.net.ssl.trustStorePassword", "secret");
-
- url = new URL(baseHttpsUrl + "BeanHttps/ejb?wsdl");
-
- HttpsURLConnection conn2 = (HttpsURLConnection) url.openConnection();
- conn2.setHostnameVerifier(new TestUtils.TestHostnameVerifier());
- try {
- checkWSDL(conn2);
- } finally {
- TestUtils.unset("javax.net.ssl.trustStore", oldTrustStore);
- TestUtils.unset("javax.net.ssl.trustStorePassword", oldTrustStorePassword);
-
- conn2.disconnect();
- }
- }
-
- @Test
- public void testWSDLHttpsAllowGet() throws Exception {
- URL url;
-
- // get wsdl over http
- url = new URL(baseHttpUrl + "BeanHttpsAllowGet/ejb?wsdl");
-
- HttpURLConnection conn1 = (HttpURLConnection) url.openConnection();
- try {
- checkWSDL(conn1);
- } finally {
- conn1.disconnect();
- }
- }
-
- private void checkWSDL(HttpURLConnection conn) throws Exception {
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- conn.setUseCaches(false);
-
- WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- wsdlReader.setFeature("javax.wsdl.importDocuments", false);
- Definition def = wsdlReader.readWSDL(null, new InputSource(conn.getInputStream()));
-
- System.out.println("WSDL: " + def);
-
- assertTrue(def.getPortTypes().size() > 0);
-
- boolean found = false;
-
- Iterator iter = def.getPortTypes().entrySet().iterator();
- while (iter.hasNext()) {
- PortType portType =
- (PortType)((Map.Entry)iter.next()).getValue();
-
- if (found == false &&
- portType.getOperation("greetMe", null, null) != null) {
- found = true;
- }
- }
-
- assertTrue("Operation not found", found);
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/test/java/org/apache/geronimo/testsuite/testset/TestUtils.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/test/java/org/apache/geronimo/testsuite/testset/TestUtils.java
deleted file mode 100644
index caaaaf5..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/test/java/org/apache/geronimo/testsuite/testset/TestUtils.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLSession;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.geronimo.crypto.encoders.Base64;
-import org.apache.geronimo.mavenplugins.geronimo.ServerProxy;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.InputSource;
-
-public class TestUtils {
-
- private static final String geronimoHome;
-
- static {
- geronimoHome = initGeronimoHome();
- }
-
- private static String initGeronimoHome() {
- ServerProxy server = null;
- try {
- server = new ServerProxy("localhost", 1099, "system", "manager");
- } catch (Exception e) {
- throw new RuntimeException("Unable to setup ServerProxy", e);
- }
-
- String home = server.getGeronimoHome();
- Throwable exception = server.getLastError();
-
- server.closeConnection();
-
- if (exception != null) {
- throw new RuntimeException("Failed to get Geronimo home", exception);
- } else {
- return home;
- }
- }
-
- public static String getGeronimoHome() {
- return geronimoHome;
- }
-
- public static void unset(String property, String value) {
- if (value == null) {
- System.clearProperty(property);
- } else {
- System.setProperty(property, value);
- }
- }
-
- public static Document parseMessage(InputSource is) throws Exception {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
-
- Document doc = db.parse(is);
- return doc;
- }
-
- public static Element findElement(Element element, String name) {
- NodeList list = element.getChildNodes();
- for (int i = 0; i < list.getLength(); i++) {
- Node child = (Node)list.item(i);
- if (child instanceof Element) {
- Element childEl = (Element)child;
- if (name.equals(childEl.getLocalName())) {
- return childEl;
- } else {
- childEl = findElement(childEl, name);
- if (childEl != null) {
- return childEl;
- }
- }
- }
- }
- return null;
- }
-
- public static Text findText(Element element, String value) {
- NodeList list = element.getChildNodes();
- for (int i = 0; i < list.getLength(); i++) {
- Node child = (Node)list.item(i);
- if (child instanceof Text) {
- Text text = (Text)child;
- if (text.getData().indexOf(value) != -1) {
- return text;
- }
- } else if (child instanceof Element) {
- Element childEl = (Element)child;
- Text text = findText(childEl, value);
- if (text != null) {
- return text;
- }
- }
- }
- return null;
- }
-
- public static String getAuthorizationValue() {
- return getAuthorizationValue("system", "manager");
- }
-
- public static String getAuthorizationValue(String user, String password) {
- String userPassword = user + ":" + password;
- byte[] encodedUserPassword = Base64.encode(userPassword.getBytes());
- String encodedUserPasswordStr = new String(encodedUserPassword, 0, encodedUserPassword.length);
- return "Basic " + encodedUserPasswordStr;
- }
-
- public static String call(HttpURLConnection conn) throws IOException {
- return call(null, conn);
- }
-
- public static String call(InputStream requestInput, HttpURLConnection conn) throws IOException {
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- conn.setUseCaches(false);
-
- if (requestInput != null) {
- conn.setDoOutput(true);
- conn.setDoInput(true);
- conn.setRequestMethod("POST");
- conn.setRequestProperty("Content-Type", "text/xml");
-
- OutputStream out = conn.getOutputStream();
-
- byte[] data = new byte[1024];
- int read = 0;
- while ((read = requestInput.read(data, 0, data.length)) != -1) {
- out.write(data, 0, read);
- }
-
- requestInput.close();
-
- out.flush();
- out.close();
- }
-
- InputStream is = null;
-
- try {
- is = conn.getInputStream();
- } catch (IOException e) {
- is = conn.getErrorStream();
- }
-
- StringBuffer buf = new StringBuffer();
- BufferedReader in = new BufferedReader(new InputStreamReader(is));
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
- buf.append(inputLine);
- }
- in.close();
-
- return buf.toString();
- }
-
- public static class TestHostnameVerifier implements HostnameVerifier {
- public boolean verify(String hostname, SSLSession session) {
- return true;
- }
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/test/resources/request1.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/test/resources/request1.xml
deleted file mode 100644
index 4581645..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb-sec/src/test/resources/request1.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Body>
- <x:greetMe xmlns:x="http://test.geronimo.apache.org/">
- <arg0>foo bar</arg0>
- </x:greetMe>
- </soap:Body>
-</soap:Envelope>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
deleted file mode 100644
index ccfbb55..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/pom.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxws-ejb</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS EJB</name>
- <packaging>jar</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openejb</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}-${project.version}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ejb</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-ejb-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXWSEJB/1.1/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/filtered-resources/META-INF/ejb-jar.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/filtered-resources/META-INF/ejb-jar.xml
deleted file mode 100644
index 8d8f042..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/filtered-resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev: 561439 $ $Date: 2007-07-31 15:03:37 -0400 (Tue, 31 Jul 2007) $ -->
-
-<ejb-jar 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/ejb-jar_3_0.xsd">
- <display-name>JAXWSBean</display-name>
- <enterprise-beans>
- <session>
- <display-name>JAXWSBean</display-name>
- <ejb-name>JAXWSBean</ejb-name>
- <ejb-class>org.apache.geronimo.test.JAXWSBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
-
- <env-entry>
- <description>Welcome message</description>
- <env-entry-name>greeting</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>Hello</env-entry-value>
- </env-entry>
-
- </session>
- </enterprise-beans>
-
-</ejb-jar>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/filtered-resources/META-INF/openejb-jar.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/filtered-resources/META-INF/openejb-jar.xml
deleted file mode 100644
index 9f3aca4..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/filtered-resources/META-INF/openejb-jar.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
- xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <environment>
- <moduleId>
- <groupId>JEE5</groupId>
- <artifactId>JAXWSEJB</artifactId>
- <version>1.1</version>
- <type>car</type>
- </moduleId>
- </environment>
-
- <enterprise-beans>
- <session>
- <ejb-name>JAXWSBean</ejb-name>
- <jndi-name>JAXWSBeanRemote</jndi-name>
- </session>
- </enterprise-beans>
-
-</openejb-jar>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/filtered-resources/org/apache/geronimo/test/handlers.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/filtered-resources/org/apache/geronimo/test/handlers.xml
deleted file mode 100755
index 3b9961e..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/filtered-resources/org/apache/geronimo/test/handlers.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev: 561439 $ $Date: 2007-07-31 15:03:37 -0400 (Tue, 31 Jul 2007) $ -->
-
-<jws:handler-chains xmlns:jws="http://java.sun.com/xml/ns/javaee">
- <jws:handler-chain>
-
- <jws:handler>
- <jws:handler-name>GreeterSOAPHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.test.GreeterSOAPHandler</jws:handler-class>
- </jws:handler>
-
- <jws:handler>
- <jws:handler-name>GreeterLogicalHandler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.test.GreeterLogicalHandler</jws:handler-class>
- </jws:handler>
-
- </jws:handler-chain>
-</jws:handler-chains>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/GreeterLogicalHandler.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/GreeterLogicalHandler.java
deleted file mode 100644
index 90c8d11..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/GreeterLogicalHandler.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.LogicalMessageContext;
-import javax.xml.ws.WebServiceContext;
-
-import javax.annotation.PreDestroy;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import javax.xml.soap.*;
-
-public class GreeterLogicalHandler implements javax.xml.ws.handler.LogicalHandler<LogicalMessageContext> {
-
- @Resource WebServiceContext context;
-
- @Resource(name="greeting")
- private String greeting;
-
- public boolean handleMessage(LogicalMessageContext context) {
- System.out.println(this + " HandleMessage: " + context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY) + " " + greeting);
- System.out.println(context.getMessage().getPayload());
- return true;
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " init " + context);
- }
-
- @PreDestroy
- public void destroy() {
- System.out.println(this + " destroy");
- }
-
- public void init(Map<String,Object> config) {
- }
-
- public boolean handleFault(LogicalMessageContext context) {
- System.out.println(this + " handleFault");
- return true;
- }
-
- public void close(MessageContext context) {
- System.out.println(this + " close");
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/GreeterSOAPHandler.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/GreeterSOAPHandler.java
deleted file mode 100644
index 3cd5203..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/GreeterSOAPHandler.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.WebServiceContext;
-
-import javax.annotation.PreDestroy;
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-
-import java.util.Iterator;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-import javax.xml.soap.*;
-
-public class GreeterSOAPHandler implements SOAPHandler<SOAPMessageContext> {
-
- @Resource
- WebServiceContext context;
-
- @Resource(name="greeting")
- private String greeting;
-
- @PostConstruct
- public void init() {
- System.out.println(this + " init: " + context);
- }
-
- @PreDestroy
- public void destroy() {
- System.out.println(this + " destroy");
- }
-
- public void init(Map<String,Object> config) {
- }
-
- public boolean handleFault(SOAPMessageContext context) {
- System.out.println(this + " handleFault");
- return true;
- }
-
- public void close(MessageContext context) {
- System.out.println(this + " close");
- }
-
- public boolean handleMessage(SOAPMessageContext context) {
- System.out.println(this + " handleMessage: " + context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY) + " " + greeting);
-
- SOAPMessage message = context.getMessage();
- try {
- if ((Boolean)context.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY)) {
- // outbound
-
- } else {
- // inbound
- SOAPElement element = findElement(message.getSOAPBody(), "arg0");
- element.setValue("foo bar");
-
- // XXX: this does not work with Axis2
- // message.getSOAPBody().getElementsByTagNameNS("*", "arg0").item(0).getFirstChild().setNodeValue("foo bar");
-
- message.saveChanges();
- }
-
- // message.writeTo(System.out);
- } catch (Exception e) {
- throw new RuntimeException("handler failed", e);
- }
-
- return true;
- }
-
- private SOAPElement findElement(SOAPElement element, String name) {
- Iterator iter = element.getChildElements();
- while(iter.hasNext()) {
- Node child = (Node)iter.next();
- if (child instanceof SOAPElement) {
- SOAPElement childEl = (SOAPElement)child;
- if (name.equals(childEl.getElementName().getLocalName())) {
- return childEl;
- } else {
- return findElement(childEl, name);
- }
- }
- }
- return null;
- }
-
- public Set<QName> getHeaders() {
- System.out.println(this + " getHeaders");
- return new TreeSet<QName>();
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/JAXWSBean.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/JAXWSBean.java
deleted file mode 100644
index d029309..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/JAXWSBean.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import javax.annotation.Resource;
-import javax.ejb.Remote;
-import javax.ejb.Stateless;
-import javax.jws.WebService;
-import javax.jws.HandlerChain;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
-import javax.xml.soap.SOAPFault;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.soap.SOAPFaultException;
-
-@WebService
-@Stateless(name="JAXWSBean")
-@Remote(JAXWSGreeter.class)
-@HandlerChain(file="handlers.xml")
-@SOAPBinding(style=SOAPBinding.Style.RPC,
- use=SOAPBinding.Use.LITERAL,
- parameterStyle=SOAPBinding.ParameterStyle.WRAPPED
-)
-public class JAXWSBean implements JAXWSGreeter {
-
- private static final Logger LOG =
- Logger.getLogger(JAXWSBean.class.getName());
-
- @Resource
- private WebServiceContext context;
-
- public String greetMe(String me) {
- LOG.info("WebServiceContext: " + context);
- LOG.info("Principal: " + context.getUserPrincipal());
- LOG.info("Context: " + context.getMessageContext());
-
- MessageContext ctx = context.getMessageContext();
- Iterator iter = ctx.entrySet().iterator();
- while(iter.hasNext()) {
- Map.Entry entry = (Map.Entry)iter.next();
- System.out.println("Key: "+entry.getKey());
- System.out.println("Value: " +entry.getValue());
- }
-
- System.out.println("i'm a ejb ws: " + me);
-
- if (!"foo bar".equals(me)) {
- throw new RuntimeException("Wrong parameter");
- }
- return "Hello " + me;
- }
-
- public String greetMeEjb(String me) {
- return "Hello EJB " + me;
- }
-
- public void greetMeFault(String me) {
- System.out.println("generate SOAP fault");
- SOAPFault fault = null;
- try {
- fault = SOAPFactory.newInstance().createFault();
- fault.setFaultCode(new QName("http://foo", "MyFaultCode"));
- fault.setFaultString("my error");
- fault.setFaultActor("my actor");
- } catch (SOAPException ex) {
- throw new RuntimeException(ex);
- }
-
- throw new SOAPFaultException(fault);
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/JAXWSGreeter.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/JAXWSGreeter.java
deleted file mode 100644
index 02de5a8..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/main/java/org/apache/geronimo/test/JAXWSGreeter.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-public interface JAXWSGreeter {
-
- public String greetMeEjb(String me);
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java
deleted file mode 100644
index 3fe98a8..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.StringReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.naming.InitialContext;
-import javax.wsdl.Definition;
-import javax.wsdl.PortType;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.geronimo.test.JAXWSGreeter;
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.InputSource;
-
-public class JaxWSTest extends TestSupport {
-
- private String baseURL = "http://localhost:8080/";
-
- @Test
- public void testInvocation() throws Exception {
- InputStream requestInput = JaxWSTest.class.getResourceAsStream("/request1.xml");
- assertNotNull("SOAP request not specified", requestInput);
-
- URL url = new URL(baseURL + "JAXWSBeanService/JAXWSBean");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = call(requestInput, conn);
-
- assertEquals("responseCode", 200, conn.getResponseCode());
- String contentType = conn.getHeaderField("Content-Type");
- assertTrue("contentType", contentType.indexOf("text/xml") != -1);
-
- InputSource is = new InputSource(new StringReader(reply));
- Document doc = parseMessage(is);
-
- Text replyMsg = findText(doc.getDocumentElement(), "Hello foo bar");
- assertTrue("reploy message", replyMsg != null);
-
- } finally {
- conn.disconnect();
- }
- }
-
- @Test
- public void testInvocationFault() throws Exception {
- InputStream requestInput = JaxWSTest.class.getResourceAsStream("/request2.xml");
- assertNotNull("SOAP request not specified", requestInput);
-
- URL url = new URL(baseURL + "JAXWSBeanService/JAXWSBean");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = call(requestInput, conn);
-
- assertEquals("responseCode", 500, conn.getResponseCode());
- String contentType = conn.getHeaderField("Content-Type");
- assertTrue("contentType", contentType.indexOf("text/xml") != -1);
-
- InputSource is = new InputSource(new StringReader(reply));
- Document doc = parseMessage(is);
-
- Element faultString = findElement(doc.getDocumentElement(), "faultstring");
- assertTrue("faultString", faultString != null);
- assertEquals("faultString value", "my error", faultString.getFirstChild().getNodeValue());
-
- } finally {
- conn.disconnect();
- }
- }
-
- private Document parseMessage(InputSource is) throws Exception {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
-
- Document doc = db.parse(is);
- return doc;
- }
-
- private Element findElement(Element element, String name) {
- NodeList list = element.getChildNodes();
- for (int i = 0; i < list.getLength(); i++) {
- Node child = (Node)list.item(i);
- if (child instanceof Element) {
- Element childEl = (Element)child;
- if (name.equals(childEl.getLocalName())) {
- return childEl;
- } else {
- childEl = findElement(childEl, name);
- if (childEl != null) {
- return childEl;
- }
- }
- }
- }
- return null;
- }
-
- private Text findText(Element element, String value) {
- NodeList list = element.getChildNodes();
- for (int i = 0; i < list.getLength(); i++) {
- Node child = (Node)list.item(i);
- if (child instanceof Text) {
- Text text = (Text)child;
- if (text.getData().indexOf(value) != -1) {
- return text;
- }
- } else if (child instanceof Element) {
- Element childEl = (Element)child;
- Text text = findText(childEl, value);
- if (text != null) {
- return text;
- }
- }
- }
- return null;
- }
-
- private String call(InputStream requestInput, HttpURLConnection conn) throws IOException {
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- conn.setDoOutput(true);
- conn.setDoInput(true);
- conn.setUseCaches(false);
- conn.setRequestMethod("POST");
- conn.setRequestProperty("Content-Type", "text/xml");
-
- OutputStream out = conn.getOutputStream();
-
- byte[] data = new byte[1024];
- int read = 0;
- while ((read = requestInput.read(data, 0, data.length)) != -1) {
- out.write(data, 0, read);
- }
-
- requestInput.close();
-
- out.flush();
- out.close();
-
- InputStream is = null;
-
- try {
- is = conn.getInputStream();
- } catch (IOException e) {
- is = conn.getErrorStream();
- }
-
- StringBuffer buf = new StringBuffer();
- BufferedReader in = new BufferedReader(new InputStreamReader(is));
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
- buf.append(inputLine);
- }
- in.close();
-
- return buf.toString();
- }
-
-
- @Test
- public void testWSDL() throws Exception {
- URL url = new URL(baseURL + "JAXWSBeanService/JAXWSBean?wsdl");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- try {
- conn.setUseCaches(false);
-
- WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- Definition def =
- wsdlReader.readWSDL(null, new InputSource(conn.getInputStream()));
-
- System.out.println("WSDL: " + def);
-
- assertTrue(def.getPortTypes().size() > 0);
-
- boolean found = false;
-
- Iterator iter = def.getPortTypes().entrySet().iterator();
- while (iter.hasNext()) {
- PortType portType =
- (PortType)((Map.Entry)iter.next()).getValue();
-
- if (found == false &&
- portType.getOperation("greetMe", null, null) != null) {
- found = true;
- }
- }
-
- assertTrue("Operation not found", found);
-
- } finally {
- conn.disconnect();
- }
-
- }
-
- @Test
- public void testEJB() throws Exception {
- Properties p = new Properties();
-
- p.put("java.naming.factory.initial",
- "org.apache.openejb.client.RemoteInitialContextFactory");
- p.put("java.naming.provider.url",
- "127.0.0.1:4201");
-
- InitialContext ctx = new InitialContext(p);
-
- JAXWSGreeter greeter = (JAXWSGreeter)ctx.lookup("/JAXWSBeanRemote");
-
- String response = greeter.greetMeEjb("foo bar");
-
- System.out.println(response);
-
- assertEquals("Hello EJB foo bar", response);
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/test/resources/request1.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/test/resources/request1.xml
deleted file mode 100644
index e934044..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/test/resources/request1.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Body>
- <x:greetMe xmlns:x="http://test.geronimo.apache.org/">
- <arg0>changeme</arg0>
- </x:greetMe>
- </soap:Body>
-</soap:Envelope>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/test/resources/request2.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/test/resources/request2.xml
deleted file mode 100644
index d98eddc..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-ejb/src/test/resources/request2.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Body>
- <x:greetMeFault xmlns:x="http://test.geronimo.apache.org/">
- <arg0>ignore</arg0>
- </x:greetMeFault>
- </soap:Body>
-</soap:Envelope>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml
deleted file mode 100644
index 41674f5..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/pom.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 653530 $ $Date: 2008-05-05 13:11:16 -0400 (Mon, 05 May 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxws-partial</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS Partial</name>
- <packaging>war</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXWSPartial/1.0/war</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/java/org/apache/geronimo/test/JAXWSBean1.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/java/org/apache/geronimo/test/JAXWSBean1.java
deleted file mode 100644
index 6606df7..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/java/org/apache/geronimo/test/JAXWSBean1.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import javax.jws.WebService;
-
-@WebService
-public class JAXWSBean1 {
-
- public String greetMe(String me) {
- return "JAXWSBean1 " + me;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/java/org/apache/geronimo/test/JAXWSBean2.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/java/org/apache/geronimo/test/JAXWSBean2.java
deleted file mode 100644
index 053360d..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/java/org/apache/geronimo/test/JAXWSBean2.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import javax.jws.WebService;
-
-@WebService
-public class JAXWSBean2 {
-
- public String greetMe(String me) {
- return "JAXWSBean2 " + me;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/java/org/apache/geronimo/test/JAXWSBean3.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/java/org/apache/geronimo/test/JAXWSBean3.java
deleted file mode 100644
index 9889d5d..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/java/org/apache/geronimo/test/JAXWSBean3.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.jws.WebService;
-
-@WebService(name = "Person",
- targetNamespace = "http://org.apache.geronimo.test.person")
-public class JAXWSBean3 {
-
- private static List<Person> PERSONS = new ArrayList<Person>();
-
- static {
- PERSONS.add(new Person("eric", "cartman"));
- PERSONS.add(new Person("homer", "simpson"));
- }
-
- public Person[] getPersons1() {
- return PERSONS.toArray(new Person [] {});
- }
-
- public List<Person> getPersons2() {
- return PERSONS;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/java/org/apache/geronimo/test/Person.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/java/org/apache/geronimo/test/Person.java
deleted file mode 100644
index 2d97b73..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/java/org/apache/geronimo/test/Person.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-public class Person {
-
- private String firstName;
- private String lastName;
-
- public Person() {
- }
-
- public Person(String firstName, String lastName) {
- this.firstName = firstName;
- this.lastName = lastName;
- }
-
- 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;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 7f5c588..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
-
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>JEE5</dep:groupId>
- <dep:artifactId>JAXWSPartial</dep:artifactId>
- <dep:version>1.0</dep:version>
- <dep:type>war</dep:type>
- </dep:moduleId>
- </dep:environment>
-
- <context-root>/jaxws-partial</context-root>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/webapp/WEB-INF/web.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index c8a30e9..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app 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/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
- version="2.5"
- >
-
- <display-name>Geronimo Partial War</display-name>
-
- <servlet>
- <display-name>JAXWSBean2</display-name>
- <servlet-name>JAXWSBean2</servlet-name>
- <servlet-class>org.apache.geronimo.test.JAXWSBean2</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>JAXWSBean2</servlet-name>
- <url-pattern>/bean2</url-pattern>
- </servlet-mapping>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java
deleted file mode 100644
index a179b82..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java
+++ /dev/null
@@ -1,234 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.StringReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.PortType;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.InputSource;
-
-public class JaxWSTest extends TestSupport {
-
- private String baseURL = "http://localhost:8080/";
-
- @Test
- public void testInvocation1() throws Exception {
- Document doc = getResponse("/JAXWSBean1Service", "/request1.xml");
-
- Text replyMsg = findText(doc.getDocumentElement(), "JAXWSBean1 foo bar");
- assertTrue("reply message", replyMsg != null);
- }
-
- @Test
- public void testInvocation2() throws Exception {
- Document doc = getResponse("/bean2", "/request1.xml");
-
- Text replyMsg = findText(doc.getDocumentElement(), "JAXWSBean2 foo bar");
- assertTrue("reply message", replyMsg != null);
- }
-
- @Test
- public void testInvocation3() throws Exception {
- Document doc = getResponse("/JAXWSBean3Service", "/request2a.xml");
-
- assertTrue(findText(doc.getDocumentElement(), "simpson") != null);
- assertTrue(findText(doc.getDocumentElement(), "cartman") != null);
- }
-
- @Test
- public void testInvocation4() throws Exception {
- Document doc = getResponse("/JAXWSBean3Service", "/request2b.xml");
-
- assertTrue(findText(doc.getDocumentElement(), "simpson") != null);
- assertTrue(findText(doc.getDocumentElement(), "cartman") != null);
- }
-
- private Document getResponse(String servlet, String requestFile) throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull("Web application name not specified", warName);
-
- InputStream requestInput = JaxWSTest.class.getResourceAsStream(requestFile);
- assertNotNull("SOAP request not specified", requestInput);
-
- URL url = new URL(baseURL + warName + servlet);
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = call(requestInput, conn);
-
- assertEquals("responseCode", 200, conn.getResponseCode());
- String contentType = conn.getHeaderField("Content-Type");
- assertTrue("contentType", contentType.indexOf("text/xml") != -1);
-
- InputSource is = new InputSource(new StringReader(reply));
- Document doc = parseMessage(is);
-
- return doc;
-
- } finally {
- conn.disconnect();
- }
- }
-
- private Document parseMessage(InputSource is) throws Exception {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
-
- Document doc = db.parse(is);
- return doc;
- }
-
- private Text findText(Element element, String value) {
- NodeList list = element.getChildNodes();
- for (int i = 0; i < list.getLength(); i++) {
- Node child = (Node)list.item(i);
- if (child instanceof Text) {
- Text text = (Text)child;
- if (text.getData().indexOf(value) != -1) {
- return text;
- }
- } else if (child instanceof Element) {
- Element childEl = (Element)child;
- Text text = findText(childEl, value);
- if (text != null) {
- return text;
- }
- }
- }
- return null;
- }
-
- private String call(InputStream requestInput, HttpURLConnection conn) throws IOException {
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- conn.setDoOutput(true);
- conn.setDoInput(true);
- conn.setUseCaches(false);
- conn.setRequestMethod("POST");
- conn.setRequestProperty("Content-Type", "text/xml");
-
- OutputStream out = conn.getOutputStream();
-
- byte[] data = new byte[1024];
- int read = 0;
- while ((read = requestInput.read(data, 0, data.length)) != -1) {
- out.write(data, 0, read);
- }
-
- requestInput.close();
-
- out.flush();
- out.close();
-
- InputStream is = null;
-
- try {
- is = conn.getInputStream();
- } catch (IOException e) {
- is = conn.getErrorStream();
- }
-
- StringBuffer buf = new StringBuffer();
- BufferedReader in = new BufferedReader(new InputStreamReader(is));
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
- buf.append(inputLine);
- }
- in.close();
- System.out.println("--");
-
- return buf.toString();
- }
-
-
- @Test
- public void testWSDL1() throws Exception {
- testWSDL("/JAXWSBean1Service");
- }
-
- @Test
- public void testWSDL2() throws Exception {
- testWSDL("/bean2");
- }
-
- private void testWSDL(String servlet) throws Exception {
-
- String warName = System.getProperty("webAppName");
- assertNotNull("Web application name not specified", warName);
-
- URL url = new URL(baseURL + warName + servlet + "?wsdl");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- try {
- conn.setUseCaches(false);
-
- WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- Definition def =
- wsdlReader.readWSDL(null, new InputSource(conn.getInputStream()));
-
- System.out.println("WSDL: " + def);
-
- assertTrue(def.getPortTypes().size() > 0);
-
- boolean found = false;
-
- Iterator iter = def.getPortTypes().entrySet().iterator();
- while (iter.hasNext()) {
- PortType portType =
- (PortType)((Map.Entry)iter.next()).getValue();
-
- if (found == false &&
- portType.getOperation("greetMe", null, null) != null) {
- found = true;
- }
- }
-
- assertTrue("Operation not found", found);
-
- } finally {
- conn.disconnect();
- }
-
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/test/resources/request1.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/test/resources/request1.xml
deleted file mode 100644
index 5d14616..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/test/resources/request1.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Body>
- <x:greetMe xmlns:x="http://test.geronimo.apache.org/">
- <arg0>foo bar</arg0>
- </x:greetMe>
- </soap:Body>
-</soap:Envelope>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/test/resources/request2a.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/test/resources/request2a.xml
deleted file mode 100644
index c05f110..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/test/resources/request2a.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Body>
- <x:getPersons1 xmlns:x="http://org.apache.geronimo.test.person">
- </x:getPersons1>
- </soap:Body>
-</soap:Envelope>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/test/resources/request2b.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/test/resources/request2b.xml
deleted file mode 100644
index d1aaaf7..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-partial/src/test/resources/request2b.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Body>
- <x:getPersons2 xmlns:x="http://org.apache.geronimo.test.person">
- </x:getPersons2>
- </soap:Body>
-</soap:Envelope>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
deleted file mode 100644
index 0b5a89e..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/pom.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxws-rest-war</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS REST WAR</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXWSRESTServlet/1.1/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/java/org/apache/calculator/CalculatorImpl.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/java/org/apache/calculator/CalculatorImpl.java
deleted file mode 100644
index a4f5952..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/java/org/apache/calculator/CalculatorImpl.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.calculator;
-
-import java.io.ByteArrayInputStream;
-
-import javax.annotation.Resource;
-import javax.servlet.ServletRequest;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.Source;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.ws.BindingType;
-import javax.xml.ws.Provider;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.WebServiceProvider;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.http.HTTPBinding;
-import javax.xml.ws.http.HTTPException;
-
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.xml.sax.InputSource;
-
-@WebServiceProvider
-@BindingType(value=HTTPBinding.HTTP_BINDING)
-public class CalculatorImpl implements Provider<Source> {
-
- @Resource
- protected WebServiceContext wsContext;
-
- public Source invoke(Source source) {
- try {
- String num1 = null;
- String num2 = null;
-
- if (source == null) {
- System.out.println("Getting input from query string");
- MessageContext mc = wsContext.getMessageContext();
- String query = (String)mc.get(MessageContext.QUERY_STRING);
- System.out.println("Query String = " + query);
- ServletRequest req = (ServletRequest)mc.get(MessageContext.SERVLET_REQUEST);
- num1 = req.getParameter("num1");
- num2 = req.getParameter("num2");
- } else {
- System.out.println("Getting input from input message");
- Node n = null;
- if (source instanceof DOMSource) {
- n = ((DOMSource)source).getNode();
- } else if (source instanceof StreamSource) {
- StreamSource streamSource = (StreamSource)source;
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- DocumentBuilder db = dbf.newDocumentBuilder();
- InputSource inputSource = null;
- if (streamSource.getInputStream() != null) {
- inputSource = new InputSource(streamSource.getInputStream());
- } else if (streamSource.getReader() != null) {
- inputSource = new InputSource(streamSource.getReader());
- }
- n = db.parse(inputSource);
- } else {
- throw new RuntimeException("Unsupported source: " + source);
- }
- NodeList children = n.getChildNodes();
- for (int i = 0; i < children.getLength(); i++) {
- Node child = children.item(i);
- if (child.getNodeName().equals("add")) {
- num1 = child.getAttributes().getNamedItem("num1").getNodeValue();
- num2 = child.getAttributes().getNamedItem("num2").getNodeValue();
- break;
- }
- }
- }
-
- int n1 = Integer.parseInt(num1);
- int n2 = Integer.parseInt(num2);
- return createResultSource(n1 + n2);
- } catch(Exception e) {
- e.printStackTrace();
- throw new HTTPException(500);
- }
- }
-
- private Source createResultSource(int sum) {
- String body =
- "<ns:addResponse xmlns:ns=\"http://geronimo.apache.org\"><ns:return>"
- + sum
- + "</ns:return></ns:addResponse>";
- Source source = new StreamSource(new ByteArrayInputStream(body.getBytes()));
- return source;
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 6d131fd..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>JEE5</dep:groupId>
- <dep:artifactId>JAXWSRESTServlet</dep:artifactId>
- <dep:version>1.1</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- </dep:environment>
-
- <context-root>/jaxws-rest-war</context-root>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/web.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index b081bdd..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee">
- <servlet>
- <servlet-name>CalculatorServlet</servlet-name>
- <servlet-class>org.apache.calculator.CalculatorImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>CalculatorServlet</servlet-name>
- <url-pattern>/calculator</url-pattern>
- </servlet-mapping>
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSRestTest.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSRestTest.java
deleted file mode 100644
index ca6da9e..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSRestTest.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.StringReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.InputSource;
-
-public class JaxWSRestTest extends TestSupport {
-
- private String baseURL = "http://localhost:8080/";
-
- @Test
- public void testGET() throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull("Web application name not specified", warName);
-
- URL url = new URL(baseURL + warName + "/calculator?num1=10&num2=50");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = call(conn);
-
- assertEquals("responseCode", 200, conn.getResponseCode());
-
- InputSource is = new InputSource(new StringReader(reply));
- Document doc = parseMessage(is);
-
- Text replyMsg = findText(doc.getDocumentElement(), "60");
- assertTrue("reply message", replyMsg != null);
-
- } finally {
- conn.disconnect();
- }
- }
-
- @Test(dependsOnMethods = {"testGET"})
- public void testPOST() throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull("Web application name not specified", warName);
-
- InputStream requestInput = JaxWSRestTest.class.getResourceAsStream("/request1.xml");
- assertNotNull("SOAP request not specified", requestInput);
-
- URL url = new URL(baseURL + warName + "/calculator");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = call(requestInput, conn);
-
- assertEquals("responseCode", 200, conn.getResponseCode());
-
- InputSource is = new InputSource(new StringReader(reply));
- Document doc = parseMessage(is);
-
- Text replyMsg = findText(doc.getDocumentElement(), "120");
- assertTrue("reply message", replyMsg != null);
-
- } finally {
- conn.disconnect();
- }
- }
-
-
- private Document parseMessage(InputSource is) throws Exception {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
-
- Document doc = db.parse(is);
- return doc;
- }
-
- private Text findText(Element element, String value) {
- NodeList list = element.getChildNodes();
- for (int i = 0; i < list.getLength(); i++) {
- Node child = (Node)list.item(i);
- if (child instanceof Text) {
- Text text = (Text)child;
- if (text.getData().indexOf(value) != -1) {
- return text;
- }
- } else if (child instanceof Element) {
- Element childEl = (Element)child;
- Text text = findText(childEl, value);
- if (text != null) {
- return text;
- }
- }
- }
- return null;
- }
-
- private String call(HttpURLConnection conn) throws IOException {
- return call(null, conn);
- }
-
- private String call(InputStream requestInput, HttpURLConnection conn) throws IOException {
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- conn.setDoInput(true);
- conn.setUseCaches(false);
-
- if (requestInput == null) {
- conn.setRequestMethod("GET");
- conn.setRequestProperty("Content-Type", "application/xml");
-
- conn.connect();
- } else {
- conn.setRequestMethod("POST");
- conn.setDoOutput(true);
- conn.setRequestProperty("Content-Type", "application/xml");
-
- conn.connect();
-
- OutputStream out = conn.getOutputStream();
-
- byte[] data = new byte[1024];
- int read = 0;
- while ((read = requestInput.read(data, 0, data.length)) != -1) {
- out.write(data, 0, read);
- }
-
- requestInput.close();
-
- out.flush();
- out.close();
- }
-
- InputStream is = null;
-
- try {
- is = conn.getInputStream();
- } catch (IOException e) {
- is = conn.getErrorStream();
- }
-
- StringBuffer buf = new StringBuffer();
- BufferedReader in = new BufferedReader(new InputStreamReader(is));
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
- buf.append(inputLine);
- }
- in.close();
-
- return buf.toString();
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/resources/request1.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/resources/request1.xml
deleted file mode 100644
index 0ac0ff1..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-rest-war/src/test/resources/request1.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<add num1="100" num2="20"/>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml
deleted file mode 100644
index b3fd464..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/pom.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxws-war-sec</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: Secure JAX-WS WAR</name>
- <packaging>war</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-kernel</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.framework</groupId>
- <artifactId>geronimo-security</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-ejb</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-ejb-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/war</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/main/java/org/apache/geronimo/test/JAXWSBean.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/main/java/org/apache/geronimo/test/JAXWSBean.java
deleted file mode 100644
index 154b485..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/main/java/org/apache/geronimo/test/JAXWSBean.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.util.logging.Logger;
-
-import javax.annotation.Resource;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.xml.ws.WebServiceContext;
-
-@WebService(wsdlLocation="WEB-INF/wsdl/greeter.wsdl")
-@SOAPBinding(style=SOAPBinding.Style.RPC,
- use=SOAPBinding.Use.LITERAL,
- parameterStyle=SOAPBinding.ParameterStyle.WRAPPED
-)
-public class JAXWSBean {
-
- private static final Logger LOG =
- Logger.getLogger(JAXWSBean.class.getName());
-
- @Resource
- private WebServiceContext context;
-
- public String greetMe(String me) {
- if (context == null) {
- throw new RuntimeException("WebServiceContext is null");
- }
- LOG.info("WebServiceContext: " + context);
- LOG.info("Principal: " + context.getUserPrincipal());
- LOG.info("Context: " + context.getMessageContext());
-
- System.out.println("i'm a ws: " + me);
-
- return "Hello " + me;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 53018a2..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
-
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>war</dep:type>
- </dep:moduleId>
- </dep:environment>
-
- <context-root>/${pom.artifactId}</context-root>
-
- <security-realm-name>geronimo-admin</security-realm-name>
-
- <security>
- <role-mappings>
- <role role-name="test">
- <principal name="admin"
- class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" />
- </role>
- </role-mappings>
- </security>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/main/webapp/WEB-INF/web.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index b3cddd2..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app 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/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
- version="2.5"
- >
-
- <display-name>Security War</display-name>
-
- <servlet>
- <display-name>Servlet1</display-name>
- <servlet-name>Servlet1</servlet-name>
- <servlet-class>org.apache.geronimo.test.JAXWSBean</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Servlet1</servlet-name>
- <url-pattern>/basic</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <display-name>Servlet2</display-name>
- <servlet-name>Servlet2</servlet-name>
- <servlet-class>org.apache.geronimo.test.JAXWSBean</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Servlet2</servlet-name>
- <url-pattern>/basicAllowGet</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <display-name>Servlet3</display-name>
- <servlet-name>Servlet3</servlet-name>
- <servlet-class>org.apache.geronimo.test.JAXWSBean</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Servlet3</servlet-name>
- <url-pattern>/https</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <display-name>Servlet4</display-name>
- <servlet-name>Servlet4</servlet-name>
- <servlet-class>org.apache.geronimo.test.JAXWSBean</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>Servlet4</servlet-name>
- <url-pattern>/httpsAllowGet</url-pattern>
- </servlet-mapping>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>basic</web-resource-name>
- <url-pattern>/basic/*</url-pattern>
- </web-resource-collection>
- <auth-constraint>
- <role-name>test</role-name>
- </auth-constraint>
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>basicAllowGet</web-resource-name>
- <url-pattern>/basicAllowGet/*</url-pattern>
- <http-method>POST</http-method>
- </web-resource-collection>
- <auth-constraint>
- <role-name>test</role-name>
- </auth-constraint>
- <user-data-constraint>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>https</web-resource-name>
- <url-pattern>/https</url-pattern>
- </web-resource-collection>
- <user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <security-constraint>
- <web-resource-collection>
- <web-resource-name>httpsAllowGet</web-resource-name>
- <url-pattern>/httpsAllowGet</url-pattern>
- <http-method>POST</http-method>
- </web-resource-collection>
- <user-data-constraint>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
-
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>geronimo-admin</realm-name>
- </login-config>
-
- <security-role>
- <role-name>test</role-name>
- </security-role>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/main/webapp/WEB-INF/wsdl/greeter.wsdl b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/main/webapp/WEB-INF/wsdl/greeter.wsdl
deleted file mode 100644
index f343724..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/main/webapp/WEB-INF/wsdl/greeter.wsdl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://test.geronimo.apache.org/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="JAXWSBeanService" targetNamespace="http://test.geronimo.apache.org/">
- <types>
- <schema targetNamespace="http://test.geronimo.apache.org/"
- xmlns="http://www.w3.org/2001/XMLSchema"
- elementFormDefault="qualified">
- </schema>
- </types>
- <message name="greetMeResponse">
- <part name="return" type="xsd:string">
- </part>
- </message>
- <message name="greetMe">
- <part name="arg0" type="xsd:string">
- </part>
- </message>
- <portType name="JAXWSBean">
- <operation name="greetMe">
- <input message="tns:greetMe">
- </input>
- <output message="tns:greetMeResponse">
- </output>
- </operation>
- </portType>
- <binding name="JAXWSBeanPortBinding" type="tns:JAXWSBean">
- <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="greetMe">
- <soap:operation soapAction=""/>
- <input>
- <soap:body namespace="http://test.geronimo.apache.org/" use="literal"/>
- </input>
- <output>
- <soap:body namespace="http://test.geronimo.apache.org/" use="literal"/>
- </output>
- </operation>
- </binding>
- <service name="JAXWSBeanService">
- <port binding="tns:JAXWSBeanPortBinding" name="JAXWSBeanPort">
- <soap:address location="http://localhost:8080/JAXWSBean1/ejb"/>
- </port>
- </service>
-</definitions>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java
deleted file mode 100644
index 9f0d537..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java
+++ /dev/null
@@ -1,293 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.io.File;
-import java.io.InputStream;
-import java.io.StringReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.net.ssl.HttpsURLConnection;
-import javax.wsdl.Definition;
-import javax.wsdl.PortType;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Text;
-import org.xml.sax.InputSource;
-
-public class JaxWSTest extends TestSupport {
-
- private String getBaseURL(boolean https) {
- String baseUrl;
- if (https) {
- baseUrl = "https://localhost:8443/";
- } else {
- baseUrl = "http://localhost:8080/";
- }
-
- String warName = System.getProperty("webAppName");
- assertNotNull("Web application name not specified", warName);
-
- return baseUrl + warName + "/";
- }
-
- @Test
- public void testInvokeBasic() throws Exception {
- invokeBasic("basic");
- }
-
- @Test
- public void testInvokeBasicAllowGet() throws Exception {
- invokeBasic("basicAllowGet");
- }
-
- private void invokeBasic(String address) throws Exception {
- URL url = new URL(getBaseURL(false) + address);
-
- InputStream requestInput;
- HttpURLConnection conn;
-
- // send request WITHOUT basic authentication info
- requestInput = JaxWSTest.class.getResourceAsStream("/request1.xml");
- assertNotNull("SOAP request not specified", requestInput);
-
- conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = TestUtils.call(requestInput, conn);
- assertEquals("responseCode", 401, conn.getResponseCode());
- } finally {
- conn.disconnect();
- }
-
- // send request WITH basic authentication info
- requestInput = JaxWSTest.class.getResourceAsStream("/request1.xml");
- assertNotNull("SOAP request not specified", requestInput);
-
- conn = (HttpURLConnection) url.openConnection();
- conn.setRequestProperty("Authorization", TestUtils.getAuthorizationValue());
- try {
- checkResponse(requestInput, conn);
- } finally {
- conn.disconnect();
- }
- }
-
- @Test
- public void testInvokeHttps() throws Exception {
- invokeHttps("https", false);
- }
-
- @Test
- public void testInvokeHttpsWithBasic() throws Exception {
- invokeHttps("https", true);
- }
-
- @Test
- public void testInvokeHttpsAllowGet() throws Exception {
- invokeHttps("httpsAllowGet", false);
- }
-
- private void invokeHttps(String address, boolean basicAuth) throws Exception {
- URL url;
- InputStream requestInput;
-
- // send request over http
- url = new URL(getBaseURL(false) + address);
-
- requestInput = JaxWSTest.class.getResourceAsStream("/request1.xml");
- assertNotNull("SOAP request not specified", requestInput);
-
- HttpURLConnection conn1 = (HttpURLConnection) url.openConnection();
- try {
- String reply = TestUtils.call(requestInput, conn1);
- assertTrue("Unexpected response code: " + conn1.getResponseCode(), conn1.getResponseCode() >= 300);
- } finally {
- conn1.disconnect();
- }
-
- // send requests over https
- String oldTrustStore = System.getProperty("javax.net.ssl.trustStore");
- String oldTrustStorePassword = System.getProperty("javax.net.ssl.trustStorePassword");
-
- File keyStore = new File(TestUtils.getGeronimoHome(), "var/security/keystores/geronimo-default");
- System.setProperty("javax.net.ssl.trustStore", keyStore.getAbsolutePath());
- System.setProperty("javax.net.ssl.trustStorePassword", "secret");
-
- url = new URL(getBaseURL(true) + address);
-
- requestInput = JaxWSTest.class.getResourceAsStream("/request1.xml");
- assertNotNull("SOAP request not specified", requestInput);
-
- HttpsURLConnection conn2 = (HttpsURLConnection) url.openConnection();
- if (basicAuth) {
- conn2.setRequestProperty("Authorization", TestUtils.getAuthorizationValue());
- }
- conn2.setHostnameVerifier(new TestUtils.TestHostnameVerifier());
- try {
- checkResponse(requestInput, conn2);
- } finally {
- TestUtils.unset("javax.net.ssl.trustStore", oldTrustStore);
- TestUtils.unset("javax.net.ssl.trustStorePassword", oldTrustStorePassword);
-
- conn2.disconnect();
- }
- }
-
- private void checkResponse(InputStream requestInput, HttpURLConnection conn) throws Exception {
- String reply = TestUtils.call(requestInput, conn);
-
- assertEquals("responseCode", 200, conn.getResponseCode());
- String contentType = conn.getHeaderField("Content-Type");
- assertTrue("contentType", contentType.indexOf("text/xml") != -1);
-
- InputSource is = new InputSource(new StringReader(reply));
- Document doc = TestUtils.parseMessage(is);
-
- Text replyMsg = TestUtils.findText(doc.getDocumentElement(), "Hello foo bar");
- assertTrue("reply message", replyMsg != null);
- }
-
- @Test
- public void testWSDLBasic() throws Exception {
- URL url = new URL(getBaseURL(false) + "basic?wsdl");
-
- HttpURLConnection conn;
-
- // get wsdl WITHOUT basic authentication info
- conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = TestUtils.call(conn);
- assertEquals("responseCode", 401, conn.getResponseCode());
- } finally {
- conn.disconnect();
- }
-
- // get wsdl WITH basic authentication info
- conn = (HttpURLConnection) url.openConnection();
- conn.setRequestProperty("Authorization", TestUtils.getAuthorizationValue());
- try {
- checkWSDL(conn);
- } finally {
- conn.disconnect();
- }
- }
-
- @Test
- public void testWSDLBasicAllowGet() throws Exception {
- URL url = new URL(getBaseURL(false) + "basicAllowGet?wsdl");
-
- HttpURLConnection conn;
-
- // get wsdl WITHOUT basic authentication info
- conn = (HttpURLConnection) url.openConnection();
- try {
- checkWSDL(conn);
- } finally {
- conn.disconnect();
- }
- }
-
- @Test
- public void testWSDLHttps() throws Exception {
- URL url;
-
- // get wsdl over http
- url = new URL(getBaseURL(false) + "https?wsdl");
-
- HttpURLConnection conn1 = (HttpURLConnection) url.openConnection();
- try {
- String reply = TestUtils.call(conn1);
- assertTrue("Unexpected response code: " + conn1.getResponseCode(), conn1.getResponseCode() >= 300);
- } finally {
- conn1.disconnect();
- }
-
- // get wsdl over https
- String oldTrustStore = System.getProperty("javax.net.ssl.trustStore");
- String oldTrustStorePassword = System.getProperty("javax.net.ssl.trustStorePassword");
-
- File keyStore = new File(TestUtils.getGeronimoHome(), "var/security/keystores/geronimo-default");
- System.setProperty("javax.net.ssl.trustStore", keyStore.getAbsolutePath());
- System.setProperty("javax.net.ssl.trustStorePassword", "secret");
-
- url = new URL(getBaseURL(true) + "https?wsdl");
-
- HttpsURLConnection conn2 = (HttpsURLConnection) url.openConnection();
- conn2.setHostnameVerifier(new TestUtils.TestHostnameVerifier());
- try {
- checkWSDL(conn2);
- } finally {
- TestUtils.unset("javax.net.ssl.trustStore", oldTrustStore);
- TestUtils.unset("javax.net.ssl.trustStorePassword", oldTrustStorePassword);
-
- conn2.disconnect();
- }
- }
-
- @Test
- public void testWSDLHttpsAllowGet() throws Exception {
- URL url;
-
- // get wsdl over http
- url = new URL(getBaseURL(false) + "httpsAllowGet?wsdl");
-
- HttpURLConnection conn1 = (HttpURLConnection) url.openConnection();
- try {
- checkWSDL(conn1);
- } finally {
- conn1.disconnect();
- }
- }
-
- private void checkWSDL(HttpURLConnection conn) throws Exception {
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- conn.setUseCaches(false);
-
- WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- wsdlReader.setFeature("javax.wsdl.importDocuments", false);
- Definition def = wsdlReader.readWSDL(null, new InputSource(conn.getInputStream()));
-
- System.out.println("WSDL: " + def);
-
- assertTrue(def.getPortTypes().size() > 0);
-
- boolean found = false;
-
- Iterator iter = def.getPortTypes().entrySet().iterator();
- while (iter.hasNext()) {
- PortType portType =
- (PortType)((Map.Entry)iter.next()).getValue();
-
- if (found == false &&
- portType.getOperation("greetMe", null, null) != null) {
- found = true;
- }
- }
-
- assertTrue("Operation not found", found);
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/test/java/org/apache/geronimo/testsuite/testset/TestUtils.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/test/java/org/apache/geronimo/testsuite/testset/TestUtils.java
deleted file mode 100644
index caaaaf5..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/test/java/org/apache/geronimo/testsuite/testset/TestUtils.java
+++ /dev/null
@@ -1,196 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-
-import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLSession;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.geronimo.crypto.encoders.Base64;
-import org.apache.geronimo.mavenplugins.geronimo.ServerProxy;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.InputSource;
-
-public class TestUtils {
-
- private static final String geronimoHome;
-
- static {
- geronimoHome = initGeronimoHome();
- }
-
- private static String initGeronimoHome() {
- ServerProxy server = null;
- try {
- server = new ServerProxy("localhost", 1099, "system", "manager");
- } catch (Exception e) {
- throw new RuntimeException("Unable to setup ServerProxy", e);
- }
-
- String home = server.getGeronimoHome();
- Throwable exception = server.getLastError();
-
- server.closeConnection();
-
- if (exception != null) {
- throw new RuntimeException("Failed to get Geronimo home", exception);
- } else {
- return home;
- }
- }
-
- public static String getGeronimoHome() {
- return geronimoHome;
- }
-
- public static void unset(String property, String value) {
- if (value == null) {
- System.clearProperty(property);
- } else {
- System.setProperty(property, value);
- }
- }
-
- public static Document parseMessage(InputSource is) throws Exception {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
-
- Document doc = db.parse(is);
- return doc;
- }
-
- public static Element findElement(Element element, String name) {
- NodeList list = element.getChildNodes();
- for (int i = 0; i < list.getLength(); i++) {
- Node child = (Node)list.item(i);
- if (child instanceof Element) {
- Element childEl = (Element)child;
- if (name.equals(childEl.getLocalName())) {
- return childEl;
- } else {
- childEl = findElement(childEl, name);
- if (childEl != null) {
- return childEl;
- }
- }
- }
- }
- return null;
- }
-
- public static Text findText(Element element, String value) {
- NodeList list = element.getChildNodes();
- for (int i = 0; i < list.getLength(); i++) {
- Node child = (Node)list.item(i);
- if (child instanceof Text) {
- Text text = (Text)child;
- if (text.getData().indexOf(value) != -1) {
- return text;
- }
- } else if (child instanceof Element) {
- Element childEl = (Element)child;
- Text text = findText(childEl, value);
- if (text != null) {
- return text;
- }
- }
- }
- return null;
- }
-
- public static String getAuthorizationValue() {
- return getAuthorizationValue("system", "manager");
- }
-
- public static String getAuthorizationValue(String user, String password) {
- String userPassword = user + ":" + password;
- byte[] encodedUserPassword = Base64.encode(userPassword.getBytes());
- String encodedUserPasswordStr = new String(encodedUserPassword, 0, encodedUserPassword.length);
- return "Basic " + encodedUserPasswordStr;
- }
-
- public static String call(HttpURLConnection conn) throws IOException {
- return call(null, conn);
- }
-
- public static String call(InputStream requestInput, HttpURLConnection conn) throws IOException {
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- conn.setUseCaches(false);
-
- if (requestInput != null) {
- conn.setDoOutput(true);
- conn.setDoInput(true);
- conn.setRequestMethod("POST");
- conn.setRequestProperty("Content-Type", "text/xml");
-
- OutputStream out = conn.getOutputStream();
-
- byte[] data = new byte[1024];
- int read = 0;
- while ((read = requestInput.read(data, 0, data.length)) != -1) {
- out.write(data, 0, read);
- }
-
- requestInput.close();
-
- out.flush();
- out.close();
- }
-
- InputStream is = null;
-
- try {
- is = conn.getInputStream();
- } catch (IOException e) {
- is = conn.getErrorStream();
- }
-
- StringBuffer buf = new StringBuffer();
- BufferedReader in = new BufferedReader(new InputStreamReader(is));
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
- buf.append(inputLine);
- }
- in.close();
-
- return buf.toString();
- }
-
- public static class TestHostnameVerifier implements HostnameVerifier {
- public boolean verify(String hostname, SSLSession session) {
- return true;
- }
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/test/resources/request1.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/test/resources/request1.xml
deleted file mode 100644
index 4581645..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war-sec/src/test/resources/request1.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Body>
- <x:greetMe xmlns:x="http://test.geronimo.apache.org/">
- <arg0>foo bar</arg0>
- </x:greetMe>
- </soap:Body>
-</soap:Envelope>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
deleted file mode 100644
index ab702be..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/pom.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxws-war</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS WAR</name>
- <packaging>war</packaging>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/JAXWSServlet/1.1/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/FaultDetail.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/FaultDetail.java
deleted file mode 100644
index 660b6f5..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/FaultDetail.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.greeter_control;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="minor" type="{http://www.w3.org/2001/XMLSchema}short"/>
- * <element name="major" type="{http://www.w3.org/2001/XMLSchema}short"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "minor",
- "major"
-})
-@XmlRootElement(name = "faultDetail")
-public class FaultDetail {
-
- protected short minor;
- protected short major;
-
- /**
- * Gets the value of the minor property.
- *
- */
- public short getMinor() {
- return minor;
- }
-
- /**
- * Sets the value of the minor property.
- *
- */
- public void setMinor(short value) {
- this.minor = value;
- }
-
- /**
- * Gets the value of the major property.
- *
- */
- public short getMajor() {
- return major;
- }
-
- /**
- * Sets the value of the major property.
- *
- */
- public void setMajor(short value) {
- this.major = value;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/Greeter.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/Greeter.java
deleted file mode 100644
index 519b73e..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/Greeter.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.greeter_control;
-
-import javax.jws.Oneway;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-@WebService(name = "Greeter", targetNamespace = "http://apache.org/greeter_control")
-public interface Greeter {
-
-
- /**
- *
- * @return
- * returns java.lang.String
- */
- @WebMethod
- @WebResult(name = "responseType", targetNamespace = "http://apache.org/greeter_control/types")
- @RequestWrapper(localName = "sayHi", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.SayHi")
- @ResponseWrapper(localName = "sayHiResponse", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.SayHiResponse")
- public String sayHi();
-
- /**
- *
- * @param requestType
- * @return
- * returns java.lang.String
- */
- @WebMethod
- @WebResult(name = "responseType", targetNamespace = "http://apache.org/greeter_control/types")
- @RequestWrapper(localName = "greetMe", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.GreetMe")
- @ResponseWrapper(localName = "greetMeResponse", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.GreetMeResponse")
- public String greetMe(
- @WebParam(name = "requestType", targetNamespace = "http://apache.org/greeter_control/types")
- String requestType);
-
- /**
- *
- * @param requestType
- */
- @WebMethod
- @Oneway
- @RequestWrapper(localName = "greetMeOneWay", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.GreetMeOneWay")
- public void greetMeOneWay(
- @WebParam(name = "requestType", targetNamespace = "http://apache.org/greeter_control/types")
- String requestType);
-
- /**
- *
- * @throws PingMeFault
- */
- @WebMethod
- @RequestWrapper(localName = "pingMe", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.PingMe")
- @ResponseWrapper(localName = "pingMeResponse", targetNamespace = "http://apache.org/greeter_control/types", className = "org.apache.greeter_control.types.PingMeResponse")
- public void pingMe()
- throws PingMeFault
- ;
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/GreeterHandler.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/GreeterHandler.java
deleted file mode 100644
index 0879c19..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/GreeterHandler.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.greeter_control;
-
-import java.util.Set;
-import javax.xml.namespace.QName;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-import javax.xml.ws.handler.MessageContext;
-
-import javax.annotation.Resource;
-import javax.annotation.PreDestroy;
-import javax.annotation.PostConstruct;
-
-public class GreeterHandler implements SOAPHandler<SOAPMessageContext> {
-
- @Resource(name="greeting")
- private String greeting;
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- @PreDestroy
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- public boolean handleMessage(SOAPMessageContext smc) {
- System.out.println(this + " handleMessage(): " + greeting);
- return true;
- }
-
- public boolean handleFault(SOAPMessageContext smc) {
- System.out.println(this + " handleFault()");
- return true;
- }
-
- public void close(MessageContext messageContext) {
- System.out.println(this + " close()");
- }
-
- public Set<QName> getHeaders(){
- return null;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/GreeterImpl.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/GreeterImpl.java
deleted file mode 100644
index 67d82fa..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/GreeterImpl.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.greeter_control;
-
-import java.util.Iterator;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.logging.Logger;
-
-import javax.annotation.Resource;
-import javax.annotation.PreDestroy;
-import javax.annotation.PostConstruct;
-
-import javax.jws.WebService;
-import javax.jws.HandlerChain;
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPFactory;
-import javax.xml.soap.SOAPFault;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.soap.SOAPFaultException;
-
-/* serviceName, portName specified in webservices.xml */
-@WebService(serviceName = "SOAPService",
- portName = "SoapPort",
- endpointInterface = "org.apache.greeter_control.Greeter",
- targetNamespace = "http://apache.org/greeter_control")
-/* two handlers specified in webservices.xml */
-@HandlerChain(file="handlers.xml")
-public class GreeterImpl implements Greeter {
-
- private static final Logger LOG =
- Logger.getLogger(GreeterImpl.class.getName());
-
- @Resource
- private WebServiceContext context;
-
- @Resource(name="greeting")
- private String greeting;
-
- public WebServiceContext getContext() {
- return context;
- }
-
- public String greetMe(String me) {
- LOG.info("Invoking greetMe " + me);
-
- LOG.info("WebServiceContext: " + context);
- LOG.info("Principal: " + context.getUserPrincipal());
- LOG.info("Context: " + context.getMessageContext());
-
- MessageContext ctx = context.getMessageContext();
- Iterator iter = ctx.entrySet().iterator();
- while(iter.hasNext()) {
- Map.Entry entry = (Map.Entry)iter.next();
- System.out.println("Key: "+entry.getKey());
- System.out.println("Value: " +entry.getValue());
- }
-
- // just playing around
-
- // send foo=BAR header
- Map responseHeaders =
- (Map)ctx.get(MessageContext.HTTP_RESPONSE_HEADERS);
- if(responseHeaders == null) {
- LOG.info("Can't get MessageContext.HTTP_RESPONSE_HEADERS from context");
- } else {
- ArrayList values = new ArrayList();
- values.add("BAR");
- responseHeaders.put("foo", values);
- }
-
- return greeting + " " + me;
- }
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- @PreDestroy()
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- public String sayHi() {
- LOG.info("Invoking sayHi ");
-
- SOAPFault fault = null;
- try {
- fault = SOAPFactory.newInstance().createFault();
- fault.setFaultCode(new QName("http://foo", "MyFaultCode"));
- fault.setFaultString("my error");
- fault.setFaultActor("my actor");
- } catch (SOAPException ex) {
- throw new RuntimeException(ex);
- }
-
- throw new SOAPFaultException(fault);
- }
-
- public void greetMeOneWay(String me){
- LOG.info("Invoking greetMeOneWay " + me);
- }
-
-
- public void pingMe()
- throws PingMeFault {
- LOG.info("Invoking pingMe ");
- throw new PingMeFault("Custom Fault", null);
- }
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/PingMeFault.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/PingMeFault.java
deleted file mode 100644
index 6b833f4..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/PingMeFault.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.greeter_control;
-
-import javax.xml.ws.WebFault;
-import org.apache.greeter_control.FaultDetail;
-
-
-@WebFault(name = "faultDetail", targetNamespace = "http://apache.org/greeter_control/types")
-public class PingMeFault
- extends Exception
-{
-
- /**
- * Java type that goes as soapenv:Fault detail element.
- *
- */
- private FaultDetail faultInfo;
-
- /**
- *
- * @param faultInfo
- * @param message
- */
- public PingMeFault(String message, FaultDetail faultInfo) {
- super(message);
- this.faultInfo = faultInfo;
- }
-
- /**
- *
- * @param faultInfo
- * @param message
- * @param cause
- */
- public PingMeFault(String message, FaultDetail faultInfo, Throwable cause) {
- super(message, cause);
- this.faultInfo = faultInfo;
- }
-
- /**
- *
- * @return
- * returns fault bean: org.apache.greeter_control.types.FaultDetail
- */
- public FaultDetail getFaultInfo() {
- return faultInfo;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/handlers.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/handlers.xml
deleted file mode 100644
index 47e5175..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/java/org/apache/greeter_control/handlers.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<jws:handler-chains xmlns:jws="http://java.sun.com/xml/ns/javaee">
- <jws:handler-chain>
- <jws:handler>
- <jws:handler-name>GreeterHandlerC</jws:handler-name>
- <jws:handler-class>org.apache.greeter_control.GreeterHandler</jws:handler-class>
- </jws:handler>
- </jws:handler-chain>
-</jws:handler-chains>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/JAXWSClient.jsp b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/JAXWSClient.jsp
deleted file mode 100644
index 51b23f3..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/JAXWSClient.jsp
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="1.2">
-<jsp:directive.page contentType="text/html"/>
-
-<jsp:directive.page import="java.io.IOException"/>
-<jsp:directive.page import="javax.naming.InitialContext"/>
-<jsp:directive.page import="javax.xml.ws.Service"/>
-<jsp:directive.page import="org.apache.greeter_control.Greeter"/>
-
-<html><head><title>JAX-WS Client JSP</title></head>
-<body>
-
-<jsp:scriptlet>
- try {
- String name = request.getParameter("name");
- if (name == null) {
- name = "Unknown";
- }
- System.out.println(name);
- InitialContext ctx = new InitialContext();
- Service service = (Service)ctx.lookup("java:comp/env/services/Greeter");
- Greeter greeter = service.getPort(Greeter.class);
- out.println("WebService returned: " + greeter.greetMe(name));
- } catch (Exception e) {
- e.printStackTrace();
- IOException exception = new IOException("Error");
- exception.initCause(e);
- throw exception;
- }
-</jsp:scriptlet>
-
-</body></html>
-</jsp:root>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 5c5eaef..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>JEE5</dep:groupId>
- <dep:artifactId>JAXWSServlet</dep:artifactId>
- <dep:version>1.1</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- </dep:environment>
-
- <context-root>/jaxws-war</context-root>
-
- <service-ref>
- <service-ref-name>services/Greeter</service-ref-name>
- <port>
- <port-name>GreeterPort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/jaxws-war/servlet2</uri>
- </port>
- </service-ref>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/web.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 47db5af..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app 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/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
- version="2.5"
- >
-
- <display-name>Geronimo POJO WS War</display-name>
-
- <servlet>
- <display-name>Geronimo POJO WS 1</display-name>
- <servlet-name>POJOServlet1</servlet-name>
- <servlet-class>org.apache.greeter_control.GreeterImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>POJOServlet1</servlet-name>
- <url-pattern>/servlet1</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <display-name>Geronimo POJO WS 2</display-name>
- <servlet-name>POJOServlet2</servlet-name>
- <servlet-class>org.apache.greeter_control.GreeterImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>POJOServlet2</servlet-name>
- <url-pattern>/servlet2</url-pattern>
- </servlet-mapping>
-
- <env-entry>
- <description>Welcome message</description>
- <env-entry-name>greeting</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>Hello</env-entry-value>
- </env-entry>
-
- <service-ref>
- <service-ref-name>services/Greeter</service-ref-name>
- <service-interface>javax.xml.ws.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/greeter_control.wsdl</wsdl-file>
- </service-ref>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/webservices.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/webservices.xml
deleted file mode 100644
index 6d8c8a1..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/webservices.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<webservices xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:greeter="http://apache.org/greeter_control"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/javaee_web_services_1_2.xsd"
- version="1.2">
- <webservice-description>
- <webservice-description-name>POJO WS (without wsdl)</webservice-description-name>
- <port-component>
- <port-component-name>POJOPort1</port-component-name>
- <wsdl-service>greeter:GreeterService</wsdl-service>
- <wsdl-port>greeter:GreeterPort</wsdl-port>
- <enable-mtom>false</enable-mtom>
- <service-endpoint-interface>org.apache.greeter_control.Greeter</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>POJOServlet1</servlet-link>
- </service-impl-bean>
- <handler-chains>
- <handler-chain>
- <handler>
- <handler-name>GreeterHandlerA</handler-name>
- <handler-class>org.apache.greeter_control.GreeterHandler</handler-class>
- </handler>
- <handler>
- <handler-name>GreeterHandlerB</handler-name>
- <handler-class>org.apache.greeter_control.GreeterHandler</handler-class>
- </handler>
- </handler-chain>
- </handler-chains>
- </port-component>
- </webservice-description>
-
- <webservice-description>
- <webservice-description-name>POJO WS (with wsdl)</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/greeter_control.wsdl</wsdl-file>
- <port-component>
- <port-component-name>POJOPort2</port-component-name>
- <wsdl-service>greeter:GreeterService</wsdl-service>
- <wsdl-port>greeter:GreeterPort</wsdl-port>
- <enable-mtom>false</enable-mtom>
- <service-endpoint-interface>org.apache.greeter_control.Greeter</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>POJOServlet2</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-
-</webservices>
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/wsdl/account.xsd b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/wsdl/account.xsd
deleted file mode 100755
index 8814214..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/wsdl/account.xsd
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://geronimo.apache.org/account"
- xmlns:tns="http://geronimo.apache.org/account">
-
- <xsd:element name="Account">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="FirstName" type="xsd:string"
- minOccurs="1" maxOccurs="1"/>
- <xsd:element name="LastName" type="xsd:string"
- minOccurs="1" maxOccurs="1"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
-</xsd:schema>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/wsdl/greeter_control.wsdl b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/wsdl/greeter_control.wsdl
deleted file mode 100644
index 80b5f9f..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/main/webapp/WEB-INF/wsdl/greeter_control.wsdl
+++ /dev/null
@@ -1,186 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:tns="http://apache.org/greeter_control"
- xmlns:x1="http://apache.org/greeter_control/types"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- targetNamespace="http://apache.org/greeter_control" name="HelloWorld">
- <wsdl:types>
- <schema targetNamespace="http://apache.org/greeter_control/types"
- xmlns="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified">
-
- <import namespace="http://geronimo.apache.org/account"
- schemaLocation="account.xsd" />
-
- <element name="sayHi">
- <complexType/>
- </element>
- <element name="sayHiResponse">
- <complexType>
- <sequence>
- <element name="responseType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMe">
- <complexType>
- <sequence>
- <element name="requestType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMeResponse">
- <complexType>
- <sequence>
- <element name="responseType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="greetMeOneWay">
- <complexType>
- <sequence>
- <element name="requestType" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
- <element name="pingMe">
- <complexType/>
- </element>
- <element name="pingMeResponse">
- <complexType/>
- </element>
- <element name="faultDetail">
- <complexType>
- <sequence>
- <element name="minor" type="xsd:short"/>
- <element name="major" type="xsd:short"/>
- </sequence>
- </complexType>
- </element>
-
- </schema>
- </wsdl:types>
-
-
- <wsdl:message name="sayHiRequest">
- <wsdl:part element="x1:sayHi" name="in"/>
- </wsdl:message>
- <wsdl:message name="sayHiResponse">
- <wsdl:part element="x1:sayHiResponse" name="out"/>
- </wsdl:message>
- <wsdl:message name="greetMeRequest">
- <wsdl:part element="x1:greetMe" name="in"/>
- </wsdl:message>
- <wsdl:message name="greetMeResponse">
- <wsdl:part element="x1:greetMeResponse" name="out"/>
- </wsdl:message>
- <wsdl:message name="greetMeOneWayRequest">
- <wsdl:part element="x1:greetMeOneWay" name="in"/>
- </wsdl:message>
- <wsdl:message name="pingMeRequest">
- <wsdl:part name="in" element="x1:pingMe"/>
- </wsdl:message>
- <wsdl:message name="pingMeResponse">
- <wsdl:part name="out" element="x1:pingMeResponse"/>
- </wsdl:message>
- <wsdl:message name="pingMeFault">
- <wsdl:part name="faultDetail" element="x1:faultDetail"/>
- </wsdl:message>
-
- <wsdl:portType name="Greeter">
- <wsdl:operation name="sayHi">
- <wsdl:input message="tns:sayHiRequest" name="sayHiRequest"/>
- <wsdl:output message="tns:sayHiResponse" name="sayHiResponse"/>
- </wsdl:operation>
-
- <wsdl:operation name="greetMe">
- <wsdl:input message="tns:greetMeRequest" name="greetMeRequest"/>
- <wsdl:output message="tns:greetMeResponse" name="greetMeResponse"/>
- </wsdl:operation>
-
- <wsdl:operation name="greetMeOneWay">
- <wsdl:input message="tns:greetMeOneWayRequest" name="greetMeOneWayRequest"/>
- </wsdl:operation>
-
- <wsdl:operation name="pingMe">
- <wsdl:input name="pingMeRequest" message="tns:pingMeRequest"/>
- <wsdl:output name="pingMeResponse" message="tns:pingMeResponse"/>
- <wsdl:fault name="pingMeFault" message="tns:pingMeFault"/>
- </wsdl:operation>
- </wsdl:portType>
-
-
- <wsdl:binding name="GreeterSOAPBinding" type="tns:Greeter">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <wsdl:operation name="sayHi">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="sayHiRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="sayHiResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="greetMe">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="greetMeRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output name="greetMeResponse">
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
-
- <wsdl:operation name="greetMeOneWay">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input name="greetMeOneWayRequest">
- <soap:body use="literal"/>
- </wsdl:input>
- </wsdl:operation>
-
- <wsdl:operation name="pingMe">
- <soap:operation style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- <wsdl:fault name="pingMeFault">
- <soap:fault name="pingMeFault" use="literal"/>
- </wsdl:fault>
- </wsdl:operation>
-
- </wsdl:binding>
-
- <wsdl:service name="GreeterService">
- <wsdl:port binding="tns:GreeterSOAPBinding" name="GreeterPort">
- <soap:address location="http://localhost:8080/SoapContext/GreeterPort"/>
- <wswa:UsingAddressing xmlns:wswa="http://www.w3.org/2005/08/addressing/wsdl"/>
- </wsdl:port>
- </wsdl:service>
-
-
-</wsdl:definitions>
-
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java
deleted file mode 100644
index b211b4b..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/java/org/apache/geronimo/testsuite/testset/JaxWSTest.java
+++ /dev/null
@@ -1,317 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.io.StringReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.PortType;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.Text;
-import org.xml.sax.InputSource;
-
-public class JaxWSTest extends TestSupport {
-
- private String baseURL = "http://localhost:8080/";
-
-
- @Test
- public void testInvocation1() throws Exception {
- // service without WSDL
- Document doc = getResponse("/servlet1", "/request3.xml");
- Text replyMsg = findText(doc.getDocumentElement(), "Hello foo bar");
- if (replyMsg == null) {
- // XXX: work-around for CXF, wants <requestType> to be unqualified
- doc = getResponse("/servlet1", "/request1.xml");
- replyMsg = findText(doc.getDocumentElement(), "Hello foo bar");
- }
- assertTrue("reply message", replyMsg != null);
- }
-
- @Test
- public void testInvocation2() throws Exception {
- // service with WSDL
- Document doc = getResponse("/servlet2", "/request3.xml");
- Text replyMsg = findText(doc.getDocumentElement(), "Hello foo bar");
- assertTrue("reply message", replyMsg != null);
- }
-
- private Document getResponse(String servlet, String requestFile) throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull("Web application name not specified", warName);
-
- InputStream requestInput = JaxWSTest.class.getResourceAsStream(requestFile);
- assertNotNull("SOAP request not found: " + requestFile, requestInput);
-
- URL url = new URL(baseURL + warName + servlet);
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = call(requestInput, conn);
-
- assertEquals("responseCode", 200, conn.getResponseCode());
- String contentType = conn.getHeaderField("Content-Type");
- assertTrue("contentType", contentType.indexOf("text/xml") != -1);
-
- InputSource is = new InputSource(new StringReader(reply));
- Document doc = parseMessage(is);
-
- return doc;
-
- } finally {
- conn.disconnect();
- }
- }
-
- @Test
- public void testInvocationFault1() throws Exception {
- testInvocationFault("/servlet1");
- }
-
- @Test
- public void testInvocationFault2() throws Exception {
- testInvocationFault("/servlet2");
- }
-
- private void testInvocationFault(String servlet) throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull("Web application name not specified", warName);
-
- InputStream requestInput = JaxWSTest.class.getResourceAsStream("/request2.xml");
- assertNotNull("SOAP request not specified", requestInput);
-
- URL url = new URL(baseURL + warName + servlet);
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- try {
- String reply = call(requestInput, conn);
-
- assertEquals("responseCode", 500, conn.getResponseCode());
- String contentType = conn.getHeaderField("Content-Type");
- assertTrue("contentType", contentType.indexOf("text/xml") != -1);
-
- InputSource is = new InputSource(new StringReader(reply));
- Document doc = parseMessage(is);
-
- Element faultString = findElement(doc.getDocumentElement(), "faultstring");
- assertTrue("faultString", faultString != null);
- assertEquals("faultString value", "my error", faultString.getFirstChild().getNodeValue());
-
- } finally {
- conn.disconnect();
- }
- }
-
- private Document parseMessage(InputSource is) throws Exception {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- DocumentBuilder db = dbf.newDocumentBuilder();
-
- Document doc = db.parse(is);
- return doc;
- }
-
- private Element findElement(Element element, String name) {
- NodeList list = element.getChildNodes();
- for (int i = 0; i < list.getLength(); i++) {
- Node child = (Node)list.item(i);
- if (child instanceof Element) {
- Element childEl = (Element)child;
- if (name.equals(childEl.getLocalName())) {
- return childEl;
- } else {
- childEl = findElement(childEl, name);
- if (childEl != null) {
- return childEl;
- }
- }
- }
- }
- return null;
- }
-
- private Text findText(Element element, String value) {
- NodeList list = element.getChildNodes();
- for (int i = 0; i < list.getLength(); i++) {
- Node child = (Node)list.item(i);
- if (child instanceof Text) {
- Text text = (Text)child;
- if (text.getData().indexOf(value) != -1) {
- return text;
- }
- } else if (child instanceof Element) {
- Element childEl = (Element)child;
- Text text = findText(childEl, value);
- if (text != null) {
- return text;
- }
- }
- }
- return null;
- }
-
- private String call(InputStream requestInput, HttpURLConnection conn) throws IOException {
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- conn.setDoOutput(true);
- conn.setDoInput(true);
- conn.setUseCaches(false);
- conn.setRequestMethod("POST");
- conn.setRequestProperty("Content-Type", "text/xml");
-
- OutputStream out = conn.getOutputStream();
-
- byte[] data = new byte[1024];
- int read = 0;
- while ((read = requestInput.read(data, 0, data.length)) != -1) {
- out.write(data, 0, read);
- }
-
- requestInput.close();
-
- out.flush();
- out.close();
-
- InputStream is = null;
-
- try {
- is = conn.getInputStream();
- } catch (IOException e) {
- is = conn.getErrorStream();
- }
-
- StringBuffer buf = new StringBuffer();
- BufferedReader in = new BufferedReader(new InputStreamReader(is));
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
- buf.append(inputLine);
- }
- in.close();
-
- return buf.toString();
- }
-
-
- @Test
- public void testWSDL1() throws Exception {
- testWSDL("/servlet1");
- }
-
- @Test
- public void testWSDL2() throws Exception {
- testWSDL("/servlet2");
- }
-
- private void testWSDL(String servlet) throws Exception {
-
- String warName = System.getProperty("webAppName");
- assertNotNull("Web application name not specified", warName);
-
- URL url = new URL(baseURL + warName + servlet + "?wsdl");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- try {
- conn.setUseCaches(false);
-
- WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- Definition def =
- wsdlReader.readWSDL(null, new InputSource(conn.getInputStream()));
-
- System.out.println("WSDL: " + def);
-
- assertTrue(def.getPortTypes().size() > 0);
-
- boolean found = false;
-
- Iterator iter = def.getPortTypes().entrySet().iterator();
- while (iter.hasNext()) {
- PortType portType =
- (PortType)((Map.Entry)iter.next()).getValue();
-
- if (found == false &&
- portType.getOperation("greetMe", null, null) != null) {
- found = true;
- }
- }
-
- assertTrue("Operation not found", found);
-
- } finally {
- conn.disconnect();
- }
-
- }
-
- @Test
- public void testClientInvocation() throws Exception {
- String expected = "Hello Tester";
-
- String warName = System.getProperty("webAppName");
- assertNotNull(warName);
- URL url = new URL(baseURL + warName + "/JAXWSClient.jsp?name=Tester");
- HttpURLConnection connection = (HttpURLConnection)url.openConnection();
- connection.setConnectTimeout(30 * 1000);
- connection.setReadTimeout(30 * 1000);
- try {
- BufferedReader reader =
- new BufferedReader(new InputStreamReader(connection.getInputStream()));
- assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
- BufferedReader in =
- new BufferedReader(new InputStreamReader(connection.getInputStream()));
- String inputLine;
- boolean found = false;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
-
- if (found == false &&
- inputLine.indexOf("WebService returned: " + expected) != -1) {
- found = true;
- }
- }
- in.close();
-
- assertTrue("Reply", found);
-
- } finally {
- connection.disconnect();
- }
- }
-
-
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request1.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request1.xml
deleted file mode 100644
index b3a79ba..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request1.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Body>
- <x:greetMe xmlns:x="http://apache.org/greeter_control/types">
- <requestType>foo bar</requestType>
- </x:greetMe>
- </soap:Body>
-</soap:Envelope>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request2.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request2.xml
deleted file mode 100644
index a2e6a13..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request2.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Body>
- <sayHi xmlns="http://apache.org/greeter_control/types"/>
- </soap:Body>
-</soap:Envelope>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request3.xml b/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request3.xml
deleted file mode 100644
index e7c043d..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/jaxws-war/src/test/resources/request3.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
- <soap:Body>
- <greetMe xmlns="http://apache.org/greeter_control/types">
- <requestType>foo bar</requestType>
- </greetMe>
- </soap:Body>
-</soap:Envelope>
diff --git a/testsuite/webservices-testsuite/jaxws-tests/pom.xml b/testsuite/webservices-testsuite/jaxws-tests/pom.xml
deleted file mode 100644
index fec023d..0000000
--- a/testsuite/webservices-testsuite/jaxws-tests/pom.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>webservices-testsuite</artifactId>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxws-tests</artifactId>
- <packaging>pom</packaging>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS</name>
-
- <description>Geronimo JEE5 Webservices JAX tests</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxb_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <modules>
- <module>jaxws-war</module>
- <module>jaxws-client</module>
- <module>jaxws-ejb</module>
- <module>jaxws-ejb-sec</module>
- <module>jaxws-rest-war</module>
- <module>jaxws-partial</module>
- <module>jaxws-war-sec</module>
- </modules>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/goals.txt b/testsuite/webservices-testsuite/jaxws-wsa-tests/goals.txt
deleted file mode 100644
index 9cb8855..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/goals.txt
+++ /dev/null
@@ -1 +0,0 @@
-clean install
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/pom.xml b/testsuite/webservices-testsuite/jaxws-wsa-tests/pom.xml
deleted file mode 100644
index c171e74..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/pom.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>webservices-testsuite</artifactId>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>jaxws-wsa-tests</artifactId>
- <packaging>pom</packaging>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS WS-A</name>
-
- <description>Geronimo JEE5 Webservices JAX tests</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxws_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-annotation_1.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jaxb_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <modules>
- <module>wsa-test-war</module>
- <module>wsa-war</module>
- <module>wsa-ejb</module>
- <module>wsa-ear</module>
- </modules>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml
deleted file mode 100644
index d2153a2..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/pom.xml
+++ /dev/null
@@ -1,160 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-wsa-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>wsa-ear</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS WS-A EAR</name>
- <packaging>ear</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>wsa-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>wsa-ejb</artifactId>
- <version>${project.version}</version>
- <type>ejb</type>
- </dependency>
-
- <dependency>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>wsa-test-war</artifactId>
- <version>${project.version}</version>
- <type>war</type>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-ear-plugin</artifactId>
- <configuration>
- <displayName>JAX-WS WS-A TestSuite EAR</displayName>
- <description>JAX-WS WS-A TestSuite EAR</description>
- <version>5</version>
- <modules>
- <webModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>wsa-war</artifactId>
- <contextRoot>/wsa</contextRoot>
- <bundleFileName>wsa-war-${project.version}.war</bundleFileName>
- </webModule>
- <ejbModule>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>wsa-ejb</artifactId>
- <bundleFileName>wsa-ejb-${project.version}.jar</bundleFileName>
- </ejbModule>
- </modules>
- </configuration>
- </plugin>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>testCompile</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>wsa-test-war</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <modules>
- <module>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>wsa-test-war</artifactId>
- <type>war</type>
- <version>${project.version}</version>
- </module>
- </modules>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.ear</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <modules>
- <module>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>wsa-test-war</artifactId>
- <type>war</type>
- <version>${project.version}</version>
- </module>
- </modules>
- <moduleId>${project.groupId}/${project.artifactId}/${project.version}/ear</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/src/main/filtered-resources/META-INF/geronimo-application.xml b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
deleted file mode 100644
index 8305b19..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/src/main/filtered-resources/META-INF/geronimo-application.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-2.0">
-
- <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
- <moduleId>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}</artifactId>
- <version>${version}</version>
- <type>ear</type>
- </moduleId>
- </environment>
-
-</application>
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/src/test/java/org/apache/geronimo/jaxws/wsa/EJBWSATest.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/src/test/java/org/apache/geronimo/jaxws/wsa/EJBWSATest.java
deleted file mode 100644
index 444fc25..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/src/test/java/org/apache/geronimo/jaxws/wsa/EJBWSATest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.wsa;
-
-public class EJBWSATest extends WSATest {
-
- protected String getTestServlet() {
- return "/test-ejb";
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/src/test/java/org/apache/geronimo/jaxws/wsa/WSATest.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/src/test/java/org/apache/geronimo/jaxws/wsa/WSATest.java
deleted file mode 100644
index 4811c68..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/src/test/java/org/apache/geronimo/jaxws/wsa/WSATest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.wsa;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.wsdl.Definition;
-import javax.wsdl.PortType;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-import org.xml.sax.InputSource;
-
-public abstract class WSATest extends TestSupport {
-
- private String baseURL = "http://localhost:8080/";
-
- abstract String getTestServlet();
-
- private String doGET(HttpURLConnection conn) throws IOException {
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
-
- InputStream is = null;
-
- try {
- is = conn.getInputStream();
- } catch (IOException e) {
- is = conn.getErrorStream();
- }
-
- StringBuffer buf = new StringBuffer();
- BufferedReader in = new BufferedReader(new InputStreamReader(is));
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- System.out.println(inputLine);
- buf.append(inputLine);
- }
- in.close();
-
- return buf.toString();
- }
-
- @Test
- public void testPort() throws Exception {
- runTest("testPort");
- }
-
- @Test
- public void testDispatch() throws Exception {
- runTest("testDispatch");
- }
-
- @Test
- public void testReferenceProperties() throws Exception {
- runTest("testReferenceProperties");
- }
-
- @Test
- public void testReferencePropertiesDispatch() throws Exception {
- runTest("testReferencePropertiesDispatch");
- }
-
- @Test
- public void testWSDL() throws Exception {
- runTest("testWSDL");
- }
-
- protected void runTest(String testName) throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull(warName);
- URL url = new URL(baseURL + warName + getTestServlet() + "?test=" + testName);
- HttpURLConnection connection = (HttpURLConnection)url.openConnection();
- try {
- String reply = doGET(connection);
-
- assertEquals("responseCode", 200, connection.getResponseCode());
- } finally {
- connection.disconnect();
- }
- }
-
- /*
- @Test
- public void testWSDL() throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull("Web application name not specified", warName);
-
- URL url = new URL(baseURL + warName + "calculator?wsdl");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- try {
- conn.setUseCaches(false);
-
- WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- Definition def =
- wsdlReader.readWSDL(null, new InputSource(conn.getInputStream()));
-
- System.out.println("WSDL: " + def);
-
- assertTrue(def.getPortTypes().size() > 0);
-
- boolean found = false;
-
- Iterator iter = def.getPortTypes().entrySet().iterator();
- while (iter.hasNext()) {
- PortType portType =
- (PortType)((Map.Entry)iter.next()).getValue();
-
- if (found == false &&
- portType.getOperation("greetMe", null, null) != null) {
- found = true;
- }
- }
-
- assertTrue("Operation not found", found);
-
- } finally {
- conn.disconnect();
- }
-
- }
- */
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/src/test/java/org/apache/geronimo/jaxws/wsa/WebWSATest.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/src/test/java/org/apache/geronimo/jaxws/wsa/WebWSATest.java
deleted file mode 100644
index 3d0fca3..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ear/src/test/java/org/apache/geronimo/jaxws/wsa/WebWSATest.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.wsa;
-
-public class WebWSATest extends WSATest {
-
- protected String getTestServlet() {
- return "/test-web";
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml
deleted file mode 100644
index 1d69fdb..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/pom.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-wsa-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>wsa-ejb</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS WS-A EJB</name>
- <packaging>jar</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-ejb_3.1_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <addClasspath>true</addClasspath>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/java/org/apache/geronimo/jaxws/test/CalculatorBean.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/java/org/apache/geronimo/jaxws/test/CalculatorBean.java
deleted file mode 100644
index 20a3528..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/java/org/apache/geronimo/jaxws/test/CalculatorBean.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.test;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.ejb.Stateless;
-import javax.jws.HandlerChain;
-import javax.jws.WebService;
-import javax.xml.ws.Action;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.soap.Addressing;
-import javax.xml.ws.wsaddressing.W3CEndpointReference;
-
-@WebService(serviceName = "CalculatorService",
- portName = "CalculatorPort",
- name = "Calculator",
- targetNamespace = "http://geronimo.apache.org/calculator")
-@Addressing(enabled = true, required = true)
-@HandlerChain(file="handlers.xml")
-@Stateless(mappedName="CalculatorBean")
-public class CalculatorBean {
-
- @Resource
- private WebServiceContext context;
-
- @Action(input="http://geronimo.apache.org/calculator/CalculatorPortType/getmyepr")
- public W3CEndpointReference getEPR() {
- return (W3CEndpointReference)context.getEndpointReference();
- }
-
- public int add(int n1, int n2) {
- return n1 + n2;
- }
-
- public int multiply(int n1, int n2) {
- MessageContext ctx = context.getMessageContext();
- CalculatorHandler.verifyReferenceParameter(ctx);
- return n1 * n2;
- }
-
- @PostConstruct
- private void myInit() {
- System.out.println(this + " PostConstruct");
- }
-
- @PreDestroy()
- private void myDestroy() {
- System.out.println(this + " PreDestroy");
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/java/org/apache/geronimo/jaxws/test/CalculatorHandler.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/java/org/apache/geronimo/jaxws/test/CalculatorHandler.java
deleted file mode 100644
index cf330cb..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/java/org/apache/geronimo/jaxws/test/CalculatorHandler.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.test;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.xml.namespace.QName;
-import javax.xml.soap.Node;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-
-import junit.framework.Assert;
-
-import org.w3c.dom.Element;
-
-public class CalculatorHandler implements SOAPHandler<SOAPMessageContext> {
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- @PreDestroy
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- public boolean handleMessage(SOAPMessageContext ctx) {
- System.out.println(this + " handleMessage()");
- boolean outbound = (Boolean)ctx.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
- if (!outbound) {
- SOAPMessage message = ctx.getMessage();
- try {
- SOAPBody body = message.getSOAPBody();
- SOAPElement responseElem = CalculatorHandler.findElement(body, "multiply");
- if (responseElem != null) {
- CalculatorHandler.verifyReferenceParameter(ctx);
- }
- } catch (SOAPException e) {
- e.printStackTrace();
- return false;
- }
- }
-
- return true;
- }
-
- public static SOAPElement findElement(SOAPElement rootElement, String name) {
- Iterator iter = rootElement.getChildElements();
- while(iter.hasNext()) {
- Node node = (Node)iter.next();
- if (node instanceof SOAPElement && node.getLocalName().equals(name)) {
- return (SOAPElement)node;
- }
- }
- return null;
- }
-
- public static void verifyReferenceParameter(MessageContext ctx) {
- List<Element> rp = (List<Element>)ctx.get(MessageContext.REFERENCE_PARAMETERS);
- Assert.assertNotNull(rp);
- Assert.assertFalse(rp.isEmpty());
- Assert.assertEquals("BarKey3", rp.get(0).getLocalName());
- Assert.assertEquals("FooBar", rp.get(0).getFirstChild().getNodeValue());
- }
-
- public boolean handleFault(SOAPMessageContext smc) {
- System.out.println(this + " handleFault()");
- return true;
- }
-
- public void close(MessageContext messageContext) {
- System.out.println(this + " close()");
- }
-
- public Set<QName> getHeaders(){
- return null;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/java/org/apache/geronimo/jaxws/test/handlers.xml b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/java/org/apache/geronimo/jaxws/test/handlers.xml
deleted file mode 100644
index 41a1b17..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/java/org/apache/geronimo/jaxws/test/handlers.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<jws:handler-chains xmlns:jws="http://java.sun.com/xml/ns/javaee">
- <jws:handler-chain>
- <jws:handler>
- <jws:handler-name>Handler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.jaxws.test.CalculatorHandler</jws:handler-class>
- </jws:handler>
- </jws:handler-chain>
-</jws:handler-chains>
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/resources/META-INF/ejb-jar.xml b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/resources/META-INF/ejb-jar.xml
deleted file mode 100644
index 7c4a400..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/resources/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<ejb-jar 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/ejb-jar_3_0.xsd">
- <display-name>JJAX-WS WS-Addressing Test</display-name>
-
- <enterprise-beans>
- <session>
- <display-name>CalculatorBean</display-name>
- <ejb-name>CalculatorBean</ejb-name>
- <ejb-class>org.apache.geronimo.jaxws.test.CalculatorBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-
-</ejb-jar>
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/resources/META-INF/openejb-jar.xml b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/resources/META-INF/openejb-jar.xml
deleted file mode 100644
index a563996..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-ejb/src/main/resources/META-INF/openejb-jar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<openejb-jar xmlns="http://openejb.apache.org/xml/ns/openejb-jar-2.2"
- xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1"
- xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.2"
- xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <environment>
- <moduleId>
- <groupId>${pom.groupId}</groupId>
- <artifactId>${pom.artifactId}</artifactId>
- <version>${version}</version>
- <type>jar</type>
- </moduleId>
- </environment>
-
-</openejb-jar>
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/pom.xml b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/pom.xml
deleted file mode 100644
index 6bbca67..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/pom.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-wsa-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>wsa-test-war</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS WS-A WAR Test Client</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/Add.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/Add.java
deleted file mode 100644
index c476be7..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/Add.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.calculator;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for add complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="add">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}int"/>
- * <element name="arg1" type="{http://www.w3.org/2001/XMLSchema}int"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "add", propOrder = {
- "arg0",
- "arg1"
-})
-public class Add {
-
- protected int arg0;
- protected int arg1;
-
- /**
- * Gets the value of the arg0 property.
- *
- */
- public int getArg0() {
- return arg0;
- }
-
- /**
- * Sets the value of the arg0 property.
- *
- */
- public void setArg0(int value) {
- this.arg0 = value;
- }
-
- /**
- * Gets the value of the arg1 property.
- *
- */
- public int getArg1() {
- return arg1;
- }
-
- /**
- * Sets the value of the arg1 property.
- *
- */
- public void setArg1(int value) {
- this.arg1 = value;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/AddResponse.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/AddResponse.java
deleted file mode 100644
index af6f17c..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/AddResponse.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.calculator;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for addResponse complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="addResponse">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="return" type="{http://www.w3.org/2001/XMLSchema}int"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "addResponse", propOrder = {
- "_return"
-})
-public class AddResponse {
-
- @XmlElement(name = "return")
- protected int _return;
-
- /**
- * Gets the value of the return property.
- *
- */
- public int getReturn() {
- return _return;
- }
-
- /**
- * Sets the value of the return property.
- *
- */
- public void setReturn(int value) {
- this._return = value;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/Calculator.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/Calculator.java
deleted file mode 100644
index abeffc0..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/Calculator.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.calculator;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-import javax.xml.ws.wsaddressing.W3CEndpointReference;
-
-@WebService(name = "Calculator", targetNamespace = "http://geronimo.apache.org/calculator")
-@XmlSeeAlso({
- ObjectFactory.class
-})
-public interface Calculator {
-
-
- /**
- *
- * @param arg1
- * @param arg0
- * @return
- * returns int
- */
- @WebMethod
- @WebResult(targetNamespace = "")
- @RequestWrapper(localName = "add", targetNamespace = "http://geronimo.apache.org/calculator", className = "org.apache.geronimo.calculator.Add")
- @ResponseWrapper(localName = "addResponse", targetNamespace = "http://geronimo.apache.org/calculator", className = "org.apache.geronimo.calculator.AddResponse")
- public int add(
- @WebParam(name = "arg0", targetNamespace = "")
- int arg0,
- @WebParam(name = "arg1", targetNamespace = "")
- int arg1);
-
- /**
- *
- * @return
- * returns javax.xml.ws.wsaddressing.W3CEndpointReference
- */
- @WebMethod
- @WebResult(targetNamespace = "")
- @RequestWrapper(localName = "getEPR", targetNamespace = "http://geronimo.apache.org/calculator", className = "org.apache.geronimo.calculator.GetEPR")
- @ResponseWrapper(localName = "getEPRResponse", targetNamespace = "http://geronimo.apache.org/calculator", className = "org.apache.geronimo.calculator.GetEPRResponse")
- public W3CEndpointReference getEPR();
-
- /**
- *
- * @param arg1
- * @param arg0
- * @return
- * returns int
- */
- @WebMethod
- @WebResult(targetNamespace = "")
- @RequestWrapper(localName = "multiply", targetNamespace = "http://geronimo.apache.org/calculator", className = "org.apache.geronimo.calculator.Multiply")
- @ResponseWrapper(localName = "multiplyResponse", targetNamespace = "http://geronimo.apache.org/calculator", className = "org.apache.geronimo.calculator.MultiplyResponse")
- public int multiply(
- @WebParam(name = "arg0", targetNamespace = "")
- int arg0,
- @WebParam(name = "arg1", targetNamespace = "")
- int arg1);
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/CalculatorService.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/CalculatorService.java
deleted file mode 100644
index f8efaf2..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/CalculatorService.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.calculator;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-@WebServiceClient(name = "CalculatorService", targetNamespace = "http://geronimo.apache.org/calculator", wsdlLocation = "http://localhost:8080/wsa-war/calculator?wsdl")
-public class CalculatorService
- extends Service
-{
-
- private final static URL CALCULATORSERVICE_WSDL_LOCATION;
-
- static {
- URL url = null;
- try {
- url = new URL("http://localhost:8080/wsa-war/calculator?wsdl");
- } catch (MalformedURLException e) {
- e.printStackTrace();
- }
- CALCULATORSERVICE_WSDL_LOCATION = url;
- }
-
- public CalculatorService(URL wsdlLocation, QName serviceName) {
- super(wsdlLocation, serviceName);
- }
-
- public CalculatorService() {
- super(CALCULATORSERVICE_WSDL_LOCATION, new QName("http://geronimo.apache.org/calculator", "CalculatorService"));
- }
-
- /**
- *
- * @return
- * returns Calculator
- */
- @WebEndpoint(name = "CalculatorPort")
- public Calculator getCalculatorPort() {
- return (Calculator)super.getPort(new QName("http://geronimo.apache.org/calculator", "CalculatorPort"), Calculator.class);
- }
-
- /**
- *
- * @param features
- * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
- * @return
- * returns Calculator
- */
- @WebEndpoint(name = "CalculatorPort")
- public Calculator getCalculatorPort(WebServiceFeature... features) {
- return (Calculator)super.getPort(new QName("http://geronimo.apache.org/calculator", "CalculatorPort"), Calculator.class, features);
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/GetEPR.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/GetEPR.java
deleted file mode 100644
index bf5f8fb..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/GetEPR.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.calculator;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for getEPR complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="getEPR">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "getEPR")
-public class GetEPR {
-
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/GetEPRResponse.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/GetEPRResponse.java
deleted file mode 100644
index 81d9611..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/GetEPRResponse.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.calculator;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.ws.wsaddressing.W3CEndpointReference;
-
-
-/**
- * <p>Java class for getEPRResponse complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="getEPRResponse">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="return" type="{http://www.w3.org/2005/08/addressing}EndpointReferenceType" minOccurs="0"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "getEPRResponse", propOrder = {
- "_return"
-})
-public class GetEPRResponse {
-
- @XmlElement(name = "return")
- protected W3CEndpointReference _return;
-
- /**
- * Gets the value of the return property.
- *
- * @return
- * possible object is
- * {@link W3CEndpointReference }
- *
- */
- public W3CEndpointReference getReturn() {
- return _return;
- }
-
- /**
- * Sets the value of the return property.
- *
- * @param value
- * allowed object is
- * {@link W3CEndpointReference }
- *
- */
- public void setReturn(W3CEndpointReference value) {
- this._return = value;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/Multiply.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/Multiply.java
deleted file mode 100644
index 6f42fc3..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/Multiply.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.calculator;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for multiply complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="multiply">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="arg0" type="{http://www.w3.org/2001/XMLSchema}int"/>
- * <element name="arg1" type="{http://www.w3.org/2001/XMLSchema}int"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "multiply", propOrder = {
- "arg0",
- "arg1"
-})
-public class Multiply {
-
- protected int arg0;
- protected int arg1;
-
- /**
- * Gets the value of the arg0 property.
- *
- */
- public int getArg0() {
- return arg0;
- }
-
- /**
- * Sets the value of the arg0 property.
- *
- */
- public void setArg0(int value) {
- this.arg0 = value;
- }
-
- /**
- * Gets the value of the arg1 property.
- *
- */
- public int getArg1() {
- return arg1;
- }
-
- /**
- * Sets the value of the arg1 property.
- *
- */
- public void setArg1(int value) {
- this.arg1 = value;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/MultiplyResponse.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/MultiplyResponse.java
deleted file mode 100644
index b5f8660..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/MultiplyResponse.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.calculator;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for multiplyResponse complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="multiplyResponse">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="return" type="{http://www.w3.org/2001/XMLSchema}int"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "multiplyResponse", propOrder = {
- "_return"
-})
-public class MultiplyResponse {
-
- @XmlElement(name = "return")
- protected int _return;
-
- /**
- * Gets the value of the return property.
- *
- */
- public int getReturn() {
- return _return;
- }
-
- /**
- * Sets the value of the return property.
- *
- */
- public void setReturn(int value) {
- this._return = value;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/ObjectFactory.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/ObjectFactory.java
deleted file mode 100644
index f61ba62..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/ObjectFactory.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.calculator;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.apache.geronimo.calculator package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
- * provided in this class.
- *
- */
-@XmlRegistry
-public class ObjectFactory {
-
- private final static QName _Add_QNAME = new QName("http://geronimo.apache.org/calculator", "add");
- private final static QName _Multiply_QNAME = new QName("http://geronimo.apache.org/calculator", "multiply");
- private final static QName _MultiplyResponse_QNAME = new QName("http://geronimo.apache.org/calculator", "multiplyResponse");
- private final static QName _GetEPR_QNAME = new QName("http://geronimo.apache.org/calculator", "getEPR");
- private final static QName _GetEPRResponse_QNAME = new QName("http://geronimo.apache.org/calculator", "getEPRResponse");
- private final static QName _AddResponse_QNAME = new QName("http://geronimo.apache.org/calculator", "addResponse");
-
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.apache.geronimo.calculator
- *
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link AddResponse }
- *
- */
- public AddResponse createAddResponse() {
- return new AddResponse();
- }
-
- /**
- * Create an instance of {@link GetEPRResponse }
- *
- */
- public GetEPRResponse createGetEPRResponse() {
- return new GetEPRResponse();
- }
-
- /**
- * Create an instance of {@link MultiplyResponse }
- *
- */
- public MultiplyResponse createMultiplyResponse() {
- return new MultiplyResponse();
- }
-
- /**
- * Create an instance of {@link Multiply }
- *
- */
- public Multiply createMultiply() {
- return new Multiply();
- }
-
- /**
- * Create an instance of {@link Add }
- *
- */
- public Add createAdd() {
- return new Add();
- }
-
- /**
- * Create an instance of {@link GetEPR }
- *
- */
- public GetEPR createGetEPR() {
- return new GetEPR();
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link Add }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://geronimo.apache.org/calculator", name = "add")
- public JAXBElement<Add> createAdd(Add value) {
- return new JAXBElement<Add>(_Add_QNAME, Add.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link Multiply }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://geronimo.apache.org/calculator", name = "multiply")
- public JAXBElement<Multiply> createMultiply(Multiply value) {
- return new JAXBElement<Multiply>(_Multiply_QNAME, Multiply.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link MultiplyResponse }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://geronimo.apache.org/calculator", name = "multiplyResponse")
- public JAXBElement<MultiplyResponse> createMultiplyResponse(MultiplyResponse value) {
- return new JAXBElement<MultiplyResponse>(_MultiplyResponse_QNAME, MultiplyResponse.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link GetEPR }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://geronimo.apache.org/calculator", name = "getEPR")
- public JAXBElement<GetEPR> createGetEPR(GetEPR value) {
- return new JAXBElement<GetEPR>(_GetEPR_QNAME, GetEPR.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link GetEPRResponse }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://geronimo.apache.org/calculator", name = "getEPRResponse")
- public JAXBElement<GetEPRResponse> createGetEPRResponse(GetEPRResponse value) {
- return new JAXBElement<GetEPRResponse>(_GetEPRResponse_QNAME, GetEPRResponse.class, null, value);
- }
-
- /**
- * Create an instance of {@link JAXBElement }{@code <}{@link AddResponse }{@code >}}
- *
- */
- @XmlElementDecl(namespace = "http://geronimo.apache.org/calculator", name = "addResponse")
- public JAXBElement<AddResponse> createAddResponse(AddResponse value) {
- return new JAXBElement<AddResponse>(_AddResponse_QNAME, AddResponse.class, null, value);
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/package-info.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/package-info.java
deleted file mode 100644
index 1104b6d..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/calculator/package-info.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://geronimo.apache.org/calculator")
-package org.apache.geronimo.calculator;
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestServlet.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestServlet.java
deleted file mode 100644
index 0b1abe5..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestServlet.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.wsa;
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.text.MessageFormat;
-import java.util.UUID;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.wsdl.Binding;
-import javax.wsdl.Definition;
-import javax.wsdl.Input;
-import javax.wsdl.Operation;
-import javax.wsdl.PortType;
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.wsdl.factory.WSDLFactory;
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.namespace.QName;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Dispatch;
-import javax.xml.ws.EndpointReference;
-import javax.xml.ws.Service;
-import javax.xml.ws.soap.AddressingFeature;
-import javax.xml.ws.soap.MTOMFeature;
-import javax.xml.ws.soap.SOAPFaultException;
-import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
-
-import junit.framework.Assert;
-
-import org.apache.geronimo.calculator.Calculator;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-
-public abstract class TestServlet extends HttpServlet {
-
- private static final String NAMESPACE =
- "http://geronimo.apache.org/calculator";
-
- private static final QName PORT =
- new QName(NAMESPACE, "CalculatorPort");
-
- private static final QName SERVICE =
- new QName(NAMESPACE, "CalculatorService");
-
- private static final String BASE_ACTION =
- "http://geronimo.apache.org/calculator/Calculator";
-
- private static final String MULTIPLY_REQUEST_ACTION =
- "http://geronimo.apache.org/calculator/Calculator/multiplyRequest";
-
- private static final String ADD_REQUEST_ACTION =
- "http://geronimo.apache.org/calculator/Calculator/addRequest";
-
- public static final String MSG1 =
- "<?xml version=\"1.0\"?><S:Envelope " +
- "xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\">" +
- "<S:Body>\n" +
- "<p:add xmlns:p=\"http://geronimo.apache.org/calculator\">\n" +
- " <arg0>10</arg0>\n" +
- " <arg1>10</arg1>\n" +
- "</p:add>\n" +
- "</S:Body></S:Envelope>";
-
- public static final String MSG2 =
- "<?xml version=\"1.0\"?><S:Envelope " +
- "xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\" " +
- "xmlns:wsa=\"http://www.w3.org/2005/08/addressing\">" +
- "<S:Header>" +
- "<wsa:To>{0}</wsa:To>\n" +
- "<wsa:MessageID>uuid:{1}</wsa:MessageID>\n" +
- "<wsa:Action>{2}</wsa:Action>\n" +
- "</S:Header>\n" +
- "<S:Body>\n" +
- "<p:add xmlns:p=\"http://geronimo.apache.org/calculator\">\n" +
- " <arg0>{3}</arg0>\n" +
- " <arg1>{3}</arg1>\n" +
- "</p:add>\n" +
- "</S:Body></S:Envelope>";
-
- public static final String REF_PARAM =
- "<foo3:BarKey3 xmlns:wsa=\"http://www.w3.org/2005/08/addressing\" wsa:IsReferenceParameter=\"1\" xmlns:foo3=\"http://geronimo.apache.org/calculator\">FooBar</foo3:BarKey3>\n";
-
- public static final String MSG3 =
- "<S:Envelope " +
- "xmlns:S=\"http://schemas.xmlsoap.org/soap/envelope/\" " +
- "xmlns:wsa=\"http://www.w3.org/2005/08/addressing\">" +
- "<S:Header>\n" +
- "<wsa:To>{0}</wsa:To>\n" +
- "<wsa:MessageID>uuid:{1}</wsa:MessageID>\n" +
- "<wsa:Action>{2}</wsa:Action>\n" +
- "<wsa:ReplyTo>\n" +
- " <wsa:Address>http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>\n" +
- " <wsa:ReferenceParameters>\n" +
- " <foo1:BarKey1 xmlns:foo1=\"http://geronimo.apache.org/calculator\">FooBarReply</foo1:BarKey1>\n" +
- " </wsa:ReferenceParameters>" +
- "</wsa:ReplyTo>\n" +
- "<wsa:FaultTo>\n" +
- " <wsa:Address>http://www.w3.org/2005/08/addressing/anonymous</wsa:Address>\n" +
- " <wsa:ReferenceParameters>\n" +
- " <foo2:BarKey2 xmlns:foo2=\"http://geronimo.apache.org/calculator\">FooBarFault</foo2:BarKey2>\n" +
- " </wsa:ReferenceParameters>" +
- "</wsa:FaultTo>\n" +
- REF_PARAM +
- "</S:Header>\n" +
- "<S:Body>\n" +
- "<p:multiply xmlns:p=\"http://geronimo.apache.org/calculator\">\n" +
- " <arg0>{3}</arg0>\n" +
- " <arg1>{3}</arg1>\n" +
- "</p:multiply>\n" +
- "</S:Body></S:Envelope>";
-
- protected String address;
-
- protected Service service;
-
- @Override
- public void doGet(HttpServletRequest request, HttpServletResponse response)
- throws ServletException, IOException {
- String testName = request.getParameter("test");
-
- System.out.println(testName);
-
- if (testName == null || !testName.startsWith("test")) {
- throw new ServletException("Invalid test name");
- }
-
- Method testMethod = null;
- try {
- testMethod = getClass().getMethod(testName, new Class [] {});
- } catch (Exception e1) {
- throw new ServletException("No such test: " + testName);
- }
-
- try {
- testMethod.invoke(this, (Object[])null);
- } catch (IllegalArgumentException e) {
- throw new ServletException("Error invoking test: " + e.getMessage());
- } catch (IllegalAccessException e) {
- throw new ServletException("Error invoking test: " + e.getMessage());
- } catch (InvocationTargetException e) {
- Throwable root = e.getTargetException();
- ServletException ex = new ServletException("Test '" + testName + "' failed");
- ex.initCause(root);
- throw ex;
- }
-
- response.setContentType("text/plain");
- response.getWriter().println("Test '" + testName + "' passed");
- }
-
- public void testReferencePropertiesDispatch() throws Exception {
- Dispatch<SOAPMessage> dispatch = null;
- SOAPMessage request = null;
- SOAPMessage response = null;
-
- // test request and ReplyTo reference properties using Dispatch API
- dispatch = service.createDispatch(PORT, SOAPMessage.class, Service.Mode.MESSAGE);
- request = TestUtils.createMessage(MessageFormat.format(MSG3, address, UUID.randomUUID(), MULTIPLY_REQUEST_ACTION, 5));
- response = dispatch.invoke(request);
- testMultiplyResponse(response, 25, false);
- TestUtils.testReferenceProperties(response, "BarKey1", "FooBarReply");
- }
-
- public void testReferenceProperties() throws Exception {
- // test request reference properties
- W3CEndpointReferenceBuilder builder = createERPBuilder();
- Document refParam = TestUtils.createDocument(REF_PARAM);
- builder.referenceParameter(refParam.getDocumentElement());
- EndpointReference epr = builder.build();
-
- Calculator calc = service.getPort(epr, Calculator.class, new AddressingFeature());
- Assert.assertEquals(36, calc.multiply(6, 6));
- }
-
- public void testDispatch() throws Exception {
- Dispatch<SOAPMessage> dispatch = null;
- SOAPMessage request = null;
- SOAPMessage response = null;
-
- // make a call without Addressing support
- dispatch = service.createDispatch(PORT, SOAPMessage.class, Service.Mode.MESSAGE);
- request = TestUtils.createMessage(MSG1);
- try {
- response = dispatch.invoke(request);
- throw new ServletException("Did not throw exception");
- } catch (SOAPFaultException e) {
- // that's what we expect
- }
-
- // make a call with Addressing support
- dispatch = service.createDispatch(PORT, SOAPMessage.class, Service.Mode.MESSAGE);
- request = TestUtils.createMessage(MessageFormat.format(MSG2, address, UUID.randomUUID(), ADD_REQUEST_ACTION, 5));
- response = dispatch.invoke(request);
- testAddResponse(response, 10, false);
-
- // make a call with Addressing support and MTOM
- dispatch = service.createDispatch(PORT, SOAPMessage.class, Service.Mode.MESSAGE, new MTOMFeature());
- request = TestUtils.createMessage(MessageFormat.format(MSG2, address, UUID.randomUUID(), ADD_REQUEST_ACTION, 10));
- response = dispatch.invoke(request);
- testAddResponse(response, 20, true);
-
- EndpointReference epr = null;
-
- // make a call with Addressing support using EPR
- epr = createEPR();
-
- service.createDispatch(epr, SOAPMessage.class, Service.Mode.MESSAGE);
- request = TestUtils.createMessage(MessageFormat.format(MSG2, address, UUID.randomUUID(), ADD_REQUEST_ACTION, 15));
- response = dispatch.invoke(request);
- testAddResponse(response, 30, false);
-
- // make a call with Addressing support using EPR and MTOM
- epr = createEPR();
-
- service.createDispatch(epr, SOAPMessage.class, Service.Mode.MESSAGE, new MTOMFeature());
- request = TestUtils.createMessage(MessageFormat.format(MSG2, address, UUID.randomUUID(), ADD_REQUEST_ACTION, 20));
- response = dispatch.invoke(request);
- testAddResponse(response, 40, true);
- }
-
- public void testPort() throws Exception {
- Calculator calc = null;
-
- // make a call without AddressingFeature
- calc = service.getPort(Calculator.class);
- try {
- calc.add(1, 1);
- throw new ServletException("Did not throw exception");
- } catch (SOAPFaultException e) {
- // that's what we expect
- }
-
- // make a call with AddressingFeature disabled
- calc = service.getPort(Calculator.class, new AddressingFeature(false, false));
- try {
- calc.add(1, 1);
- throw new ServletException("Did not throw exception");
- } catch (SOAPFaultException e) {
- // that's what we expect
- }
-
- // make a call with AddressingFeature enabled
- calc = service.getPort(Calculator.class, new AddressingFeature());
- Assert.assertEquals(4, calc.add(2, 2));
-
- // make a call with AddressingFeature enabled and port
- calc = service.getPort(PORT, Calculator.class, new AddressingFeature());
- Assert.assertEquals(6, calc.add(3, 3));
-
- EndpointReference epr = null;
-
- // make a call using EPR from Binding
- epr = ((BindingProvider)calc).getEndpointReference();
-
- calc = service.getPort(epr, Calculator.class, new AddressingFeature());
- Assert.assertEquals(8, calc.add(4, 4));
-
- // make a call using EPR from Service
- epr = calc.getEPR();
-
- calc = service.getPort(epr, Calculator.class, new AddressingFeature());
- Assert.assertEquals(10, calc.add(5, 5));
-
- // make a call using created EPR
- epr = createEPR();
-
- calc = service.getPort(epr, Calculator.class, new AddressingFeature());
- Assert.assertEquals(12, calc.add(6, 6));
- }
-
- public void testWSDL() throws Exception {
- URL url = new URL(this.address + "?wsdl");
- HttpURLConnection conn = (HttpURLConnection) url.openConnection();
- conn.setConnectTimeout(30 * 1000);
- conn.setReadTimeout(30 * 1000);
- conn.setUseCaches(false);
-
- QName useAddressing = new QName("http://www.w3.org/2006/05/addressing/wsdl", "UsingAddressing");
- QName actionAttr = new QName("http://www.w3.org/2006/05/addressing/wsdl", "Action");
-
- WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader();
- try {
- Definition def =
- wsdlReader.readWSDL(null, new InputSource(conn.getInputStream()));
-
- // check for right wsa:Action element
- Assert.assertEquals(1, def.getPortTypes().size());
- PortType portType = (PortType)def.getPortTypes().values().iterator().next();
- Assert.assertEquals(3, portType.getOperations().size());
- Operation operation1 = portType.getOperation("getEPR", null, null);
- Assert.assertNotNull("operation", operation1);
- Input input1 = operation1.getInput();
- Assert.assertNotNull("input", input1);
- Object action = input1.getExtensionAttribute(actionAttr);
- Assert.assertNotNull("action", action);
- Assert.assertEquals("http://geronimo.apache.org/calculator/CalculatorPortType/getmyepr", action.toString());
-
- // check for presence wsaw:UsingAddressing element
- Assert.assertEquals(1, def.getBindings().size());
- Binding binding = (Binding)def.getBindings().values().iterator().next();
- Assert.assertEquals(3, binding.getBindingOperations().size());
- ExtensibilityElement wsa = TestUtils.getExtensibilityElement(binding.getExtensibilityElements(), useAddressing);
- Assert.assertNotNull("UsingAddressing", wsa);
- } finally {
- conn.disconnect();
- }
- }
-
- private void testAddResponse(SOAPMessage message, int sum, boolean mtom) throws Exception {
- TestUtils.testResponse(message, BASE_ACTION + "/addResponse", "addResponse", sum, mtom);
- }
-
- private void testMultiplyResponse(SOAPMessage message, int sum, boolean mtom) throws Exception {
- TestUtils.testResponse(message, BASE_ACTION + "/multiplyResponse", "multiplyResponse", sum, mtom);
- }
-
- private W3CEndpointReferenceBuilder createERPBuilder() {
- W3CEndpointReferenceBuilder builder = new W3CEndpointReferenceBuilder();
- builder = builder.address(address);
- builder = builder.serviceName(SERVICE);
- builder = builder.endpointName(PORT);
- return builder;
- }
-
- private EndpointReference createEPR() {
- return createERPBuilder().build();
- }
-
- protected void updateAddress() {
- Calculator calc = service.getPort(Calculator.class);
- BindingProvider binding = (BindingProvider)calc;
- this.address = (String)binding.getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
- System.out.println("Set address: " + this.address);
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletEJB.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletEJB.java
deleted file mode 100644
index 9f0bd71..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletEJB.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.wsa;
-
-import javax.annotation.PostConstruct;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceRef;
-
-public class TestServletEJB extends TestServlet {
-
- @WebServiceRef(name = "services/ejb/Calculator")
- private Service myService;
-
- @PostConstruct
- private void myInit() {
- this.service = myService;
- updateAddress();
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletWeb.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletWeb.java
deleted file mode 100644
index c08166a..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestServletWeb.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.wsa;
-
-import javax.annotation.PostConstruct;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebServiceRef;
-
-public class TestServletWeb extends TestServlet {
-
- @WebServiceRef(name = "services/Calculator")
- private Service myService;
-
- @PostConstruct
- private void myInit() {
- this.service = myService;
- updateAddress();
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestUtils.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestUtils.java
deleted file mode 100644
index 6999fc4..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/java/org/apache/geronimo/jaxws/wsa/TestUtils.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.wsa;
-
-import java.io.IOException;
-import java.io.StringReader;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.wsdl.extensions.ExtensibilityElement;
-import javax.xml.namespace.QName;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.Node;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPHeader;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.transform.Source;
-import javax.xml.transform.stream.StreamSource;
-
-import junit.framework.Assert;
-
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
-
-public class TestUtils {
-
- private static final QName IS_REFERENCE_PARAMETER =
- new QName("http://www.w3.org/2005/08/addressing", "IsReferenceParameter");
-
- public static SOAPElement findElement(SOAPElement rootElement, String name) {
- Iterator iter = rootElement.getChildElements();
- while(iter.hasNext()) {
- Node node = (Node)iter.next();
- if (node instanceof SOAPElement && node.getLocalName().equals(name)) {
- return (SOAPElement)node;
- }
- }
- return null;
- }
-
- public static SOAPMessage createMessage(String msg) throws SOAPException {
- Source src = new StreamSource(new StringReader(msg));
- MessageFactory factory = MessageFactory.newInstance();
- SOAPMessage message = factory.createMessage();
- message.getSOAPPart().setContent(src);
- message.saveChanges();
- return message;
- }
-
- public static Document createDocument(String xml)
- throws ParserConfigurationException, SAXException, IOException {
- return createDocument(new InputSource(new StringReader(xml)));
- }
-
- public static Document createDocument(InputSource source)
- throws ParserConfigurationException, SAXException, IOException {
- DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
- dbf.setNamespaceAware(true);
- dbf.setValidating(false);
- DocumentBuilder builder = dbf.newDocumentBuilder();
- return builder.parse(source);
- }
-
- public static void testResponse(SOAPMessage message, String responseAction, String responseElement, int result, boolean mtom)
- throws SOAPException, IOException {
- message.writeTo(System.out);
-
- SOAPHeader header = message.getSOAPHeader();
- SOAPElement action = TestUtils.findElement(header, "Action");
- Assert.assertNotNull(action);
- Assert.assertEquals(responseAction, action.getValue());
-
- SOAPBody body = message.getSOAPBody();
- SOAPElement responseElem = TestUtils.findElement(body, responseElement);
- Assert.assertNotNull(responseElem);
- SOAPElement returnElem = TestUtils.findElement(responseElem, "return");
- Assert.assertNotNull(returnElem);
- Assert.assertEquals(String.valueOf(result), returnElem.getValue());
- }
-
- public static void testReferenceProperties(SOAPMessage message, String name, String value)
- throws SOAPException {
- SOAPHeader header = message.getSOAPHeader();
- SOAPElement propElement = TestUtils.findElement(header, name);
- Assert.assertNotNull(propElement);
- Assert.assertEquals(value, propElement.getValue());
- String attrValue = propElement.getAttributeValue(IS_REFERENCE_PARAMETER);
- Assert.assertTrue(attrValue,
- "true".equalsIgnoreCase(attrValue) || "1".equalsIgnoreCase(attrValue));
- }
-
- public static ExtensibilityElement getExtensibilityElement(List elements, QName queryElement) {
- for (int i = 0; i < elements.size(); i++) {
- ExtensibilityElement element = (ExtensibilityElement)elements.get(i);
- if (queryElement.equals(element.getElementType())) {
- return element;
- }
- }
- return null;
- }
-
-}
\ No newline at end of file
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index 4719d7f..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>war</dep:type>
- </dep:moduleId>
- </dep:environment>
-
- <context-root>/${pom.artifactId}</context-root>
-
- <service-ref>
- <service-ref-name>services/Calculator</service-ref-name>
- <port>
- <port-name>CalculatorPort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/wsa-war/calculator</uri>
- </port>
- </service-ref>
-
- <service-ref>
- <service-ref-name>services/ejb/Calculator</service-ref-name>
- <port>
- <port-name>CalculatorPort</port-name>
- <protocol>http</protocol>
- <host>localhost</host>
- <port>8080</port>
- <uri>/CalculatorService/Calculator</uri>
- </port>
- </service-ref>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/webapp/WEB-INF/web.xml b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index de56fec..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app 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/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
- version="2.5"
- >
-
- <display-name>JAX-WS WS-Addressing Test</display-name>
-
- <servlet>
- <display-name>TestServletWeb</display-name>
- <servlet-name>TestServletWeb</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.wsa.TestServletWeb</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestServletWeb</servlet-name>
- <url-pattern>/test-web</url-pattern>
- </servlet-mapping>
-
- <servlet>
- <display-name>TestServletEJB</display-name>
- <servlet-name>TestServletEJB</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.wsa.TestServletEJB</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>TestServletEJB</servlet-name>
- <url-pattern>/test-ejb</url-pattern>
- </servlet-mapping>
-
- <service-ref>
- <service-ref-name>services/Calculator</service-ref-name>
- <service-interface>javax.xml.ws.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/calculator.wsdl</wsdl-file>
- </service-ref>
-
- <service-ref>
- <service-ref-name>services/ejb/Calculator</service-ref-name>
- <service-interface>javax.xml.ws.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/calculator.wsdl</wsdl-file>
- </service-ref>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/webapp/WEB-INF/wsdl/calculator.wsdl b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/webapp/WEB-INF/wsdl/calculator.wsdl
deleted file mode 100644
index 430b3d1..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-test-war/src/main/webapp/WEB-INF/wsdl/calculator.wsdl
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://geronimo.apache.org/calculator" xmlns:wsaw="http://www.w3.org/2006/05/addressing/wsdl" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="CalculatorService" targetNamespace="http://geronimo.apache.org/calculator">
- <wsdl:types>
- <xs:schema xmlns:ns1="http://www.w3.org/2005/08/addressing" xmlns:tns="http://geronimo.apache.org/calculator" xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="unqualified" targetNamespace="http://geronimo.apache.org/calculator">
- <xs:import namespace="http://www.w3.org/2005/08/addressing" schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd"/>
- <xs:element name="add" type="tns:add"/>
- <xs:element name="addResponse" type="tns:addResponse"/>
- <xs:element name="getEPR" type="tns:getEPR"/>
- <xs:element name="getEPRResponse" type="tns:getEPRResponse"/>
- <xs:element name="multiply" type="tns:multiply"/>
- <xs:element name="multiplyResponse" type="tns:multiplyResponse"/>
- <xs:complexType name="add">
- <xs:sequence>
- <xs:element name="arg0" type="xs:int"/>
- <xs:element name="arg1" type="xs:int"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="addResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:int"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="getEPR">
- <xs:sequence/>
- </xs:complexType>
- <xs:complexType name="getEPRResponse">
- <xs:sequence>
- <xs:element minOccurs="0" name="return" type="ns1:EndpointReferenceType"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="multiply">
- <xs:sequence>
- <xs:element name="arg0" type="xs:int"/>
- <xs:element name="arg1" type="xs:int"/>
- </xs:sequence>
- </xs:complexType>
- <xs:complexType name="multiplyResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:int"/>
- </xs:sequence>
- </xs:complexType>
- </xs:schema>
- </wsdl:types>
- <wsdl:message name="multiply">
- <wsdl:part element="tns:multiply" name="parameters">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getEPRResponse">
- <wsdl:part element="tns:getEPRResponse" name="parameters">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="addResponse">
- <wsdl:part element="tns:addResponse" name="parameters">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="multiplyResponse">
- <wsdl:part element="tns:multiplyResponse" name="parameters">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="add">
- <wsdl:part element="tns:add" name="parameters">
- </wsdl:part>
- </wsdl:message>
- <wsdl:message name="getEPR">
- <wsdl:part element="tns:getEPR" name="parameters">
- </wsdl:part>
- </wsdl:message>
- <wsdl:portType name="Calculator">
- <wsdl:operation name="add">
- <wsdl:input message="tns:add">
- </wsdl:input>
- <wsdl:output message="tns:addResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getEPR">
- <wsdl:input message="tns:getEPR" wsaw:Action="http://geronimo.apache.org/calculator/CalculatorPortType/getmyepr">
- </wsdl:input>
- <wsdl:output message="tns:getEPRResponse">
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="multiply">
- <wsdl:input message="tns:multiply">
- </wsdl:input>
- <wsdl:output message="tns:multiplyResponse">
- </wsdl:output>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="CalculatorServiceSoapBinding" type="tns:Calculator">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="add">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="getEPR">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="multiply">
- <soap:operation soapAction="" style="document"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="CalculatorService">
- <wsdl:port binding="tns:CalculatorServiceSoapBinding" name="CalculatorPort">
- <soap:address location="http://localhost:8080/wsa-war/calculator"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/pom.xml b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/pom.xml
deleted file mode 100644
index 9657d24..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/pom.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>jaxws-wsa-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>wsa-war</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: JAX-WS WS-A WAR</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <resources>
- <resource>
- <directory>src/main/java</directory>
- <includes>
- <include>**/*.xml</include>
- </includes>
- </resource>
- </resources>
- </build>
-
-</project>
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/test/CalculatorHandler.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/test/CalculatorHandler.java
deleted file mode 100644
index cf330cb..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/test/CalculatorHandler.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.test;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.xml.namespace.QName;
-import javax.xml.soap.Node;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPException;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.handler.soap.SOAPHandler;
-import javax.xml.ws.handler.soap.SOAPMessageContext;
-
-import junit.framework.Assert;
-
-import org.w3c.dom.Element;
-
-public class CalculatorHandler implements SOAPHandler<SOAPMessageContext> {
-
- @PostConstruct
- public void init() {
- System.out.println(this + " PostConstruct");
- }
-
- @PreDestroy
- public void destroy() {
- System.out.println(this + " PreDestroy");
- }
-
- public boolean handleMessage(SOAPMessageContext ctx) {
- System.out.println(this + " handleMessage()");
- boolean outbound = (Boolean)ctx.get(MessageContext.MESSAGE_OUTBOUND_PROPERTY);
- if (!outbound) {
- SOAPMessage message = ctx.getMessage();
- try {
- SOAPBody body = message.getSOAPBody();
- SOAPElement responseElem = CalculatorHandler.findElement(body, "multiply");
- if (responseElem != null) {
- CalculatorHandler.verifyReferenceParameter(ctx);
- }
- } catch (SOAPException e) {
- e.printStackTrace();
- return false;
- }
- }
-
- return true;
- }
-
- public static SOAPElement findElement(SOAPElement rootElement, String name) {
- Iterator iter = rootElement.getChildElements();
- while(iter.hasNext()) {
- Node node = (Node)iter.next();
- if (node instanceof SOAPElement && node.getLocalName().equals(name)) {
- return (SOAPElement)node;
- }
- }
- return null;
- }
-
- public static void verifyReferenceParameter(MessageContext ctx) {
- List<Element> rp = (List<Element>)ctx.get(MessageContext.REFERENCE_PARAMETERS);
- Assert.assertNotNull(rp);
- Assert.assertFalse(rp.isEmpty());
- Assert.assertEquals("BarKey3", rp.get(0).getLocalName());
- Assert.assertEquals("FooBar", rp.get(0).getFirstChild().getNodeValue());
- }
-
- public boolean handleFault(SOAPMessageContext smc) {
- System.out.println(this + " handleFault()");
- return true;
- }
-
- public void close(MessageContext messageContext) {
- System.out.println(this + " close()");
- }
-
- public Set<QName> getHeaders(){
- return null;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/test/CalculatorImpl.java b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/test/CalculatorImpl.java
deleted file mode 100644
index 213e6a3..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/test/CalculatorImpl.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.jaxws.test;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
-import javax.annotation.Resource;
-import javax.jws.HandlerChain;
-import javax.jws.WebService;
-import javax.xml.ws.Action;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.MessageContext;
-import javax.xml.ws.soap.Addressing;
-import javax.xml.ws.wsaddressing.W3CEndpointReference;
-
-@WebService(serviceName = "CalculatorService",
- portName = "CalculatorPort",
- name = "Calculator",
- targetNamespace = "http://geronimo.apache.org/calculator")
-@Addressing(enabled = true, required = true)
-@HandlerChain(file="handlers.xml")
-public class CalculatorImpl {
-
- @Resource
- private WebServiceContext context;
-
- @Action(input="http://geronimo.apache.org/calculator/CalculatorPortType/getmyepr")
- public W3CEndpointReference getEPR() {
- return (W3CEndpointReference)context.getEndpointReference();
- }
-
- public int add(int n1, int n2) {
- return n1 + n2;
- }
-
- public int multiply(int n1, int n2) {
- MessageContext ctx = context.getMessageContext();
- CalculatorHandler.verifyReferenceParameter(ctx);
- return n1 * n2;
- }
-
- @PostConstruct
- private void myInit() {
- System.out.println(this + " PostConstruct");
- }
-
- @PreDestroy()
- private void myDestroy() {
- System.out.println(this + " PreDestroy");
- }
-
-}
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/test/handlers.xml b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/test/handlers.xml
deleted file mode 100644
index 41a1b17..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/java/org/apache/geronimo/jaxws/test/handlers.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<!-- $Rev$ $Date$ -->
-
-<jws:handler-chains xmlns:jws="http://java.sun.com/xml/ns/javaee">
- <jws:handler-chain>
- <jws:handler>
- <jws:handler-name>Handler</jws:handler-name>
- <jws:handler-class>org.apache.geronimo.jaxws.test.CalculatorHandler</jws:handler-class>
- </jws:handler>
- </jws:handler-chain>
-</jws:handler-chains>
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index fe72988..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>${pom.groupId}</dep:groupId>
- <dep:artifactId>${pom.artifactId}</dep:artifactId>
- <dep:version>${version}</dep:version>
- <dep:type>war</dep:type>
- </dep:moduleId>
- </dep:environment>
-
- <context-root>/${pom.artifactId}</context-root>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/web.xml b/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index ad51aea..0000000
--- a/testsuite/webservices-testsuite/jaxws-wsa-tests/wsa-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app 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/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_5.xsd"
- version="2.5"
- >
-
- <display-name>JAX-WS WS-Addressing Test</display-name>
-
- <servlet>
- <display-name>CalculatorServlet</display-name>
- <servlet-name>CalculatorServlet</servlet-name>
- <servlet-class>org.apache.geronimo.jaxws.test.CalculatorImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>CalculatorServlet</servlet-name>
- <url-pattern>/calculator</url-pattern>
- </servlet-mapping>
-
-</web-app>
diff --git a/testsuite/webservices-testsuite/pom.xml b/testsuite/webservices-testsuite/pom.xml
index 5e1bcec..b868714 100644
--- a/testsuite/webservices-testsuite/pom.xml
+++ b/testsuite/webservices-testsuite/pom.xml
@@ -40,18 +40,6 @@
<modules>
<module>jaxb-tests</module>
-<!--
- <module>jaxr-tests</module>
- <module>jaxrpc-jaxws-tests</module>
- <module>jaxrpc-tests</module>
- <module>jaxws-catalog-tests</module>
- <module>jaxws-catalog-tests</module>
- <module>jaxws-mtom-tests</module>
- <module>jaxws-provider-tests</module>
- <module>jaxws-tests</module>
- <module>jaxws-wsa-tests</module>
- <module>saaj-tests</module>
--->
<module>stax-tests</module>
</modules>
diff --git a/testsuite/webservices-testsuite/saaj-tests/goals.txt b/testsuite/webservices-testsuite/saaj-tests/goals.txt
deleted file mode 100644
index 9cb8855..0000000
--- a/testsuite/webservices-testsuite/saaj-tests/goals.txt
+++ /dev/null
@@ -1 +0,0 @@
-clean install
diff --git a/testsuite/webservices-testsuite/saaj-tests/pom.xml b/testsuite/webservices-testsuite/saaj-tests/pom.xml
deleted file mode 100644
index 32d5894..0000000
--- a/testsuite/webservices-testsuite/saaj-tests/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>webservices-testsuite</artifactId>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>saaj-tests</artifactId>
- <packaging>pom</packaging>
- <name>Geronimo TestSuite :: WebServices TestSuite :: SAAJ</name>
- <description>Geronimo JEE5 Webservices SAAJ tests</description>
-
- <modules>
- <module>saaj-war</module>
- <module>saaj-client</module>
- </modules>
-
-</project>
diff --git a/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml b/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
deleted file mode 100644
index a78fee4..0000000
--- a/testsuite/webservices-testsuite/saaj-tests/saaj-client/pom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>saaj-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>saaj-client</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: SAAJ Client</name>
- <packaging>jar</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <properties>
- <clientLogFile>${basedir}/target/client.log</clientLogFile>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.geronimo.test.SAAJClient</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
- <profiles>
- <profile>
- <id>it</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>clientLogFile</name>
- <value>${clientLogFile}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-client</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.jar</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <phase>pre-integration-test</phase>
- <id>run-client</id>
- <goals>
- <goal>run-client</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/SAAJClient/1.1/car</moduleId>
- <logOutput>true</logOutput>
- <logFile>${clientLogFile}</logFile>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-client-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/SAAJClientServer/1.1/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
-
-</project>
-
diff --git a/testsuite/webservices-testsuite/saaj-tests/saaj-client/src/main/java/org/apache/geronimo/test/SAAJClient.java b/testsuite/webservices-testsuite/saaj-tests/saaj-client/src/main/java/org/apache/geronimo/test/SAAJClient.java
deleted file mode 100644
index 8d38781..0000000
--- a/testsuite/webservices-testsuite/saaj-tests/saaj-client/src/main/java/org/apache/geronimo/test/SAAJClient.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-public class SAAJClient {
-
- public static void main(String [] args) throws Exception {
- try {
- test();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- // needs to be forced because of a bug
- System.exit(0);
- }
-
- public static void test() throws Exception {
- SAAJTest t = new SAAJTest();
- System.out.println(t.getMessageFactoryImplementation());
- System.out.println(t.getSOAPFactoryImplementation());
- System.out.println(t.getSOAPConnectionFactoryImplementation());
- t.test();
- }
-
-}
diff --git a/testsuite/webservices-testsuite/saaj-tests/saaj-client/src/main/java/org/apache/geronimo/test/SAAJTest.java b/testsuite/webservices-testsuite/saaj-tests/saaj-client/src/main/java/org/apache/geronimo/test/SAAJTest.java
deleted file mode 100644
index 732d11a..0000000
--- a/testsuite/webservices-testsuite/saaj-tests/saaj-client/src/main/java/org/apache/geronimo/test/SAAJTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.io.StringWriter;
-import java.io.StringReader;
-
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPConnectionFactory;
-import javax.xml.soap.SOAPFactory;
-import javax.xml.soap.SOAPConstants;
-
-/**
- * Performs basic tests using the SAAJ 1.3 API.
- */
-public class SAAJTest {
-
- MessageFactory messageFactory = null;
- SOAPConnectionFactory soapConnectionFactory = null;
- SOAPFactory soapFactory = null;
-
- public SAAJTest() throws Exception {
- this.messageFactory = MessageFactory.newInstance();
- this.soapConnectionFactory = SOAPConnectionFactory.newInstance();
- this.soapFactory = SOAPFactory.newInstance();
- }
-
- public String getMessageFactoryImplementation() {
- return this.messageFactory.getClass().getName();
- }
-
- public String getSOAPFactoryImplementation() {
- return this.soapFactory.getClass().getName();
- }
-
- public String getSOAPConnectionFactoryImplementation() {
- return this.soapConnectionFactory.getClass().getName();
- }
-
- public void test() throws Exception {
- // this will test SAAJMetaFactory (and 1.3 SAAJ API)
- System.out.println(SOAPFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL));
- System.out.println(SOAPFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL));
- System.out.println(SOAPFactory.newInstance(SOAPConstants.DYNAMIC_SOAP_PROTOCOL));
-
- System.out.println(MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL));
- System.out.println(MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL));
- System.out.println(MessageFactory.newInstance(SOAPConstants.DYNAMIC_SOAP_PROTOCOL));
-
- System.out.println(this.soapConnectionFactory.createConnection().getClass().getName());
- System.out.println(this.messageFactory.createMessage().getClass().getName());
- System.out.println(this.soapFactory.createName("foo").getClass().getName());
- }
-
-}
diff --git a/testsuite/webservices-testsuite/saaj-tests/saaj-client/src/main/resources/META-INF/application-client.xml b/testsuite/webservices-testsuite/saaj-tests/saaj-client/src/main/resources/META-INF/application-client.xml
deleted file mode 100644
index 0e96474..0000000
--- a/testsuite/webservices-testsuite/saaj-tests/saaj-client/src/main/resources/META-INF/application-client.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<application-client 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/applicationclient_1_4.xsd"
- version="1.4">
-
- <display-name>SAAJ Client</display-name>
-
-</application-client>
-
diff --git a/testsuite/webservices-testsuite/saaj-tests/saaj-client/src/main/resources/META-INF/geronimo-application-client.xml b/testsuite/webservices-testsuite/saaj-tests/saaj-client/src/main/resources/META-INF/geronimo-application-client.xml
deleted file mode 100644
index 1d95686..0000000
--- a/testsuite/webservices-testsuite/saaj-tests/saaj-client/src/main/resources/META-INF/geronimo-application-client.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<application-client
- xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-client-1.2"
- xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-
- <dep:client-environment>
- <dep:moduleId>
- <dep:groupId>JEE5</dep:groupId>
- <dep:artifactId>SAAJClient</dep:artifactId>
- <dep:version>1.1</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- </dep:client-environment>
-
- <dep:server-environment>
- <dep:moduleId>
- <dep:groupId>JEE5</dep:groupId>
- <dep:artifactId>SAAJClientServer</dep:artifactId>
- <dep:version>1.1</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- </dep:server-environment>
-
-</application-client>
diff --git a/testsuite/webservices-testsuite/saaj-tests/saaj-client/src/test/java/org/apache/geronimo/testsuite/testset/ClientSAAJTest.java b/testsuite/webservices-testsuite/saaj-tests/saaj-client/src/test/java/org/apache/geronimo/testsuite/testset/ClientSAAJTest.java
deleted file mode 100644
index 8302ba7..0000000
--- a/testsuite/webservices-testsuite/saaj-tests/saaj-client/src/test/java/org/apache/geronimo/testsuite/testset/ClientSAAJTest.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.FileInputStream;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-
-public class ClientSAAJTest extends TestSupport {
-
- @Test
- public void testClient() throws Exception {
- String outputFile = System.getProperty("clientLogFile");
- assertNotNull(outputFile);
- FileInputStream in = null;
- try {
- in = new FileInputStream(outputFile);
- BufferedReader reader =
- new BufferedReader(new InputStreamReader(in));
- assertTrue("MessageFactoryImplementation",
- find(reader, "org.apache.geronimo.webservices.saaj.GeronimoMessageFactory"));
- assertTrue("SOAPFactoryImplementation",
- find(reader, "org.apache.geronimo.webservices.saaj.GeronimoSOAPFactory"));
- assertTrue("SOAPConnectionFactoryImplementation",
- find(reader, "org.apache.geronimo.webservices.saaj.GeronimoSOAPConnectionFactory"));
- } finally {
- if (in != null) {
- in.close();
- }
- }
- }
-
- private boolean find(BufferedReader reader, String text)
- throws IOException {
- String line = null;
- while ((line = reader.readLine()) != null) {
- System.out.println(line);
- if (line.indexOf(text) != -1) {
- return true;
- }
- }
- return false;
- }
-
-}
diff --git a/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml b/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
deleted file mode 100644
index ed0b2a4..0000000
--- a/testsuite/webservices-testsuite/saaj-tests/saaj-war/pom.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-
-<!-- $Rev: 653503 $ $Date: 2008-05-05 22:35:18 +0700 (Mon, 05 May 2008) $ -->
-
-<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/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.geronimo.testsuite</groupId>
- <artifactId>saaj-tests</artifactId>
- <version>3.0-M1-SNAPSHOT</version>
- </parent>
-
- <artifactId>saaj-war</artifactId>
- <name>Geronimo TestSuite :: WebServices TestSuite :: SAAJ WAR</name>
- <packaging>war</packaging>
-
- <description>This project executes testcases for your testsuite</description>
-
- <dependencies>
- <!--
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.2_spec</artifactId>
- <scope>provided</scope>
- </dependency>
- -->
-
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>webAppName</name>
- <value>${project.artifactId}-${project.version}</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
-
- <plugin>
- <groupId>org.apache.geronimo.buildsupport</groupId>
- <artifactId>geronimo-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>deploy-wars</id>
- <phase>pre-integration-test</phase>
- <goals>
- <goal>deploy-module</goal>
- </goals>
- <configuration>
- <moduleArchive>${project.build.directory}/${project.artifactId}-${project.version}.war</moduleArchive>
- </configuration>
- </execution>
-
- <execution>
- <id>undeploy-war-as-moduleId</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>undeploy-module</goal>
- </goals>
- <configuration>
- <moduleId>JEE5/SAAJServlet/1.1/car</moduleId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
-
diff --git a/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/main/java/org/apache/geronimo/test/SAAJServlet.java b/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/main/java/org/apache/geronimo/test/SAAJServlet.java
deleted file mode 100644
index 37fac62..0000000
--- a/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/main/java/org/apache/geronimo/test/SAAJServlet.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.io.IOException;
-import java.io.PrintWriter;
-
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-public class SAAJServlet extends HttpServlet {
-
- public void doGet(HttpServletRequest theRequest,
- HttpServletResponse theResponse)
- throws IOException {
-
- PrintWriter pw = theResponse.getWriter();
-
- theResponse.setContentType("text/html");
- pw.println("<html><head><title>Servlet</title></head>");
- pw.println("<body>");
-
- try {
- SAAJTest t = new SAAJTest();
- pw.println(t.getMessageFactoryImplementation());
- pw.println(t.getSOAPFactoryImplementation());
- pw.println(t.getSOAPConnectionFactoryImplementation());
- t.test();
- } catch (Exception e) {
- e.printStackTrace();
- IOException exception = new IOException("Error");
- exception.initCause(e);
- throw exception;
- }
-
- pw.println("</body></html>");
- }
-
-}
diff --git a/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/main/java/org/apache/geronimo/test/SAAJTest.java b/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/main/java/org/apache/geronimo/test/SAAJTest.java
deleted file mode 100644
index 732d11a..0000000
--- a/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/main/java/org/apache/geronimo/test/SAAJTest.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.test;
-
-import java.io.StringWriter;
-import java.io.StringReader;
-
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPConnectionFactory;
-import javax.xml.soap.SOAPFactory;
-import javax.xml.soap.SOAPConstants;
-
-/**
- * Performs basic tests using the SAAJ 1.3 API.
- */
-public class SAAJTest {
-
- MessageFactory messageFactory = null;
- SOAPConnectionFactory soapConnectionFactory = null;
- SOAPFactory soapFactory = null;
-
- public SAAJTest() throws Exception {
- this.messageFactory = MessageFactory.newInstance();
- this.soapConnectionFactory = SOAPConnectionFactory.newInstance();
- this.soapFactory = SOAPFactory.newInstance();
- }
-
- public String getMessageFactoryImplementation() {
- return this.messageFactory.getClass().getName();
- }
-
- public String getSOAPFactoryImplementation() {
- return this.soapFactory.getClass().getName();
- }
-
- public String getSOAPConnectionFactoryImplementation() {
- return this.soapConnectionFactory.getClass().getName();
- }
-
- public void test() throws Exception {
- // this will test SAAJMetaFactory (and 1.3 SAAJ API)
- System.out.println(SOAPFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL));
- System.out.println(SOAPFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL));
- System.out.println(SOAPFactory.newInstance(SOAPConstants.DYNAMIC_SOAP_PROTOCOL));
-
- System.out.println(MessageFactory.newInstance(SOAPConstants.SOAP_1_1_PROTOCOL));
- System.out.println(MessageFactory.newInstance(SOAPConstants.SOAP_1_2_PROTOCOL));
- System.out.println(MessageFactory.newInstance(SOAPConstants.DYNAMIC_SOAP_PROTOCOL));
-
- System.out.println(this.soapConnectionFactory.createConnection().getClass().getName());
- System.out.println(this.messageFactory.createMessage().getClass().getName());
- System.out.println(this.soapFactory.createName("foo").getClass().getName());
- }
-
-}
diff --git a/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/main/webapp/SAAJJSP.jsp b/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/main/webapp/SAAJJSP.jsp
deleted file mode 100644
index ce3b7f5..0000000
--- a/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/main/webapp/SAAJJSP.jsp
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
- version="1.2">
-<jsp:directive.page contentType="text/html"/>
-<jsp:directive.page import="java.io.IOException"/>
-<jsp:directive.page import="org.apache.geronimo.test.SAAJTest"/>
-
-<html><head><title>JSP</title></head>
-<body>
-
-<jsp:scriptlet>
-// Note we need to declare CDATA because we don't escape the less than symbol
-<![CDATA[
- try {
- SAAJTest t = new SAAJTest();
- out.println(t.getMessageFactoryImplementation());
- out.println(t.getSOAPFactoryImplementation());
- out.println(t.getSOAPConnectionFactoryImplementation());
- t.test();
- } catch (Exception e) {
- e.printStackTrace();
- IOException exception = new IOException("Error");
- exception.initCause(e);
- throw exception;
- }
-]]>
-</jsp:scriptlet>
-
-</body></html>
-</jsp:root>
diff --git a/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/main/webapp/WEB-INF/geronimo-web.xml b/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/main/webapp/WEB-INF/geronimo-web.xml
deleted file mode 100644
index dbfc656..0000000
--- a/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/main/webapp/WEB-INF/geronimo-web.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.1" xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1">
- <dep:environment>
- <dep:moduleId>
- <dep:groupId>JEE5</dep:groupId>
- <dep:artifactId>SAAJServlet</dep:artifactId>
- <dep:version>1.1</dep:version>
- <dep:type>car</dep:type>
- </dep:moduleId>
- </dep:environment>
-</web-app>
diff --git a/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/main/webapp/WEB-INF/web.xml b/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index e488db3..0000000
--- a/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<web-app 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"
- version="2.4">
- <servlet>
- <servlet-name>SAAJServlet</servlet-name>
- <servlet-class>org.apache.geronimo.test.SAAJServlet</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>SAAJServlet</servlet-name>
- <url-pattern>/SAAJServlet</url-pattern>
- </servlet-mapping>
-</web-app>
diff --git a/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/test/java/org/apache/geronimo/testsuite/testset/WebSAAJTest.java b/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/test/java/org/apache/geronimo/testsuite/testset/WebSAAJTest.java
deleted file mode 100644
index 8109ccf..0000000
--- a/testsuite/webservices-testsuite/saaj-tests/saaj-war/src/test/java/org/apache/geronimo/testsuite/testset/WebSAAJTest.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.geronimo.testsuite.testset;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import org.apache.geronimo.testsupport.TestSupport;
-import org.testng.annotations.Test;
-
-public class WebSAAJTest extends TestSupport {
-
- private String baseURL = "http://localhost:8080/";
-
- @Test
- public void testServlet() throws Exception {
- checkReply("/SAAJServlet");
- }
-
-
- @Test
- public void testJSP() throws Exception {
- checkReply("/SAAJJSP.jsp");
- }
-
- private void checkReply(String address)
- throws Exception {
- String warName = System.getProperty("webAppName");
- assertNotNull(warName);
- URL url = new URL(baseURL + warName + address);
- HttpURLConnection connection = (HttpURLConnection)url.openConnection();
- connection.setConnectTimeout(30 * 1000);
- connection.setReadTimeout(30 * 1000);
- try {
- BufferedReader reader =
- new BufferedReader(new InputStreamReader(connection.getInputStream()));
- assertEquals(HttpURLConnection.HTTP_OK, connection.getResponseCode());
- assertTrue("MessageFactoryImplementation",
- find(reader, "org.apache.geronimo.webservices.saaj.GeronimoMessageFactory"));
- assertTrue("SOAPFactoryImplementation",
- find(reader, "org.apache.geronimo.webservices.saaj.GeronimoSOAPFactory"));
- assertTrue("SOAPConnectionFactoryImplementation",
- find(reader, "org.apache.geronimo.webservices.saaj.GeronimoSOAPConnectionFactory"));
- } finally {
- connection.disconnect();
- }
- }
-
- private boolean find(BufferedReader reader, String text)
- throws IOException {
- String line = null;
- while ((line = reader.readLine()) != null) {
- System.out.println(line);
- if (line.indexOf(text) != -1) {
- return true;
- }
- }
- return false;
- }
-
-}
