This commit was manufactured by cvs2svn to create tag 'v200605040108'.
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.classpath b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.cvsignore b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.cvsignore
deleted file mode 100644
index ba077a4..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-bin
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.project b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.project
deleted file mode 100644
index 93e1bac..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.ejb.generation.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/about.html b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/about.html
deleted file mode 100644
index 4ec5989..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/about.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<HTML>
-
-<head>
-<title>About</title>
-<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
-</head>
-
-<BODY lang="EN-US">
-
-<H3>About This Content</H3>
-
-<P>May 2, 2006</P>
-
-<H3>License</H3>
-
-<P>The Eclipse Foundation makes available all content in this plug-in
-("Content"). Unless otherwise indicated below, the Content is provided to you
-under the terms and conditions of the Eclipse Public License Version 1.0
-("EPL"). A copy of the EPL is available at
-<A href="http://www.eclipse.org/org/documents/epl-v10.php">http://www.eclipse.org/org/documents/epl-v10.php</A>.
-For purposes of the EPL, "Program" will mean the Content.</P>
-
-<P>If you did not receive this Content directly from the Eclipse Foundation, the
-Content is being redistributed by another party ("Redistributor") and different
-terms and conditions may apply to your use of any object code in the Content.
-Check the Redistributors license that was provided with the Content. If no such
-license exists, contact the Redistributor. Unless otherwise indicated below, the
-terms and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at
-<A href="http://www.eclipse.org/">http://www.eclipse.org/</A>.</P>
-
-</BODY>
-</HTML>
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/build.properties b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/build.properties
deleted file mode 100644
index 357dfc4..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.annotationtests.jar = src/
-output.annotationtests.jar = bin/
-bin.includes = plugin.xml,\
- annotationtests.jar,\
- about.html,\
- test.xml
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/plugin.xml b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/plugin.xml
deleted file mode 100644
index b54b35e..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/plugin.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.jst.j2ee.ejb.generation.tests"
- name="Tests Plug-in"
- version="1.0.0"
- provider-name="Eclipse.org"
- class="org.eclipse.jst.j2ee.ejb.generation.tests.TestsPlugin">
-
- <runtime>
- <library name="annotationtests.jar"/>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.junit"/>
- <import plugin="org.eclipse.jst.j2ee.ejb.annotation.model"/>
- <import plugin="org.eclipse.jst.j2ee.ejb.annotations.emitter"/>
- <import plugin="org.eclipse.jst.j2ee.ejb.annotations.ui"/>
- <import plugin="org.eclipse.jst.j2ee.ejb.annotations.xdoclet"/>
- <import plugin="org.eclipse.jdt.core"/>
- <import plugin="org.eclipse.core.resources"/>
- <import plugin="org.eclipse.jdt.launching"/>
- <import plugin="org.eclipse.jst.j2ee.core"/>
- <import plugin="org.eclipse.jst.ejb.ui"/>
- <import plugin="org.eclipse.jst.j2ee.ejb"/>
- <import plugin="org.eclipse.jst.j2ee.ui"/>
- <import plugin="org.eclipse.jst.j2ee"/>
- <import plugin="org.eclipse.wst.common.frameworks"/>
- <import plugin="org.eclipse.jst.server.core"/>
- <import plugin="org.eclipse.jst.server.generic.core"/>
- <import plugin="org.eclipse.jst.server.generic.ui"/>
- <import plugin="org.eclipse.wst.server.core"/>
- <import plugin="org.eclipse.emf"/>
- <import plugin="org.eclipse.emf.ecore"/>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.jst.common.frameworks"/>
- </requires>
-
-</plugin>
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/AllTests.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/AllTests.java
deleted file mode 100644
index cb9216a..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/AllTests.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**********************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
-�*
- * Contributors:
- * IBM Corporation - Initial API and implementation
- **********************************************************************/
-package org.eclipse.jst.j2ee.ejb.generation.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.ejb.generation.tests.common.EjbModuleCreationTest;
-import org.eclipse.jst.j2ee.ejb.generation.tests.common.EnterpriseBeanModelTest;
-import org.eclipse.jst.j2ee.ejb.generation.tests.common.ExistenceTest;
-import org.eclipse.jst.j2ee.ejb.generation.tests.common.TestSettings;
-
-public class AllTests {
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.jst.j2ee.ejb.generation.tests");
- //$JUnit-BEGIN$
- System.setProperty("wtp.autotest.noninteractive", "true");
-
- //$JUnit-BEGIN$
- String s = System.getProperty(TestSettings.runtimeid);
- //s = "D:\\Tools\\tomcat\\jakarta-tomcat-3.2.4";
- if (s != null && s.length() > 0) {
- TestSettings.serverlocation = s;
- }
- s = System.getProperty("org.eclipse.jst.xdoclet.version");
- //s = "1.2.3";
- if (s != null && s.length() > 0) {
- TestSettings.xdocletversion = s;
- }
-
- s = System.getProperty("org.eclipse.jst.xdoclet.location");
- //s = "D:\\Tools\\tomcat\\jakarta-tomcat-3.2.4";
- if (s != null && s.length() > 0) {
- TestSettings.xdocletlocation = s;
- }
-
- suite.addTestSuite(EnterpriseBeanModelTest.class);
- suite.addTest(new OrderedTestSuite(EjbModuleCreationTest.class));
- suite.addTestSuite(ExistenceTest.class);
-
- s = System.getProperty("org.eclipse.jst.server.generic.jonas4");
- if (s != null && s.length() > 0) {
- }
- return suite;
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/OrderedTestSuite.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/OrderedTestSuite.java
deleted file mode 100644
index dd96fb8..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/OrderedTestSuite.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.generation.tests;
-
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.util.Vector;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class OrderedTestSuite extends TestSuite {
- public OrderedTestSuite(Class theClass, String name) {
- this(theClass);
- setName(name);
- }
-
- public OrderedTestSuite(final Class theClass) {
- super();
- setName(theClass.getName());
- try {
- getTestConstructor(theClass); // Avoid generating multiple error messages
- } catch (NoSuchMethodException e) {
- addTest(warning("Class " + theClass.getName()
- + " has no public constructor TestCase(String name) or TestCase()"));
- return;
- }
- if (!Modifier.isPublic(theClass.getModifiers())) {
- addTest(warning("Class " + theClass.getName() + " is not public"));
- return;
- }
- Class superClass = theClass;
- Vector names = new Vector();
-
- Method[] methods = superClass.getMethods();
- int size = methods.length;
- for (int i = 0; i < size - 1; i++) {
- for (int j = i + 1; j < size; j++) {
- if (methods[i].getName().compareTo(methods[j].getName()) > 0) {
- Method m = methods[i];
- methods[i] = methods[j];
- methods[j] = m;
- }
- }
- }
- for (int i = 0; i < size; i++) {
- addTestMethod(methods[i], names, theClass);
- }
- if (!tests().hasMoreElements())
- addTest(warning("No tests found in " + theClass.getName()));
- }
-
- private void addTestMethod(Method m, Vector names, Class theClass) {
- String name = m.getName();
- if (names.contains(name))
- return;
- if (!isPublicTestMethod(m)) {
- if (isTestMethod(m))
- addTest(warning("Test method isn't public: " + m.getName()));
- return;
- }
- names.addElement(name);
- addTest(createTest(theClass, name));
- }
-
- private boolean isPublicTestMethod(Method m) {
- return isTestMethod(m) && Modifier.isPublic(m.getModifiers());
- }
-
- private boolean isTestMethod(Method m) {
- String name = m.getName();
- Class[] parameters = m.getParameterTypes();
- Class returnType = m.getReturnType();
- return parameters.length == 0 && name.startsWith("test") && returnType.equals(Void.TYPE);
- }
-
- private Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/TestsPlugin.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/TestsPlugin.java
deleted file mode 100644
index 03ccdd4..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/TestsPlugin.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package org.eclipse.jst.j2ee.ejb.generation.tests;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-import java.util.*;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class TestsPlugin extends Plugin {
- //The shared instance.
- private static TestsPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public TestsPlugin() {
- super();
- plugin = this;
- }
-
- /**
- * This method is called upon plug-in activation
- */
- public void start(BundleContext context) throws Exception {
- super.start(context);
- }
-
- /**
- * This method is called when the plug-in is stopped
- */
- public void stop(BundleContext context) throws Exception {
- super.stop(context);
- plugin = null;
- resourceBundle = null;
- }
-
- /**
- * Returns the shared instance.
- */
- public static TestsPlugin getDefault() {
- return plugin;
- }
-
- /**
- * Returns the string from the plugin's resource bundle,
- * or 'key' if not found.
- */
- public static String getResourceString(String key) {
- ResourceBundle bundle = TestsPlugin.getDefault().getResourceBundle();
- try {
- return (bundle != null) ? bundle.getString(key) : key;
- } catch (MissingResourceException e) {
- return key;
- }
- }
-
- /**
- * Returns the plugin's resource bundle,
- */
- public ResourceBundle getResourceBundle() {
- try {
- if (resourceBundle == null)
- resourceBundle = ResourceBundle.getBundle("org.eclipse.jst.j2ee.ejb.generation.tests.TestsPluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/AnnotationTest.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/AnnotationTest.java
deleted file mode 100644
index 86cfef5..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/AnnotationTest.java
+++ /dev/null
@@ -1,228 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2002, 2003 Eteration Bilisim A.S., Naci Dai and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the GNU Lesser General Public License (LGPL)
- * which accompanies this distribution, and is available at
- * http://www.gnu.org/licenses/lgpl.html
- *
- * Contributors:
- * Eteration Bilisim A.S. - initial API and implementation
- * Naci M. Dai
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * 3. The end-user documentation included with the redistribution, if
- * any, must include the following acknowlegement:
- * "This product includes software developed by the
- * Eteration Bilisim A.S and Naci Dai (http://www.eteration.com/)."
- * Alternately, this acknowlegement may appear in the software itself,
- * if and wherever such third-party acknowlegements normally appear.
- *
- * 4. The names "Lomboz", "ObjectLearn" and "Eteration" must not be used to endorse or promote products derived
- * from this software without prior written permission. For written
- * permission, please contact info@eteration.com.
- *
- * 5. Products derived from this software may not be called "Lomboz"
- * nor may "Lomboz" appear in their names without prior written
- * permission of the Eteration Bilisim A.S.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Eteration Bilisim A.S. For more
- * information on eteration, please see
- * <http://www.eteration.com/>.
- ***************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.generation.tests.common;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.HashMap;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.common.jdt.internal.integration.JavaProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.FlexibleJavaProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.SessionBeanDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbComponentCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.servertarget.J2EEProjectServerTargetDataModelProvider;
-import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelOperation;
-import org.eclipse.wst.server.core.IRuntime;
-import org.eclipse.wst.server.core.IRuntimeType;
-import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
-import org.eclipse.wst.server.core.IServerType;
-import org.eclipse.wst.server.core.IServerWorkingCopy;
-import org.eclipse.wst.server.core.ServerCore;
-import org.eclipse.wst.server.core.ServerUtil;
-import org.eclipse.wst.server.core.model.RuntimeDelegate;
-
-public abstract class AnnotationTest extends TestCase {
-
- protected static final String EJB_NAME = "Cow";
- protected static final String MODULE_NAME = "zoo";
- protected static final String PROJECT_NAME = "TestEjbProject";
- protected static final String SOURCE_FOLDER = "/"+MODULE_NAME+"/ejbModule";
- public static final String BEAN_PACKAGE = "com.farm";
- public static final String BEAN_CLASS = "CowBean";
-
- /**
- *
- */
- public AnnotationTest() {
- super();
- }
-
- /**
- * @param name
- */
- public AnnotationTest(String name) {
- super(name);
- }
-
- public static final String XDOCLET = "XDoclet";
-
- protected IDataModelOperation createFlexibleProject() throws Exception {
- FlexibleJavaProjectCreationDataModelProvider provider = new FlexibleJavaProjectCreationDataModelProvider();
- DataModelFactory.createDataModel(provider);
-
- IDataModel creationDataModel = provider.getDataModel();
- creationDataModel.setProperty(FlexibleJavaProjectCreationDataModelProvider.PROJECT_NAME, PROJECT_NAME);
- creationDataModel.setProperty(JavaProjectCreationDataModelProvider.SOURCE_FOLDERS, new String[] { "ejbModules" });
- IRuntime runtime = getRuntimeTarget();
- creationDataModel.setProperty(J2EEProjectServerTargetDataModelProvider.RUNTIME_TARGET_ID, runtime.getId());
-
- return provider.getDefaultOperation();
- }
-
- public IRuntime getRuntimeTarget() throws Exception {
-
- // Finds the generic server type
- IServerType[] sTypes = ServerCore.getServerTypes();
- IServerType serverType = null;
- for (int i = 0; i < sTypes.length; i++) {
- IServerType sType = sTypes[i];
- if (TestSettings.runtimeid.equals(sType.getId()))
- serverType = sType;
- }
- assertNotNull("Could not find " + TestSettings.runtimeid + " server type", serverType);
-
- // Finds the generic server runtime type
- IRuntimeType runtimeType = serverType.getRuntimeType();
- assertNotNull("Could not find runtime type for the generic server type", runtimeType);
-
- // Create a new server instance from the type
- IServerWorkingCopy server = serverType.createServer(TestSettings.runtimeid + ".Jonas.Server", null, (IRuntime) null, null);
- assertNotNull("Could not create server", server);
-
- // Create a new runtime instance from the type
- IRuntime runtime = runtimeType.createRuntime(TestSettings.runtimeid + ".Jonas.Runtime", null);
-
- assertNotNull("Could not create runtime", runtime);
-
- // Set the runtime for the server
- server.setRuntime(runtime);
-
- // Save the server
- server.save(false, null);
-
- // Set properties for the runtime
- IRuntimeWorkingCopy runtimeWorkingCopy = runtime.createWorkingCopy();
- assertNotNull("Could not create runtime working copy", runtimeWorkingCopy);
-
- // Set the JONAS runtime as the default runtime
- ServerUtil.setRuntimeDefaultName(runtimeWorkingCopy);
- assertNotNull("Runtime working copy has no name", runtimeWorkingCopy.getName());
-
- // Set properties for the JONAS runtime
- GenericServerRuntime runtimeDelegate = (GenericServerRuntime) runtimeWorkingCopy.loadAdapter(RuntimeDelegate.class,
- new NullProgressMonitor());
- assertNotNull("Could not obtain runtime delegate", runtimeDelegate);
-
- HashMap props = new HashMap();
- props.put("mappernames", "");
- props.put("classPathVariableName", "JONAS");
- props.put("serverAddress", "127.0.0.1");
- props.put("jonasBase", TestSettings.serverlocation);
- props.put("jonasRoot", TestSettings.serverlocation);
- props.put("classPath", TestSettings.serverlocation);
- props.put("protocols", TestSettings.serverlocation);
- props.put("port", "9000");
- runtimeDelegate.setServerInstanceProperties(props);
-
- // Save the runtime working copy
- runtimeWorkingCopy.save(false, null);
-
- return runtime;
- }
-
- protected IDataModel createDefaultSessionModel() {
- SessionBeanDataModelProvider provider = new SessionBeanDataModelProvider();
- DataModelFactory.createDataModel(provider);
- IDataModel model = provider.getDataModel();
- model.setProperty(SessionBeanDataModelProvider.ANNOTATIONPROVIDER, XDOCLET);
-
- model.setBooleanProperty(SessionBeanDataModelProvider.MODIFIER_ABSTRACT, true);
- model.setProperty(SessionBeanDataModelProvider.CLASS_NAME, BEAN_CLASS);
- model.setProperty(SessionBeanDataModelProvider.JAVA_PACKAGE, BEAN_PACKAGE);
-
- model.setProperty(SessionBeanDataModelProvider.PROJECT_NAME, PROJECT_NAME);
- model.setProperty(SessionBeanDataModelProvider.SOURCE_FOLDER, SOURCE_FOLDER);
- //model.setProperty(SessionBeanDataModelProvider.JAVA_SOURCE_FOLDER, SOURCE_FOLDER);
- model.setProperty(SessionBeanDataModelProvider.COMPONENT_NAME, MODULE_NAME);
- model.setProperty(SessionBeanDataModelProvider.EJB_NAME, EJB_NAME);
- model.setProperty(SessionBeanDataModelProvider.JNDI_NAME, EJB_NAME);
- model.setProperty(SessionBeanDataModelProvider.DISPLAY_NAME, EJB_NAME);
- return model;
- }
-
- protected IDataModelOperation createEjbModuleAndProject() throws Exception {
-
- //IDataModelOperation flexibleJavaProjectCreationOperation = createFlexibleProject();
- //flexibleJavaProjectCreationOperation.execute(new NullProgressMonitor(), null);
- EjbComponentCreationDataModelProvider aProvider = new EjbComponentCreationDataModelProvider();
- DataModelFactory.createDataModel(aProvider);
- IDataModel a = aProvider.getDataModel();
- IRuntime runtime = getRuntimeTarget();
-
- a.setProperty(J2EEProjectServerTargetDataModelProvider.RUNTIME_TARGET_ID, runtime.getId());
- a.setBooleanProperty(EjbComponentCreationDataModelProvider.ADD_TO_EAR, false);
- a.setProperty(EjbComponentCreationDataModelProvider.JAVASOURCE_FOLDER, SOURCE_FOLDER);
- a.setProperty(EjbComponentCreationDataModelProvider.COMPONENT_NAME, MODULE_NAME);
- a.setProperty(EjbComponentCreationDataModelProvider.PROJECT_NAME, PROJECT_NAME);
-
- a.setProperty(EjbComponentCreationDataModelProvider.COMPONENT_DEPLOY_NAME, MODULE_NAME);
- a.setBooleanProperty(EjbComponentCreationDataModelProvider.CREATE_CLIENT, false);
- a.getDefaultOperation().execute(new NullProgressMonitor(), null);
-
- return a.getDefaultOperation();
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/EjbModuleCreationTest.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/EjbModuleCreationTest.java
deleted file mode 100644
index 766a593..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/EjbModuleCreationTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- *
- */
-package org.eclipse.jst.j2ee.ejb.generation.tests.common;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.operations.AddSessionBeanOperation;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.preferences.AnnotationPreferenceStore;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletAntProjectBuilder;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletPreferenceStore;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author naci
- */
-public class EjbModuleCreationTest extends AnnotationTest {
-
-
- public void test01CreateEjbModule() throws Exception {
- this.createEjbModuleAndProject();
- IProject project = (IProject) ResourcesPlugin.getWorkspace().getRoot().findMember(PROJECT_NAME); // Project.ge.getProject(PROJECT_NAME);
- assertNotNull(project);
- }
-
- public void test04TestXDocletBuilder(){
-
- IProject project = (IProject) ResourcesPlugin.getWorkspace().getRoot().findMember(PROJECT_NAME); // Project.ge.getProject(PROJECT_NAME);
- assertNotNull(project);
- IFile bean = project.getFile(new Path(SOURCE_FOLDER+"/com/farm/CowBean.java"));
- assertNotNull(bean);
-
- IVirtualResource[] vResources = ComponentCore.createResources(bean);
- assertTrue(vResources.length > 0);
- assertNotNull(vResources[0].getComponent());
-
- XDocletAntProjectBuilder antProjectBuilder = XDocletAntProjectBuilder.Factory.newInstance(bean);
- antProjectBuilder.buildUsingAnt(bean, new NullProgressMonitor());
-
- IFile bean2 = project.getFile(new Path(SOURCE_FOLDER+"/com/farm/CowUtilities.java"));
- assertNotNull(bean2);
- }
- public void test02SetXDocletPreferences() throws Exception {
- IProject project = (IProject) ResourcesPlugin.getWorkspace().getRoot().findMember(PROJECT_NAME); // Project.ge.getProject(PROJECT_NAME);
- assertNotNull(project);
-
- XDocletPreferenceStore store = new XDocletPreferenceStore(project);
- AnnotationPreferenceStore.setProperty(AnnotationPreferenceStore.ANNOTATIONPROVIDER, XDOCLET);
- store.setProperty(XDocletPreferenceStore.XDOCLETBUILDERACTIVE, true);
- store.setProperty(XDocletPreferenceStore.XDOCLETUSEGLOBAL,false);
- store.setProperty(XDocletPreferenceStore.XDOCLETVERSION, TestSettings.xdocletversion);
- store.setProperty(XDocletPreferenceStore.XDOCLETHOME, TestSettings.xdocletlocation);
- store.save();
- assertEquals(store.getProperty(XDocletPreferenceStore.XDOCLETHOME),TestSettings.xdocletlocation);
- }
-
-
- public void test03CreateSessionBean() throws Exception {
- IProject project = (IProject) ResourcesPlugin.getWorkspace().getRoot().findMember(PROJECT_NAME); // Project.ge.getProject(PROJECT_NAME);
- assertNotNull(project);
- IDataModel commonDataModel = createDefaultSessionModel();
- AddSessionBeanOperation sessionBeanOperation = new AddSessionBeanOperation(commonDataModel);
- sessionBeanOperation.execute(new NullProgressMonitor(), null);
-
- IFile bean = project.getFile(new Path(SOURCE_FOLDER+"/com/farm/CowBean.java"));
- assertNotNull(bean);
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/EnterpriseBeanModelTest.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/EnterpriseBeanModelTest.java
deleted file mode 100644
index 041c3e4..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/EnterpriseBeanModelTest.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.generation.tests.common;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.SessionBeanDataModelProvider;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author naci
- *
- */
-public class EnterpriseBeanModelTest extends AnnotationTest {
-
-
- public void testSessionBeanDataModel() throws Exception
- {
- createEjbModuleAndProject();
-
- IDataModel dataModel = createDefaultSessionModel();
-
- assertNotNull(dataModel);
- IStatus status = dataModel.validate();
- assertTrue(status.isOK() );
-
- assertEquals(PROJECT_NAME,dataModel.getStringProperty(SessionBeanDataModelProvider.PROJECT_NAME));
-
-
- assertEquals(BEAN_CLASS, dataModel.getProperty(SessionBeanDataModelProvider.CLASS_NAME));
- String[] interfaces = (String[])dataModel.getProperty(SessionBeanDataModelProvider.EJB_INTERFACES);
- assertEquals(1, interfaces.length);
- assertEquals("javax.ejb.SessionBean", interfaces[0]);
-
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/ExistenceTest.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/ExistenceTest.java
deleted file mode 100644
index 2536474..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/ExistenceTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2005 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- * IBM Corporation - Initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.ejb.generation.tests.common;
-
-import org.eclipse.jst.j2ee.ejb.annotation.internal.model.ModelPlugin;
-import org.eclipse.jst.j2ee.ejb.annotation.ui.internal.EjbAnnotationsUiPlugin;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.emitter.EjbEmitterPlugin;
-import org.eclipse.jst.j2ee.ejb.annotations.internal.xdoclet.XDocletAnnotationPlugin;
-
-import junit.framework.TestCase;
-
-public class ExistenceTest extends TestCase {
- public void testModelPluginExists() {
- assertNotNull(ModelPlugin.getDefault());
- }
- public void testEmitterPluginExists() {
- assertNotNull(EjbEmitterPlugin.getDefault());
- }
- public void testEjbUIPluginExists() {
- assertNotNull(EjbAnnotationsUiPlugin.getDefault());
- }
- public void testXDocletPluginExists() {
- assertNotNull(XDocletAnnotationPlugin.getDefault());
- }
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/TestSettings.java b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/TestSettings.java
deleted file mode 100644
index f533306..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/src/org/eclipse/jst/j2ee/ejb/generation/tests/common/TestSettings.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/***************************************************************************************************
- * Copyright (c) 2005 Eteration A.S. and others. All rights reserved. This program and the
- * accompanying materials are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors: Eteration A.S. - initial API and implementation
- **************************************************************************************************/
-
-package org.eclipse.jst.j2ee.ejb.generation.tests.common;
-
-/**
- * @author naci
- *
- */
-public class TestSettings {
-
- public static String runtimeid = "org.eclipse.jst.server.generic.jonas4";
- public static String serverlocation = "C:\\nmd\\dev\\java\\appservers\\JOnAS-4.1.4";
- public static String xdocletlocation = "c:\\downloads\\xdoclet-1.2.2";
- public static String xdocletversion = "1.2.2";
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/test.xml b/tests/org.eclipse.jst.j2ee.ejb.generation.tests/test.xml
deleted file mode 100644
index 6fdd602..0000000
--- a/tests/org.eclipse.jst.j2ee.ejb.generation.tests/test.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="testsuite" default="run" basedir=".">
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <!-- <property name="eclipse-home" value="${basedir}\..\.."/> -->
- <echo message="basedir ${basedir}" />
- <echo message="eclipse place ${eclipse-home}" />
- <!-- sets the properties plugin-name, and library-file -->
- <property name="plugin-name" value="org.eclipse.jst.j2ee.ejb.generation.tests"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
- <property name="extraVMargs" value="-Dorg.eclipse.jst.server.generic.jonas414=${testDir}/${jonas432DirName} -Dorg.eclipse.jst.xdoclet.location=${testDir}/${xdocletDirName} -Dorg.eclipse.jst.xdoclet.version=${xdocletVersion}"/>
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp/>
- <delete>
- <fileset dir="${eclipse-home}" includes="org*.xml"/>
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="jst-folder" value="${eclipse-home}/jst_folder"/>
- <delete dir="${jst-folder}" quiet="true"/>
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${jst-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.j2ee.ejb.generation.tests.common.AllEJBGenerationTests"/>
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- This target runs the test suite. Any actions that need to happen -->
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml"/>
- <property name="output-file" value="${plugin-name}.xml"/>
- </ant>
- </target>
-</project>
\ No newline at end of file
