Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java')
-rw-r--r--bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java18
1 files changed, 0 insertions, 18 deletions
diff --git a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java b/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java
deleted file mode 100644
index e8d48b71f..000000000
--- a/bundles/org.eclipse.jst.ws.ui/src/org/eclipse/jst/ws/internal/ui/action/WebServiceDeploy.java
+++ /dev/null
@@ -1,18 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2000, 2004 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.ws.internal.ui.action;
-import org.eclipse.core.resources.IResource;
-
-
-public interface WebServiceDeploy {
- public void run(IResource selection);
-}

Back to the top

avaee.tests.git/diff/tests/org.eclipse.jem.tests/Java%20AllSuites.launch?h=v201009141216'>tests/org.eclipse.jem.tests/Java AllSuites.launch260
-rw-r--r--tests/org.eclipse.jem.tests/META-INF/MANIFEST.MF36
-rw-r--r--tests/org.eclipse.jem.tests/about.html25
-rw-r--r--tests/org.eclipse.jem.tests/about.ini29
-rw-r--r--tests/org.eclipse.jem.tests/about.mappings6
-rw-r--r--tests/org.eclipse.jem.tests/about.properties28
-rw-r--r--tests/org.eclipse.jem.tests/build.properties27
-rw-r--r--tests/org.eclipse.jem.tests/eclipse32.pngbin4594 -> 0 bytes-rw-r--r--tests/org.eclipse.jem.tests/javatests/InitParserTest46376.java31
-rw-r--r--tests/org.eclipse.jem.tests/javatests/initParserTest46376/SameNameTestClass.java38
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/.classpath6
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/AllSuites.java82
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JDK5BinReflectionTests.java37
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JDK5ReflectionSuite.java56
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JDK5ReflectionTests.java689
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JavaProjectUtil.java259
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JavaTestsPlugin.java38
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/UITester.java26
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/basic/BasicSuite.java94
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/basic/TestWorkbenchUtils112678.java166
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/AbstractBeanInfoTestCase.java99
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/BeanInfoSuite.java101
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestAWTSwingUI.java536
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestReflection.java232
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestStandard.java629
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/InstantiationSuite.java98
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/TestStandard.java202
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/IListenerTester.java30
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/ListenersSuite.java93
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestBeanInfo.java183
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestBeaninfoAdapterFactory.java138
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestJEM.java135
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestJavaJDOMAdapterFactory.java234
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestListeners.java353
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/AbstractTestProxy.java131
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ExpressionTest.java3303
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ExpressionThreadTransferCallBack.java71
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ProxySuite.java86
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/TestAWTProxy.java116
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/TestCallback.java128
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/TestCallbackStream.java112
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/TestStandard.java796
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ide/IDEProxySuite.java93
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/AbstractInitParserTestCase.java70
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/AbstractInitStringParserTestHelper.java66
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/ArrayConstructorTest.java130
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/BlockTest.java108
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/BorderTest.java114
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/CastTest.java79
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/CharTest.java51
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/ExceptionTest.java45
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/InitParserSuite.java85
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/InitStringParserTestHelper.java134
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/JFCTest.java136
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/LiteralTest.java48
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/MultiArgConstructorTest.java62
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/MultiArgInstanceTest.java54
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/MultiArgStaticMethodTest.java54
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/NavigationParameters.java244
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/NeedsCodingTest.java61
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/NumberTest.java69
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/OverloadingTest.java40
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/SameName46376Test.java41
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/StringTest.java54
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTArraysTest.java65
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTFieldAccessTest.java72
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTInnerClassAccessTest.java72
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTMiscTest.java72
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTNestFieldAccessTestData.java29
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTOperationsTest.java84
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTParserSuite.java133
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTTreeInitStringParserTestHelper.java238
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/InnerClassTestData.java76
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/TestCompatibleMethods.java83
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/TestCompatibleMethodsData.java35
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/TestCompatibleMethodsData1.java33
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/remote/RemoteProxySuite.java126
-rw-r--r--tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/remote/TestProjectAccess.java62
-rw-r--r--tests/org.eclipse.jem.tests/plugin.properties18
-rw-r--r--tests/org.eclipse.jem.tests/plugin.xml21
-rw-r--r--tests/org.eclipse.jem.tests/proxy.jars2
-rw-r--r--tests/org.eclipse.jem.tests/test.xml.off51
-rw-r--r--tests/org.eclipse.jem.tests/testdata/JDK5BinTests.jarbin2881 -> 0 bytes-rw-r--r--tests/org.eclipse.jem.tests/testdata/JDK5Tests.zipbin4782 -> 0 bytes-rw-r--r--tests/org.eclipse.jem.tests/testdata/extjarops.txt4
-rw-r--r--tests/org.eclipse.jem.tests/testdata/extjarprops.txt28
-rw-r--r--tests/org.eclipse.jem.tests/testdata/jlabelops.txt173
-rw-r--r--tests/org.eclipse.jem.tests/testdata/jlabelprops.txt61
-rw-r--r--tests/org.eclipse.jem.tests/testdata/overrides/beaninfo/TestOverrides.override12
-rw-r--r--tests/org.eclipse.jem.tests/testdata/testbasic.zipbin2373 -> 0 bytes-rw-r--r--tests/org.eclipse.jem.tests/testdata/testbeaninfo.zipbin50112 -> 0 bytes-rw-r--r--tests/org.eclipse.jem.tests/testdata/testbeaninfobeaninfos.zipbin1893 -> 0 bytes-rw-r--r--tests/org.eclipse.jem.tests/testdata/testbeaninfopreq.zipbin12701 -> 0 bytes-rw-r--r--tests/org.eclipse.jem.tests/testdata/testbuttonbeaninfoui1projectjar.zipbin4067 -> 0 bytes-rw-r--r--tests/org.eclipse.jem.tests/testdata/testremoteproject.zipbin1272 -> 0 bytes-rw-r--r--tests/org.eclipse.jem.tests/testdata/unzip.xml5
-rw-r--r--tests/org.eclipse.jem.tests/vm_tests/org/eclipse/jem/tests/proxy/vm/TestCallback.java87
-rw-r--r--tests/org.eclipse.jem.tests/vm_tests/org/eclipse/jem/tests/proxy/vm/TestCallbackStream.java63
-rw-r--r--tests/org.eclipse.jem.tests/vm_tests/org/eclipse/jem/tests/proxy/vm/TestExpressionThreadTransfer.java68
-rw-r--r--tests/org.eclipse.jem.tests/vm_tests/testPackage/TestAccess.java74
-rw-r--r--tests/org.eclipse.jem.tests/vm_tests/testPackage/TestCtorWithNull.java27
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests.performance/.classpath7
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests.performance/.cvsignore4
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests.performance/.project28
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests.performance/about.html34
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests.performance/build.properties7
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests.performance/plugin.xml26
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests.performance/src/org/eclipse/jst/j2ee/core/tests/performance/AllCorePerformanceTests.java79
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests.performance/src/org/eclipse/jst/j2ee/core/tests/performance/CorePerformanceTestPlugin.java72
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests.performance/test.xml53
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests.performance/testcase.xml47
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/.classpath8
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/.cvsignore5
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/.project27
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/.settings/org.eclipse.jdt.core.prefs58
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/META-INF/MANIFEST.MF35
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/META-INF/eclipse.inf6
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/about.html34
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/build.properties27
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/build/buildcontrol.properties6
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/build/package.xml20
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/build/wsBuild.xml41
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/.cvsignore2
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/application-client.xml142
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/application.xml54
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/ejb-jar.xml2869
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/ra.xml102
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/web.xml1284
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/application-client.xml142
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/application.xml54
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ejb-jar.xml1864
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ejb-jar1-1.xml2831
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ejb-jar2-0.xml2863
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ejb-jar2-0sax.xml2859
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ra.xml103
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/web.xml1285
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/.metadata/.plugins/com.ibm.etools.j2ee/looseApp.xmi8
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/.metadata/.plugins/com.ibm.etools.j2ee/looseConfig.xmi10
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseConnector/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseConnector/META-INF/application.xml7
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseConnector/fooRAR/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseConnector/fooRAR/META-INF/ra.xml103
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAR/META-INF/application.xml13
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAR/META-INF/ibm-application-ext.xmi10
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARApp/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARApp/META-INF/application.xml7
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARApp/fooAPP/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARApp/fooAPP/META-INF/application-client.xml272
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/.classpath7
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/.j2ee4
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/.project41
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/.runtime2
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/META-INF/ejb-jar.xml19
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/META-INF/ibm-ejb-jar-bnd.xmi7
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/META-INF/ibm-ejb-jar-ext.xmi4
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/com/ibm/test/ejb/MyCMP.classbin135 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/com/ibm/test/ejb/MyCMPBean.classbin2291 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/com/ibm/test/ejb/MyCMPHome.classbin417 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/com/ibm/test/ejb/MyCMPKey.classbin831 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/META-INF/ejb-jar.xml35
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/META-INF/ibm-ejb-jar-bnd.xmi11
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/META-INF/ibm-ejb-jar-ext.xmi4
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/com/ibm/test/ejb/MyCMP.java6
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/com/ibm/test/ejb/MyCMPBean.java97
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/com/ibm/test/ejb/MyCMPHome.java14
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/com/ibm/test/ejb/MyCMPKey.java39
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP1Bean.java72
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP1Key.java38
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP1Local.java6
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP1LocalHome.java16
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP2Bean.java72
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP2Key.java38
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP2Local.java6
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP2LocalHome.java16
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/.classpath11
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/.websettings4
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/source/com/ibm/test/web/C.java14
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/META-INF/MANIFEST.MF3
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/WEB-INF/classes/com/ibm/test/web/C.classbin384 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/WEB-INF/ibm-web-bnd.xmi3
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/WEB-INF/ibm-web-ext.xmi10
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/WEB-INF/web.xml13
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaUtil/.classpath6
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaUtil/bin/com/ibm/test/A.classbin376 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaUtil/src/com/ibm/test/A.java14
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaWebLib/.classpath6
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaWebLib/bin/com/ibm/web/test/B.classbin384 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaWebLib/src/com/ibm/web/test/B.java14
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/boo.jar/META-INF/MANIFEST.MF4
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/foobar.jarbin300 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/readme.txt1
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AllDOMTests.java59
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AllSAXTests.java59
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AllTests.java33
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AppClientEMFEditTest.java64
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AppClientEMFTest.java124
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EarEMFEditTest.java117
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EarEMFTest.java170
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EjbEMFEditTest.java321
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EjbEMFTest.java347
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/GeneralEMFEditingTest.java479
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/GeneralEMFPopulationTest.java491
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/GeneralEMFTest.java93
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/RarEMFEditTest.java63
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/RarEMFTest.java141
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/ResolverTest.java264
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WarEMFEditTest.java139
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WarEMFTest.java224
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WebServicesEMFTest.java246
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/AbstractArchiveTest.java84
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/AllArchiveTestsEclipse.java20
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/AllArchiveTestsJava.java58
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/ClientContainerResourceLoadTest.java104
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/CopyTests.java234
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/DefectVerificationTests.java383
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/DiscriminatorTest.java107
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/DomComparitor.java285
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/InitializationTests.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/JavaTests.java61
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/LooseArchiveTests.java282
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/RarFileTests.java207
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/ResourceTests.java112
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/SaveTests.java106
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/SecurityRoleTests.java119
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/SimpleTests.java433
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/TestInvalidXmlMultiplicity.java79
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/TestModuleClassLoading.java107
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/WARFileTests.java108
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/testutilities/EAttributeDescriptor.java70
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/testutilities/EMFAttributeFeatureGenerator.java473
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/testutilities/J2EEVersionCheck.java210
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/testutilities/TestUtilities.java115
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/core/tests/bvt/AutomatedBVT.java68
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/core/tests/bvt/AutomatedBVTEclipse.java33
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/emfload/LoadJaxRPCMapOutsideWorkspace.java96
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/emfload/LoadWebServicesOutsideWorkspace.java93
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/application/test/ApplicationFactoryTest.java76
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/application/test/ApplicationTest.java247
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/client/test/ApplicationClientTest.java185
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/client/test/ClientFactoryTest.java37
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/CommonFactoryTest.java218
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/CompatibilityDescriptionGroupTest.java99
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/EjbRefTest.java257
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/ListenerTest.java56
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/QNameTest.java96
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/CommonExample.java128
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/CommonTests.java49
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/CompatibilityDescriptionGroupTest.java70
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/DescriptionGroupTest.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/DescriptionTest.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/DisplayNameTest.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/EJBLocalRefTest.java70
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/EjbRefTest.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/EnvEntryTest.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/IconTypeTest.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/IdentityTest.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/JNDIEnvRefsGroupTest.java38
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/ListenerTest.java70
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/MessageDestinationRefTest.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/MessageDestinationTest.java70
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/ParamValueTest.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/QNameTest.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/ResourceEnvRefTest.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/ResourceRefTest.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/RunAsSpecifiedIdentityTest.java70
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/SecurityIdentityTest.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/SecurityRoleRefTest.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/SecurityRoleTest.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/UseCallerIdentityTest.java70
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/core/api/test/AllCoreAPITests.java33
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/core/api/test/AutomatedAPIBVT.java64
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/core/tests/api/AllAPITest.java75
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/AssemblyDescriptorTest.java220
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/CMPAttributeTest.java186
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/CMRFieldTest.java87
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/ContainerManagedEntityTest.java398
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EJBJarTest.java589
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EJBRelationTest.java154
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EJBRelationshipRoleTest.java307
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EjbEMFTestBase.java40
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EjbFactoryTest.java285
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EntityTest.java141
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/MethodElementTest.java527
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/MethodPermissionTest.java187
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/MethodTransactionTest.java160
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/QueryMethodTest.java96
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/QueryTest.java130
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/SessionTest.java116
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/jca/test/ConnectorTest.java45
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/jca/test/JcaFactoryTest.java159
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/jsp/test/JspFactoryTest.java56
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/webapplication/test/WebapplicationFactoryTest.java281
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/webservice/wscommon/test/WscommonFactoryTest.java82
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/webservice/wsdd/test/WsddFactoryTest.java101
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/out.xmi110
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/test.xml58
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/MANIFEST.MF5
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/Table.ddl13
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/Map.mapxmi34
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/Table.ddl13
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB.dbxmi6
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID.schxmi5
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID_ACCOUNT.tblxmi27
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/ibm_pmbab.properties2
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/ejb-jar.xml77
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/ibm-ejb-jar-bnd.xmi14
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/ibm-ejb-jar-ext-pme.xmi34
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/ibm-ejb-jar-ext.xmi22
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/META-INF/ejb-jar.xml16
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/ejbs/T1.classbin117 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/ejbs/T1Bean.classbin925 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/ejbs/T1Home.classbin240 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/sl/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/sl/META-INF/ejb-jar.xml15
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/sl/ejbs/T1.classbin117 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/sl/ejbs/T1Bean.classbin925 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/sl/ejbs/T1Home.classbin240 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/webservices/META-INF/AnnuityServices_mapping.xml461
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/webservices/META-INF/ibm-webservices-bnd.xmi7
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/webservices/META-INF/ibm-webservices-ext.xmi6
-rw-r--r--tests/org.eclipse.jst.j2ee.core.tests/testData/webservices/META-INF/webservices.xml21
-rw-r--r--tests/org.eclipse.jst.j2ee.tests.performance/.classpath7
-rw-r--r--tests/org.eclipse.jst.j2ee.tests.performance/.cvsignore4
-rw-r--r--tests/org.eclipse.jst.j2ee.tests.performance/.project28
-rw-r--r--tests/org.eclipse.jst.j2ee.tests.performance/about.html34
-rw-r--r--tests/org.eclipse.jst.j2ee.tests.performance/build.properties5
-rw-r--r--tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/BasePerformanceTestCase.java166
-rw-r--r--tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/EJBProjectCreationTestCase.java30
-rw-r--r--tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/HeaderParserPerformanceTest.java132
-rw-r--r--tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/PerformancePlugin.java74
-rw-r--r--tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/PerformanceTestCaseWrapper.java162
-rw-r--r--tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/PerformanceTestObject.java47
-rw-r--r--tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/PerformanceTestSuite.java46
-rw-r--r--tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/TestCaseSAXParser.java139
-rw-r--r--tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/WTPHeadlessPerformanceTests.java24
-rw-r--r--tests/org.eclipse.jst.j2ee.tests.performance/plugin.xml27
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/.classpath12
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/.cvsignore4
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/.project28
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/.settings/org.eclipse.jdt.core.prefs59
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/.settings/org.eclipse.jdt.ui.prefs3
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/.settings/org.eclipse.pde.prefs15
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/149995.earbin14369 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/149995BinaryClasspathTest.earbin11020 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/BeenThere.earbin96578 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/Collision.earbin3048 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158Client.jarbin1213 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158Connector.rarbin608 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158EJB.jarbin644 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158Util.jarbin1754 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158Web.warbin843 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/META-INF/MANIFEST.MF2
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/META-INF/application.xml20
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/EARForLibDep.earbin3918 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/EJBLocalAndRemoteRefEARWithClientJars.earbin25120 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/Example1.warbin1562 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/JarTest.auto.jarbin403 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/JarTest.man.jarbin189 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/WebDavTest.warbin1942 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/WorkAreaFvtApp.earbin1029707 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/componentLoadAdapterTestData/testblah.warbin807 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/sib.test.mediations.m5.JsMBR.earbin1253903 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/DefectTestData/undeployed_DefaultApplication.earbin32593 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/META-INF/MANIFEST.MF71
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/META-INF/eclipse.inf6
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/.cvsignore1
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/12AppClientTest.jarbin947 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/13AppClient.jarbin1297 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/13AppClientTest.jarbin933 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/AppClientExpTest.jarbin1331 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/AppClientNoSource.jarbin1540 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/AppClientSomeSource.jarbin2136 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/AppClientSource.jarbin2444 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/BindingsHelperTests/BindingsTestEAR.earbin4464 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/Test1.jarbin509 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/Test2.jarbin506 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/Test3.jarbin505 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/Test3_bin/test/Test3.classbin258 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/other/Test3.jarbin505 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/DefectTests/EJB100441NoClient.jarbin3079 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/SimpleEAR.earbin6085 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test12EJBEAR.earbin9063 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test12WEBEJBEAR.earbin15237 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test13EJBEAR.earbin11766 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test13WEBEJBEAR.earbin14410 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test14EJBEAR.earbin10612 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test14WEBEJBEAR.earbin14057 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test14WEBEJBEARWithMetaData.earbin17158 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/UtilityJarTestEAR.earbin3810 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/UtilityJarWebLibWithMetaDataFilesEAR.earbin5775 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/EJBImportTests/Test13EJB.jarbin14438 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/EJBImportTests/Test14EJB.jarbin9410 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/EJBImportTests/TestEJB3.jarbin10215 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/GenralArtifactTest/J2EEArtifactEditTestProjects.zipbin197813 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/GenralArtifactTest/perfWAR.zipbin701471 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_Defaults.jarbin1866 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_InterestingName_Defaults.jarbin1872 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_InterestingName_NoBuild.jarbin1872 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_InterestingName_Source.jarbin2473 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_InterestingName_Source_NoBuild.jarbin2473 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_NoBuild.jarbin1866 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_Source.jarbin2467 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_Source_NoBuild.jarbin2467 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_Defaults_Defaults.jarbin1864 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_Defaults_NoBuild.jarbin1864 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_Defaults_Source.jarbin2465 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_Defaults_Source_NoBuild.jarbin2465 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_InterestingName_Defaults.jarbin1870 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_InterestingName_NoBuild.jarbin1870 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_InterestingName_Source.jarbin2471 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_InterestingName_Source_NoBuild.jarbin2471 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_NoDefaultClass_Defaults.jarbin1497 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_NoDefaultClass_NoBuild.jarbin1497 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_NoDefaultClass_Source.jarbin1829 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_NoDefaultClass_Source_NoBuild.jarbin1829 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_Defaults.jarbin1862 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_InterestingName_Defaults.jarbin1866 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_InterestingName_NoBuild.jarbin1866 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_InterestingName_Source.jarbin2467 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_InterestingName_Source_NoBuild.jarbin2467 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_NoBuild.jarbin1862 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_Source.jarbin2463 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_Source_NoBuild.jarbin2463 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_Defaults_Defaults.jarbin1858 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_Defaults_NoBuild.jarbin1858 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_Defaults_Source.jarbin2459 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_Defaults_Source_NoBuild.jarbin2459 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_InterestingName_Defaults.jarbin1865 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_InterestingName_NoBuild.jarbin1865 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_InterestingName_Source.jarbin2466 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_InterestingName_Source_NoBuild.jarbin2466 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_NoDefaultClass_Defaults.jarbin1491 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_NoDefaultClass_NoBuild.jarbin1491 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_NoDefaultClass_Source.jarbin1823 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_NoDefaultClass_Source_NoBuild.jarbin1823 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_Defaults.jarbin1866 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_InterestingName_Defaults.jarbin1870 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_InterestingName_NoBuild.jarbin1870 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_InterestingName_Source.jarbin2471 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_InterestingName_Source_NoBuild.jarbin2471 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_NoBuild.jarbin1866 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_Source.jarbin2467 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_Source_NoBuild.jarbin2467 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_Defaults_Defaults.jarbin1865 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_Defaults_NoBuild.jarbin1865 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_Defaults_Source.jarbin2466 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_Defaults_Source_NoBuild.jarbin2466 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_InterestingName_Defaults.jarbin1868 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_InterestingName_NoBuild.jarbin1868 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_InterestingName_Source.jarbin2469 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_InterestingName_Source_NoBuild.jarbin2469 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_NoDefaultClass_Defaults.jarbin1498 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_NoDefaultClass_NoBuild.jarbin1498 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_NoDefaultClass_Source.jarbin1830 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_NoDefaultClass_Source_NoBuild.jarbin1830 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Defaults.jarbin2007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Defaults.jarbin2007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_NoBuild.jarbin2007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Source.jarbin2007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Source_NoBuild.jarbin2007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_WithDD_Defaults.jarbin2328 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_WithDD_NoBuild.jarbin2328 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_WithDD_Source.jarbin2328 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_WithDD_Source_NoBuild.jarbin2328 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_NoBuild.jarbin2007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Source.jarbin2007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Source_NoBuild.jarbin2007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_WithDD_Defaults.jarbin2328 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_WithDD_NoBuild.jarbin2328 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_WithDD_Source.jarbin2328 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_WithDD_Source_NoBuild.jarbin2328 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Defaults.jarbin2007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_NoBuild.jarbin2007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Source.jarbin2007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Source_NoBuild.jarbin2007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Defaults.jarbin2007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_NoBuild.jarbin2007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Source.jarbin2007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Source_NoBuild.jarbin2007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Defaults.jarbin1100 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_NoBuild.jarbin1100 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Source.jarbin1100 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Source_NoBuild.jarbin1100 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_WithDD_Defaults.jarbin1533 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_WithDD_NoBuild.jarbin1533 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_WithDD_Source.jarbin1533 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_WithDD_Source_NoBuild.jarbin1533 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_WithDD_Defaults.jarbin2328 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_WithDD_NoBuild.jarbin2328 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_WithDD_Source.jarbin2328 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_WithDD_Source_NoBuild.jarbin2328 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Defaults.jarbin2347 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_NoBuild.jarbin2348 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Source.jarbin2348 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Source_NoBuild.jarbin2348 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Defaults.jarbin2348 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_NoBuild.jarbin2348 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Source.jarbin2348 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Source_NoBuild.jarbin2348 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Defaults.jarbin1553 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_NoBuild.jarbin1553 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Source.jarbin1553 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Source_NoBuild.jarbin1553 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Defaults.jarbin2348 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_NoBuild.jarbin2348 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Source.jarbin2348 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Source_NoBuild.jarbin2348 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/288180.earbin2054 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_ChangedContentDir_Defaults.earbin4298 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_ChangedContentDir_NoBuild.earbin4298 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_ChangedContentDir_Source.earbin4828 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_ChangedContentDir_Source_NoBuild.earbin4828 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_Defaults.earbin4327 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_NoBuild.earbin4327 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_Source.earbin4859 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_Source_NoBuild.earbin4859 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_ChangedContentDir_Defaults.earbin9509 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_ChangedContentDir_NoBuild.earbin9509 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_ChangedContentDir_Source.earbin10705 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_ChangedContentDir_Source_NoBuild.earbin10705 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_Defaults.earbin9534 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_NoBuild.earbin9534 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_Source.earbin10745 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_Source_NoBuild.earbin10745 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_ChangedContentDir_Defaults.earbin13138 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_ChangedContentDir_NoBuild.earbin13138 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_ChangedContentDir_Source.earbin14858 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_ChangedContentDir_Source_NoBuild.earbin14858 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_Defaults.earbin13144 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_NoBuild.earbin13193 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_Source.earbin14883 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_Source_NoBuild.earbin14913 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_Defaults.earbin21639 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_NoBuild.earbin21639 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_Source.earbin21639 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_Source_NoBuild.earbin21639 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_WithDD_Defaults.earbin22314 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_WithDD_NoBuild.earbin22314 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_WithDD_Source.earbin22314 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_WithDD_Source_NoBuild.earbin22314 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_Defaults.earbin21658 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_NoBuild.earbin21658 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_Source.earbin21658 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_Source_NoBuild.earbin21658 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_WithDD_Defaults.earbin22266 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_WithDD_NoBuild.earbin22265 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_WithDD_Source.earbin22265 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_WithDD_Source_NoBuild.earbin22265 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesNoDDs.earbin4249 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesNoDDsAndWithDDs.earbin7459 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesNoDDsAndWithDDs_WithUtil.earbin8078 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesNoDDs_WithUtil.earbin4868 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesWithDDs.earbin3391 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesWithDDs_WithUtil.earbin4010 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesNoDDs.earbin4797 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesNoDDsAndWithDDs.earbin8007 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesNoDDsAndWithDDs_WithUtil.earbin8626 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesNoDDs_WithUtil.earbin5416 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesWithDDs.earbin3916 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesWithDDs_WithUtil.earbin4535 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_ChangedEJBClientName_WithSource_DontRunBuild.jarbin1856 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_Defaults_Defaults.jarbin1518 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_Defaults_NoBuild.jarbin1518 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_Defaults_Source.jarbin1850 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_Defaults_Source_NoBuild.jarbin1850 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_Defaults.jarbin1524 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jarbin1518 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jarbin1518 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jarbin1850 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jarbin1850 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_NoBuild.jarbin1524 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_Source.jarbin1856 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_Source_NoBuild.jarbin1856 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientSourceFolder_Defaults.jarbin1518 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientSourceFolder_NoBuild.jarbin1518 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientSourceFolder_Source.jarbin1850 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jarbin1850 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_NoClient_Defaults.jarbin1482 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_NoClient_NoBuild.jarbin1482 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_NoClient_Source.jarbin1814 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_NoClient_Source_NoBuild.jarbin1814 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_Defaults_Defaults.jarbin1483 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_Defaults_NoBuild.jarbin1483 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_Defaults_Source.jarbin1815 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_Defaults_Source_NoBuild.jarbin1815 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_Defaults_Defaults.jarbin1515 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_Defaults_NoBuild.jarbin1515 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_Defaults_Source.jarbin1847 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_Defaults_Source_NoBuild.jarbin1847 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_Defaults.jarbin1515 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jarbin1517 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jarbin1517 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jarbin1849 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jarbin1849 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_NoBuild.jarbin1515 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_Source.jarbin1847 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_Source_NoBuild.jarbin1847 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientSourceFolder_Defaults.jarbin1517 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientSourceFolder_NoBuild.jarbin1517 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientSourceFolder_Source.jarbin1849 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jarbin1849 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_NoClient_Defaults.jarbin1479 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_NoClient_NoBuild.jarbin1479 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_NoClient_Source.jarbin1811 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_NoClient_Source_NoBuild.jarbin1811 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_Defaults_Defaults.jarbin1479 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_Defaults_NoBuild.jarbin1479 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_Defaults_Source.jarbin1811 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_Defaults_Source_NoBuild.jarbin1811 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_Defaults_Defaults.jarbin1525 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_Defaults_NoBuild.jarbin1525 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_Defaults_Source.jarbin1857 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_Defaults_Source_NoBuild.jarbin1857 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_Defaults.jarbin1521 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jarbin1519 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jarbin1519 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jarbin1851 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jarbin1851 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_NoBuild.jarbin1521 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_Source.jarbin1853 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_Source_NoBuild.jarbin1853 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientSourceFolder_Defaults.jarbin1519 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientSourceFolder_NoBuild.jarbin1519 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientSourceFolder_Source.jarbin1851 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jarbin1851 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_NoClient_Defaults.jarbin1485 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_NoClient_NoBuild.jarbin1485 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_NoClient_Source.jarbin1817 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_NoClient_Source_NoBuild.jarbin1817 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_Defaults_Defaults.jarbin1482 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_Defaults_NoBuild.jarbin1482 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_Defaults_Source.jarbin1814 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_Defaults_Source_NoBuild.jarbin1814 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Defaults.jarbin2020 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_NoBuild.jarbin2078 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Source.jarbin2078 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Source_NoBuild.jarbin2078 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_WithDD_Defaults.jarbin1730 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_WithDD_NoBuild.jarbin1730 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_WithDD_Source.jarbin1730 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_WithDD_Source_NoBuild.jarbin1730 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Defaults.jarbin2079 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jarbin2077 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jarbin2077 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jarbin2077 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jarbin2077 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Defaults.jarbin1733 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_NoBuild.jarbin1733 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source.jarbin1733 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source_NoBuild.jarbin1733 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_NoBuild.jarbin2079 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Source.jarbin2079 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Source_NoBuild.jarbin2079 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_WithDD_Defaults.jarbin1730 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_WithDD_NoBuild.jarbin1730 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_WithDD_Source.jarbin1730 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_WithDD_Source_NoBuild.jarbin1730 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Defaults.jarbin2077 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_NoBuild.jarbin2077 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Source.jarbin2077 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jarbin2077 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_WithDD_Defaults.jarbin1727 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_WithDD_NoBuild.jarbin1727 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_WithDD_Source.jarbin1727 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_WithDD_Source_NoBuild.jarbin1727 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Defaults.jarbin2061 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_NoBuild.jarbin2061 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Source.jarbin2061 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Source_NoBuild.jarbin2061 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_WithDD_Defaults.jarbin1676 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_WithDD_NoBuild.jarbin1676 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_WithDD_Source.jarbin1676 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_WithDD_Source_NoBuild.jarbin1676 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Defaults.jarbin1933 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_NoBuild.jarbin1933 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Source.jarbin1933 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Source_NoBuild.jarbin1933 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_WithDD_Defaults.jarbin1676 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_WithDD_NoBuild.jarbin1676 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_WithDD_Source.jarbin1676 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_WithDD_Source_NoBuild.jarbin1676 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Defaults.jarbin1750 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_NoBuild.jarbin1750 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Source.jarbin1750 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Source_NoBuild.jarbin1750 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Defaults.jarbin1752 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_NoBuild.jarbin1752 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source.jarbin1752 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source_NoBuild.jarbin1752 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Defaults.jarbin1749 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_NoBuild.jarbin1749 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Source.jarbin1749 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Source_NoBuild.jarbin1749 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Defaults.jarbin1747 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_NoBuild.jarbin1747 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Source.jarbin1747 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Source_NoBuild.jarbin1747 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Defaults.jarbin1697 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_NoBuild.jarbin1697 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Source.jarbin1697 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Source_NoBuild.jarbin1697 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Defaults.jarbin1697 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_NoBuild.jarbin1697 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Source.jarbin1697 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Source_NoBuild.jarbin1697 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_Defaults_Defaults.rarbin1597 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_Defaults_NoBuild.rarbin1591 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_Defaults_Source.rarbin1698 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_Defaults_Source_NoBuild.rarbin1698 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_Defaults.rarbin1588 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_NoBuild.rarbin1588 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_Source.rarbin1690 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_Source_NoBuild.rarbin1690 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_WithEAR_Defaults.rarbin1595 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_WithEAR_NoBuild.rarbin1595 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_WithEAR_Source.rarbin1699 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_WithEAR_Source_NoBuild.rarbin1699 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_WithEAR_Defaults.rarbin1609 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_WithEAR_NoBuild.rarbin1609 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_WithEAR_Source.rarbin1713 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_WithEAR_Source_NoBuild.rarbin1713 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_Defaults_Defaults.rarbin1420 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_Defaults_NoBuild.rarbin1420 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_Defaults_Source.rarbin1519 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_Defaults_Source_NoBuild.rarbin1519 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_Defaults.rarbin1402 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_NoBuild.rarbin1397 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_Source.rarbin1504 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_Source_NoBuild.rarbin1498 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_WithEAR_Defaults.rarbin1395 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_WithEAR_NoBuild.rarbin1395 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_WithEAR_Source.rarbin1496 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_WithEAR_Source_NoBuild.rarbin1496 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_WithEAR_Defaults.rarbin1420 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_WithEAR_NoBuild.rarbin1420 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_WithEAR_Source.rarbin1519 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_WithEAR_Source_NoBuild.rarbin1519 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR12_Defaults.earbin1439 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR12_NoBuild.earbin1439 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR12_Source.earbin1552 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR12_Source_NoBuild.earbin1552 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR13_Defaults.earbin1439 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR13_NoBuild.earbin1439 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR13_Source.earbin1552 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR13_Source_NoBuild.earbin1552 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR14_Defaults.earbin1449 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR14_NoBuild.earbin1449 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR14_Source.earbin1562 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR14_Source_NoBuild.earbin1562 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithDD_Defaults.earbin1533 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithDD_NoBuild.earbin1533 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithDD_Source.earbin1533 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithDD_Source_NoBuild.earbin1533 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithoutDD_Defaults.earbin1107 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithoutDD_NoBuild.earbin1107 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithoutDD_Source.earbin1107 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithoutDD_Source_NoBuild.earbin1107 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_Defaults_Defaults.earbin1447 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_Defaults_NoBuild.earbin1447 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_Defaults_Source.earbin1561 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_Defaults_Source_NoBuild.earbin1561 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_Defaults.warbin1888 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_NoBuild.warbin1888 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_Source.warbin2284 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_Source_NoBuild.warbin2284 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_WithEAR_Defaults.warbin1888 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_WithEAR_NoBuild.warbin1888 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_WithEAR_Source.warbin2284 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_WithEAR_Source_NoBuild.warbin2284 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_Defaults.warbin1883 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_Defaults.warbin1880 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_NoBuild.warbin1880 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_Source.warbin2276 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_Source_NoBuild.warbin2276 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_WithEAR_Defaults.warbin1880 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.warbin1880 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_WithEAR_Source.warbin2276 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.warbin2276 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_NoBuild.warbin1883 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_Source.warbin2279 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_Source_NoBuild.warbin2279 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_WithEAR_Defaults.warbin1883 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_WithEAR_NoBuild.warbin1883 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_WithEAR_Source.warbin2279 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_WithEAR_Source_NoBuild.warbin2279 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.warbin1880 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.warbin1880 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.warbin2276 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.warbin2276 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_WithEAR_Defaults.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_WithEAR_Source.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffSrcDir_WithEAR_Source.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_WithEAR_Defaults.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_WithEAR_NoBuild.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_WithEAR_Source.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_WithEAR_Source_NoBuild.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_Defaults.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_NoBuild.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_Source.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_Source_NoBuild.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_WithEAR_Defaults.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_WithEAR_NoBuild.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_WithEAR_Source.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_WithEAR_Source_NoBuild.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_Defaults.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_NoBuild.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_Source.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_Source_NoBuild.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_WithEAR_Defaults.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_WithEAR_NoBuild.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_WithEAR_Source.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_WithEAR_Source_NoBuild.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_Defaults.warbin1881 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_Defaults.warbin1880 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_NoBuild.warbin1880 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_Source.warbin2276 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_Source_NoBuild.warbin2276 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_WithEAR_Defaults.warbin1880 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.warbin1880 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_WithEAR_Source.warbin2276 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.warbin2276 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_NoBuild.warbin1881 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_Source.warbin2277 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_Source_NoBuild.warbin2277 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_WithEAR_Defaults.warbin1881 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_WithEAR_NoBuild.warbin1881 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_WithEAR_Source.warbin2277 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_WithEAR_Source_NoBuild.warbin2277 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.warbin1880 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.warbin1880 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.warbin2276 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.warbin2276 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_WithEAR_Defaults.warbin1883 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.warbin1883 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_WithEAR_Source.warbin2279 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.warbin2279 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffSrcDir_WithEAR_Source.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_WithEAR_Defaults.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_WithEAR_NoBuild.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_WithEAR_Source.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_WithEAR_Source_NoBuild.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_Defaults.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_NoBuild.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_Source.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_Source_NoBuild.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_WithEAR_Defaults.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_WithEAR_NoBuild.warbin1882 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_WithEAR_Source.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_WithEAR_Source_NoBuild.warbin2278 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_Defaults.warbin1888 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_NoBuild.warbin1888 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_Source.warbin2284 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_Source_NoBuild.warbin2284 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_WithEAR_Defaults.warbin1888 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_WithEAR_NoBuild.warbin1888 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_WithEAR_Source.warbin2284 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_WithEAR_Source_NoBuild.warbin2284 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_Defaults.warbin1887 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_Defaults.warbin1884 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_NoBuild.warbin1884 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_Source.warbin2280 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_Source_NoBuild.warbin2280 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_WithEAR_Defaults.warbin1884 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.warbin1884 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_WithEAR_Source.warbin2280 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.warbin2280 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_NoBuild.warbin1887 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_Source.warbin2283 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_Source_NoBuild.warbin2283 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_WithEAR_Defaults.warbin1887 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_WithEAR_NoBuild.warbin1887 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_WithEAR_Source.warbin2283 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_WithEAR_Source_NoBuild.warbin2283 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.warbin1884 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.warbin1884 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.warbin2280 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.warbin2280 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_WithEAR_Defaults.warbin1887 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.warbin1887 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_WithEAR_Source.warbin2283 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.warbin2283 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.warbin1886 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.warbin1886 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffSrcDir_WithEAR_Source.warbin2282 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.warbin2282 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_WithEAR_Defaults.warbin1886 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_WithEAR_NoBuild.warbin1886 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_WithEAR_Source.warbin2282 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_WithEAR_Source_NoBuild.warbin2282 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_Defaults.warbin1886 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_NoBuild.warbin1886 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_Source.warbin2282 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_Source_NoBuild.warbin2282 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_WithEAR_Defaults.warbin1886 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_WithEAR_NoBuild.warbin1886 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_WithEAR_Source.warbin2282 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_WithEAR_Source_NoBuild.warbin2282 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Defaults.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Source.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Source_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithDD_Defaults.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithDD_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithDD_Source.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithDD_Source_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Defaults.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Source.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Source_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_WithDD_Defaults.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_WithDD_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_WithDD_Source.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_WithDD_Source_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Defaults.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Defaults.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Source.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Source_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithDD_Defaults.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithDD_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithDD_Source.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithDD_Source_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Defaults.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Source.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Defaults.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_WithDD_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Source.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Source_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Source.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Source_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithDD_Defaults.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithDD_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithDD_Source.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithDD_Source_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Defaults.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Source.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Source_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_WithDD_Defaults.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_WithDD_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_WithDD_Source.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_WithDD_Source_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithDD_Defaults.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithDD_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithDD_Source.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithDD_Source_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Defaults.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_WithDD_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Source.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Source_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithDD_Defaults.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithDD_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithDD_Source.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithDD_Source_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Defaults.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Source.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_WithDD_Defaults.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_WithDD_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_WithDD_Source.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_WithDD_Source_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithDD_Defaults.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithDD_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithDD_Source.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithDD_Source_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Source.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_WithDD_Defaults.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_WithDD_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_WithDD_Source.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_WithDD_Source_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithDD_Defaults.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithDD_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithDD_Source.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithDD_Source_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Defaults.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Source.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Source_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_WithDD_Defaults.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_WithDD_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_WithDD_Source.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_WithDD_Source_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Defaults.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Source.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Source_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithDD_Defaults.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithDD_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithDD_Source.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithDD_Source_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Defaults.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Source.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Source_NoBuild.warbin1899 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_WithDD_Defaults.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_WithDD_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_WithDD_Source.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_WithDD_Source_NoBuild.warbin2196 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/RARImportTests/JDEConnector.rarbin2753855 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/SaveStrategyTests/AppClient.zipbin1801 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/SaveStrategyTests/WarImportFlexProject.zipbin5902 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Bug311542.warbin1382 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Example1.warbin1562 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/InvalidWebXML1.warbin1151 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/InvalidWebXML14_1.warbin1167 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/InvalidWebXML14_2.warbin1170 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/InvalidWebXML2.warbin1160 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Test12Web.warbin2843 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Test13Web.warbin2632 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Test14Web.warbin3842 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/WebContainerClientApp.warbin24605 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/WebNoSource.warbin2413 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/WebSomeSource.warbin3130 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/WebSource.warbin3478 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/WebAppLibrariesContainerTests/abc.jarbin494 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/WebAppLibrariesContainerTests/foo.jarbin494 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/WebDeployTests/WebDeployTest.zipbin105861 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/EAR5_NoDD.earbin14832 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/EAR5_WithDD.earbin15380 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client0.xml4
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client00.xml5
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client000.xml5
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client12.jarbin461 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client12.xml5
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client13.jarbin458 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client13.xml5
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client14.jarbin465 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client14.xml5
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client5.jarbin461 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client5.xml5
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application0.xml16
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application00.xml17
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application000.xml20
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application12.earbin550 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application12.xml17
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application13.earbin578 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application13.xml20
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application14.earbin578 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application14.xml20
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application5.earbin577 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application5.xml20
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar0.xml14
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar00.xml15
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar000.xml15
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar11.jarbin542 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar11.xml15
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar20.jarbin539 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar20.xml15
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar21.jarbin547 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar21.xml15
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar30.jarbin544 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar30.xml15
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/notjavaee.xml4
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/notxml.xml1
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra0.xml38
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra00.xml39
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra000.xml10
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra10.rarbin710 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra10.xml39
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra15.rarbin488 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra15.xml10
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web0.xml12
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web00.xml13
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web000.xml13
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web22.warbin478 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web22.xml13
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web23.warbin475 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web23.xml13
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web24.warbin481 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web24.xml13
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web25.warbin480 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web25.xml13
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/12AppClientTest_withoutSource.jarbin928 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/13AppClientTest_withoutSource.jarbin916 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/13AppClient_withoutSource.jarbin536 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/AppClientExpTest_withoutSource.jarbin564 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/AppClientNoSource_withoutSource.jarbin1525 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/AppClientSomeSource_withoutSource.jarbin847 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/AppClientSource_withoutSource.jarbin542 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.j2ee.tests/about.html34
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/build.properties28
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/ClasspathContainerThreading.java166
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/DefectVerificationTests.java837
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/DefectVerificationTestsSuite.java29
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/exportmodel-tests/org/eclipse/wtp/j2ee/headless/tests/exportmodel/ExportModelTest.java212
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/exportmodel-tests/org/eclipse/wtp/j2ee/headless/tests/exportmodel/TestExportReferenceResolver.java66
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/exportmodel-tests/org/eclipse/wtp/j2ee/headless/tests/exportmodel/TestExportVirtualComponent.java45
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/common/annotations/tests/AnnotationProviderTest.java49
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/common/annotations/tests/TestAnnotationProvider.java35
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/bindingshelper/tests/BarBindingsHelper.java23
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/bindingshelper/tests/BindingsHelperTest.java223
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/bindingshelper/tests/FooBindingsHelper.java22
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/bindingshelper/tests/TestBindingsHelper.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/AbstractTests.java25
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/AllTests.java30
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/ClasspathDependencyCreationTests.java151
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/ClasspathDependencyEARTests.java647
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/ClasspathDependencyValidationTests.java360
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/ClasspathDependencyWebTests.java435
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/util/ClasspathDependencyTestUtil.java219
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/AbstractTests.java25
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/AllTests.java36
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/EarLibDirContainerTests.java114
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectClasspathRefactoringTests.java140
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectCreationTests.java85
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectDependencyTests.java97
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectEARRefactoringTests.java289
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectModuleRefactoringTests.java166
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectServerRefactoringTests.java33
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectWebLibRefactoringTests.java133
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/DependencyCreationUtil.java146
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/DependencyUtil.java272
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/DependencyVerificationUtil.java330
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/ProjectUtil.java381
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/AppClientArtifactEditFVTest.java110
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/AppClientArtifactEditTest.java580
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/ConnectorArtifactEditFVTest.java113
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/ConnectorArtifactEditTest.java243
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EARArtifactEditTest.java347
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EJBArtifactEditFVTest.java118
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EJBArtifactEditTest.java345
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EarArtiFactEditFVTest.java126
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EnterpriseArtifactEditTest.java92
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/J2EEArtifactEditAPIAllTest.java34
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/JaxRPCMapArtifactEditFVTest.java78
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/TestWorkspace.java115
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/WSDDArtifactEditFVTest.java95
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/WebArtifactEditFVTest.java152
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/WebArtifactEditTest.java414
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/ArchiveComponentCreationTest.java106
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/EJBArtifactEditFvTest.java6
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/EJBDeployTest.java223
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/J2EEFlexProjDeployablePerfTest.java89
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/PortedComponentCreationTest.java156
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/WebDeployTest.java120
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/tests/FlexibleProjectEditTest.java13
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/project/facet/tests/EjbProjectFacetCreationTest.java33
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/project/facet/tests/ProjectFacetCreationTest.java79
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/AutomatedBVT.java63
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/AutomatedBVTEclipse.java30
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/modulecore/AllTests.java55
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/modulecore/FlexibleProjectBuilderTest.java259
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/modulecore/ModuleStructuralModelTest.java409
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/CreateModelFromXmlTest.java99
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/DeleteProjectTest.java150
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EJB3MergedModelProviderFactoryTest.java75
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EJB3MergedModelProviderTest.java338
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EJBAnnotationReaderWithClientTest.java178
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/Ejb3ModelProviderTest.java83
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EjbAnnotationFactoryTest.java303
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EjbAnnotationReaderTest.java930
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EjbReferenceTest.java371
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/GenerateDDTest.java84
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/LifecycleAnnotationsTest.java209
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/NotifyCloseProjectTest.java83
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/ResourceReferenceTest.java278
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/SecurityRolesTest.java175
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/AssemblyDescriptorMergerTest.java232
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/EjbJarMergerTest.java630
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/JndiRefsTest.java2068
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/MdbMergerTest.java721
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/MergersTestSuite.java35
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/SessionMergerTest.java1212
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/WebApp3MergerTest.java1456
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/WebAppMergerTest.java634
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AbstractAnnotationFactoryTest.java53
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AbstractAnnotationModelTest.java91
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AbstractTest.java320
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AllAnnotationModelTests.java83
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/ChangeListenerWithSemaphore.java74
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE5LegacyModelTest.java207
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE5ModelTest.java426
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JEE6ModelTest.java504
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/JdtChangeListenerWithSemaphore.java39
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/ManyToOneRelationTest.java132
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/ModelProviderTest.java786
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/RegisterMergedModelProviderTest.java89
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/SynchronousModelChangedListener.java66
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/TestUtils.java163
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/web/tests/DeleteWebProjectTest.java151
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/web/tests/Web25MergedModelProviderTest.java166
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/web/tests/Web3AnnotationReaderTest.java403
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/web/tests/WebAnnotationReaderTest.java440
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/appclient/operations/AllTests.java30
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/appclient/operations/AppClientExportOperationTest.java324
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/appclient/operations/AppClientImportOperationTest.java210
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/appclient/operations/AppClientProjectCreationOperationTest.java266
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ear/operations/AllTests.java41
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ear/operations/EARExportOperationTest.java293
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ear/operations/EARImportOperationTest.java379
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ear/operations/EARProjectCreationOperationTest.java560
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ejb/operations/AddEJBeanOperationTest.java142
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ejb/operations/AllTests.java36
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ejb/operations/EJBExportOperationTest.java388
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ejb/operations/EJBGeneraUseTest.java106
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ejb/operations/EJBImportOperationTest.java252
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/ejb/operations/EJBProjectCreationOperationTest.java338
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/ArchiveTestsUtil.java191
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/HeaderParserTests.java384
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/JEEExportOperationTest.java199
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/JEEImportOperationTest.java264
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/JEEProjectCreationOperationTest.java39
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/JavaEEFacetConstants.java51
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/JavaFileTestingUtilities.java403
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/JavaFileUpdateListener.java95
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/ModuleExportOperationTest.java93
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/ModuleImportOperationTest.java129
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/ModuleProjectCreationOperationTest.java41
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/RandomObjectGenerator.java101
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/j2ee/operations/SourceFolderUpdateTest.java67
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/jca/operations/AllTests.java31
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/jca/operations/JCAExportOperationTest.java136
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/jca/operations/JCAImportOperationTest.java99
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/jca/operations/JCAProjectCreationOperationTest.java160
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/plugin/AllPluginTests.java90
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/plugin/AllTestsSuite.java73
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/plugin/HeadlessTestsPlugin.java76
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/utility/operations/AllTests.java20
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/utility/operations/UtilityExportOperationTest.java134
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/utility/operations/UtilityImportOperationTest.java185
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/utility/operations/UtilityProjectCreationOperationTest.java106
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/AddWebArtifactOperationTest.java417
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/AllTests.java89
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/StaticWebProjectCreationOperationTest.java46
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/UrlPatternTest.java61
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/WebExportOperationTest.java554
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/WebImportOperationTest.java348
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/web/operations/WebProjectCreationOperationTest.java573
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/wtp/j2ee/headless/tests/webfragment/operations/WebFragmentProjectCreationOperationTest.java219
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/ejb/verifiers/EJBExportDataModelVerifier.java29
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/ejb/verifiers/EJBImportDataModelVerifier.java75
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/ejb/verifiers/EJBProjectCreationDataModelVerifier.java119
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/DataModelVerifierListGenerator.java83
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/JEEExportDataModelVerifier.java129
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/JEEImportDataModelVerifier.java215
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/JEEProjectCreationDataModelVerifier.java119
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/ModuleExportDataModelVerifier.java54
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/ModuleImportDataModelVerifier.java23
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/j2ee/verifiers/ModuleProjectCreationDataModelVerifier.java47
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/jca/verifiers/JCAExportDataModelVerifier.java30
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/jca/verifiers/JCAImportDataModelVerifier.java75
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/jca/verifiers/JCAProjectCreationDataModelVerifier.java78
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/utility/verifiers/UtilityImportDataModelVerifier.java87
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/utility/verifiers/UtilityProjectCreationDataModelVerifier.java35
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/web/verifiers/WebExportDataModelVerifier.java29
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/web/verifiers/WebImportDataModelVerifier.java127
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tests/web/verifiers/WebProjectCreationDataModelVerifier.java140
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tets/appclient/verifiers/AppClientExportDataModelVerifier.java30
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tets/appclient/verifiers/AppClientImportDataModelVerifier.java78
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tets/appclient/verifiers/AppClientProjectCreationDataModelVerifier.java83
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tets/ear/verifiers/EARExportDataModelVerifier.java34
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tets/ear/verifiers/EARImportDataModelVerifier.java108
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/j2ee-verifiers/org/eclipse/wtp/j2ee/headless/tets/ear/verifiers/EARProjectCreationDataModelVerifier.java113
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/plugin.xml48
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/savestrategy-tests/org/eclipse/wtp/headless/tests/savestrategy/ThreadingTest.java233
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/testHOLD.xml56
-rw-r--r--tests/org.eclipse.jst.j2ee.tests/webmodule-tests/org/eclipse/wtp/j2ee/headless/tests/web/container/WebAppLibrariesContainerTests.java384
-rw-r--r--tests/org.eclipse.jst.servlet.tests/.classpath7
-rw-r--r--tests/org.eclipse.jst.servlet.tests/.cvsignore5
-rw-r--r--tests/org.eclipse.jst.servlet.tests/.project28
-rw-r--r--tests/org.eclipse.jst.servlet.tests/.settings/org.eclipse.jdt.core.prefs7
-rw-r--r--tests/org.eclipse.jst.servlet.tests/META-INF/MANIFEST.MF27
-rw-r--r--tests/org.eclipse.jst.servlet.tests/WARImportTests/Example1.warbin1562 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.servlet.tests/WARImportTests/Test12Web.warbin2843 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.servlet.tests/WARImportTests/Test13Web.warbin2632 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.servlet.tests/WARImportTests/Test14Web.warbin3842 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.servlet.tests/WARImportTests/YourCompanyExample.warbin888392 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.servlet.tests/about.html34
-rw-r--r--tests/org.eclipse.jst.servlet.tests/build.properties18
-rw-r--r--tests/org.eclipse.jst.servlet.tests/plugin.properties13
-rw-r--r--tests/org.eclipse.jst.servlet.tests/testHOLD.xml50
-rw-r--r--tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tests/ServletTestsPlugin.java74
-rw-r--r--tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tests/bvt/AutomatedBVT.java60
-rw-r--r--tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tests/bvt/AutomatedBVTEclipse.java31
-rw-r--r--tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/AllTomcatTests.java55
-rw-r--r--tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/WebExportOperationTomcatTest.java157
-rw-r--r--tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/WebImportOperationTomcatTest.java171
-rw-r--r--tests/org.eclipse.jst.servlet.tests/webmodule-tomcat-tests/org/eclipse/jst/servlet/tomcat/tests/WebProjectCreationTomcatTest.java218
-rw-r--r--tests/org.eclipse.jst.validation.sample/.classpath10
-rw-r--r--tests/org.eclipse.jst.validation.sample/.cvsignore4
-rw-r--r--tests/org.eclipse.jst.validation.sample/.project28
-rw-r--r--tests/org.eclipse.jst.validation.sample/META-INF/MANIFEST.MF21
-rw-r--r--tests/org.eclipse.jst.validation.sample/about.html34
-rw-r--r--tests/org.eclipse.jst.validation.sample/build.properties13
-rw-r--r--tests/org.eclipse.jst.validation.sample/filesystem.bat46
-rw-r--r--tests/org.eclipse.jst.validation.sample/filesystemFWK/filesystem.properties21
-rw-r--r--tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/jst/validation/sample/filesystem/FilesystemApplication.java82
-rw-r--r--tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/jst/validation/sample/filesystem/FilesystemLoader.java62
-rw-r--r--tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/jst/validation/sample/filesystem/FilesystemManager.java220
-rw-r--r--tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/jst/validation/sample/filesystem/FullReporter.java92
-rw-r--r--tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/jst/validation/sample/filesystem/IFilesystemHelper.java34
-rw-r--r--tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/jst/validation/sample/filesystem/IncrementalReporter.java168
-rw-r--r--tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/jst/validation/sample/filesystem/MessageManager.java254
-rw-r--r--tests/org.eclipse.jst.validation.sample/filesystemFWK/org/eclipse/jst/validation/sample/filesystem/ValidatorMessages.java171
-rw-r--r--tests/org.eclipse.jst.validation.sample/plugin.properties2
-rw-r--r--tests/org.eclipse.jst.validation.sample/plugin.xml60
-rw-r--r--tests/org.eclipse.jst.validation.sample/prop.bat45
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValFS/org/eclipse/jst/validation/sample/filesystemimpl/FilesystemPropertiesHelper.java203
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValWB/org/eclipse/jst/validation/sample/workbenchimpl/PluginPropertyFile.java239
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValWB/org/eclipse/jst/validation/sample/workbenchimpl/PropertiesHelper.java234
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValWB/org/eclipse/jst/validation/sample/workbenchimpl/PropertiesValidatorPlugin.java47
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/PModelEnum.java35
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/PropertiesValidator.java107
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/ValidatorPropertyFile.java115
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/parser/APropertyFile.java728
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/parser/CompareProperties.java377
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/parser/IValidationConstants.java46
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/parser/Main.java451
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/parser/MessageMetaData.java211
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/parser/PropertyFile.java106
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/parser/PropertyLine.java642
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/parser/PropertyLineComparator.java254
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValidator/org/eclipse/jst/validation/sample/parser/ResourceHandler.java90
-rw-r--r--tests/org.eclipse.jst.validation.sample/propertiesValidator/propertiesValidator.properties41
-rw-r--r--tests/org.eclipse.jst.validation.sample/test/test.properties67
-rw-r--r--tests/org.eclipse.jst.validation.sample/test/test2.properties24
-rw-r--r--tests/org.eclipse.jst.validation.sample/tvtplugin.xml52
-rw-r--r--tests/org.eclipse.jst.validation.test/.classpath9
-rw-r--r--tests/org.eclipse.jst.validation.test/.cvsignore4
-rw-r--r--tests/org.eclipse.jst.validation.test/.project28
-rw-r--r--tests/org.eclipse.jst.validation.test/.settings/org.eclipse.jdt.core.prefs62
-rw-r--r--tests/org.eclipse.jst.validation.test/.settings/org.eclipse.jdt.ui.prefs6
-rw-r--r--tests/org.eclipse.jst.validation.test/META-INF/MANIFEST.MF31
-rw-r--r--tests/org.eclipse.jst.validation.test/about.html34
-rw-r--r--tests/org.eclipse.jst.validation.test/build.properties17
-rw-r--r--tests/org.eclipse.jst.validation.test/build/buildcontrol.properties6
-rw-r--r--tests/org.eclipse.jst.validation.test/build/package.xml20
-rw-r--r--tests/org.eclipse.jst.validation.test/build/sourcejar.txt6
-rw-r--r--tests/org.eclipse.jst.validation.test/build/wsBuild.xml25
-rw-r--r--tests/org.eclipse.jst.validation.test/jUnitWrapper/org/eclipse/jst/validation/test/junit/AutomatedValidationBVT.java64
-rw-r--r--tests/org.eclipse.jst.validation.test/jUnitWrapper/org/eclipse/jst/validation/test/junit/BVTSuite.java81
-rw-r--r--tests/org.eclipse.jst.validation.test/jUnitWrapper/org/eclipse/jst/validation/test/junit/BuildInfo.java7
-rw-r--r--tests/org.eclipse.jst.validation.test/jUnitWrapper/org/eclipse/jst/validation/test/junit/JUnitBuffer.java123
-rw-r--r--tests/org.eclipse.jst.validation.test/jUnitWrapper/org/eclipse/jst/validation/test/junit/OperationSuite.java35
-rw-r--r--tests/org.eclipse.jst.validation.test/jUnitWrapper/org/eclipse/jst/validation/test/junit/OperationTest.java60
-rw-r--r--tests/org.eclipse.jst.validation.test/jUnitWrapper/org/eclipse/jst/validation/test/junit/ValidatorSuite.java40
-rw-r--r--tests/org.eclipse.jst.validation.test/jUnitWrapper/org/eclipse/jst/validation/test/junit/ValidatorTest.java77
-rw-r--r--tests/org.eclipse.jst.validation.test/plugin.properties3
-rw-r--r--tests/org.eclipse.jst.validation.test/plugin.xml422
-rw-r--r--tests/org.eclipse.jst.validation.test/test.xml65
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/api/test/ApiTestsSuite.java17
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/api/test/ValidationRegistryApiTest.java35
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/BVTValidationBatch.java107
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/BVTValidationException.java26
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/BVTValidationPlugin.java104
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/BufferedTaskStatus.java155
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/BuildInfo.java7
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/ConsoleBuffer.java103
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/ConsoleProgressMonitor.java74
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/IOperationRunnable.java15
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/TaskStatus.java269
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/ValidationTypeEnum.java23
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/registry/BVTValidationRegistryReader.java904
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/registry/BuildInfo.java7
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/registry/ITestcaseMetaData.java51
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/registry/MessageMetaData.java88
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/registry/MessageUtility.java713
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/registry/OperationTestcase.java81
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/registry/RegistryConstants.java37
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/registry/TestSetupImport.java89
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/registry/TestcaseMetaData.java160
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/registry/TestcaseUtility.java84
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/registry/ValidatorTestcase.java492
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/util/BVTRunner.java684
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/util/BVTValidationUtility.java253
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/util/BuildInfo.java7
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/internal/util/RunTestsOperation.java46
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/setup/AImportOperation.java95
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/setup/BuildInfo.java7
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/setup/CheckForUntestedPropertiesOperation.java142
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/setup/IBuffer.java53
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/setup/IImportOperation.java30
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/setup/ITestStatus.java56
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/setup/JARImportOperation.java169
-rw-r--r--tests/org.eclipse.jst.validation.test/test/org/eclipse/jst/validation/test/setup/TestCaseGeneratorOperation.java134
-rw-r--r--tests/org.eclipse.jst.validation.test/testFwk/org/eclipse/jst/validation/test/fwk/BuildInfo.java7
-rw-r--r--tests/org.eclipse.jst.validation.test/testFwk/org/eclipse/jst/validation/test/fwk/TestOpConstrBuilder.java38
-rw-r--r--tests/org.eclipse.jst.validation.test/testFwk/org/eclipse/jst/validation/test/fwk/TestOpConstrInputOperation.java260
-rw-r--r--tests/org.eclipse.jst.validation.test/testFwk/org/eclipse/jst/validation/test/fwk/TestOpConstrOperation.java629
-rw-r--r--tests/org.eclipse.jst.validation.test/testFwk/org/eclipse/jst/validation/test/fwk/VALFWK02Operation.java711
-rw-r--r--tests/org.eclipse.jst.validation.test/testFwk/org/eclipse/jst/validation/test/fwk/validator/FwkNoBuildTestHelper.java131
-rw-r--r--tests/org.eclipse.jst.validation.test/testFwk/org/eclipse/jst/validation/test/fwk/validator/FwkNoBuildTestValidator.java45
-rw-r--r--tests/org.eclipse.jst.validation.test/testFwk/org/eclipse/jst/validation/test/fwk/validator/FwkTestHelper.java121
-rw-r--r--tests/org.eclipse.jst.validation.test/testFwk/org/eclipse/jst/validation/test/fwk/validator/FwkTestValidator.java45
-rw-r--r--tests/org.eclipse.jst.validation.test/testFwk/org/eclipse/jst/validation/test/fwk/validator/JDTUtility.java318
-rw-r--r--tests/org.eclipse.jst.validation.test/testInput/FWK/BVT/opConstr.jarbin3966 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.validation.test/testInput/Properties/aProperties.jarbin3652 -> 0 bytes-rw-r--r--tests/org.eclipse.jst.web_tests.feature.patch/.project17
-rw-r--r--tests/org.eclipse.jst.web_tests.feature.patch/build.properties1
-rw-r--r--tests/org.eclipse.jst.web_tests.feature.patch/feature.xml18
1433 files changed, 0 insertions, 103260 deletions
diff --git a/features/org.eclipse.jem.tests-feature/.project b/features/org.eclipse.jem.tests-feature/.project
deleted file mode 100644
index f5e8794a..00000000
--- a/features/org.eclipse.jem.tests-feature/.project
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jem.tests-feature</name>
- <comment></comment>
- <projects>
- </projects>
-</projectDescription>
diff --git a/features/org.eclipse.jem.tests-feature/archived.txt b/features/org.eclipse.jem.tests-feature/archived.txt
deleted file mode 100644
index ae7c321b..00000000
--- a/features/org.eclipse.jem.tests-feature/archived.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This feature is no longer used,
-so I have "nulled out" the head stream
-to avoid confusion.
-
diff --git a/features/org.eclipse.jst.web_tests.feature/.cvsignore b/features/org.eclipse.jst.web_tests.feature/.cvsignore
deleted file mode 100644
index c14487ce..00000000
--- a/features/org.eclipse.jst.web_tests.feature/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.jst.web_tests.feature/.project b/features/org.eclipse.jst.web_tests.feature/.project
deleted file mode 100644
index 832ea5e4..00000000
--- a/features/org.eclipse.jst.web_tests.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.web_tests.feature</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.pde.FeatureBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.FeatureNature</nature>
- </natures>
-</projectDescription>
diff --git a/features/org.eclipse.jst.web_tests.feature/build.properties b/features/org.eclipse.jst.web_tests.feature/build.properties
deleted file mode 100644
index 7f47694a..00000000
--- a/features/org.eclipse.jst.web_tests.feature/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-bin.includes = feature.xml,\
- eclipse_update_120.jpg,\
- epl-v10.html,\
- license.html,\
- feature.properties
diff --git a/features/org.eclipse.jst.web_tests.feature/eclipse_update_120.jpg b/features/org.eclipse.jst.web_tests.feature/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708a..00000000
--- a/features/org.eclipse.jst.web_tests.feature/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.jst.web_tests.feature/epl-v10.html b/features/org.eclipse.jst.web_tests.feature/epl-v10.html
deleted file mode 100644
index ed4b1966..00000000
--- a/features/org.eclipse.jst.web_tests.feature/epl-v10.html
+++ /dev/null
@@ -1,328 +0,0 @@
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=windows-1252">
-<meta name=ProgId content=Word.Document>
-<meta name=Generator content="Microsoft Word 9">
-<meta name=Originator content="Microsoft Word 9">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<!--[if gte mso 9]><xml>
- <o:DocumentProperties>
- <o:Revision>2</o:Revision>
- <o:TotalTime>3</o:TotalTime>
- <o:Created>2004-03-05T23:03:00Z</o:Created>
- <o:LastSaved>2004-03-05T23:03:00Z</o:LastSaved>
- <o:Pages>4</o:Pages>
- <o:Words>1626</o:Words>
- <o:Characters>9270</o:Characters>
- <o:Lines>77</o:Lines>
- <o:Paragraphs>18</o:Paragraphs>
- <o:CharactersWithSpaces>11384</o:CharactersWithSpaces>
- <o:Version>9.4402</o:Version>
- </o:DocumentProperties>
-</xml><![endif]--><!--[if gte mso 9]><xml>
- <w:WordDocument>
- <w:TrackRevisions/>
- </w:WordDocument>
-</xml><![endif]-->
-<style>
-<!--
- /* Font Definitions */
-@font-face
- {font-family:Tahoma;
- panose-1:2 11 6 4 3 5 4 4 2 4;
- mso-font-charset:0;
- mso-generic-font-family:swiss;
- mso-font-pitch:variable;
- mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
- {mso-style-parent:"";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p
- {margin-right:0in;
- mso-margin-top-alt:auto;
- mso-margin-bottom-alt:auto;
- margin-left:0in;
- mso-pagination:widow-orphan;
- font-size:12.0pt;
- font-family:"Times New Roman";
- mso-fareast-font-family:"Times New Roman";}
-p.BalloonText, li.BalloonText, div.BalloonText
- {mso-style-name:"Balloon Text";
- margin:0in;
- margin-bottom:.0001pt;
- mso-pagination:widow-orphan;
- font-size:8.0pt;
- font-family:Tahoma;
- mso-fareast-font-family:"Times New Roman";}
-@page Section1
- {size:8.5in 11.0in;
- margin:1.0in 1.25in 1.0in 1.25in;
- mso-header-margin:.5in;
- mso-footer-margin:.5in;
- mso-paper-source:0;}
-div.Section1
- {page:Section1;}
--->
-</style>
-</head>
-
-<body lang=EN-US style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), 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 OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal><![if !supportEmptyParas]>&nbsp;<![endif]><o:p></o:p></p>
-
-</div>
-
-</body>
-
-</html> \ No newline at end of file
diff --git a/features/org.eclipse.jst.web_tests.feature/feature.properties b/features/org.eclipse.jst.web_tests.feature/feature.properties
deleted file mode 100644
index cb21bc58..00000000
--- a/features/org.eclipse.jst.web_tests.feature/feature.properties
+++ /dev/null
@@ -1,168 +0,0 @@
-###############################################################################
-# Copyright (c) 2006 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
-###############################################################################
-# feature.properties
-# contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=JST Web Tests
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse Web Tools Platform
-
-
-# "description" property - description of the feature
-description=JST Web tests
-
-# "copyright" property - text of the "Feature Update Copyright"
-copyright=\
-Copyright (c) 2006 IBM Corporation and others.\n\
-All rights reserved. This program and the accompanying materials\n\
-are made available under the terms of the Eclipse Public License v1.0\n\
-which accompanies this distribution, and is available at\n\
-http://www.eclipse.org/legal/epl-v10.html\n\
-\n\
-Contributors:\n\
- IBM Corporation - initial API and implementation\n
-################ end of copyright property ####################################
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the\n\
-Eclipse Foundation is provided to you under the terms and conditions of\n\
-the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is\n\
-provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse Foundation source code\n\
-repository ("Repository") in software modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
- - Content may be structured and packaged into modules to facilitate delivering,\n\
- extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
- plug-in fragments ("Fragments"), and features ("Features").\n\
- - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java(TM) ARchive)\n\
- in a directory named "plugins".\n\
- - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
- Each Feature may be packaged as a sub-directory in a directory named "features".\n\
- Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
- numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
- - Features may also include other Features ("Included Features"). Within a Feature, files\n\
- named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
- - The top-level (root) directory\n\
- - Plug-in and Fragment directories\n\
- - Inside Plug-ins and Fragments packaged as JARs\n\
- - Sub-directories of the directory named "src" of certain Plug-ins\n\
- - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Provisioning Technology (as defined below), you must agree to a license ("Feature \n\
-Update License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties" found within a Feature.\n\
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the\n\
-terms and conditions (or references to such terms and conditions) that\n\
-govern your use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
- - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-\n\Use of Provisioning Technology\n\
-\n\
-The Eclipse Foundation makes available provisioning software, examples of which include,\n\
-but are not limited to, p2 and the Eclipse Update Manager ("Provisioning Technology") for\n\
-the purpose of allowing users to install software, documentation, information and/or\n\
-other materials (collectively "Installable Software"). This capability is provided with\n\
-the intent of allowing such users to install, extend and update Eclipse-based products.\n\
-Information about packaging Installable Software is available at\n\
-http://eclipse.org/equinox/p2/repository_packaging.html ("Specification").\n\
-\n\
-You may use Provisioning Technology to allow other parties to install Installable Software.\n\
-You shall be responsible for enabling the applicable license agreements relating to the\n\
-Installable Software to be presented to, and accepted by, the users of the Provisioning Technology\n\
-in accordance with the Specification. By using Provisioning Technology in such a manner and\n\
-making it available in accordance with the Specification, you further acknowledge your\n\
-agreement to, and the acquisition of all necessary rights to permit the following:\n\
-\n\
- 1. A series of actions may occur ("Provisioning Process") in which a user may execute\n\
- the Provisioning Technology on a machine ("Target Machine") with the intent of installing,\n\
- extending or updating the functionality of an Eclipse-based product.\n\
- 2. During the Provisioning Process, the Provisioning Technology may cause third party\n\
- Installable Software or a portion thereof to be accessed and copied to the Target Machine.\n\
- 3. Pursuant to the Specification, you will provide to the user the terms and conditions that\n\
- govern the use of the Installable Software ("Installable Software Agreement") and such\n\
- Installable Software Agreement shall be accessed from the Target Machine in accordance\n\
- with the Specification. Such Installable Software Agreement must inform the user of the\n\
- terms and conditions that govern the Installable Software and must solicit acceptance by\n\
- the end user in the manner prescribed in such Installable Software Agreement. Upon such\n\
- indication of agreement by the user, the provisioning Technology will complete installation\n\
- of the Installable Software.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use, and\n\
-re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.jst.web_tests.feature/feature.xml b/features/org.eclipse.jst.web_tests.feature/feature.xml
deleted file mode 100644
index bd0f81e2..00000000
--- a/features/org.eclipse.jst.web_tests.feature/feature.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.jst.web_tests.feature"
- label="%featureName"
- version="3.3.0.qualifier"
- provider-name="%providerName">
-
- <description>
- %description
- </description>
-
- <copyright>
- %copyright
- </copyright>
-
- <license url="license.html">
- %license
- </license>
-
- <plugin
- id="org.eclipse.jst.j2ee.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.j2ee.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.jsp.core.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.jsp.tests.encoding"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.jsp.ui.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jst.servlet.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
- <plugin
- id="org.eclipse.jem.tests"
- download-size="0"
- install-size="0"
- version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.jst.web_tests.feature/license.html b/features/org.eclipse.jst.web_tests.feature/license.html
deleted file mode 100644
index c184ca36..00000000
--- a/features/org.eclipse.jst.web_tests.feature/license.html
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" />
-<title>Eclipse Foundation Software User Agreement</title>
-</head>
-
-<body lang="EN-US">
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
- (COLLECTIVELY &quot;CONTENT&quot;). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
- CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE
- OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
- NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
- CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0
- (&quot;EPL&quot;). A copy of the EPL is provided with this Content and is also available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
- For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse Foundation source code
- repository (&quot;Repository&quot;) in software modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
- <li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content. Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
- <li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
- <li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material. Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;. Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
- and/or Fragments associated with that Feature.</li>
- <li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;). Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
- <li>The top-level (root) directory</li>
- <li>Plug-in and Fragment directories</li>
- <li>Inside Plug-ins and Fragments packaged as JARs</li>
- <li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
- <li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Provisioning Technology (as defined below), you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process. If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them. Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS. SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
- <li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
- <li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
- <li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
- <li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
- <li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-
-<h3>Use of Provisioning Technology</h3>
-
-<p>The Eclipse Foundation makes available provisioning software, examples of which include, but are not limited to, p2 and the Eclipse
- Update Manager (&quot;Provisioning Technology&quot;) for the purpose of allowing users to install software, documentation, information and/or
- other materials (collectively &quot;Installable Software&quot;). This capability is provided with the intent of allowing such users to
- install, extend and update Eclipse-based products. Information about packaging Installable Software is available at <a
- href="http://eclipse.org/equinox/p2/repository_packaging.html">http://eclipse.org/equinox/p2/repository_packaging.html</a>
- (&quot;Specification&quot;).</p>
-
-<p>You may use Provisioning Technology to allow other parties to install Installable Software. You shall be responsible for enabling the
- applicable license agreements relating to the Installable Software to be presented to, and accepted by, the users of the Provisioning Technology
- in accordance with the Specification. By using Provisioning Technology in such a manner and making it available in accordance with the
- Specification, you further acknowledge your agreement to, and the acquisition of all necessary rights to permit the following:</p>
-
-<ol>
- <li>A series of actions may occur (&quot;Provisioning Process&quot;) in which a user may execute the Provisioning Technology
- on a machine (&quot;Target Machine&quot;) with the intent of installing, extending or updating the functionality of an Eclipse-based
- product.</li>
- <li>During the Provisioning Process, the Provisioning Technology may cause third party Installable Software or a portion thereof to be
- accessed and copied to the Target Machine.</li>
- <li>Pursuant to the Specification, you will provide to the user the terms and conditions that govern the use of the Installable
- Software (&quot;Installable Software Agreement&quot;) and such Installable Software Agreement shall be accessed from the Target
- Machine in accordance with the Specification. Such Installable Software Agreement must inform the user of the terms and conditions that govern
- the Installable Software and must solicit acceptance by the end user in the manner prescribed in such Installable Software Agreement. Upon such
- indication of agreement by the user, the provisioning Technology will complete installation of the Installable Software.</li>
-</ol>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
- another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
- possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<p><small>Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.</small></p>
-</body>
-</html>
diff --git a/tests/org.eclipse.jem.tests/.classpath b/tests/org.eclipse.jem.tests/.classpath
deleted file mode 100644
index db77f44c..00000000
--- a/tests/org.eclipse.jem.tests/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="javatests/"/>
- <classpathentry kind="src" path="vm_tests"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jem.tests/.cvsignore b/tests/org.eclipse.jem.tests/.cvsignore
deleted file mode 100644
index 60463af3..00000000
--- a/tests/org.eclipse.jem.tests/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-build.xml
diff --git a/tests/org.eclipse.jem.tests/.project b/tests/org.eclipse.jem.tests/.project
deleted file mode 100644
index abd595b6..00000000
--- a/tests/org.eclipse.jem.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jem.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.jem.tests/.settings/org.eclipse.core.resources.prefs b/tests/org.eclipse.jem.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 02d07704..00000000
--- a/tests/org.eclipse.jem.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sun Apr 15 21:10:03 EDT 2007
-eclipse.preferences.version=1
-encoding/<project>=ISO-8859-1
diff --git a/tests/org.eclipse.jem.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jem.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 7f2dae33..00000000
--- a/tests/org.eclipse.jem.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,292 +0,0 @@
-#Sat Mar 31 23:15:49 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=error
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=error
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLocal=error
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_assignment=0
-org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16
-org.eclipse.jdt.core.formatter.alignment_for_compact_if=16
-org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
-org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
-org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
-org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
-org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_after_package=1
-org.eclipse.jdt.core.formatter.blank_lines_before_field=1
-org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=1
-org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
-org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
-org.eclipse.jdt.core.formatter.blank_lines_before_method=1
-org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
-org.eclipse.jdt.core.formatter.blank_lines_before_package=0
-org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
-org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
-org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
-org.eclipse.jdt.core.formatter.comment.format_header=false
-org.eclipse.jdt.core.formatter.comment.format_html=true
-org.eclipse.jdt.core.formatter.comment.format_source_code=true
-org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true
-org.eclipse.jdt.core.formatter.comment.indent_root_tags=true
-org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
-org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert
-org.eclipse.jdt.core.formatter.comment.line_length=150
-org.eclipse.jdt.core.formatter.compact_else_if=true
-org.eclipse.jdt.core.formatter.continuation_indentation=2
-org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
-org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
-org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
-org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_empty_lines=false
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
-org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
-org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=true
-org.eclipse.jdt.core.formatter.indentation.size=4
-org.eclipse.jdt.core.formatter.insert_new_line_after_annotation=insert
-org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
-org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
-org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
-org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
-org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
-org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
-org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
-org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
-org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
-org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
-org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
-org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
-org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
-org.eclipse.jdt.core.formatter.lineSplit=150
-org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
-org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
-org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true
-org.eclipse.jdt.core.formatter.tabulation.char=tab
-org.eclipse.jdt.core.formatter.tabulation.size=4
-org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false
diff --git a/tests/org.eclipse.jem.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jem.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 855e1366..00000000
--- a/tests/org.eclipse.jem.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,8 +0,0 @@
-#Tue Feb 21 10:09:18 EST 2006
-eclipse.preferences.version=1
-formatter_profile=_jve
-formatter_settings_version=10
-org.eclipse.jdt.ui.ignorelowercasenames=true
-org.eclipse.jdt.ui.importorder=java;javax;org;org.eclipse.wtp;org.eclipse.jem;org.eclipse.ve.internal.cdm;org.eclipse.ve.internal.cde;org.eclipse.ve.internal.jcm;org.eclipse.ve.internal.java;org.eclipse.ve;com;
-org.eclipse.jdt.ui.ondemandthreshold=3
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/tests/org.eclipse.jem.tests/BeanInfo AllSuites with Remote Debug.launch b/tests/org.eclipse.jem.tests/BeanInfo AllSuites with Remote Debug.launch
deleted file mode 100644
index 92e5c812..00000000
--- a/tests/org.eclipse.jem.tests/BeanInfo AllSuites with Remote Debug.launch
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="false"/>
-<stringAttribute key="vminstall" value="jdk1.4.2_05"/>
-<booleanAttribute key="tracing" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<mapAttribute key="tracingOptions">
-<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/remote/debug/ioconsole" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
-<mapEntry key="org.eclipse.core.resources/monitor/builders" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packages" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/success" value="false"/>
-<mapEntry key="org.eclipse.jem.beaninfo/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
-<mapEntry key="org.eclipse.jem/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/jobs" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/success" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug/events/plugin" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.core.resources/monitor/listeners" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.jem/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/timing/startup" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="false"/>
-<mapEntry key="org.eclipse.jdt.debug/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/jobs/errorondeadlock" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/workbench.restore" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/logtrace" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/native" value="*"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/snapshots" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="org.eclipse.jem.ui/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/>
-<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/uijob.longwarning" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/allTypesCache" value="false"/>
-<mapEntry key="org.eclipse.help/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/failure" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
-<mapEntry key="org.eclipse.jdt.debug.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.help.base/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug/events/extension" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/part.activate" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/remote/debug/notimeouts" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/timing/shutdown" value="false"/>
-<mapEntry key="org.eclipse.jem.ui/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/vetimetrace" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.ui/trace/part.create" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/livewindow" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/failure" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/workbench.start" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
-<mapEntry key="org.eclipse.ant.core/debug" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/loader" value="*"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/actions" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/resource" value="*"/>
-<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.jem.beaninfo/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin/timing" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/jobs/beginend" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/remote/debug/debugvm" value="true"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/xmltext" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/logtracefile" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/remote/debug/vmtraceout" value="true"/>
-<mapEntry key="org.eclipse.jem.ui/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/contenttypes/debug" value="false"/>
-<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug/dump" value=""/>
-<mapEntry key="org.eclipse.jem/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.jem.util/debug/loglevel" value="WARNING"/>
-<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.jem.beaninfo/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.core.runtime/config/debug" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
-<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/properties" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/part.listeners" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.jem.proxy/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.core.runtime/jobs/locks" value="false"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/perspective" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/debug/pluginstopper" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
-<mapEntry key="org.eclipse.help/debug/context" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
-<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/class" value="*"/>
-</mapAttribute>
-<stringAttribute key="selectedPlugin" value="org.eclipse.jem.proxy"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="checked" value="org.eclipse.jem.proxy"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-<booleanAttribute key="clearws" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jem.tests.beaninfo.BeanInfoSuite"/>
-<stringAttribute key="location1" value="D:\runtime-junit-test-workspace"/>
-<booleanAttribute key="default" value="true"/>
-<stringAttribute key="vmargs" value=""/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="progargs" value="-os win32 -ws win32 -arch x86 -nl en_US"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jem.tests"/>
-<booleanAttribute key="askclear" value="true"/>
-<stringAttribute key="location0" value="D:\runtime-junit-test-workspace"/>
-</launchConfiguration>
diff --git a/tests/org.eclipse.jem.tests/BeanInfo AllSuites.launch b/tests/org.eclipse.jem.tests/BeanInfo AllSuites.launch
deleted file mode 100644
index f487a8c7..00000000
--- a/tests/org.eclipse.jem.tests/BeanInfo AllSuites.launch
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="false"/>
-<stringAttribute key="vminstall" value="J9_142_20040926"/>
-<booleanAttribute key="tracing" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<mapAttribute key="tracingOptions">
-<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/remote/debug/ioconsole" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
-<mapEntry key="org.eclipse.core.resources/monitor/builders" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packages" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/success" value="false"/>
-<mapEntry key="org.eclipse.jem.beaninfo/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
-<mapEntry key="org.eclipse.jem/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.core.runtime/jobs" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/success" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug/events/plugin" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes" value="false"/>
-<mapEntry key="org.eclipse.core.resources/monitor/listeners" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
-<mapEntry key="org.eclipse.jem/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/timing/startup" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
-<mapEntry key="org.eclipse.jdt.debug/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/jobs/errorondeadlock" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/workbench.restore" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/logtrace" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/native" value="*"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/snapshots" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
-<mapEntry key="org.eclipse.jem.ui/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/uijob.longwarning" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
-<mapEntry key="org.eclipse.help/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/allTypesCache" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/failure" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
-<mapEntry key="org.eclipse.jdt.debug.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.help.base/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug/events/extension" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/part.activate" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/remote/debug/notimeouts" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/timing/shutdown" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/vetimetrace" value="false"/>
-<mapEntry key="org.eclipse.jem.ui/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.ui/trace/part.create" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/livewindow" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/failure" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/workbench.start" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
-<mapEntry key="org.eclipse.ant.core/debug" value="true"/>
-<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/loader" value="*"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/actions" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/resource" value="*"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.jem.beaninfo/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/jobs/beginend" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin/timing" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/remote/debug/debugvm" value="false"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/xmltext" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/logtracefile" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/remote/debug/vmtraceout" value="false"/>
-<mapEntry key="org.eclipse.jem.ui/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/contenttypes/debug" value="false"/>
-<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug/dump" value=""/>
-<mapEntry key="org.eclipse.jem/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.jem.util/debug/loglevel" value="WARNING"/>
-<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.jem.beaninfo/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.core.runtime/config/debug" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
-<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/properties" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/part.listeners" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.jem.proxy/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.core.runtime/jobs/locks" value="false"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/perspective" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/debug/pluginstopper" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
-<mapEntry key="org.eclipse.help/debug/context" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
-<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/class" value="*"/>
-</mapAttribute>
-<stringAttribute key="selectedPlugin" value="org.eclipse.jem.proxy"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="checked" value="org.eclipse.jem.proxy"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-<booleanAttribute key="clearws" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jem.tests.beaninfo.BeanInfoSuite"/>
-<stringAttribute key="location1" value="D:\runtime-junit-test-workspace"/>
-<booleanAttribute key="default" value="true"/>
-<stringAttribute key="vmargs" value=""/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="progargs" value="-os win32 -ws win32 -arch x86 -nl en_US"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jem.tests"/>
-<booleanAttribute key="askclear" value="true"/>
-<stringAttribute key="location0" value="D:\runtime-junit-test-workspace"/>
-</launchConfiguration>
diff --git a/tests/org.eclipse.jem.tests/Java AllSuites with Remote Debug.launch b/tests/org.eclipse.jem.tests/Java AllSuites with Remote Debug.launch
deleted file mode 100644
index 9a46c52e..00000000
--- a/tests/org.eclipse.jem.tests/Java AllSuites with Remote Debug.launch
+++ /dev/null
@@ -1,303 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="false"/>
-<booleanAttribute key="tracing" value="true"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<mapAttribute key="tracingOptions">
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/debug/traceexpressionstimethreshold" value="100"/>
-<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/viewer" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/logtrace" value="false"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist/extensions" value="1000"/>
-<mapEntry key="org.eclipse.ui.ide/debug/gc" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype/cache" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/remote/debug/vmtraceout" value="true"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/shutdown" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/get" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/locks" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.equinox.registry/debug/events" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/checkConditions" value="300"/>
-<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.listeners" value="200"/>
-<mapEntry key="org.eclipse.jdt.core/perf/containerinitializer" value="5000"/>
-<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.switch" value="800"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.ui/perf/part.input" value="200"/>
-<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
-<mapEntry key="org.eclipse.jem.ui/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.equinox.preferences/general" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/search/participants" value="300"/>
-<mapEntry key="org.eclipse.ui/perf/part.listeners" value="200"/>
-<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.ui/perf/part.control" value="800"/>
-<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/remote/debug/notimeouts" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/selection" value="300"/>
-<mapEntry key="org.eclipse.help/debug/context" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/content_assist_sorters/extensions" value=""/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/livewindow" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
-<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/save.participants" value="500"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.jem/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
-<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/variableinitializer" value="5000"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/model" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/perf/success" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.performance" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/logtracefile" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.core.jobs/jobs" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/perspective.create" value="800"/>
-<mapEntry key="org.eclipse.ui/trace/sources" value="false"/>
-<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPartReference" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.activate" value="200"/>
-<mapEntry key="org.eclipse.ui.intro.universal/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
-<mapEntry key="org.eclipse.core.resources/contenttype" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/contributions" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.start" value="45000"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPerspectiveListener" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
-<mapEntry key="org.eclipse.ui.workbench/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/FastPartitioner/PositionCache" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.performance" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/xmltext" value="false"/>
-<mapEntry key="org.eclipse.ve.cde/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
-<mapEntry key="org.eclipse.jem/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="500"/>
-<mapEntry key="org.eclipse.ui/perf/part.init" value="800"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/part.create" value="800"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
-<mapEntry key="org.eclipse.equinox.preferences/set" value="false"/>
-<mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/stacktrace" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
-<mapEntry key="org.eclipse.ve.cde/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/beginend" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/interrupt" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/showHeapStatus" value="true"/>
-<mapEntry key="org.eclipse.ui/perf/contentTypes" value="200"/>
-<mapEntry key="org.eclipse.ui/trace/commands" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/completion" value="300"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel/cache" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
-<mapEntry key="org.eclipse.jem.beaninfo/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/clipboardtext" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/messageBundles" value="false"/>
-<mapEntry key="org.eclipse.jem.beaninfo/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.jdt.core.manipulation/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPartListener2" value="false"/>
-<mapEntry key="org.eclipse.jem.ui/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.jdt.core/perf/reconcile" value="1000"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
-<mapEntry key="org.eclipse.ltk.core.refactoring/perf/participants/createChanges" value="300"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
-<mapEntry key="org.eclipse.jem.beaninfo/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.ve.cde/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.jem/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/makeActions" value="1000"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchWindow.IPageListener" value="false"/>
-<mapEntry key="org.eclipse.team.core/threading" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/debug/traceexpressions" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/remote/debug/debugvm" value="true"/>
-<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/plugin" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/remote/debug/ioconsole" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/vetimetrace" value="false"/>
-<mapEntry key="org.eclipse.jem.ui/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ResultCollector" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/createPartControl" value="1300"/>
-<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.pde.core/cache" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations.verbose" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/workbench.restore" value="30000"/>
-<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/>
-<mapEntry key="org.eclipse.core.jobs/jobs/errorondeadlock" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.ui.intro.universal/trace/logPerformance" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/uijob" value="200"/>
-<mapEntry key="org.eclipse.jdt.core/debug/sourcemapper" value="false"/>
-<mapEntry key="org.eclipse.debug.ui/debug/viewers/deltas" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/generics" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/perf/javadeltalistener" value="500"/>
-<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
-<mapEntry key="org.eclipse.core.contenttype/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/loglevel" value="WARNING"/>
-<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/operations" value="false"/>
-<mapEntry key="org.eclipse.ui/perf/page.listeners" value="200"/>
-<mapEntry key="org.eclipse.jdt.ui/perf/explorer/RefactorActionGroup" value="150"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
-<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="true"/>
-<mapEntry key="org.eclipse.help/debug" value="true"/>
-<mapEntry key="org.eclipse.jface.text.source/debug/RevisionRulerColumn" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.ui/listeners/IWorkbenchPage.IPropertyChangeListener" value="false"/>
-<mapEntry key="org.eclipse.ui.browser/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
-<mapEntry key="org.eclipse.pde.core/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
-<mapEntry key="org.eclipse.ui.ide/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/formatter/enable_new" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.ui/experimental/menus" value="false"/>
-<mapEntry key="org.eclipse.pde.core/classpath" value="false"/>
-</mapAttribute>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="selectedPlugin" value="org.eclipse.jem.proxy"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<stringAttribute key="location" value="D:\runtime-junit-test-workspace"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-<stringAttribute key="configLocation" value=""/>
-<booleanAttribute key="clearws" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jem.tests.AllSuites"/>
-<stringAttribute key="location1" value="D:\runtime-junit-test-workspace"/>
-<stringAttribute key="pde.version" value="3.2a"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os win32 -ws win32 -arch x86 -nl en_US"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jem.tests"/>
-<booleanAttribute key="askclear" value="true"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.jem.tests"/>
-</listAttribute>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-</launchConfiguration>
diff --git a/tests/org.eclipse.jem.tests/Java AllSuites.launch b/tests/org.eclipse.jem.tests/Java AllSuites.launch
deleted file mode 100644
index ca967910..00000000
--- a/tests/org.eclipse.jem.tests/Java AllSuites.launch
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<stringAttribute key="product" value="org.eclipse.platform.ide"/>
-<stringAttribute key="bootstrap" value=""/>
-<booleanAttribute key="useProduct" value="false"/>
-<booleanAttribute key="tracing" value="true"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="4"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<mapAttribute key="tracingOptions">
-<mapEntry key="org.eclipse.team.cvs.core/syncchangeevents" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/xmltext" value="false"/>
-<mapEntry key="org.eclipse.help.webapp/debug/workingsets" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logfilename" value=""/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/loader" value="*"/>
-<mapEntry key="org.eclipse.jem/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/actions" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/debug/traceexpressionstimethreshold" value="100"/>
-<mapEntry key="org.eclipse.jface.text/debug/ContentAssistSubjectAdapters" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/listeners" value="500"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/connect" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/markers" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/needbuild" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/logtrace" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/graphics" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/resolution" value="false"/>
-<mapEntry key="org.eclipse.update.configurator/debug" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/ssh_protocol" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/snapshot" value="500"/>
-<mapEntry key="org.eclipse.osgi/monitor/activation" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packages" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/showSystemJobs" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/remote/debug/vmtraceout" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/classes" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/debug/context" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/converter/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/set" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/swtdebug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javamodel" value="false"/>
-<mapEntry key="org.eclipse.team.core/streams" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/jobs/locks" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/printHTML" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug/dump" value=""/>
-<mapEntry key="org.eclipse.jdt.ui/debug/TypeConstraints" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta/verbose" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug" value="true"/>
-<mapEntry key="org.eclipse.core.expressions/tracePropertyResolving" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filename" value="runtime.traces"/>
-<mapEntry key="org.eclipse.update.core/debug/web" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug/resolve" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/delta" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/activation" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/search" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/checkCoreBindingIsEqualTo" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.jdt.core/debug/compiler" value="false"/>
-<mapEntry key="org.eclipse.jface.text/debug/AnnotationPainter" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug/events/plugin" value="false"/>
-<mapEntry key="org.eclipse.jem.beaninfo/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.update.core/debug/configuration" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/part.activate" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/imports" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/infopop" value="false"/>
-<mapEntry key="org.eclipse.osgi/trace/filters" value="trace.properties"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/platformadmin/resolver" value="false"/>
-<mapEntry key="org.eclipse.jem.beaninfo/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.core.runtime/registry/debug/events/extension" value="false"/>
-<mapEntry key="org.eclipse.jem.ui/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.jem.ui/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.help.webapp/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/hierarchy" value="false"/>
-<mapEntry key="org.eclipse.core.resources/refresh" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/debug" value="false"/>
-<mapEntry key="org.eclipse.team.core/backgroundevents" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/cpresolution" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/threading" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.jem.beaninfo/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.update.core/debug/warning" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/install" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/internalerror/openDialog" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/jobs/errorondeadlock" value="false"/>
-<mapEntry key="org.eclipse.core.resources/debug" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug/embeddedBrowser/inprocess" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/impl" value="org.eclipse.osgi.profile.DefaultProfileLogger"/>
-<mapEntry key="org.eclipse.jem/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.osgi/profile/benchmark" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/parsing" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/general" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/cvsprotocol" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/postaction" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/perspective.listeners" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/remote/debug/notimeouts" value="false"/>
-<mapEntry key="org.eclipse.team.core/threading" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachelookup" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin/timing" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/reconciler" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/security" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/debug/traceexpressions" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/remote/debug/debugvm" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/manifest" value="false"/>
-<mapEntry key="org.eclipse.help/debug/context" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/builder" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/requires" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/syncinfo" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/resource" value="*"/>
-<mapEntry key="org.eclipse.osgi/profile/startup" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/services" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/activateplugin" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.ssh/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/markers" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/livewindow" value="false"/>
-<mapEntry key="org.eclipse.update.core/debug/installhandler" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/startlevel" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/remote/debug/ioconsole" value="false"/>
-<mapEntry key="org.eclipse.osgi/monitor/resources" value="false"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/vetimetrace" value="false"/>
-<mapEntry key="org.eclipse.jem.ui/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.jdt.core/debug/javadelta" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/selection" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/tree" value="false"/>
-<mapEntry key="org.eclipse.core.resources/preferences" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/workbench.restore" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/part.create" value="false"/>
-<mapEntry key="org.eclipse.help/debug/protocols" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/snapshots" value="false"/>
-<mapEntry key="org.eclipse.core.resources/natures" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug/search" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/dirtycaching" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/buffersize" value="256"/>
-<mapEntry key="org.eclipse.jem/debug/loglevel" value="default"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/native" value="*"/>
-<mapEntry key="org.eclipse.jdt.core/debug/zipaccess" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/url/debug/cachecopy" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/properties" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/cycles" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/create" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/include.timings" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/keyBindings.verbose" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/bundleTime" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/jobs/beginend" value="false"/>
-<mapEntry key="org.eclipse.team.cvs.core/metafiles" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/preferences/get" value="false"/>
-<mapEntry key="org.eclipse.team.core/debug" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/perf/success" value="true"/>
-<mapEntry key="org.eclipse.osgi/debug/events" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/compatibility/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/declaredImages" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/monitorbundles" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/success" value="false"/>
-<mapEntry key="org.eclipse.pde.build/debug" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/logtracefile" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug/location" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts.verbose" value="false"/>
-<mapEntry key="org.eclipse.help.base/debug" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/debug/pluginstopper" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/jobs" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/workbench.start" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/debug/logtrace" value="default"/>
-<mapEntry key="org.eclipse.core.runtime/contenttypes/debug" value="false"/>
-<mapEntry key="org.eclipse.core.resources/strings" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/checkCoreBindingGetJavaElement" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/metainfo" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/timing/startup" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/wiring" value="false"/>
-<mapEntry key="org.eclipse.osgi/profile/debug" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/perf" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/contexts" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/invoking" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/failure" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/uijob.longwarning" value="false"/>
-<mapEntry key="org.eclipse.jem.util/debug/loglevel" value="WARNING"/>
-<mapEntry key="org.eclipse.update.core/debug/type" value="false"/>
-<mapEntry key="org.eclipse.core.resources/perf/builders" value="10000"/>
-<mapEntry key="org.eclipse.ui/trace/page.listeners" value="false"/>
-<mapEntry key="org.eclipse.ui/debug/job.stale" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/allTypesCache" value="false"/>
-<mapEntry key="org.eclipse.jem.proxy/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.core.resources/history" value="false"/>
-<mapEntry key="org.eclipse.team.core/refreshjob" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/debug" value="true"/>
-<mapEntry key="org.eclipse.jdt.core/debug/completion" value="false"/>
-<mapEntry key="org.eclipse.osgi/eclipseadaptor/debug" value="false"/>
-<mapEntry key="org.eclipse.debug.core/debug" value="true"/>
-<mapEntry key="org.eclipse.help/debug" value="true"/>
-<mapEntry key="org.eclipse.ui/trace/perspective" value="false"/>
-<mapEntry key="org.eclipse.ui/debug" value="false"/>
-<mapEntry key="org.eclipse.jdt.core/debug/indexmanager" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/packageadmin" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/loader" value="false"/>
-<mapEntry key="org.eclipse.core.resources/build/failure" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/tree" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/config/debug" value="false"/>
-<mapEntry key="org.eclipse.osgi/defaultprofile/logsynchronously" value="false"/>
-<mapEntry key="org.eclipse.help.ui/debug" value="true"/>
-<mapEntry key="org.eclipse.osgi/trace/classLoading" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/metainfo" value="false"/>
-<mapEntry key="org.eclipse.core.resources/save/mastertable" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/perf/failure" value="true"/>
-<mapEntry key="org.eclipse.core.runtime/debug" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/handlers.verbose.commandId" value=""/>
-<mapEntry key="org.eclipse.jdt.core/debug/buffermanager" value="false"/>
-<mapEntry key="org.eclipse.osgi/debug/filter" value="false"/>
-<mapEntry key="org.eclipse.osgi/resolver/grouping" value="false"/>
-<mapEntry key="org.eclipse.jdt.ui/debug/ASTProvider" value="false"/>
-<mapEntry key="org.eclipse.ui/trace/part.listeners" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/success" value="false"/>
-<mapEntry key="org.eclipse.core.resources/restore/mastertable" value="false"/>
-<mapEntry key="org.eclipse.ui.intro/trace/logInfo" value="true"/>
-<mapEntry key="org.eclipse.ve.java.core/debug/logtracefile" value="default"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/filter/class" value="*"/>
-<mapEntry key="org.eclipse.core.runtime/jobs/timing" value="false"/>
-<mapEntry key="org.eclipse.core.runtime/loader/debug/prefixes/failure" value="false"/>
-</mapAttribute>
-<stringAttribute key="selectedPlugin" value="org.eclipse.jem.proxy"/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<stringAttribute key="timestamp" value="1172079346936"/>
-<stringAttribute key="location" value="D:\runtime-junit-test-workspace"/>
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-<stringAttribute key="configLocation" value=""/>
-<booleanAttribute key="clearws" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.jem.tests.AllSuites"/>
-<stringAttribute key="location1" value="D:\runtime-junit-test-workspace"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os win32 -ws win32 -arch x86 -nl en_US"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="clearConfig" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.jem.tests"/>
-<booleanAttribute key="askclear" value="true"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.jem.tests"/>
-</listAttribute>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>
-</launchConfiguration>
diff --git a/tests/org.eclipse.jem.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jem.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 3b21034d..00000000
--- a/tests/org.eclipse.jem.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,36 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.jem.tests; singleton:=true
-Bundle-Version: 1.2.300.qualifier
-Bundle-ClassPath: javatests.jar
-Bundle-Activator: org.eclipse.jem.tests.JavaTestsPlugin
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: initParserTest46376;x-internal:=true,
- org.eclipse.jem.tests,
- org.eclipse.jem.tests.basic,
- org.eclipse.jem.tests.beaninfo,
- org.eclipse.jem.tests.instantiation,
- org.eclipse.jem.tests.modelListeners,
- org.eclipse.jem.tests.proxy,
- org.eclipse.jem.tests.proxy.ide,
- org.eclipse.jem.tests.proxy.initParser,
- org.eclipse.jem.tests.proxy.initParser.tree,
- org.eclipse.jem.tests.proxy.remote
-Require-Bundle: org.eclipse.jem.proxy;bundle-version="[2.0.0,3.0.0)",
- org.junit;bundle-version="[3.8.1,5.0.0)",
- org.eclipse.ant.core;bundle-version="[3.1.100,4.0.0)",
- org.eclipse.jem.beaninfo;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.jdt.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.workbench;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jdt.launching;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.2.0,3.0.0)",
- org.eclipse.jem;bundle-version="[2.0.0,3.0.0)",
- org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.debug.core;bundle-version="[3.2.0,4.0.0)",
- org.eclipse.jem.util;bundle-version="[2.0.0,3.0.0)"
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
-Bundle-ActivationPolicy: lazy
diff --git a/tests/org.eclipse.jem.tests/about.html b/tests/org.eclipse.jem.tests/about.html
deleted file mode 100644
index 5acea59c..00000000
--- a/tests/org.eclipse.jem.tests/about.html
+++ /dev/null
@@ -1,25 +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">
-<h2>About This Content</h2>
-
-<P>June, 2008</P>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
-indicated below, the Content is provided to you under the terms and conditions of the
-Eclipse Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; 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 (&quot;Redistributor&quot;) and different terms and conditions may
-apply to your use of any object code in the Content. Check the Redistributor's 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> \ No newline at end of file
diff --git a/tests/org.eclipse.jem.tests/about.ini b/tests/org.eclipse.jem.tests/about.ini
deleted file mode 100644
index 1931489a..00000000
--- a/tests/org.eclipse.jem.tests/about.ini
+++ /dev/null
@@ -1,29 +0,0 @@
-# about.ini
-# contains information about a feature
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# "%key" are externalized strings defined in about.properties
-# This file does not need to be translated.
-
-# Property "aboutText" contains blurb for "About" dialog (translated)
-aboutText=%blurb
-
-# Property "windowImage" contains path to window icon (16x16)
-# needed for primary features only
-
-# Property "featureImage" contains path to feature image (32x32)
-featureImage=eclipse32.png
-
-# Property "aboutImage" contains path to product image (500x330 or 115x164)
-# needed for primary features only
-
-# Property "appName" contains name of the application (translated)
-# needed for primary features only
-
-# Property "welcomePage" contains path to welcome page (special XML-based format)
-# optional
-
-# Property "welcomePerspective" contains the id of the perspective in which the
-# welcome page is to be opened.
-# optional
-
-
diff --git a/tests/org.eclipse.jem.tests/about.mappings b/tests/org.eclipse.jem.tests/about.mappings
deleted file mode 100644
index bddaab43..00000000
--- a/tests/org.eclipse.jem.tests/about.mappings
+++ /dev/null
@@ -1,6 +0,0 @@
-# about.mappings
-# contains fill-ins for about.properties
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file does not need to be translated.
-
-0=@build@ \ No newline at end of file
diff --git a/tests/org.eclipse.jem.tests/about.properties b/tests/org.eclipse.jem.tests/about.properties
deleted file mode 100644
index 7929ea5c..00000000
--- a/tests/org.eclipse.jem.tests/about.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 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
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.tests.git/tests/org.eclipse.jem.tests/about.properties,v $
-# $Revision: 1.8 $ $Date: 2006/05/18 19:09:56 $
-#
-
-# about.properties
-# contains externalized strings for about.ini
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# fill-ins are supplied by about.mappings
-# This file should be translated.
-
-blurb=Java EMF Model Tests\n\
-\n\
-Version: {featureVersion}\n\
-Build id: {0}\n\
-\n\
-(c) Copyright Eclipse contributors and others. 2000, 2006. All rights reserved.\n\
-Visit http://www.eclipse.org/vep
diff --git a/tests/org.eclipse.jem.tests/build.properties b/tests/org.eclipse.jem.tests/build.properties
deleted file mode 100644
index 41951208..00000000
--- a/tests/org.eclipse.jem.tests/build.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 2006 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
-###############################################################################
-bin.includes = plugin.xml,\
- plugin.properties,\
- javatests.jar,\
- vm/tests.jar,\
- about.html,\
- testdata/,\
- test.xml.off,\
- about.ini,\
- about.mappings,\
- about.properties,\
- eclipse32.png,\
- META-INF/
-jars.compile.order = vm/tests.jar,\
- javatests.jar
-source.vm/tests.jar = vm_tests/
-source.javatests.jar = javatests/
-src.includes = proxy.jars
diff --git a/tests/org.eclipse.jem.tests/eclipse32.png b/tests/org.eclipse.jem.tests/eclipse32.png
deleted file mode 100644
index 568fac1d..00000000
--- a/tests/org.eclipse.jem.tests/eclipse32.png
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jem.tests/javatests/InitParserTest46376.java b/tests/org.eclipse.jem.tests/javatests/InitParserTest46376.java
deleted file mode 100644
index 7336ada0..00000000
--- a/tests/org.eclipse.jem.tests/javatests/InitParserTest46376.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * $RCSfile: InitParserTest46376.java,v $
- * $Revision: 1.3 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * This is to test for defect [46376].
- *
- * SameName test. This is test where you have this:
- * initParserTest46376.SameNameTestClass.java
- * InitParserTest46376.java
- *
- * Before [46376] the Static parser would find throw NoClassDefFoundError on initParserTest46376 when looking for
- * SameNameTestClass and never find the class.
- *
- * To compile in Eclipse we need to have one of the classes be in the default package. Eclipse complains if we didn't.
- * But there is nothing to stop this from happening with packages too if they are spread across compile groups.
- */
-public class InitParserTest46376 {
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/initParserTest46376/SameNameTestClass.java b/tests/org.eclipse.jem.tests/javatests/initParserTest46376/SameNameTestClass.java
deleted file mode 100644
index 6a1f7b0e..00000000
--- a/tests/org.eclipse.jem.tests/javatests/initParserTest46376/SameNameTestClass.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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 initParserTest46376;
-/*
- * $RCSfile: SameNameTestClass.java,v $
- * $Revision: 1.3 $ $Date: 2005/08/24 20:58:55 $
- */
-/**
- * This is to test for defect [46376].
- *
- * SameName test. This is test where you have this:
- * InitParserTest46376.SameNameTestClass.java
- * InitParserTest46376.java
- *
- * and
- *
- * new org.eclipse.jem.tests.proxy.initParser.SameNameTestClass.RealClass()
- *
- * Before [46376] the Static parser would find SameNameTestClass.java instead of the RealClass and would of failed.
- * To compile in Eclipse we need to have one of the classes be in the default package. Eclipse complains if we didn't.
- * But there is nothing to stop this from happening with packages too if they are spread across compile groups.
- */
-public class SameNameTestClass {
-
- public boolean equals(Object other) {
- // To make test easier, we simply looking if both of same type.
- return other != null && other.getClass() == SameNameTestClass.class;
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/.classpath b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/.classpath
deleted file mode 100644
index fb501163..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/AllSuites.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/AllSuites.java
deleted file mode 100644
index f8ed9792..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/AllSuites.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests;
-/*
- * $RCSfile: AllSuites.java,v $
- * $Revision: 1.10 $ $Date: 2007/03/14 01:22:06 $
- */
-import org.eclipse.jem.tests.basic.BasicSuite;
-import org.eclipse.jem.tests.beaninfo.BeanInfoSuite;
-import org.eclipse.jem.tests.instantiation.InstantiationSuite;
-import org.eclipse.jem.tests.modelListeners.ListenersSuite;
-import org.eclipse.jem.tests.proxy.ide.IDEProxySuite;
-import org.eclipse.jem.tests.proxy.initParser.InitParserSuite;
-import org.eclipse.jem.tests.proxy.initParser.tree.ASTParserSuite;
-import org.eclipse.jem.tests.proxy.remote.RemoteProxySuite;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllSuites extends TestSuite {
- // Testa cases to be include in the suite
- private static Class suitesList[] = {
- BasicSuite.class,
- JDK5ReflectionSuite.class,
- InitParserSuite.class,
- ASTParserSuite.class,
- RemoteProxySuite.class,
- IDEProxySuite.class,
- BeanInfoSuite.class,
- InstantiationSuite.class,
- ListenersSuite.class,
- } ;
- public static String pkgName = "Java EMF Model jUnit Test Suite" ;
-
- /**
- * Constructor for PackageSuite.
- */
- public AllSuites() {
- super();
- populateSuite() ;
- }
-
- /**
- * Constructor for PackageSuite.
- * @param theClass
- */
- public AllSuites(Class theClass) {
- super(theClass);
- populateSuite() ;
- }
-
- /**
- * Constructor for PackageSuite.
- * @param name
- */
- public AllSuites(String name) {
- super(name);
- populateSuite() ;
- }
-
- private void populateSuite () {
- for (int i=0; i<suitesList.length; i++)
- try {
- Test ts = (Test) suitesList[i].newInstance() ;
- addTest(ts) ;
- }
- catch (Exception e) {}
- }
-
- public static Test suite() {
- return new AllSuites(pkgName);
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JDK5BinReflectionTests.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JDK5BinReflectionTests.java
deleted file mode 100644
index 70dcf465..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JDK5BinReflectionTests.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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.jem.tests;
-
-
-/**
- * Test case for testing the reflection of concepts
- * from JDK 5 when source is not available.
- * @since 1.2.2
- *
- */
-public class JDK5BinReflectionTests extends JDK5ReflectionTests {
-
- /**
- *
- */
- public JDK5BinReflectionTests() {
- isReflectingSource = false;
- }
-
- /**
- * @param name
- */
- public JDK5BinReflectionTests(String name) {
- super(name);
- isReflectingSource = false;
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JDK5ReflectionSuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JDK5ReflectionSuite.java
deleted file mode 100644
index 4f779672..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JDK5ReflectionSuite.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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
- *******************************************************************************/
-/*
- * $RCSfile: JDK5ReflectionSuite.java,v $
- * $Revision: 1.1 $ $Date: 2006/10/27 19:36:33 $
- */
-package org.eclipse.jem.tests;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * This is basic JEM JDK5 toleration mode tests.
- *
- * @author richkulp
- *
- */
-public class JDK5ReflectionSuite extends TestSetup {
-
- // Test cases to be include in the suite
- private static final Class testsList[] = { JDK5ReflectionTests.class, JDK5BinReflectionTests.class};
-
- /**
- *
- */
- public JDK5ReflectionSuite() {
- this("Test Basic JEM JDK5 toleration mode Suite");
- }
-
- /**
- * @param name
- */
- public JDK5ReflectionSuite(String name) {
- super(new TestSuite(name) {
- {
- for (int i = 0; i < testsList.length; i++) {
- addTestSuite(testsList[i]);
- }
-
- }
- });
- }
-
- public static Test suite() {
- return new JDK5ReflectionSuite();
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JDK5ReflectionTests.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JDK5ReflectionTests.java
deleted file mode 100644
index e8ae859a..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JDK5ReflectionTests.java
+++ /dev/null
@@ -1,689 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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.jem.tests;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.*;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory;
-import org.eclipse.jem.java.*;
-
-/**
- * Test case for testing the reflection of concepts
- * from JDK 5.
- * @since 1.2.2
- *
- */
-public class JDK5ReflectionTests extends TestCase {
-
- private static final String PROJECT_NAME = "JDK5Tests"; //$NON-NLS-1$
- private IJavaProject javaProject;
- private ResourceSet resourceSet;
-
- private boolean oldAutoBuildingState; // autoBuilding state before we started.
-
- protected boolean isReflectingSource;
-
- /**
- *
- */
- public JDK5ReflectionTests() {
- isReflectingSource = true;
- }
-
- /**
- * @param name
- */
- public JDK5ReflectionTests(String name) {
- super(name);
- isReflectingSource = true;
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- if (isReflectingSource)
- setUpForSource();
- else
- setUpForNoSource();
- }
-
- protected void setUpForSource() throws CoreException, IOException, MalformedURLException {
- oldAutoBuildingState = JavaProjectUtil.setAutoBuild(true);
- URL installURL = JavaTestsPlugin.getPlugin().getBundle().getEntry("/");
- String[] zipPaths = new String[1];
- zipPaths[0] = FileLocator.toFileURL(new URL(installURL, "testdata/JDK5Tests.zip")).getFile();
- IProject[] projects =
- JavaProjectUtil.importProjects(
- new String[] { PROJECT_NAME },
- zipPaths);
- assertNotNull(projects[0]);
- JavaProjectUtil.waitForAutoBuild();
- javaProject = JavaCore.create(projects[0]);
- javaProject.setOption(JavaCore.COMPILER_COMPLIANCE, "1.5");
- resourceSet = new ResourceSetImpl();
- resourceSet.getAdapterFactories().add(new JavaJDOMAdapterFactory(javaProject));
- }
-
- protected void setUpForNoSource() throws CoreException, IOException, MalformedURLException {
- oldAutoBuildingState = JavaProjectUtil.setAutoBuild(true);
- URL installURL = JavaTestsPlugin.getPlugin().getBundle().getEntry("/");
- String[] jarPaths = new String[1];
- jarPaths[0] = FileLocator.toFileURL(new URL(installURL, "testdata/JDK5BinTests.jar")).getFile();
- IProject project = JavaProjectUtil.createEmptyJavaProject(ResourcesPlugin.getWorkspace(), new Path(PROJECT_NAME), null);
- assertNotNull(project);
- JavaProjectUtil.waitForAutoBuild();
- javaProject = JavaCore.create(project);
- javaProject.setOption(JavaCore.COMPILER_COMPLIANCE, "1.5");
- ArrayList classpath = new ArrayList(Arrays.asList(javaProject.getRawClasspath()));
- classpath.add(JavaCore.newLibraryEntry(new Path(jarPaths[0]), null, null));
- javaProject.setRawClasspath((IClasspathEntry[]) classpath.toArray(new IClasspathEntry[0]), null);
- JavaProjectUtil.waitForAutoBuild();
- resourceSet = new ResourceSetImpl();
- resourceSet.getAdapterFactories().add(new JavaJDOMAdapterFactory(javaProject));
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- JavaProjectUtil.deleteProject(javaProject.getProject());
- }
- }, ResourcesPlugin.getWorkspace().getRoot(), 0, null);
-
- JavaProjectUtil.setAutoBuild(oldAutoBuildingState);
- }
-
- private JavaHelpers reflectClass(String qualifiedName) {
- return JavaRefFactory.eINSTANCE.reflectType(qualifiedName, resourceSet);
- }
-
- /**
- * Test method test1 from Test class.
- *
- * public Collection<String> test1()
- *
- */
- public void test1() {
- JavaHelpers testHelper = reflectClass("test.me.Test");
- assertFalse(testHelper.isPrimitive());
- JavaClass testClass = (JavaClass) testHelper;
- assertTrue((testClass).isExistingType());
-
- Method method = testClass.getMethod("test1", Collections.EMPTY_LIST);
- assertNotNull(method);
- JavaHelpers returnType = method.getReturnType();
-
-
- assertEquals("java.util.Collection", returnType.getQualifiedName());
- assertEquals("Collection", returnType.getSimpleName());
- }
-
- /**
- * Test method test2 from Test class.
- *
- * public void test2(Collection<? extends IFoo> aCollection)
- *
- */
- public void test2() {
- JavaHelpers testHelper = reflectClass("test.me.Test");
- JavaClass testClass = (JavaClass) testHelper;
- assertTrue((testClass).isExistingType());
-
- Method method = null;
- List methods = testClass.getMethods();
- for (int i = 0; i < methods.size(); i++) {
- method = (Method) methods.get(i);
- if (method.getName().equals("test2")) {
- break;
- } else {
- method = null;
- }
- }
-
- assertNotNull(method);
- JavaHelpers returnType = method.getReturnType();
- assertNotNull(returnType); //void
- List params = method.getParameters();
- assertTrue(params.size() == 1);
- JavaParameter param = (JavaParameter) params.get(0);
- if (isReflectingSource)
- assertTrue(param.getName().equals("aCollection"));
- JavaHelpers paramType = param.getJavaType();
- assertNotNull(paramType);
-
- assertEquals("java.util.Collection", paramType.getQualifiedName());
- assertEquals("Collection", paramType.getSimpleName());
- }
-
- /**
- * Test method test3 from Test class.
- *
- * public <T extends IFoo> T test3(Class<T> aClass, String s, List<Integer> aList)
- *
- */
- public void test3() {
- JavaHelpers testHelper = reflectClass("test.me.Test");
- JavaClass testClass = (JavaClass) testHelper;
- assertTrue((testClass).isExistingType());
-
- Method method = null;
- List methods = testClass.getMethods();
- for (int i = 0; i < methods.size(); i++) {
- method = (Method) methods.get(i);
- if (method.getName().equals("test3")) {
- break;
- } else {
- method = null;
- }
- }
-
- assertNotNull(method);
-
- //Verify return type.
- JavaHelpers returnType = method.getReturnType();
- assertNotNull(returnType);
-
- assertEquals("test.dependents.IFoo", returnType.getQualifiedName());
- assertEquals("IFoo", returnType.getSimpleName());
-
- //Verify parameters
- List params = method.getParameters();
- assertTrue(params.size() == 3);
-
- //Verify Class<T> aClass
- JavaParameter param1 = (JavaParameter) params.get(0);
- if (isReflectingSource)
- assertTrue(param1.getName().equals("aClass"));
- JavaHelpers param1Type = param1.getJavaType();
- assertNotNull(param1Type);
-
- assertEquals("java.lang.Class", param1Type.getQualifiedName());
- assertEquals("Class", param1Type.getSimpleName());
-
- //Verify String s
- JavaParameter param2 = (JavaParameter) params.get(1);
- if (isReflectingSource)
- assertEquals("s", param2.getName());
- JavaHelpers param2Type = param2.getJavaType();
- assertNotNull(param2Type);
-
- //Verify List<Integer> aList
- JavaHelpers listType = reflectClass("java.util.List");
- JavaParameter param3 = (JavaParameter) params.get(2);
- if (isReflectingSource)
- assertEquals("aList", param3.getName());
- JavaHelpers param3Type = param3.getJavaType();
- assertNotNull(param3Type);
- assertEquals(listType, param3Type);
- }
-
- /**
- * Test method test4 from Test class.
- *
- * public Map<Integer, String> test4(Integer anInteger)
- *
- */
- public void test4() {
- JavaHelpers testHelper = reflectClass("test.me.Test");
- JavaClass testClass = (JavaClass) testHelper;
- assertTrue((testClass).isExistingType());
-
- Method method = null;
- List methods = testClass.getMethods();
- for (int i = 0; i < methods.size(); i++) {
- method = (Method) methods.get(i);
- if (method.getName().equals("test4")) {
- break;
- } else {
- method = null;
- }
- }
-
- assertNotNull(method);
-
- //Verify return type.
- JavaHelpers returnType = method.getReturnType();
- assertNotNull(returnType);
-
- assertEquals("java.util.Map", returnType.getQualifiedName());
- assertEquals("Map", returnType.getSimpleName());
- }
-
- /**
- * Test method test5 from Test class.
- *
- * public void test5(List<? super IFoo> aList)
- *
- */
- public void test5() {
- JavaHelpers testHelper = reflectClass("test.me.Test");
- JavaClass testClass = (JavaClass) testHelper;
- assertTrue((testClass).isExistingType());
-
- Method method = null;
- List methods = testClass.getMethods();
- for (int i = 0; i < methods.size(); i++) {
- method = (Method) methods.get(i);
- if (method.getName().equals("test5")) {
- break;
- } else {
- method = null;
- }
- }
-
- assertNotNull(method);
-
- //Verify parameters
- List params = method.getParameters();
- assertTrue(params.size() == 1);
-
- JavaParameter param1 = (JavaParameter) params.get(0);
- if (isReflectingSource)
- assertTrue(param1.getName().equals("aList"));
- JavaHelpers param1Type = param1.getJavaType();
- assertNotNull(param1Type);
-
- assertEquals("java.util.List", param1Type.getQualifiedName());
- assertEquals("List", param1Type.getSimpleName());
- }
-
- /**
- * Test method test6 from Test class.
- *
- * public <T> void test6(Class<T>[] aClassArray, List<String>[] anArrayOfListsOfString, Class<?>[] aWildcardClassArray, Class<?>[][][] aMultiDimWildcardArray)
- *
- */
- public void test6() {
- JavaHelpers testHelper = reflectClass("test.me.Test");
- JavaClass testClass = (JavaClass) testHelper;
- assertTrue((testClass).isExistingType());
-
- Method method = null;
- List methods = testClass.getMethods();
- for (int i = 0; i < methods.size(); i++) {
- method = (Method) methods.get(i);
- if (method.getName().equals("test6")) {
- break;
- } else {
- method = null;
- }
- }
-
- assertNotNull(method);
-
- //Verify parameters
- List params = method.getParameters();
- assertEquals(4, params.size());
-
- // Verify Class<T>[] aClassArray
- JavaParameter param1 = (JavaParameter) params.get(0);
- if (isReflectingSource)
- assertTrue(param1.getName().equals("aClassArray"));
- JavaHelpers param1Type = param1.getJavaType();
- assertNotNull(param1Type);
- assertTrue(((ArrayType)param1Type).getArrayDimensions() == 1);
- assertEquals("java.lang.Class[]", param1Type.getQualifiedName());
- assertEquals("Class[]", param1Type.getSimpleName());
- assertEquals("java.lang.Class", ((ArrayType)param1Type).getComponentTypeAsHelper().getQualifiedName());
- assertEquals("Class", ((ArrayType)param1Type).getComponentTypeAsHelper().getSimpleName());
-
- // Verify List<String>[] anArrayOfListsOfString
- JavaParameter param2 = (JavaParameter) params.get(1);
- if (isReflectingSource)
- assertTrue(param2.getName().equals("anArrayOfListsOfString"));
- JavaHelpers param2Type = param2.getJavaType();
- assertNotNull(param2Type);
- assertTrue(((ArrayType)param2Type).getArrayDimensions() == 1);
- assertEquals("java.util.List[]", param2Type.getQualifiedName());
- assertEquals("List[]", param2Type.getSimpleName());
- assertEquals("java.util.List", ((ArrayType)param2Type).getComponentTypeAsHelper().getQualifiedName());
- assertEquals("List", ((ArrayType)param2Type).getComponentTypeAsHelper().getSimpleName());
-
- // Verify Class<?>[] aWildcardClassArray
- JavaParameter param3 = (JavaParameter) params.get(2);
- if (isReflectingSource)
- assertTrue(param3.getName().equals("aWildcardClassArray"));
- JavaHelpers param3Type = param3.getJavaType();
- assertNotNull(param3Type);
- assertTrue(((ArrayType)param3Type).getArrayDimensions() == 1);
- assertEquals("java.lang.Class[]", param3Type.getQualifiedName());
- assertEquals("Class[]", param3Type.getSimpleName());
- assertEquals("java.lang.Class", ((ArrayType)param3Type).getComponentTypeAsHelper().getQualifiedName());
- assertEquals("Class", ((ArrayType)param3Type).getComponentTypeAsHelper().getSimpleName());
-
- // Verify Class<?>[][][] aMultiDimWildcardArray
- JavaParameter param4 = (JavaParameter) params.get(3);
- if (isReflectingSource)
- assertTrue(param4.getName().equals("aMultiDimWildcardArray"));
- JavaHelpers param4Type = param4.getJavaType();
- assertNotNull(param4Type);
- assertTrue(((ArrayType)param4Type).getArrayDimensions() == 3);
- assertEquals("java.lang.Class[][][]", param4Type.getQualifiedName());
- assertEquals("Class[][][]", param4Type.getSimpleName());
- JavaHelpers componentType = ((ArrayType)param4Type).getComponentTypeAsHelper();
- assertEquals("java.lang.Class[][]", componentType.getQualifiedName());
- assertEquals("Class[][]", componentType.getSimpleName());
- componentType = ((ArrayType) componentType).getComponentTypeAsHelper();
- assertEquals("java.lang.Class[]", componentType.getQualifiedName());
- assertEquals("Class[]", componentType.getSimpleName());
- componentType = ((ArrayType) componentType).getComponentTypeAsHelper();
-
- }
-
- /**
- * Test method test7 from Test class.
- *
- * public <T> void test7(List<List<String>> aListOfListOfString, List<List<T>> aListOfListOfT, Map<IFoo, List<Map<IBar, T>>> aMap)
- *
- */
- public void test7() {
- JavaHelpers testHelper = reflectClass("test.me.Test");
- JavaClass testClass = (JavaClass) testHelper;
- assertTrue((testClass).isExistingType());
-
- Method method = null;
- List methods = testClass.getMethods();
- for (int i = 0; i < methods.size(); i++) {
- method = (Method) methods.get(i);
- if (method.getName().equals("test7")) {
- break;
- } else {
- method = null;
- }
- }
-
- assertNotNull(method);
-
- //Verify parameters
- List params = method.getParameters();
- assertTrue(params.size() == 3);
-
-
- // Verify List<List<String>> aListOfListOfString
- JavaParameter param1 = (JavaParameter) params.get(0);
- if (isReflectingSource)
- assertTrue(param1.getName().equals("aListOfListOfString"));
- JavaHelpers param1Type = param1.getJavaType();
- assertNotNull(param1Type);
- assertEquals("java.util.List", param1Type.getQualifiedName());
- assertEquals("List", param1Type.getSimpleName());
-
- // Verify List<List<T>> aListOfListOfT
- JavaParameter param2 = (JavaParameter) params.get(1);
- if (isReflectingSource)
- assertTrue(param2.getName().equals("aListOfListOfT"));
- JavaHelpers param2Type = param2.getJavaType();
- assertNotNull(param2Type);
- assertEquals("java.util.List", param2Type.getQualifiedName());
- assertEquals("List", param2Type.getSimpleName());
-
- // Verify Map<IFoo, List<Map<IBar, T>>> aMap
- JavaParameter param3 = (JavaParameter) params.get(2);
- if (isReflectingSource)
- assertTrue(param3.getName().equals("aMap"));
- JavaHelpers param3Type = param3.getJavaType();
- assertNotNull(param3Type);
- assertEquals("java.util.Map", param3Type.getQualifiedName());
- assertEquals("Map", param3Type.getSimpleName());
-
- }
-
- /**
- * Test method test8 from Test class.
- *
- * public void test8(List<? extends List<String>> aList)
- *
- */
- public void test8() {
- JavaHelpers testHelper = reflectClass("test.me.Test");
- JavaClass testClass = (JavaClass) testHelper;
- assertTrue((testClass).isExistingType());
-
- Method method = null;
- List methods = testClass.getMethods();
- for (int i = 0; i < methods.size(); i++) {
- method = (Method) methods.get(i);
- if (method.getName().equals("test8")) {
- break;
- } else {
- method = null;
- }
- }
-
- assertNotNull(method);
-
- //Verify parameters
- List params = method.getParameters();
- assertTrue(params.size() == 1);
-
- // Verify List<? extends List<String>> aList
- JavaParameter param1 = (JavaParameter) params.get(0);
- if (isReflectingSource)
- assertTrue(param1.getName().equals("aList"));
- JavaHelpers param1Type = param1.getJavaType();
- assertNotNull(param1Type);
-
- assertEquals("java.util.List", param1Type.getQualifiedName());
- assertEquals("List", param1Type.getSimpleName());
-
- }
-
- /**
- * Test method test9 from Test class.
- * This is the same test as test7 but with qualified names.
- *
- * public <T> void test9(java.util.List<java.util.List<java.lang.String>> aListOfListOfString, java.util.List<java.util.List<T>> aListOfListOfT, java.util.Map<test.dependents.IFoo, java.util.List<java.util.Map<test.dependents.IBar, T>>> aMap)
- *
- */
- public void test9() {
- JavaHelpers testHelper = reflectClass("test.me.Test");
- JavaClass testClass = (JavaClass) testHelper;
- assertTrue((testClass).isExistingType());
-
- Method method = null;
- List methods = testClass.getMethods();
- for (int i = 0; i < methods.size(); i++) {
- method = (Method) methods.get(i);
- if (method.getName().equals("test9")) {
- break;
- } else {
- method = null;
- }
- }
-
- assertNotNull(method);
-
- //Verify parameters
- List params = method.getParameters();
- assertTrue(params.size() == 3);
-
-
- // Verify List<List<String>> aListOfListOfString
- JavaParameter param1 = (JavaParameter) params.get(0);
- if (isReflectingSource)
- assertTrue(param1.getName().equals("aListOfListOfString"));
- JavaHelpers param1Type = param1.getJavaType();
- assertNotNull(param1Type);
- assertEquals("java.util.List", param1Type.getQualifiedName());
- assertEquals("List", param1Type.getSimpleName());
-
- // Verify List<List<T>> aListOfListOfT
- JavaParameter param2 = (JavaParameter) params.get(1);
- if (isReflectingSource)
- assertTrue(param2.getName().equals("aListOfListOfT"));
- JavaHelpers param2Type = param2.getJavaType();
- assertNotNull(param2Type);
-
- assertEquals("java.util.List", param2Type.getQualifiedName());
- assertEquals("List", param2Type.getSimpleName());
-
- // Verify Map<IFoo, List<Map<IBar, T>>> aMap
- JavaParameter param3 = (JavaParameter) params.get(2);
- if (isReflectingSource)
- assertTrue(param3.getName().equals("aMap"));
- JavaHelpers param3Type = param3.getJavaType();
- assertNotNull(param3Type);
-
- assertEquals("java.util.Map", param3Type.getQualifiedName());
- assertEquals("Map", param3Type.getSimpleName());
- }
-
- /**
- * Test method test10 from Test class.
- *
- * public <T extends Tester> T test10(List<Integer> list)
- *
- */
- public void test10() {
- JavaHelpers testHelper = reflectClass("test.me.Test");
- JavaClass testClass = (JavaClass) testHelper;
- assertTrue((testClass).isExistingType());
-
- Method method = null;
- List methods = testClass.getMethods();
- for (int i = 0; i < methods.size(); i++) {
- method = (Method) methods.get(i);
- if (method.getName().equals("test10")) {
- break;
- } else {
- method = null;
- }
- }
-
- assertNotNull(method);
-
- JavaHelpers returnType = method.getReturnType();
-
- assertEquals("test.dependents.Tester", returnType.getQualifiedName());
- assertEquals("Tester", returnType.getSimpleName());
-
- //Verify parameters
- List params = method.getParameters();
- assertTrue(params.size() == 1);
-
-
- // Verify List<List<String>> aListOfListOfString
- JavaParameter param1 = (JavaParameter) params.get(0);
- if (isReflectingSource)
- assertTrue(param1.getName().equals("list"));
- JavaHelpers param1Type = param1.getJavaType();
- assertNotNull(param1Type);
- assertEquals("java.util.List", param1Type.getQualifiedName());
- assertEquals("List", param1Type.getSimpleName());
- }
-
- /**
- * Test method test11 from Test class.
- *
- * public <T extends Tester> T[] test11()
- *
- */
- public void test11() {
- JavaHelpers testHelper = reflectClass("test.me.Test");
- JavaClass testClass = (JavaClass) testHelper;
- assertTrue((testClass).isExistingType());
-
- Method method = null;
- List methods = testClass.getMethods();
- for (int i = 0; i < methods.size(); i++) {
- method = (Method) methods.get(i);
- if (method.getName().equals("test11")) {
- break;
- } else {
- method = null;
- }
- }
- //TODO need to revisit
-// assertNotNull(method);
-//
-// JavaHelpers returnType = method.getReturnType();
-//
-// assertEquals("test.dependents.Tester[]", returnType.getQualifiedName());
-// assertEquals("Tester[]", returnType.getSimpleName());
- }
-
- /**
- * Test method test11 from Test class.
- *
- * public <T extends Tester> T[][][] test11()
- *
- */
- public void test12() {
- JavaHelpers testHelper = reflectClass("test.me.Test");
- JavaClass testClass = (JavaClass) testHelper;
- assertTrue((testClass).isExistingType());
-
- Method method = null;
- List methods = testClass.getMethods();
- for (int i = 0; i < methods.size(); i++) {
- method = (Method) methods.get(i);
- if (method.getName().equals("test12")) {
- break;
- } else {
- method = null;
- }
- }
- //TODO need to revisit
-// assertNotNull(method);
-//
-// JavaHelpers returnType = method.getReturnType();
-//
-// assertEquals("test.dependents.Tester[][][]", returnType.getQualifiedName());
-// assertEquals("Tester[][][]", returnType.getSimpleName());
- }
- /**
- * Test method test13 from Test class.
- *
- * public void test13(Y param) (where Y is a class-level type parameter
- *
- */
- public void test13() {
- JavaHelpers testHelper = reflectClass("test.me.Test");
- JavaClass testClass = (JavaClass) testHelper;
- assertTrue((testClass).isExistingType());
-
- Method method = null;
- List methods = testClass.getMethods();
- for (int i = 0; i < methods.size(); i++) {
- method = (Method) methods.get(i);
- if (method.getName().equals("test13")) {
- break;
- } else {
- method = null;
- }
- }
- assertNotNull(method);
-
- //Verify parameters
- List params = method.getParameters();
- assertTrue(params.size() == 1);
-
-
- // Verify Y param
- JavaParameter param1 = (JavaParameter) params.get(0);
- if (isReflectingSource)
- assertTrue(param1.getName().equals("param"));
- JavaHelpers param1Type = param1.getJavaType();
- assertNotNull(param1Type);
- assertEquals("java.io.Serializable", param1Type.getQualifiedName());
- assertEquals("Serializable", param1Type.getSimpleName());
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JavaProjectUtil.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JavaProjectUtil.java
deleted file mode 100644
index d7e041b7..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JavaProjectUtil.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 2006 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.jem.tests;
-/*
- * $RCSfile: JavaProjectUtil.java,v $
- * $Revision: 1.16 $ $Date: 2007/04/01 03:28:18 $
- */
-
-
-import java.io.File;
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-import org.eclipse.ant.core.AntRunner;
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.*;
-import org.osgi.framework.Bundle;
-
-import org.eclipse.jem.internal.proxy.core.ProxyPlugin;
-
-/**
- * The purpose of this class is to be a utility for manipulating/populating java projects.
- * 1) Get a java project as one of the resources.
- * 2) Create a project from a directory. The directory needs to be all set up to be a project already. Typically
- * from an unzip.
- */
-
-public class JavaProjectUtil {
- public static IProject getProject(String projectName) throws CoreException {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- return (project.exists()) ? project: null;
- }
-
-
- /**
- * Create a project from the path. The path will be a complete project, including a .project file.
- *
- * @param workspace
- * @param projectPath Needs to be a complete path to a directory within the file system. The directory must be a complete project including .project file.
- * @param pm
- * @return The new IProject.
- * @throws CoreException
- */
- public static IProject createProject(IWorkspace workspace, IPath projectPath, final IProgressMonitor pm) throws CoreException {
- IProjectDescription newDescription = null;
-
- File projectFile = new File(projectPath.toFile(), IProjectDescription.DESCRIPTION_FILE_NAME);
- if (!projectFile.exists())
- throw new CoreException(new Status(IStatus.ERROR, JavaTestsPlugin.getPlugin().getBundle().getSymbolicName(), 0, "Project file not in project directory. Couldn't create project \""+projectPath.toString()+"\"", null));
-
-
- IPath projectFilePath = new Path(projectFile.getPath());
- newDescription = workspace.loadProjectDescription(projectFilePath);
-
- // create the new project operation
- final IProject project = workspace.getRoot().getProject(newDescription.getName());
- final IProjectDescription description = newDescription;
- ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- project.create(description, new SubProgressMonitor(monitor, 1000));
- project.open(new SubProgressMonitor(monitor, 1000));
- }
- }, project, 0, pm);
-
- return project;
- }
-
- /**
- * Create an empty project in the workspace root. If there is a .project file already there, then use it.
- * @param workspace The workspace to create projec in.
- * @param projectPath The name of the project. It should only be one segment long, and that will be the name of the project.
- * @param pm
- * @return The project.
- * @throws CoreException
- *
- * @since 1.0.0
- */
- public static IProject createEmptyJavaProject(IWorkspace workspace, IPath projectPath, final IProgressMonitor pm) throws CoreException {
- projectPath = workspace.getRoot().getFullPath().append(projectPath); // Put it into the workspace relative.
- File projectFile = new File(projectPath.toFile(), IProjectDescription.DESCRIPTION_FILE_NAME);
- if (projectFile.exists())
- return createProject(workspace, projectPath, pm); // Let it be created normally.
-
- // create the new project operation
- final IProject project = workspace.getRoot().getProject(projectPath.lastSegment());
- ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- project.create(new SubProgressMonitor(monitor, 1000));
- project.open(new SubProgressMonitor(monitor, 1000));
- IProjectDescription description = project.getDescription();
- String[] natureids = description.getNatureIds();
- for (int i = 0; i < natureids.length; i++) {
- if (natureids[i].equals("org.eclipse.jdt.core.javanature"))
- return; // Already has nature.
- }
- String[] newNatureids = new String[natureids.length+1];
- newNatureids[0] = "org.eclipse.jdt.core.javanature";
- System.arraycopy(natureids, 0, newNatureids, 1, natureids.length);
- description.setNatureIds(newNatureids);
- project.setDescription(description, new SubProgressMonitor(monitor, 1000));
- // Need to put out a classfile too. We need a src and a bin directory for the classpath.
- IFolder sf = project.getFolder("src");
- sf.create(true, true, new SubProgressMonitor(monitor, 1000));
- IFolder bf = project.getFolder("bin");
- bf.create(true, true, new SubProgressMonitor(monitor, 1000));
- IFile cp = project.getFile(".classpath");
- try {
- cp.create(getClass().getResource(".classpath").openStream(), true, new SubProgressMonitor(monitor, 1000));
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
- }, workspace.getRoot(), 0, pm);
-
- return project;
- }
-
- /**
- * Delete a project and all files from the project.
- * @param project
- * @throws CoreException
- */
- public static void deleteProject(IProject project) throws CoreException {
- if (project != null) {
- project.delete(true, false, null); // Get rid of the project and the files themselves.
- }
- }
-
-
- /**
- * This sets the workspace autobuild to the specified state. It returns what
- * the state was previously so that it can be later restored.
- * @param autoBuild
- * @return Previous autoBuild state.
- * @throws CoreException
- */
- public static boolean setAutoBuild(boolean autoBuild) throws CoreException {
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- if (autoBuild != workspace.isAutoBuilding()) {
- IWorkspaceDescription description = workspace.getDescription();
- description.setAutoBuilding(true);
- workspace.setDescription(description);
- return !autoBuild; // It wasn't this state.
- } else
- return autoBuild; // It already is this state.
- }
-
- /**
- * Import the given projects from the given zipfiles into the current workspace root.
- * @param projectNames The array of project names to create
- * @param zipFiles The zipfiles containing each project. It must be a complete project.
- * The first directory in the zip must be the project directory.
- * It must be the same name as from projectNames. Also it must include a .project file
- * in that directory.
- * @return The array of IProjects that were created.
- * @throws CoreException
- */
- public static IProject[] importProjects(final String[] projectNames, final String[] zipFiles) throws CoreException {
- // Delete/create/populate within a runnable so that the build is done only after all changes have been made.
- // Make sure autobuild is on.
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IProject[] result = new IProject[projectNames.length];
- workspace.run(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- // First import all, then after that, create the projects.
- IPath rootLocation = workspace.getRoot().getLocation();
- try {
- String antFile = FileLocator.toFileURL(JavaTestsPlugin.getPlugin().getBundle().getEntry("testdata/unzip.xml")).getFile();
- for (int i = 0; i < zipFiles.length; i++) {
- // First create/recreate the project.
- IProject p = getProject(projectNames[i]);
- if (p != null)
- p.delete(true, true, new SubProgressMonitor(monitor, 50)); // Get rid of it, we want a clean one for testing.
-
- // Now import the requested files.
- AntRunner ant = new AntRunner();
- ant.setBuildFileLocation(antFile);
- ant.setArguments(new String[] { "-Dzipfrom=" + zipFiles[i], "-Dzipto=" + rootLocation.toString()});
- ant.run(new SubProgressMonitor(monitor, 50));
- }
- for (int i = 0; i < zipFiles.length; i++) {
- result[i] = createProject(workspace, rootLocation.append(projectNames[i]), new SubProgressMonitor(monitor, 50));
- }
- } catch (MalformedURLException e) {
- } catch (IOException e) {
- }
- }
- }, workspace.getRoot(), 0, null);
-
- return result;
- }
-
- static int cfSuffix = 0;
- /**
- * Add a path to plugin jar to the java project's class path.
- * @param bundle The plugin where the jar is located.
- * @param pathToJar Path to the jar within the above plugin
- * @param project java project to add to.
- *
- * @since 1.0.0
- */
- public static void addBundleJarToPath(Bundle bundle, String pathToJar, final IJavaProject project, IProgressMonitor pm) throws CoreException {
- final IPath actualPath = new Path(ProxyPlugin.getPlugin().localizeFromBundleAndFragments(bundle, pathToJar));
- if (actualPath.isEmpty())
- return; // Didn't exist.
-
- final IWorkspace workspace = ResourcesPlugin.getWorkspace();
- workspace.run(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- if (actualPath.toFile().isFile()) {
- // It is a jar, this will be during runtime
- // Create an external jar entry.
- IClasspathEntry[] raw = project.getRawClasspath();
- IClasspathEntry[] newRaw = new IClasspathEntry[raw.length+1];
- newRaw[raw.length] = JavaCore.newLibraryEntry(actualPath, null, null);
- System.arraycopy(raw, 0, newRaw, 0, raw.length);
- project.setRawClasspath(newRaw, new SubProgressMonitor(monitor, 100));
- } else {
- // It is a path to class folder, this will be during development time.
- // But classfolders MUST exist in the workspace. JDT doesn't understand them outside workspace,
- // so we will link it into the project.
- IFolder cf = project.getProject().getFolder("linkbin"+(++cfSuffix));
- cf.createLink(actualPath, 0, new SubProgressMonitor(monitor, 100));
- // Create class folder entry.
- IClasspathEntry[] raw = project.getRawClasspath();
- IClasspathEntry[] newRaw = new IClasspathEntry[raw.length+1];
- newRaw[raw.length] = JavaCore.newLibraryEntry(cf.getFullPath(), null, null);
- System.arraycopy(raw, 0, newRaw, 0, raw.length);
- project.setRawClasspath(newRaw, new SubProgressMonitor(monitor, 100));
- }
- }
- }, workspace.getRoot(), 0, pm);
- }
-
- public static void waitForAutoBuild() throws CoreException {
- IJobManager jobManager = Job.getJobManager();
- if (jobManager.find(ResourcesPlugin.FAMILY_AUTO_BUILD).length > 0) {
- while (true) {
- try {
- jobManager.join(ResourcesPlugin.FAMILY_AUTO_BUILD, new NullProgressMonitor());
- break;
- } catch (InterruptedException e) {
- }
- }
- }
-
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JavaTestsPlugin.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JavaTestsPlugin.java
deleted file mode 100644
index 7ad62ae8..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/JavaTestsPlugin.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests;
-/*
- * $RCSfile: JavaTestsPlugin.java,v $
- * $Revision: 1.6 $ $Date: 2005/08/24 20:58:54 $
- */
-import org.eclipse.core.runtime.Plugin;
-
-/**
- * @author richkulp
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class JavaTestsPlugin extends Plugin {
-
- private static JavaTestsPlugin PLUGIN;
- /**
- * @param descriptor
- */
- public JavaTestsPlugin() {
- PLUGIN = this;
- }
-
- public static JavaTestsPlugin getPlugin() {
- return PLUGIN;
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/UITester.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/UITester.java
deleted file mode 100644
index 818a7658..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/UITester.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Common Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/cpl-v10.html
- *
- * Contributors:
- * IBM Corporation - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jem.tests;
-
-/**
- * This is used to make the JEM tests run in UI mode instead of HEADLESS mode,
- * even though a UI is not available. The tests will normally need that mode.
- */
-public class UITester implements org.eclipse.jem.util.UITester {
-
- /* (non-Javadoc)
- * @see com.ibm.wtp.common.UITester#isCurrentContextUI()
- */
- public boolean isCurrentContextUI() {
- return true;
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/basic/BasicSuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/basic/BasicSuite.java
deleted file mode 100644
index c64ffb87..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/basic/BasicSuite.java
+++ /dev/null
@@ -1,94 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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
- *******************************************************************************/
-/*
- * $RCSfile: BasicSuite.java,v $
- * $Revision: 1.3 $ $Date: 2006/05/17 20:13:56 $
- */
-package org.eclipse.jem.tests.basic;
-
-import java.net.URL;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-
-import org.eclipse.jem.tests.JavaProjectUtil;
-import org.eclipse.jem.tests.JavaTestsPlugin;
-
-/**
- * This is basic JEM testing not covered by specific components tests.
- *
- * @author richkulp
- *
- */
-public class BasicSuite extends TestSetup {
-
- // Test cases to be include in the suite
- private static final Class testsList[] = { TestWorkbenchUtils112678.class};
-
- /**
- *
- */
- public BasicSuite() {
- this("Test Basic JEM Suite");
- }
-
- /**
- * @param name
- */
- public BasicSuite(String name) {
- super(new TestSuite(name) {
- {
- for (int i = 0; i < testsList.length; i++) {
- addTestSuite(testsList[i]);
- }
-
- }
- });
- }
-
- public static Test suite() {
- return new BasicSuite();
- }
-
- public static final String TEST_BASIC_PROJECT = "Test Basic"; //$NON-NLS-1$
-
- private boolean oldAutoBuildingState; // autoBuilding state before we started.
- protected void setUp() throws Exception {
- System.out.println("-- Initializing the Basic test data --"); //$NON-NLS-1$
- oldAutoBuildingState = JavaProjectUtil.setAutoBuild(true);
- URL installURL = JavaTestsPlugin.getPlugin().getBundle().getEntry("/");
- String[] zipPaths = new String[1];
- zipPaths[0] = FileLocator.toFileURL(new URL(installURL, "testdata/testbasic.zip")).getFile();
- IProject[] projects =
- JavaProjectUtil.importProjects(
- new String[] { TEST_BASIC_PROJECT },
- zipPaths);
- assertNotNull(projects[0]);
- JavaProjectUtil.waitForAutoBuild();
- System.out.println("-- Data initialized --"); //$NON-NLS-1$
-
- }
-
- protected void tearDown() throws Exception {
- ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- JavaProjectUtil.deleteProject(JavaProjectUtil.getProject(TEST_BASIC_PROJECT));
- }
- }, ResourcesPlugin.getWorkspace().getRoot(), 0, null);
-
- JavaProjectUtil.setAutoBuild(oldAutoBuildingState);
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/basic/TestWorkbenchUtils112678.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/basic/TestWorkbenchUtils112678.java
deleted file mode 100644
index c031d3d6..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/basic/TestWorkbenchUtils112678.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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.jem.tests.basic;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.common.util.WrappedException;
-import org.eclipse.emf.ecore.resource.Resource;
-
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-
-
-/**
- * Test bug: https://bugs.eclipse.org/bugs/show_bug.cgi?id=112678
- * @since 1.2.0
- */
-public class TestWorkbenchUtils112678 extends TestCase {
-
- /**
- *
- *
- * @since 1.2.0
- */
- public TestWorkbenchUtils112678() {
- super();
- }
-
- /**
- * @param name
- *
- * @since 1.2.0
- */
- public TestWorkbenchUtils112678(String name) {
- super(name);
- }
-
- public static final String FILE_RESOURCE_PATH = "Test Basic/workbenchUtil/FileResource.xmi";
- public static final String NOT_FOUND_FILE_RESOURCE_PATH = "Test Basic/workbenchUtil/NoFileResource.xmi";
-
- /**
- * Test {@link WorkbenchResourceHelperBase#getIFile(URI)} with platform resource uri.
- *
- *
- * @since 1.2.0
- */
- public void testGetIFilePlatformResource() {
- URI uri = URI.createPlatformResourceURI(FILE_RESOURCE_PATH);
- IFile file = WorkbenchResourceHelperBase.getIFile(uri);
- assertNotNull(file);
- assertTrue(file.exists());
-
- uri = URI.createPlatformResourceURI(NOT_FOUND_FILE_RESOURCE_PATH);
- file = WorkbenchResourceHelperBase.getIFile(uri);
- assertNotNull(file);
- assertFalse(file.exists());
-
- // Test a relative form that is not a valid project.
- uri = URI.createPlatformResourceURI("NotProject/file.xmi");
- file = WorkbenchResourceHelperBase.getIFile(uri);
- assertNull(file);
- }
-
- /**
- * Test {@link WorkbenchResourceHelperBase#getIFile(URI)} with a relative uri (e.g. "project/file").
- *
- *
- * @since 1.2.0
- */
- public void testGetIFileProjectRelativeResource() {
- URI uri = URI.createURI(FILE_RESOURCE_PATH);
- IFile file = WorkbenchResourceHelperBase.getIFile(uri);
- assertNotNull(file);
- assertTrue(file.exists());
-
- uri = URI.createURI(NOT_FOUND_FILE_RESOURCE_PATH);
- file = WorkbenchResourceHelperBase.getIFile(uri);
- assertNotNull(file);
- assertFalse(file.exists());
-
- // Test a relative form that is not a valid project.
- uri = URI.createURI("NotProject/file.xmi");
- file = WorkbenchResourceHelperBase.getIFile(uri);
- assertNull(file);
-
- }
-
- /**
- * Test {@link WorkbenchResourceHelperBase#getIFile(URI)} with a non-platform resource uri.
- *
- *
- * @since 1.2.0
- */
- public void testGetIFileNotPlatformResource() {
- URI uri = URI.createURI("platform:/plugin/xyz/abc");
- IFile file = WorkbenchResourceHelperBase.getIFile(uri);
- assertNull(file);
- }
-
- /**
- * Test {@link WorkbenchResourceHelperBase#getResource(URI)} with a platform resource uri.
- *
- *
- * @since 1.2.0
- */
- public void testGetResourcePlatformResource() {
- URI uri = URI.createPlatformResourceURI(FILE_RESOURCE_PATH);
- Resource res = WorkbenchResourceHelperBase.getResource(uri);
- assertNotNull(res);
- assertTrue(res.isLoaded());
-
- uri = URI.createPlatformResourceURI(NOT_FOUND_FILE_RESOURCE_PATH);
- boolean good = false;
- try {
- res = WorkbenchResourceHelperBase.getResource(uri);
- } catch (WrappedException e) {
- good = true;
- }
- assertTrue(good);
-
- // Test a relative form that is not a valid project.
- uri = URI.createPlatformResourceURI("NotProject/file.xmi");
- res = WorkbenchResourceHelperBase.getResource(uri);
- assertNull(res);
- }
-
- /**
- * Test {@link WorkbenchResourceHelperBase#getResource(URI)} with a relative uri (e.g. "project/file").
- *
- *
- * @since 1.2.0
- */
- public void testGetResourceProjectRelativeResource() {
- URI uri = URI.createURI(FILE_RESOURCE_PATH);
- Resource res = WorkbenchResourceHelperBase.getResource(uri);
- assertNotNull(res);
- assertTrue(res.isLoaded());
-
-/*
- boolean good = false;
- uri = URI.createURI(NOT_FOUND_FILE_RESOURCE_PATH);
- try {
- res = WorkbenchResourceHelperBase.getResource(uri);
- } catch (WrappedException e) {
- good = true;
- }
-
- assertTrue(good);
-
- // Test a relative form that is not a valid project.
- uri = URI.createURI("NotProject/file.xmi");
- res = WorkbenchResourceHelperBase.getResource(uri);
- assertNull(res);
-*/
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/AbstractBeanInfoTestCase.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/AbstractBeanInfoTestCase.java
deleted file mode 100644
index 4f4d28cf..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/AbstractBeanInfoTestCase.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.beaninfo;
-/*
- * $RCSfile: AbstractBeanInfoTestCase.java,v $
- * $Revision: 1.10 $ $Date: 2005/08/24 20:58:54 $
- */
-import java.util.*;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.jem.internal.beaninfo.ImplicitItem;
-import org.eclipse.jem.internal.beaninfo.PropertyDecorator;
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
-import org.eclipse.jem.internal.beaninfo.core.Utilities;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.tests.JavaProjectUtil;
-
-/**
- * @author richkulp
- *
- */
-public abstract class AbstractBeanInfoTestCase extends TestCase {
-
- public AbstractBeanInfoTestCase() {
- super();
- }
-
- public AbstractBeanInfoTestCase(String name) {
- super(name);
- }
-
- protected BeaninfoNature nature;
- protected ResourceSet rset;
-
- public static final String
- TEST_BEANINFO_PROJECT = "Test BeanInfo", //$NON-NLS-1$
- TEST_BEANINFO_BEANINFOS_PROJECT = "Test BeanInfo BeanInfos", //$NON-NLS-1$
- TEST_BEANINFO_PREREQ_PROJECT = "Test BeanInfo Prereq"; //$NON-NLS-1$
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- IProject biProject = JavaProjectUtil.getProject(TEST_BEANINFO_PROJECT);
- assertNotNull(biProject);
- nature = BeaninfoNature.getRuntime(biProject);
- assertNotNull(nature);
- rset = nature.getResourceSet();
- assertNotNull(rset);
- // We also want to remove any beaninfos from the search path that aren't from testing so that we don't get any weird side-effects.
- ProxyFactoryRegistry registry = nature.getRegistry();
- IArrayBeanProxy sp = Utilities.getBeanInfoSearchPath(registry);
- // remove any that don't start with org.eclipse.jem.tests.
- int len = sp.getLength();
- for (int i = 0; i < len; i++) {
- String path = ((IStringBeanProxy) sp.get(i)).stringValue();
- if (!path.startsWith("org.eclipse.jem.tests"))
- Utilities.removeBeanInfoPath(registry, path);
- }
- }
-
- protected int objFeatures, objNonProperties; // Object features count and Object non-properties count. This is only initialized as needed.
- protected Set objFeaturesSet;
- /**
- * To initialize the objFeatures and objNonProperties counts when necessary. Not needed for all tests.
- */
- protected void objFeaturesSetup() {
- // Get the number of features that java.lang.Object has:
- JavaClass objClass = (JavaClass) rset.getEObject(URI.createURI("java:/java.lang#Object"), true); //$NON-NLS-1$
- objFeaturesSet = new HashSet();
- objFeatures = objClass.getProperties().size();
- // Find the number of always inherited properties.
- objNonProperties = 0;
- for (Iterator itr0 = objClass.getProperties().iterator(); itr0.hasNext();) {
- EStructuralFeature p = (EStructuralFeature) itr0.next();
- objFeaturesSet.add(p);
- PropertyDecorator pd = Utilities.getPropertyDecorator(p);
- if ( pd == null || (pd.getImplicitDecoratorFlag() == ImplicitItem.NOT_IMPLICIT_LITERAL && !pd.isMergeIntrospection()))
- objNonProperties++;
- }
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/BeanInfoSuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/BeanInfoSuite.java
deleted file mode 100644
index 8dfbbda6..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/BeanInfoSuite.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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.jem.tests.beaninfo;
-/*
- * $RCSfile: BeanInfoSuite.java,v $
- * $Revision: 1.13 $ $Date: 2007/03/14 17:26:59 $
- */
-import java.net.URL;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
-import org.eclipse.jem.tests.JavaProjectUtil;
-import org.eclipse.jem.tests.JavaTestsPlugin;
-
-/**
- * @author richkulp
- *
- * This is the true test suite for Beaninfo Testing.
- */
-public class BeanInfoSuite extends TestSetup {
-
- // Test cases to be include in the suite
- private static final Class testsList[] =
- { TestReflection.class, // NOTE: This one must always be first because it does some tests that depend on this.
- TestStandard.class, /*TestAWTSwingUI.class*/ };
-
- /**
- * Constructor for BeanInfoSuite.
- */
- public BeanInfoSuite(String name) {
- super(new TestSuite(name) {
- {
- for (int i = 0; i < testsList.length; i++) {
- addTestSuite(testsList[i]);
- }
- }
-
- });
- }
-
- public BeanInfoSuite() {
- this("Test BeanInfo Suite");
- }
-
- public static Test suite() {
- return new BeanInfoSuite();
- }
-
- private boolean oldAutoBuildingState; // autoBuilding state before we started.
- protected void setUp() throws Exception {
- System.out.println("-- Initializing the BeanInfo test data --"); //$NON-NLS-1$
- oldAutoBuildingState = JavaProjectUtil.setAutoBuild(true);
- URL installURL = JavaTestsPlugin.getPlugin().getBundle().getEntry("/");
- String[] zipPaths = new String[3];
- zipPaths[0] = FileLocator.toFileURL(new URL(installURL, "testdata/testbeaninfo.zip")).getFile();
- zipPaths[1] = FileLocator.toFileURL(new URL(installURL, "testdata/testbeaninfobeaninfos.zip")).getFile();
- zipPaths[2] = FileLocator.toFileURL(new URL(installURL, "testdata/testbeaninfopreq.zip")).getFile();
- IProject[] projects =
- JavaProjectUtil.importProjects(
- new String[] {
- AbstractBeanInfoTestCase.TEST_BEANINFO_PROJECT,
- AbstractBeanInfoTestCase.TEST_BEANINFO_BEANINFOS_PROJECT,
- AbstractBeanInfoTestCase.TEST_BEANINFO_PREREQ_PROJECT },
- zipPaths);
- assertNotNull(projects[0]);
- assertNotNull(projects[1]);
- assertNotNull(projects[2]);
- JavaProjectUtil.waitForAutoBuild();
- System.out.println("-- Data initialized --"); //$NON-NLS-1$
-
- BeaninfoNature nature = BeaninfoNature.getRuntime(projects[0]);
- assertNotNull(nature);
- }
-
- protected void tearDown() throws Exception {
- ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- JavaProjectUtil.deleteProject(JavaProjectUtil.getProject(AbstractBeanInfoTestCase.TEST_BEANINFO_PROJECT));
- JavaProjectUtil.deleteProject(JavaProjectUtil.getProject(AbstractBeanInfoTestCase.TEST_BEANINFO_BEANINFOS_PROJECT));
- JavaProjectUtil.deleteProject(JavaProjectUtil.getProject(AbstractBeanInfoTestCase.TEST_BEANINFO_PREREQ_PROJECT));
- }
- }, ResourcesPlugin.getWorkspace().getRoot(), 0, null);
-
- JavaProjectUtil.setAutoBuild(oldAutoBuildingState);
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestAWTSwingUI.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestAWTSwingUI.java
deleted file mode 100644
index 629a504c..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestAWTSwingUI.java
+++ /dev/null
@@ -1,536 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.beaninfo;
-/*
- * $RCSfile: TestAWTSwingUI.java,v $
- * $Revision: 1.8 $ $Date: 2005/08/24 20:58:55 $
- */
-import java.io.BufferedReader;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.ENamedElement;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jem.internal.beaninfo.MethodProxy;
-import org.eclipse.jem.internal.beaninfo.PropertyDecorator;
-import org.eclipse.jem.internal.beaninfo.core.Utilities;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.tests.JavaTestsPlugin;
-
-/**
- * @author richkulp
- *
- * AWT/Swing tests
- */
-public class TestAWTSwingUI extends AbstractBeanInfoTestCase {
-
- /**
- *
- */
- public TestAWTSwingUI() {
- super();
- }
-
- /**
- * @param name
- */
- public TestAWTSwingUI(String name) {
- super(name);
- }
-
- /*
- * The number of properties keep increasing by version,
- * but there is a minimal set. This minimal set will be
- * stored in a file and can be loaded by this method.
- * This set can be used to make sure that at least the
- * required properties are there.
- *
- * The filename has to be relative to the tests plugin.
- */
- protected Set getNames(String filename) throws IOException {
- Set names = new HashSet(50);
- URL url = JavaTestsPlugin.getPlugin().getBundle().getEntry(filename);
- assertNotNull(url);
- BufferedReader rdr = new BufferedReader(new InputStreamReader(url.openStream()));
- try {
- String line = null;
- while ((line = rdr.readLine()) != null)
- names.add(line);
- } finally {
- rdr.close();
- }
- return names;
- }
-
- /*
- * Test the names against the set. Print those not found in the set,
- * or those in the againstSet that weren't found. Throw assert error if
- * any from against set not found.
- *
- */
- protected void testIncludesAllNames(String id, List testNames, Set againstSet, Set exclude) {
- Set workingAgainst = new HashSet(againstSet.size());
- workingAgainst.addAll(againstSet); // There may be dup testNames (like for operations), so in that case we leave againstSet alone.
- boolean wroteAny = false;
- for (Iterator itr = testNames.iterator(); itr.hasNext();) {
- ENamedElement testName = (ENamedElement) itr.next();
- if (exclude.contains(testName))
- continue; // This is one we want to ignore
- if (againstSet.contains(testName.getName()))
- workingAgainst.remove(testName.getName()); // Get rid of it since found.
- else {
- if (!wroteAny) {
- wroteAny = true;
- System.out.println("Names in list that are new for " + id + ':');
- }
- System.out.print(" ");
- System.out.println(testName.getName());
- }
- }
- if (wroteAny)
- System.out.println("End of new names.");
-
- if (!workingAgainst.isEmpty()) {
- System.out.println("Names that should of been found, but weren't for " + id + ':');
- for (Iterator itr = workingAgainst.iterator(); itr.hasNext();) {
- String name = (String) itr.next();
- System.out.print(" ");
- System.out.println(name);
- }
- System.out.println("End of missing names");
- fail("Missing some required names for "+id+'.');
- }
- }
-
- /*
- * Write the names out. Call only when want to update list. Filename must
- * be a local file.
- */
- protected void writeNames(String filename, List props, Set excluding) throws FileNotFoundException {
- PrintWriter pr = new PrintWriter(new FileOutputStream(filename));
- try {
- for (Iterator itr = props.iterator(); itr.hasNext();) {
- ENamedElement element = (ENamedElement) itr.next();
- if (excluding != null && excluding.contains(element))
- continue;
- pr.println(element.getName());
- }
- } finally {
- pr.close();
- }
- }
-
- /**
- * Reflect the entire super type hierarchy of the class passed in, including the class itself.
- * @param jclass
- */
- protected void reflectHierachy(JavaClass jclass) {
- JavaClass loopClass = jclass;
- while (loopClass != null) {
- System.out.println("Reflecting for " + loopClass.getQualifiedName()); //$NON-NLS-1$
- loopClass.isFinal(); // This causes reflection.
- loopClass = loopClass.getSupertype();
- }
- }
-
- /**
- * Use when the compares don't match to get a sorted list of operations so that
- * manually verify the count.
- * @param jclass
- */
- protected void showSortedOperations(JavaClass jclass) {
- List allB = jclass.getEAllOperations();
- String[] names = new String[allB.size()];
- for (int i = 0; i < names.length; i++) {
- names[i] = ((MethodProxy) allB.get(i)).getMethod().getMethodElementSignature();
- }
- Arrays.sort(names);
- System.out.println("--- List of Operations for " + jclass.toString());
- for (int i = 0; i < names.length; i++) {
- System.out.println(names[i]);
- }
- }
-
- /**
- * Use when the compares don't match to get a sorted list of properties so that
- * manually verify the count.
- * @param jclass
- */
- protected void showSortedProperties(JavaClass jclass) {
- List allP = jclass.getAllProperties();
- String[] names = new String[allP.size()];
- for (int i = 0; i < names.length; i++) {
- names[i] = ((EStructuralFeature) allP.get(i)).getName();
- }
- Arrays.sort(names);
- System.out.println("--- List of properties for " + jclass.toString());
- for (int i = 0; i < names.length; i++) {
- System.out.println(names[i]);
- }
- }
-
- protected JavaClass getButton() {
- return (JavaClass) rset.getEObject(URI.createURI("java:/java.awt#Button"), true); //$NON-NLS-1$
- }
-
- protected JavaClass getJLabel() {
- return (JavaClass) rset.getEObject(URI.createURI("java:/javax.swing#JLabel"), true); //$NON-NLS-1$
- }
-
- public void testExternalJar() throws IOException {
- objFeaturesSetup();
-
- // This tests getting beaninfo out of jar. The jar is within the project. It contains ButtonBeanInfo.
- JavaClass button = getButton();
- reflectHierachy(button); // First reflect all parents (not introspect).
- // Now cause introspection.
-
- // To write out the names if want new set.
-// writeNames("d:/temp/extjarprops.txt", button.getAllProperties(), objFeaturesSet);
-
- Set names = getNames("testdata/extjarprops.txt");
- testIncludesAllNames("Button", button.getAllProperties(), names, objFeaturesSet);
-
- // To write out the names if want new set.
-// writeNames("d:/temp/extjarops.txt", button.getEOperations(), Collections.EMPTY_SET);
-
- names = getNames("testdata/extjarops.txt");
- testIncludesAllNames("Button", button.getEOperations(), names, Collections.EMPTY_SET);
-
-// showSortedProperties(button);
- }
-
- public void testJLabel() throws IOException {
- objFeaturesSetup();
-
- // This tests JLabel beaninfo out of current project, but through search path.
- JavaClass jlabel = getJLabel();
- reflectHierachy(jlabel); // First reflect all parents (not introspect).
- // Now cause introspection.
-
- // To write out the names if want new set.
-// writeNames("d:/temp/jlabelprops.txt", jlabel.getAllProperties(), objFeaturesSet);
-
- Set names = getNames("testdata/jlabelprops.txt");
- testIncludesAllNames("JLabel", jlabel.getAllProperties(), names, objFeaturesSet);
-
- // To write out the names if want new set.
-// writeNames("d:/temp/jlabelops.txt", jlabel.getEAllOperations(), Collections.EMPTY_SET);
-
- names = getNames("testdata/jlabelops.txt");
- testIncludesAllNames("JLabel", jlabel.getEAllOperations(), names, Collections.EMPTY_SET);
-
-// showSortedProperties(jlabel);
-// showSortedOperations(jlabel);
-
- // Test that isPreferred works both for 1.3 JVM and 1.4 and later since there was a bug in 1.3.
- EStructuralFeature enabledSF = jlabel.getEStructuralFeature("enabled"); //$NON-NLS-1$
- PropertyDecorator pd = Utilities.getPropertyDecorator(enabledSF);
- assertTrue(pd.isPreferred());
- }
-
- /*
- * At time of this test creation, this is the sorted lists for comparison purposes.
- *
- --- List of properties for java.awt.Button
- actionCommand
- alignmentX
- alignmentY
- background
- bounds
- class
- colorModel
- componentOrientation
- cursor
- enabled
- events
- focusTraversable
- font
- foreground
- graphics
- implicit
- initializationString
- instantiateUsing
- label
- locale
- location
- locationOnScreen
- maximumSize
- minimumSize
- name
- parent
- preferredSize
- serializeData
- showing
- size
- toolkit
- treeLock
- valid
- visible
-
- --- List of properties for javax.swing.JLabel
- alignmentX
- alignmentY
- autoscrolls
- background
- border
- bounds
- class
- colorModel
- componentCount
- componentOrientation
- components
- cursor
- debugGraphicsOptions
- disabledIcon
- displayedMnemonic
- doubleBuffered
- enabled
- events
- focusCycleRoot
- focusTraversable
- font
- foreground
- graphics
- height
- horizontalAlignment
- horizontalTextPosition
- icon
- iconTextGap
- implicit
- initializationString
- insets
- instantiateUsing
- labelFor
- layout
- locale
- location
- locationOnScreen
- managingFocus
- maximumSize
- minimumSize
- name
- nextFocusableComponent
- opaque
- optimizedDrawingEnabled
- paintingTile
- parent
- preferredSize
- registeredKeyStrokes
- requestFocusEnabled
- rootPane
- serializeData
- showing
- size
- text
- toolTipText
- toolkit
- topLevelAncestor
- treeLock
- valid
- validateRoot
- verticalAlignment
- verticalTextPosition
- visible
- visibleRect
- width
- x
- y
-
- --- List of Operations for javax.swing.JLabel
- add(java.awt.Component)
- add(java.awt.Component,int)
- add(java.awt.Component,java.lang.Object)
- add(java.awt.Component,java.lang.Object,int)
- add(java.awt.PopupMenu)
- add(java.lang.String,java.awt.Component)
- addNotify()
- checkImage(java.awt.Image,java.awt.image.ImageObserver)
- computeVisibleRect(java.awt.Rectangle)
- contains(int,int)
- contains(java.awt.Point)
- createImage(int,int)
- createImage(java.awt.image.ImageProducer)
- createToolTip()
- dispatchEvent(java.awt.AWTEvent)
- doLayout()
- equals(java.lang.Object)
- firePropertyChange(java.lang.String,boolean,boolean)
- firePropertyChange(java.lang.String,char,char)
- firePropertyChange(java.lang.String,double,double)
- firePropertyChange(java.lang.String,float,float)
- firePropertyChange(java.lang.String,int,int)
- firePropertyChange(java.lang.String,long,long)
- firePropertyChange(java.lang.String,short,short)
- getAccessibleContext()
- getActionForKeyStroke(javax.swing.KeyStroke)
- getAlignmentX()
- getAlignmentY()
- getAutoscrolls()
- getBackground()
- getBorder()
- getBounds()
- getBounds(java.awt.Rectangle)
- getClass()
- getClientProperty(java.lang.Object)
- getColorModel()
- getComponent(int)
- getComponentAt(int,int)
- getComponentAt(java.awt.Point)
- getComponentCount()
- getComponents()
- getConditionForKeyStroke(javax.swing.KeyStroke)
- getCursor()
- getDisabledIcon()
- getDisplayedMnemonic()
- getFont()
- getFontMetrics(java.awt.Font)
- getForeground()
- getGraphics()
- getHeight()
- getHorizontalAlignment()
- getHorizontalTextPosition()
- getIcon()
- getIconTextGap()
- getInsets()
- getLabelFor()
- getLayout()
- getLocale()
- getLocation()
- getLocation(java.awt.Point)
- getLocationOnScreen()
- getMaximumSize()
- getMinimumSize()
- getName()
- getNextFocusableComponent()
- getParent()
- getPreferredSize()
- getRegisteredKeyStrokes()
- getRootPane()
- getSize()
- getSize(java.awt.Dimension)
- getText()
- getToolTipText()
- getToolkit()
- getTopLevelAncestor()
- getTreeLock()
- getUI()
- getVerticalAlignment()
- getVerticalTextPosition()
- getVisibleRect()
- getWidth()
- getX()
- getY()
- grabFocus()
- hasFocus()
- hashCode()
- invalidate()
- isAncestorOf(java.awt.Component)
- isDoubleBuffered()
- isEnabled()
- isFocusCycleRoot()
- isFocusTraversable()
- isManagingFocus()
- isOpaque()
- isOptimizedDrawingEnabled()
- isRequestFocusEnabled()
- isShowing()
- isValid()
- isValidateRoot()
- isVisible()
- list()
- list(java.io.PrintStream)
- list(java.io.PrintStream,int)
- list(java.io.PrintWriter,int)
- notify()
- notifyAll()
- paint(java.awt.Graphics)
- paintAll(java.awt.Graphics)
- paintImmediately(java.awt.Rectangle)
- prepareImage(java.awt.Image,java.awt.image.ImageObserver)
- print(java.awt.Graphics)
- printAll(java.awt.Graphics)
- putClientProperty(java.lang.Object,java.lang.Object)
- remove(int)
- remove(java.awt.Component)
- remove(java.awt.MenuComponent)
- removeAll()
- removeNotify()
- repaint()
- repaint(java.awt.Rectangle)
- requestDefaultFocus()
- requestFocus()
- resetKeyboardActions()
- revalidate()
- scrollRectToVisible(java.awt.Rectangle)
- setAlignmentX(float)
- setAlignmentY(float)
- setAutoscrolls(boolean)
- setBackground(java.awt.Color)
- setBorder(javax.swing.border.Border)
- setBounds(int,int,int,int)
- setBounds(java.awt.Rectangle)
- setCursor(java.awt.Cursor)
- setDebugGraphicsOptions(int)
- setDisabledIcon(javax.swing.Icon)
- setDisplayedMnemonic(char)
- setDoubleBuffered(boolean)
- setEnabled(boolean)
- setFont(java.awt.Font)
- setForeground(java.awt.Color)
- setHorizontalAlignment(int)
- setHorizontalTextPosition(int)
- setIcon(javax.swing.Icon)
- setIconTextGap(int)
- setLabelFor(java.awt.Component)
- setLayout(java.awt.LayoutManager)
- setLocale(java.util.Locale)
- setLocation(int,int)
- setLocation(java.awt.Point)
- setMaximumSize(java.awt.Dimension)
- setMinimumSize(java.awt.Dimension)
- setName(java.lang.String)
- setNextFocusableComponent(java.awt.Component)
- setOpaque(boolean)
- setPreferredSize(java.awt.Dimension)
- setRequestFocusEnabled(boolean)
- setSize(int,int)
- setSize(java.awt.Dimension)
- setText(java.lang.String)
- setToolTipText(java.lang.String)
- setUI(javax.swing.plaf.LabelUI)
- setVerticalAlignment(int)
- setVerticalTextPosition(int)
- setVisible(boolean)
- toString()
- transferFocus()
- unregisterKeyboardAction(javax.swing.KeyStroke)
- update(java.awt.Graphics)
- updateUI()
- validate()
- wait()
- wait(long)
- wait(long,int)
-
- */
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestReflection.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestReflection.java
deleted file mode 100644
index 6f111838..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestReflection.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.beaninfo;
-/*
- * $RCSfile: TestReflection.java,v $
- * $Revision: 1.10 $ $Date: 2007/03/28 02:43:45 $
- */
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EOperation;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jem.internal.beaninfo.PropertyDecorator;
-import org.eclipse.jem.internal.beaninfo.core.Utilities;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaEvent;
-import org.eclipse.jem.java.TypeKind;
-
-/**
- * @author richkulp
- * This one is for testing reflection. It is separate so that
- * test suite can guarentee that it is first.
- */
-public class TestReflection extends AbstractBeanInfoTestCase {
-
- public TestReflection() {
- super();
- }
-
- public TestReflection(String name) {
- super(name);
- }
-
- public void testReflection() {
- // Test one without a beaninfo. This will do reflection.
- JavaClass test1Class =
- (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test1Class"), true); //$NON-NLS-1$
-
- assertSame(TypeKind.CLASS_LITERAL, test1Class.getKind());
-
- // Test that the reflection key can find features that aren't yet loaded.
- Object foo = rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test1Class/foo"), true); //$NON-NLS-1$
- assertNotNull(foo);
-
- // Test that the reflection key can find operations that aren't yet loaded.
- Object getFoo =
- rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test1Class/operation/getFoo"), true); //$NON-NLS-1$
- assertNotNull(getFoo);
- }
-
- public void testInnerReflectionInDefault() {
- // Test that a property of class (through reflection) is an inner class, and the class is resolved correctly.
- JavaClass testInnerClass =
- (JavaClass) rset.getEObject(URI.createURI("java:/#TestDefaultInner"), true); //$NON-NLS-1$
-
- assertSame(TypeKind.CLASS_LITERAL, testInnerClass.getKind());
-
- EList properties = testInnerClass.getProperties();
- assertEquals(1, properties.size());
-
- EStructuralFeature pf = (EStructuralFeature) properties.get(0);
- assertEquals("propertyInner", pf.getName());
-
- PropertyDecorator pd = Utilities.getPropertyDecorator(pf);
- assertNotNull(pd);
-
- JavaClass pdType = (JavaClass) pd.getPropertyType();
- assertEquals("TestDefaultInner$Inner", pdType.getName());
- assertSame(TypeKind.CLASS_LITERAL, pdType.getKind());
- }
-
- public void testInnerReflectionInPackage() {
- // Test that a property of class (through reflection) is an inner class, and the class is resolved correctly.
- JavaClass testInnerClass =
- (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#TestInner"), true); //$NON-NLS-1$
-
- assertSame(TypeKind.CLASS_LITERAL, testInnerClass.getKind());
-
- EList properties = testInnerClass.getProperties();
- assertEquals(1, properties.size());
-
- EStructuralFeature pf = (EStructuralFeature) properties.get(0);
- assertEquals("propertyInner", pf.getName());
-
- PropertyDecorator pd = Utilities.getPropertyDecorator(pf);
- assertNotNull(pd);
-
- JavaClass pdType = (JavaClass) pd.getPropertyType();
- assertEquals("TestInner$Inner", pdType.getName());
- assertSame(TypeKind.CLASS_LITERAL, pdType.getKind());
- }
-
- private List getRealProps(List props) {
- int size = props.size();
- List newList = new ArrayList(size);
- for (int i=0; i<size; i++) {
- EStructuralFeature f = (EStructuralFeature) props.get(i);
- if (Utilities.getPropertyDecorator(f) != null)
- newList.add(f);
- }
- return newList;
- }
-
- public void testInterfacePropertyReflection() {
- // Test the reflection of interfaces with multiple extends on them so that properities are correct.
- JavaClass testPropClass =
- (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo.test#NotTopGuy"), true); //$NON-NLS-1$
-
- assertTrue(testPropClass.isInterface());
-
- // Test that we don't pick up the extends stuff
- List props = getRealProps(testPropClass.getProperties());
- // Forgot there may be non-properties properties.
- assertEquals(1, props.size());
- assertEquals("number", ((EStructuralFeature) props.get(0)).getName());
-
- // Test that we pick up the extends stuff
- props = getRealProps(testPropClass.getAllProperties());
- assertEquals(3, props.size());
- List validNames = Arrays.asList(new String[] {"number", "object", "integer"});
- for (Iterator itr = props.iterator(); itr.hasNext();) {
- EStructuralFeature feature = (EStructuralFeature) itr.next();
- assertTrue("Extra feature:"+feature.getName(), validNames.contains(feature.getName()));
- }
- }
-
- public void testInterfaceEventReflection() {
- // Test the reflection of interfaces with multiple extends on them so that events are correct.
- JavaClass testEventClass =
- (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo.test#NotTopGuy"), true); //$NON-NLS-1$
-
- assertTrue(testEventClass.isInterface());
-
- // Test that we don't pick up the extends stuff
- List events = testEventClass.getEvents();
- assertTrue(events.isEmpty());
-
- // Test that we pick up the extends stuff
- events = testEventClass.getAllEvents();
- assertEquals(1, events.size());
- assertEquals("test1ClassEvent", ((JavaEvent) events.get(0)).getName());
- }
-
- public void testInterfaceOperationsReflection() {
- // Test the reflection of interfaces with multiple extends on them so that properities are correct.
- JavaClass testOpClass =
- (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo.test#NotTopGuy"), true); //$NON-NLS-1$
-
- assertTrue(testOpClass.isInterface());
-
- // Test that we don't pick up the extends stuff
- List ops = testOpClass.getEOperations();
- assertEquals(2, ops.size());
- List validNames = Arrays.asList(new String[] {"getNumber", "setNumber"});
- for (Iterator itr = ops.iterator(); itr.hasNext();) {
- EOperation op = (EOperation) itr.next();
- assertTrue("Extra operation:"+op.getName(), validNames.contains(op.getName()));
- }
-
-
- // Test that we pick up the extends stuff
- ops = testOpClass.getEAllOperations();
- assertEquals(8, ops.size());
- validNames = Arrays.asList(new String[] {"getNumber", "setNumber", "getObject", "setObject", "getInteger", "setInteger", "addTest1ClassEventListener", "removeTest1ClassEventListener"});
- for (Iterator itr = ops.iterator(); itr.hasNext();) {
- EOperation op = (EOperation) itr.next();
- assertTrue("Extra operation:"+op.getName(), validNames.contains(op.getName()));
- }
- }
-
- /**
- * Test for regression for this bug.
- * @throws CoreException
- * @see https://bugs.eclipse.org/bugs/show_bug.cgi?id=153150
- *
- */
- /* see https://bugs.eclipse.org/bugs/show_bug.cgi?id=179023 - we need to run HEADLESS tests as HEADLESS, and this test requires UI
- public void test153150() throws CoreException {
- // This tests that within a platform runnable, that if a class is reflected as not found, then is created and source type tested that
- // it will now reflect as found. The source type test forces a flush if the type is now found. However, if didn't do source type test
- // but did just reflection we wouldn't see the new class until after notification. This bug doesn't address that problem.
-
- // Need to have a folder (package) already exist for this test to work. If the package was created at the same time
- // as the class, then it won't be found until after the notification is done. But this fix was for a new class in an
- // existing package.
- IPackageFragment pkg1 = (IPackageFragment) JavaCore.create(nature.getProject()).findElement(new Path("org/eclipse/jem/tests/beaninfo"));
- final IFolder folder = ((IFolder) pkg1.getCorrespondingResource()).getFolder("t153150");
- if (!folder.exists())
- folder.create(true, true, new NullProgressMonitor());
-
- final ICompilationUnit[] testCU = new ICompilationUnit[1];
- try {
- JavaCore.run(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- JavaClass test1Class =
- (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo.t153150#Test153150Class"), true); //$NON-NLS-1$
- assertEquals("Should not be defined.", TypeKind.UNDEFINED_LITERAL, test1Class.getKind());
-
- // Now create the class.
- IPackageFragment pkg = (IPackageFragment) JavaCore.create(folder);
- testCU[0] = pkg.createCompilationUnit("Test153150Class.java", "public class Test153150Class {}", true, new NullProgressMonitor());
-
- assertEquals("It should still reflect as not found.", TypeKind.UNDEFINED_LITERAL, test1Class.getKind());
-
- // Now do the get source type. This should reset our flags.
- assertTrue("It should have a source type.", test1Class.isExistingType());
-
- // Now it should reflect.
- assertEquals("It should now reflect as found.", TypeKind.CLASS_LITERAL, test1Class.getKind());
- }
- }, new NullProgressMonitor());
- } finally {
- if (testCU[0] != null) {
- testCU[0].delete(true, new NullProgressMonitor());
- }
- }
- }
- */
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestStandard.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestStandard.java
deleted file mode 100644
index 43c92b2b..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/beaninfo/TestStandard.java
+++ /dev/null
@@ -1,629 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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.jem.tests.beaninfo;
-/*
- * $RCSfile: TestStandard.java,v $
- * $Revision: 1.14 $ $Date: 2006/05/17 20:13:56 $
- */
-
-import java.util.Iterator;
-import java.util.List;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.jobs.ISchedulingRule;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.*;
-
-import org.eclipse.jem.internal.beaninfo.*;
-import org.eclipse.jem.internal.beaninfo.core.Utilities;
-
-import org.eclipse.jem.java.*;
-
-/**
- * @author richkulp
- *
- * Standard BeanInfo tests.
- */
-public class TestStandard extends AbstractBeanInfoTestCase {
-
- public TestStandard() {
- super();
- }
-
- public TestStandard(String name) {
- super(name);
- }
-
- public void testArrayClassType() {
- // Test one dimension array type for a class as final component
- JavaClass at = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("org.eclipse.jem.tests.beaninfo.Test1Class[]", rset);
-
- assertTrue(at.isArray());
- assertSame(TypeKind.CLASS_LITERAL, at.getKind());
- assertEquals(1, ((ArrayType) at).getArrayDimensions());
- assertTrue(at.isPublic());
- assertTrue("java.lang.Object".equals(at.getSupertype().getQualifiedName()));
- assertTrue(at.getImplementsInterfaces().size() == 2);
- assertTrue(at.getMethods().isEmpty());
- assertTrue(at.getFields().isEmpty());
- assertTrue(at.getProperties().isEmpty());
- assertTrue(at.getEvents().isEmpty());
- assertTrue(at.getEOperations().isEmpty());
- }
-
- public void testArrayPrimitiveType() {
- // Test one dimension array type for a class as final component
- JavaClass at = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("int[]", rset);
-
- assertTrue(at.isArray());
- assertSame(TypeKind.CLASS_LITERAL, at.getKind());
- assertEquals(1, ((ArrayType) at).getArrayDimensions());
- assertTrue(at.isPublic());
- assertTrue("java.lang.Object".equals(at.getSupertype().getQualifiedName()));
- assertTrue(at.getImplementsInterfaces().size() == 2);
- assertTrue(at.getMethods().isEmpty());
- assertTrue(at.getFields().isEmpty());
- assertTrue(at.getProperties().isEmpty());
- assertTrue(at.getEvents().isEmpty());
- assertTrue(at.getEOperations().isEmpty());
- }
-
- public void testArrayUndefined() {
- // Test one dimension array type for a class as final component that is undefined.
- JavaClass at = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("XYZ[]", rset);
-
- assertTrue(at.isArray());
- assertSame(TypeKind.UNDEFINED_LITERAL, at.getKind());
- }
-
- public void testArrayClassType2Dim() {
- // Test one dimension array type for a class as final component
- JavaClass at = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("org.eclipse.jem.tests.beaninfo.Test1Class[][]", rset);
-
- assertTrue(at.isArray());
- assertSame(TypeKind.CLASS_LITERAL, at.getKind());
- assertEquals(2, ((ArrayType) at).getArrayDimensions());
- assertTrue(at.isPublic());
- assertTrue("java.lang.Object".equals(at.getSupertype().getQualifiedName()));
- assertTrue(at.getImplementsInterfaces().size() == 2);
- assertTrue(at.getMethods().isEmpty());
- assertTrue(at.getFields().isEmpty());
- assertTrue(at.getProperties().isEmpty());
- assertTrue(at.getEvents().isEmpty());
- assertTrue(at.getEOperations().isEmpty());
- }
-
- public void testArrayPrimitiveType2Dim() {
- // Test one dimension array type for a class as final component
- JavaClass at = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("int[][]", rset);
-
- assertTrue(at.isArray());
- assertSame(TypeKind.CLASS_LITERAL, at.getKind());
- assertEquals(2, ((ArrayType) at).getArrayDimensions());
- assertTrue(at.isPublic());
- assertTrue("java.lang.Object".equals(at.getSupertype().getQualifiedName()));
- assertTrue(at.getImplementsInterfaces().size() == 2);
- assertTrue(at.getMethods().isEmpty());
- assertTrue(at.getFields().isEmpty());
- assertTrue(at.getProperties().isEmpty());
- assertTrue(at.getEvents().isEmpty());
- assertTrue(at.getEOperations().isEmpty());
- }
-
- public void testArrayUndefined2Dim() {
- // Test one dimension array type for a class as final component that is undefined.
- JavaClass at = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("XYZ[][]", rset);
-
- assertTrue(at.isArray());
- assertSame(TypeKind.UNDEFINED_LITERAL, at.getKind());
- }
-
- public void testArrayInnerClassType() {
- // Test one dimension array type for a class as final component
- JavaClass at = (JavaClass) JavaRefFactory.eINSTANCE.reflectType("org.eclipse.jem.tests.beaninfo.Customer$Account[]", rset);
-
- assertTrue(at.isArray());
- assertSame(TypeKind.CLASS_LITERAL, at.getKind());
- assertEquals(1, ((ArrayType) at).getArrayDimensions());
- assertTrue(at.isPublic());
- assertTrue("java.lang.Object".equals(at.getSupertype().getQualifiedName()));
- assertTrue(at.getImplementsInterfaces().size() == 2);
- assertTrue(at.getMethods().isEmpty());
- assertTrue(at.getFields().isEmpty());
- assertTrue(at.getProperties().isEmpty());
- assertTrue(at.getEvents().isEmpty());
- assertTrue(at.getEOperations().isEmpty());
- }
-
- public void testBeanDecoratorReflected() {
- JavaClass test1Class = getTest1Class();
-
- // Test the bean decorator.
- BeanDecorator bd = Utilities.getBeanDecorator(test1Class);
- assertEquals("Test1Class", bd.getName()); //$NON-NLS-1$
- assertNull(bd.getCustomizerClass());
- }
-
- protected JavaClass getTest1Class() {
- JavaClass test1Class =
- (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test1Class"), true); //$NON-NLS-1$
- return test1Class;
- }
-
- public void testLocalReflectedProperties() {
- EList allLocalFeatures = getTest1Class().getProperties();
- assertEquals(2, allLocalFeatures.size());
-
- Iterator itr = Utilities.getPropertiesIterator(allLocalFeatures);
- boolean found = false;
- while (itr.hasNext()) {
- PropertyDecorator pd = (PropertyDecorator) itr.next();
- if (pd.getName().equals("foo")) { //$NON-NLS-1$
- found = true;
- assertTrue(pd instanceof IndexedPropertyDecorator);
- IndexedPropertyDecorator ip = (IndexedPropertyDecorator) pd;
- JavaHelpers type = (JavaHelpers) ip.getPropertyType();
- assertEquals("java.lang.String[]", type.getQualifiedName());
- if (!type.getQualifiedName().equals("java.lang.String[]")); //$NON-NLS-1$
-
- Method mthd = ip.getReadMethod();
- assertSame(rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test1Class.getFoo("), true), mthd);
-
- mthd = ip.getWriteMethod();
- assertSame(rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test1Class.setFoo(java.lang.String[]"), true), mthd);
-
- mthd = ip.getIndexedReadMethod();
- assertSame(rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test1Class.getFoo(int"), true), mthd);
-
- mthd = ip.getIndexedWriteMethod();
- assertSame(rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test1Class.setFoo(int,java.lang.String"), true), mthd);
-
- break;
- }
- }
-
- assertTrue(found);
- }
-
- public void testLocalReflectedOperations() {
- JavaClass test1Class = getTest1Class();
-
- // Test local operations.
- EList allLocalOperations = test1Class.getEOperations();
- assertEquals(10, allLocalOperations.size());
- Iterator itr = allLocalOperations.iterator();
- // This is the desired method that the operation of interest points to.
- Method desired =
- (Method) rset.getEObject(URI.createURI(
- "java:/org.eclipse.jem.tests.beaninfo#Test1Class.setFoo(int,java.lang.String"), true); //$NON-NLS-1$
- boolean found = false;
- while (itr.hasNext()) {
- MethodProxy bhav = (MethodProxy) itr.next();
- if (bhav.getMethod() == desired) {
- found = true;
- List parms = Utilities.getMethodDecorator(bhav).getParameterDescriptors();
- assertEquals(2, parms.size());
- ParameterDecorator pmd = (ParameterDecorator) parms.get(0);
- assertEquals("index", pmd.getName());
-
- break;
- }
- }
- assertTrue(found);
- }
-
- public void testLocalReflectedEvents() {
- JavaClass test1Class = getTest1Class();
-
- // Test event set reflected.
- List events = test1Class.getEvents();
- assertEquals(2, events.size());
- Iterator itr = events.iterator();
- boolean foundevt1 = false, foundevt2 = false;
- while (itr.hasNext()) {
- JavaEvent event = (JavaEvent) itr.next();
- if ("test1ClassEvent".equals(event.getName())) { //$NON-NLS-1$
- foundevt1 = true;
- EventSetDecorator edec = Utilities.getEventSetDecorator(event);
- List mlist = edec.getListenerMethods();
- assertEquals(2, mlist.size());
- } else if ("test1ClassUnicastEvent".equals(event.getName())) { //$NON-NLS-1$
- foundevt2 = true;
- EventSetDecorator edec = Utilities.getEventSetDecorator(event);
- assertTrue(edec.isUnicast());
- }
- }
- assertTrue(foundevt1);
- assertTrue(foundevt2);
- }
-
- protected JavaClass getTest2ClassB() {
- return (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test2ClassB"), true); //$NON-NLS-1$
- }
-
- public void testBeanDecoratorIntrospected() {
- // Test one with a beaninfo.
- JavaClass test2ClassB = getTest2ClassB();
- BeanDecorator bd = Utilities.getBeanDecorator(test2ClassB);
- assertEquals("Test2ClassB", bd.getName());
-
- // The following will test if search across beaninfo search path worked. It would fail if it didn't work.
- assertEquals("A name for this class.", bd.getDisplayName()); //$NON-NLS-1$
- assertFalse(bd.isExpert());
- // Customizer class set in BeanInfo, but bogus for now to same class as being introspected.
- assertSame(test2ClassB, bd.getCustomizerClass());
- }
-
- public void testLocalIntrospectedProperties() {
- JavaClass test2ClassB = getTest2ClassB();
- EList allLocalFeatures = test2ClassB.getProperties();
- assertEquals(2, allLocalFeatures.size());
-
- Iterator itr = Utilities.getPropertiesIterator(allLocalFeatures);
- boolean gotSet = false, gotFoo = false;
- while (itr.hasNext()) {
- PropertyDecorator pd = (PropertyDecorator) itr.next();
- Method mthd = null;
- if (pd.getName().equals("setA")) { //$NON-NLS-1$
- gotSet = true;
- mthd = pd.getReadMethod();
- assertSame(rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test2ClassB.isSetA("), true), mthd);
- } else if (pd.getName().equals("foo")) { //$NON-NLS-1$
- gotFoo = true;
- IndexedPropertyDecorator ipd = (IndexedPropertyDecorator) pd;
- mthd = ipd.getIndexedReadMethod();
- assertSame(rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test2ClassB.getFoo(int"), true), mthd);
- }
- }
- assertTrue(gotSet);
- assertTrue(gotFoo);
- }
-
- public void testLocalIntrospectedOperations() {
- JavaClass test2ClassB = getTest2ClassB();
-
- EList allLocalOperations = test2ClassB.getEOperations();
- assertEquals(2, allLocalOperations.size());
-
- boolean found = false;
- Iterator itr = test2ClassB.getEOperations().iterator();
- while (itr.hasNext()) {
- EOperation bhav = (EOperation) itr.next();
- if (bhav.getName().equals("setSetA")) { //$NON-NLS-1$
- List parms = Utilities.getMethodDecorator(bhav).getParameterDescriptors();
- assertEquals(1, parms.size());
- ParameterDecorator pmd = (ParameterDecorator) parms.get(0);
- assertEquals("aBooleanSetting", pmd.getName());
- found = true;
- break;
- }
- }
- assertTrue(found);
- }
-
- public void testLocalIntrospectedEvents() {
- JavaClass test2ClassB = getTest2ClassB();
-
- // Test event set introspected.
- EList events = test2ClassB.getEvents();
- assertEquals(1, events.size());
- JavaEvent event = (JavaEvent) events.get(0);
- assertEquals("overrideName", event.getName()); //$NON-NLS-1$
- EventSetDecorator edec = Utilities.getEventSetDecorator(event);
- assertEquals("ITest1ClassEventListener", edec.getListenerType().getName());
- List mlist = edec.getListenerMethods();
- assertEquals(1, mlist.size());
- MethodProxy mproxy = (MethodProxy) mlist.get(0);
- MethodDecorator mdec = Utilities.getMethodDecorator(mproxy);
- assertEquals("event1", mdec.getName()); //$NON-NLS-1$
- assertEquals("Event 1", mdec.getDisplayName()); //$NON-NLS-1$
- }
-
- public void testSuperTypes() {
- JavaClass testClass = getTest1Class();
- objFeaturesSetup(); // Get number of features for Object. This can vary depending on extensions, so that is why we compute it.
-
- // Now do the testing of merging with super types.
- assertEquals(2+objFeatures, testClass.getAllProperties().size());
- JavaClass test1ClassA = getTest1ClassA(); //$NON-NLS-1$
- assertNotNull(test1ClassA);
- assertEquals(3+objFeatures, test1ClassA.getAllProperties().size());
- }
-
- protected JavaClass getTest1ClassA() {
- return (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test1ClassA"), true);
- }
-
- public void testSuperTypesEvents() {
- JavaClass test1ClassA = getTest1ClassA();
-
- // Test merging supertypes event set.
- List events = test1ClassA.getAllEvents();
- assertEquals(2, events.size());
- Iterator itr = events.iterator();
- boolean foundevt1 = false;
- boolean foundevt2 = false;
- while (itr.hasNext()) {
- JavaEvent event = (JavaEvent) itr.next();
- if ("test1ClassEvent".equals(event.getName())) { //$NON-NLS-1$
- foundevt1 = true;
- EventSetDecorator edec = Utilities.getEventSetDecorator(event);
- List mlist = edec.getListenerMethods();
- assertEquals(2, mlist.size());
- } else if ("test1ClassUnicastEvent".equals(event.getName())) { //$NON-NLS-1$
- foundevt2 = true;
- EventSetDecorator edec = Utilities.getEventSetDecorator(event);
- assertTrue(edec.isUnicast());
- }
- }
- assertTrue(foundevt1);
- assertTrue(foundevt2);
- }
-
- protected JavaClass getTest2Class() {
- return (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test2Class"), true); //$NON-NLS-1$
- }
-
- protected JavaClass getTest2ClassA() {
- return (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test2ClassA"), true); //$NON-NLS-1$
- }
-
- public void testSuperTypeHideProperty() {
- JavaClass test2Class = getTest2Class();
- objFeaturesSetup();
-
- // Test2ClassBeanInfo explicitly hides Object (super) from its BeanInfo, so only the non-BeanInfo properties will show.
- assertEquals(2+objNonProperties, test2Class.getAllProperties().size());
-
- // Try with subclasses. Make sure that Test2ClassBeanInfo is used with the subclasses.
- JavaClass test2ClassA = getTest2ClassA();
- assertEquals(3+objNonProperties, test2ClassA.getAllProperties().size());
-
- JavaClass test2ClassB = getTest2ClassB();
- assertEquals(4+objNonProperties, test2ClassB.getAllProperties().size());
- }
-
- public void testIndexedBeanInfo() {
- JavaClass test2Class = getTest2Class();
-
- // Test that Indexed thru beaninfo works
- Iterator itr = Utilities.getPropertiesIterator(test2Class.getProperties());
- boolean found = false;
- while (itr.hasNext()) {
- PropertyDecorator pd = (PropertyDecorator) itr.next();
- if (pd.getName().equals("fooBar")) { //$NON-NLS-1$
- found = true;
- assertTrue(pd instanceof IndexedPropertyDecorator);
- IndexedPropertyDecorator ip = (IndexedPropertyDecorator) pd;
- JavaHelpers type = (JavaHelpers) ip.getPropertyType();
- assertEquals("java.lang.String[]", type.getQualifiedName()); //$NON-NLS-1$
- Method mthd = ip.getReadMethod();
- assertSame(rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test2Class.getFooBar("), true), mthd); //$NON-NLS-1$
- mthd = ip.getWriteMethod();
- assertSame(rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test2Class.setFooBar(java.lang.String[]"), true), mthd); //$NON-NLS-1$
- mthd = ip.getIndexedReadMethod();
- assertSame(rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test2Class.getFooBar(int"), true), mthd); //$NON-NLS-1$
- mthd = ip.getIndexedWriteMethod();
- assertSame(rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test2Class.setFooBar(int,java.lang.String"), true), mthd); //$NON-NLS-1$
- break;
- }
- }
-
- assertTrue(found);
- }
-
- protected JavaClass getTest2ClassC() {
- return (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Test2ClassC"), true); //$NON-NLS-1$
- }
-
- public void testBeanInfoProject() {
- JavaClass test2ClassC = getTest2ClassC();
-
- // This will test that we could find Test2ClassC BeanInfo that is in another BeanInfo project (i.e. a project
- // that is specifically for BeanInfo's for a specific code project).
- BeanDecorator bd = Utilities.getBeanDecorator(test2ClassC);
- assertNotNull(bd);
- assertEquals("Test2ClassC from BeanInfo", bd.getDisplayName());
-
- }
-
- public void testOverride() {
-
- // Test that the local property is expert because it overrode from Test2ClassB and made it expert.
- JavaClass test2ClassB = getTest2ClassB();
-
- // Test that the local property is not expert in Test2ClassB.
- EStructuralFeature p = test2ClassB.getEStructuralFeature("setA");
- assertNotNull(p);
- PropertyDecorator pd = Utilities.getPropertyDecorator(p);
- assertFalse(pd.isExpert());
-
- // Now get subclass with override.
- JavaClass test2ClassC = getTest2ClassC();
-
- // Test that the local property is now expert because it overrode from Test2ClassB and made it expert.
- p = test2ClassC.getEStructuralFeature("setA");
- assertNotNull(p);
- pd = Utilities.getPropertyDecorator(p);
- assertTrue(pd.isExpert());
- }
-
- protected JavaClass getTest2ClassPreq() {
- return (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo.prereq#Test2ClassPreq"), true); //$NON-NLS-1$
- }
-
- public void testPrereqedProjects() {
- JavaClass test2ClassPrereq = getTest2ClassPreq();
- objFeaturesSetup();
-
- // Test finding beaninfos for classes in another project (pre-reqed project).
- assertEquals(1+objFeatures, test2ClassPrereq.getAllProperties().size());
- // Verify BeanInfo and not jsut introspection.
- EStructuralFeature f = test2ClassPrereq.getEStructuralFeature("aSet");
- assertNotNull(f);
- PropertyDecorator pd = Utilities.getPropertyDecorator(f);
- assertTrue(pd.isExpert());
- }
-
- public void testRemovePropRebuild() throws CoreException {
- objFeaturesSetup();
-
- // Test removing a property directly from a super class causes the subclasses to re-build their properties.
- JavaClass test1Class = getTest1Class();
- JavaClass test1ClassA = getTest1ClassA();
- // Get and test the properties first to cause introspection for both BEFORE the modification.
- assertEquals(2+objFeatures, test1Class.getAllProperties().size());
- assertEquals(3+objFeatures, test1ClassA.getAllProperties().size());
- try {
- test1Class.getEStructuralFeatures().remove(0); // Remove the first one. They should both now rebuild.
- assertEquals(1+objFeatures, test1Class.getAllProperties().size());
- assertEquals(2+objFeatures, test1ClassA.getAllProperties().size());
- } finally {
- // Need to close and reopen the project so that to restore the correct shape for test1Class for other tests.
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- final IProject project = nature.getProject();
- ISchedulingRule projectRule = workspace.getRuleFactory().modifyRule(project);
- workspace.run(new IWorkspaceRunnable () {
- public void run(IProgressMonitor monitor) throws CoreException {
- project.close(monitor);
- project.open(monitor);
- }
- }, projectRule, 0, null);
- }
- }
-
- public void testRemoveEventRebuild() throws CoreException {
- // Test removing an event directly from a super class causes the subclasses to re-build their allEvents.
- JavaClass test1Class = getTest1Class();
- JavaClass test1ClassA = getTest1ClassA();
- // Get and test the events first to cause introspection for both BEFORE the modification.
- assertEquals(2, test1Class.getAllEvents().size());
- assertEquals(2, test1ClassA.getAllEvents().size());
- try {
- test1Class.getEvents().remove(0); // Remove the first one. They should now both rebuild.
- assertEquals(1, test1Class.getAllEvents().size());
- assertEquals(1, test1ClassA.getAllEvents().size());
- } finally {
- // Need to close and reopen the project so that to restore the correct shape for test1Class for other tests.
- final IProject project = nature.getProject();
- IWorkspace workspace = ResourcesPlugin.getWorkspace();
- ISchedulingRule projectRule = workspace.getRuleFactory().modifyRule(project);
- workspace.run(new IWorkspaceRunnable () {
- public void run(IProgressMonitor monitor) throws CoreException {
- project.close(monitor);
- project.open(monitor);
- }
- }, projectRule, 0, null);
- }
- }
-
- protected JavaClass getCustomer() {
- return (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#Customer"), true); //$NON-NLS-1$
- }
-
- public void testInnerClass() {
- JavaClass customer = getCustomer();
-
- // Now test customer to make sure that it introspects correctly, plus the inner class of one of its properties does too.
- List allLocalFeatures = customer.getProperties();
- assertEquals(2, allLocalFeatures.size());
- Iterator itr = allLocalFeatures.iterator();
- boolean found = false;
- while (itr.hasNext()) {
- EStructuralFeature ea = (EStructuralFeature) itr.next();
- if ("savings".equals(ea.getName())) { //$NON-NLS-1$
- found = true;
- JavaClass innerClass = (JavaClass) ea.getEType(); // This property type is an innerclass of Customer
- assertEquals("Customer$Account", innerClass.getName());
- allLocalFeatures = innerClass.getProperties();
- assertEquals(2, allLocalFeatures.size());
- }
- }
-
- assertTrue(found);
- }
-
- protected JavaClass getTestBoundNotBound() {
- return (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#TestBoundNotBound"), true); //$NON-NLS-1$
- }
-
- public void testNotBoundReflection() {
- JavaClass testBoundNotBound = getTestBoundNotBound();
-
- // Now test that properties are bound correctly on reflection. First test reflect not bound correct.
- // This is determined by no addPropertyChangeListener method on class.
- List allLocalFeatures = testBoundNotBound.getProperties();
- assertEquals(1, allLocalFeatures.size());
- EStructuralFeature ea = (EStructuralFeature) allLocalFeatures.get(0);
- PropertyDecorator pd = Utilities.getPropertyDecorator(ea);
- assertNotNull(pd);
- assertFalse(pd.isBound());
- }
-
- protected JavaClass getTestBoundSuper() {
- return (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#TestBoundSuper"), true); //$NON-NLS-1$
- }
-
- public void testBoundReflection() {
- JavaClass testBoundSuper = getTestBoundSuper();
-
- // Test that reflection can find bound property.
- // This is determined by finding add/remove PropertyChangeListener method on class.
- List allLocalFeatures = testBoundSuper.getProperties();
- assertEquals(1, allLocalFeatures.size());
- EStructuralFeature ea = (EStructuralFeature) allLocalFeatures.get(0);
- PropertyDecorator pd = Utilities.getPropertyDecorator(ea);
- assertNotNull(pd);
- assertTrue(pd.isBound());
- }
-
- protected JavaClass getTestBoundSub() {
- return (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#TestBoundSub"), true); //$NON-NLS-1$
- }
-
- public void testBoundReflectionSubclass() {
- JavaClass testBoundSub = getTestBoundSub();
-
- // Test that reflection can find bound property due to inherit from a bound class.
- // This is determined by finding add/remove PropertyChangeListener method on class (but from a super class).
- List allLocalFeatures = testBoundSub.getProperties();
- assertEquals(1, allLocalFeatures.size());
- EStructuralFeature ea = (EStructuralFeature) allLocalFeatures.get(0);
- PropertyDecorator pd = Utilities.getPropertyDecorator(ea);
- assertNotNull(pd);
- assertTrue(pd.isBound());
- }
-
- public void testOverridesFile() {
- // Test that override files get applied correctly.
- JavaClass testOverride = (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#TestOverrides"), true); //$NON-NLS-1$
- assertNotNull(testOverride);
- EStructuralFeature xyz = testOverride.getEStructuralFeature("xyz");
- assertNotNull(xyz);
- // Test that it has the correct type so that we know it was reflected correctly.
- assertEquals(rset.getEObject(URI.createURI("java:/#int"), true), xyz.getEType());
-
- // Test that we have the annotation we added.
- assertNotNull(xyz.getEAnnotation("Override Annotation"));
- }
-
- public void test79083() {
- // Test bug 79083: Null ETypes from overrides that didn't have a reflection to give it the type. BeanInfo should make it EObject type.
- JavaClass testOverride = (JavaClass) rset.getEObject(URI.createURI("java:/org.eclipse.jem.tests.beaninfo#TestOverrides"), true); //$NON-NLS-1$
- assertNotNull(testOverride);
- EStructuralFeature test79083 = testOverride.getEStructuralFeature("test79083");
- assertNotNull(test79083);
- assertEquals(EcorePackage.eINSTANCE.getEObject(), test79083.getEType());
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/InstantiationSuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/InstantiationSuite.java
deleted file mode 100644
index 25c0b962..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/InstantiationSuite.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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.jem.tests.instantiation;
-/*
- * $RCSfile: InstantiationSuite.java,v $
- * $Revision: 1.12 $ $Date: 2006/05/17 20:13:56 $
- */
-import java.net.URL;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
-import org.eclipse.jem.internal.instantiation.base.JavaInstantiation;
-import org.eclipse.jem.tests.JavaProjectUtil;
-import org.eclipse.jem.tests.JavaTestsPlugin;
-import org.eclipse.jem.tests.beaninfo.AbstractBeanInfoTestCase;
-
-/**
- * @author richkulp
- *
- */
-public class InstantiationSuite extends TestSetup {
-
- // Test cases to be include in the suite
- private static final Class testsList[] = { TestStandard.class, };
-
- /**
- *
- */
- public InstantiationSuite() {
- this("Test Instantiation Suite");
- }
-
- /**
- * @param name
- */
- public InstantiationSuite(String name) {
- super(new TestSuite(name) {
- {
- for (int i = 0; i < testsList.length; i++) {
- addTestSuite(testsList[i]);
- }
-
- }
- });
- }
-
- public static Test suite() {
- return new InstantiationSuite();
- }
-
- private boolean oldAutoBuildingState; // autoBuilding state before we started.
- protected void setUp() throws Exception {
- System.out.println("-- Initializing the Instantiation test data --"); //$NON-NLS-1$
- oldAutoBuildingState = JavaProjectUtil.setAutoBuild(true);
- URL installURL = JavaTestsPlugin.getPlugin().getBundle().getEntry("/");
- String[] zipPaths = new String[2];
- zipPaths[0] = FileLocator.toFileURL(new URL(installURL, "testdata/testbeaninfo.zip")).getFile();
- zipPaths[1] = FileLocator.toFileURL(new URL(installURL, "testdata/testbeaninfopreq.zip")).getFile();
- IProject[] projects =
- JavaProjectUtil.importProjects(
- new String[] { AbstractBeanInfoTestCase.TEST_BEANINFO_PROJECT, AbstractBeanInfoTestCase.TEST_BEANINFO_PREREQ_PROJECT },
- zipPaths);
- assertNotNull(projects[0]);
- assertNotNull(projects[1]);
- JavaProjectUtil.waitForAutoBuild();
- System.out.println("-- Data initialized --"); //$NON-NLS-1$
-
- BeaninfoNature nature = BeaninfoNature.getRuntime(projects[0]);
- assertNotNull(nature);
- JavaInstantiation.initialize(nature.getResourceSet());
- }
-
- protected void tearDown() throws Exception {
- ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- JavaProjectUtil.deleteProject(JavaProjectUtil.getProject(AbstractBeanInfoTestCase.TEST_BEANINFO_PROJECT));
- JavaProjectUtil.deleteProject(JavaProjectUtil.getProject(AbstractBeanInfoTestCase.TEST_BEANINFO_PREREQ_PROJECT));
- }
- }, ResourcesPlugin.getWorkspace().getRoot(), 0, null);
-
- JavaProjectUtil.setAutoBuild(oldAutoBuildingState);
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/TestStandard.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/TestStandard.java
deleted file mode 100644
index bf2a7b9f..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/instantiation/TestStandard.java
+++ /dev/null
@@ -1,202 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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
- *******************************************************************************/
-/*
- * Created on Sep 3, 2003
- *
- * To change the template for this generated file go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-package org.eclipse.jem.tests.instantiation;
-
-import java.io.*;
-import java.util.Collections;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-//import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoNature;
-import org.eclipse.jem.internal.instantiation.InitStringAllocation;
-import org.eclipse.jem.internal.instantiation.InstantiationFactory;
-import org.eclipse.jem.internal.instantiation.base.IJavaDataTypeInstance;
-import org.eclipse.jem.internal.instantiation.base.IJavaObjectInstance;
-import org.eclipse.jem.java.*;
-import org.eclipse.jem.tests.JavaProjectUtil;
-import org.eclipse.jem.tests.beaninfo.AbstractBeanInfoTestCase;
-
-/**
- * @author richkulp
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class TestStandard extends TestCase {
-
- /**
- *
- */
- public TestStandard() {
- super();
- }
-
- /**
- * @param name
- */
- public TestStandard(String name) {
- super(name);
- }
-
- protected BeaninfoNature nature;
- protected ResourceSet rset;
- protected JavaHelpers boolType;
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- IProject biProject = JavaProjectUtil.getProject(AbstractBeanInfoTestCase.TEST_BEANINFO_PROJECT);
- assertNotNull(biProject);
- nature = BeaninfoNature.getRuntime(biProject);
- assertNotNull(nature);
- rset = nature.getResourceSet();
- assertNotNull(rset);
- boolType = JavaRefFactory.eINSTANCE.reflectType("boolean", rset);
- assertNotNull(boolType);
- }
-
- protected JavaClass getTest1Class() {
- return (JavaClass) JavaRefFactory.eINSTANCE.reflectType("org.eclipse.jem.tests.beaninfo.Test1Class", rset); //$NON-NLS-1$
- }
-
- public void testInit() {
- JavaClass test1Class = getTest1Class();
-
- // Test instantiate an instance.
- IJavaObjectInstance ji1 = (IJavaObjectInstance) test1Class.getEPackage().getEFactoryInstance().create(test1Class);
- ji1.setAllocation(InstantiationFactory.eINSTANCE.createInitStringAllocation("new Test1Class()")); //$NON-NLS-1$
- assertInit(ji1);
- }
-
- private void assertInit(IJavaObjectInstance ji1) {
- // Here because two tests will do same test sequence.
- assertTrue(ji1.isSetAllocation());
- InitStringAllocation alloc = (InitStringAllocation) ji1.getAllocation();
- assertEquals("new Test1Class()", alloc.getInitString()); //$NON-NLS-1$
- }
-
- public void testPropertyAccess() {
- JavaClass test1Class = getTest1Class();
- IJavaObjectInstance ji1 = (IJavaObjectInstance) test1Class.getEPackage().getEFactoryInstance().create(test1Class);
- ji1.setAllocation(InstantiationFactory.eINSTANCE.createInitStringAllocation("new Test1Class()")); //$NON-NLS-1$
-
- // Test property set/get of a dynamic property.
- EStructuralFeature setSF = test1Class.getEStructuralFeature("set");
- assertNotNull(setSF);
- assertSame(boolType, setSF.getEType());
- IJavaDataTypeInstance setting = (IJavaDataTypeInstance) setSF.getEType().getEPackage().getEFactoryInstance().create((EClass) setSF.getEType());
- setting.setAllocation(InstantiationFactory.eINSTANCE.createInitStringAllocation("true")); //$NON-NLS-1$
- ji1.eSet(
- setSF,
- setting);
- assertProperty(ji1);
- }
-
- private void assertProperty(IJavaObjectInstance ji1) {
- // Here because two tests will do same test sequence.
- EStructuralFeature setSF = ji1.eClass().getEStructuralFeature("set");
- Object v = ji1.eGet(setSF);
- assertNotNull(v);
- assertTrue(v instanceof IJavaDataTypeInstance);
- IJavaDataTypeInstance dtv = (IJavaDataTypeInstance) v;
- assertSame(boolType, dtv.getJavaType());
- assertTrue(dtv.isSetAllocation());
- InitStringAllocation alloc = (InitStringAllocation) dtv.getAllocation();
- assertEquals("true", alloc.getInitString());
- }
-
- protected IJavaObjectInstance setupInstance() {
- // Setup the standard test instance without the assertions. For use in other tests.
- JavaClass test1Class = getTest1Class();
- IJavaObjectInstance ji1 = (IJavaObjectInstance) test1Class.getEPackage().getEFactoryInstance().create(test1Class);
- ji1.setAllocation(InstantiationFactory.eINSTANCE.createInitStringAllocation("new Test1Class()")); //$NON-NLS-1$
-
- // Test property set/get of a dynamic property.
- EStructuralFeature setSF = test1Class.getEStructuralFeature("set");
- IJavaDataTypeInstance setting = (IJavaDataTypeInstance) setSF.getEType().getEPackage().getEFactoryInstance().create((EClass) setSF.getEType());
- setting.setAllocation(InstantiationFactory.eINSTANCE.createInitStringAllocation("true")); //$NON-NLS-1$
- ji1.eSet(
- setSF,
- setting);
- return ji1;
- }
-
- protected String setupResource() throws IOException {
- IJavaObjectInstance ji1 = setupInstance();
-
- // Write it out, see if it is what it should be, then read it in and see if it loads correctly.
- ResourceSet rswork1 = nature.newResourceSet(); // Rsource set to write from
-
- Resource r = rswork1.createResource(URI.createURI("f.xmi")); //$NON-NLS-1$
- r.getContents().add(ji1);
- // Bit of a kludge, but all references in java model are shared, so to serialize we need to get the
- // "set" setting and add to the resource so that it is contained somewhere.
- r.getContents().add(ji1.eGet(ji1.eClass().getEStructuralFeature("set")));
-
- ByteArrayOutputStream bo = new ByteArrayOutputStream();
- r.save(bo, Collections.EMPTY_MAP);
- return bo.toString();
- }
-
-/*
- public void testSerialization() throws IOException {
- // Test the serialization that it produces correct output string.
- String out = setupResource();
- // Need to create a print stream so that we get the correct local newline chars in to match from the resource.
- StringWriter sw = new StringWriter(out.length() + 50);
- PrintWriter pw = new PrintWriter(sw);
- pw.println("<?xml version=\"1.0\" encoding=\"ASCII\"?>");
- pw.println(
- "<xmi:XMI xmi:version=\"2.0\" xmlns:xmi=\"http://www.omg.org/XMI\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:_-javaprim=\"java:/\" xmlns:org.eclipse.jem.internal.instantiation=\"http:///org/eclipse/jem/internal/instantiation.ecore\" xmlns:org.eclipse.jem.tests.beaninfo=\"java:/org.eclipse.jem.tests.beaninfo\">");
- pw.println(" <org.eclipse.jem.tests.beaninfo:Test1Class set=\"/1\">");
- pw.println(" <allocation xsi:type=\"org.eclipse.jem.internal.instantiation:InitStringAllocation\" initString=\"new Test1Class()\"/>");
- pw.println(" </org.eclipse.jem.tests.beaninfo:Test1Class>");
- pw.println(" <_-javaprim:boolean>");
- pw.println(" <allocation xsi:type=\"org.eclipse.jem.internal.instantiation:InitStringAllocation\" initString=\"true\"/>");
- pw.println(" </_-javaprim:boolean>");
- pw.println("</xmi:XMI>");
- pw.close();
- assertEquals(sw.toString(), out);
- }
-
- public void testReading() throws IOException {
- // Test reading serialization back in produces correct objects.
- // Rerun tests.
- String out = setupResource();
-
- ResourceSet rswork2 = nature.newResourceSet(); // Resource set to read into
- Resource rIn = rswork2.createResource(URI.createURI("f1.xmi")); //$NON-NLS-1$
- rIn.load(new ByteArrayInputStream(out.getBytes()), Collections.EMPTY_MAP);
- JavaClass test1Class = getTest1Class();
- IJavaObjectInstance ji1 = (IJavaObjectInstance) EcoreUtil.getObjectByType(rIn.getContents(), test1Class);
- assertNotNull(ji1);
- assertInit(ji1);
- assertProperty(ji1);
- }
-*/
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/IListenerTester.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/IListenerTester.java
deleted file mode 100644
index 93e56625..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/IListenerTester.java
+++ /dev/null
@@ -1,30 +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
- *******************************************************************************/
-/*
- * $RCSfile: IListenerTester.java,v $
- * $Revision: 1.3 $ $Date: 2005/08/24 20:58:55 $
- */
-package org.eclipse.jem.tests.modelListeners;
-
-import junit.framework.AssertionFailedError;
-
-
-/**
- * For many of the listener tests, the actual Assert is done on a safe runnable so that it can't be
- * normally sent. So we will have a listener tester that will retrieve the exception and will
- * be called to get it from the main thread.
- * @since 1.0.0
- */
-public interface IListenerTester {
-
- public void isException() throws AssertionFailedError;
- public void isComplete() throws AssertionFailedError;
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/ListenersSuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/ListenersSuite.java
deleted file mode 100644
index 72541332..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/ListenersSuite.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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.jem.tests.modelListeners;
-/*
- * $RCSfile: ListenersSuite.java,v $
- * $Revision: 1.7 $ $Date: 2006/05/17 20:13:56 $
- */
-import java.net.URL;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.*;
-import org.eclipse.core.runtime.*;
-
-import org.eclipse.jem.tests.JavaProjectUtil;
-import org.eclipse.jem.tests.JavaTestsPlugin;
-import org.eclipse.jem.tests.beaninfo.AbstractBeanInfoTestCase;
-
-/**
- * @author richkulp
- *
- */
-public class ListenersSuite extends TestSetup {
-
- // Test cases to be include in the suite
- private static final Class testsList[] = { TestJEM.class, TestBeanInfo.class};
-
- /**
- *
- */
- public ListenersSuite() {
- this("Test Listeners Suite");
- }
-
- /**
- * @param name
- */
- public ListenersSuite(String name) {
- super(new TestSuite(name) {
- {
- for (int i = 0; i < testsList.length; i++) {
- addTestSuite(testsList[i]);
- }
-
- }
- });
- }
-
- public static Test suite() {
- return new ListenersSuite();
- }
-
- private boolean oldAutoBuildingState; // autoBuilding state before we started.
- protected void setUp() throws Exception {
- System.out.println("-- Initializing the Listeners test data --"); //$NON-NLS-1$
- oldAutoBuildingState = JavaProjectUtil.setAutoBuild(true);
- URL installURL = JavaTestsPlugin.getPlugin().getBundle().getEntry("/");
- String[] zipPaths = new String[2];
- zipPaths[0] = FileLocator.toFileURL(new URL(installURL, "testdata/testbeaninfo.zip")).getFile();
- zipPaths[1] = FileLocator.toFileURL(new URL(installURL, "testdata/testbeaninfopreq.zip")).getFile();
- IProject[] projects =
- JavaProjectUtil.importProjects(
- new String[] { AbstractBeanInfoTestCase.TEST_BEANINFO_PROJECT, AbstractBeanInfoTestCase.TEST_BEANINFO_PREREQ_PROJECT },
- zipPaths);
- assertNotNull(projects[0]);
- assertNotNull(projects[1]);
- JavaProjectUtil.waitForAutoBuild();
- System.out.println("-- Data initialized --"); //$NON-NLS-1$
-
- }
-
- protected void tearDown() throws Exception {
- ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
- public void run(IProgressMonitor monitor) throws CoreException {
- JavaProjectUtil.deleteProject(JavaProjectUtil.getProject(AbstractBeanInfoTestCase.TEST_BEANINFO_PROJECT));
- JavaProjectUtil.deleteProject(JavaProjectUtil.getProject(AbstractBeanInfoTestCase.TEST_BEANINFO_PREREQ_PROJECT));
- }
- }, ResourcesPlugin.getWorkspace().getRoot(), 0, null);
-
- JavaProjectUtil.setAutoBuild(oldAutoBuildingState);
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestBeanInfo.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestBeanInfo.java
deleted file mode 100644
index 7e9d0d27..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestBeanInfo.java
+++ /dev/null
@@ -1,183 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- *******************************************************************************/
-/*
- * $RCSfile: TestBeanInfo.java,v $
- * $Revision: 1.10 $ $Date: 2006/09/18 22:57:55 $
- */
-package org.eclipse.jem.tests.modelListeners;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoModelSynchronizer;
-import org.eclipse.jem.internal.beaninfo.core.IBeaninfoSupplier;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-
-
-/**
- * This is for testing the JEM Reflection listeners
- * @since 1.0.0
- */
-public class TestBeanInfo extends TestListeners {
-
- BeaninfoModelSynchronizer sync;
- TestBeaninfoAdapterFactory factory;
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- factory = new TestBeaninfoAdapterFactory(new IBeaninfoSupplier() {
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.beaninfo.core.IBeaninfoSupplier#getRegistry()
- */
- public ProxyFactoryRegistry getRegistry() {
- return null;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.beaninfo.core.IBeaninfoSupplier#isRegistryCreated()
- */
- public boolean isRegistryCreated() {
- return false;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.beaninfo.core.IBeaninfoSupplier#closeRegistry()
- */
- public void closeRegistry() {
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.beaninfo.core.IBeaninfoSupplier#getProject()
- */
- public IProject getProject() {
- return jp.getProject();
- }
-
- public ProjectResourceSet getNewResourceSet() {
- return null;
- }
-
- public ResourceSet getProjectResourceSet() {
- return null;
- }
- }); // Needs to be set first so that super.setUP() calls to special setups will have a factory.
- super.setUp(); // Called first so that any setup won't fire our synchronizer.
-
- // Basic for this is add our special listener. (Don't need full JEM model cluttering things up).
- sync = new BeaninfoModelSynchronizer(factory, jp);
- setTester(factory);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setUpClose()
- */
- protected void setUpClose() throws JavaModelException {
- super.setUpClose();
- factory.setTestCases(new int[0], new Object[0]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setUpOpen()
- */
- protected void setUpOpen() {
- super.setUpOpen();
- factory.setTestCases(new int[0], new Object[0]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setUpAddMethodInWorkingCopy()
- */
- protected void setUpAddMethodInWorkingCopy() throws JavaModelException {
- super.setUpAddMethodInWorkingCopy();
- factory.setTestCases(new int[0], new Object[0]);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setUpSaveFromWorkingCopy()
- */
- protected void setUpSaveFromWorkingCopy() throws JavaModelException {
- super.setUpSaveFromWorkingCopy();
- factory.setTestCases(new int[] {TestBeaninfoAdapterFactory.MARK_STALE_INTROSPECTION_PLUS_INNER}, new Object[] {new Object[] {"org.eclipse.jem.tests.beaninfo.Test1Class", Boolean.FALSE}});
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setUpRevert()
- */
- protected void setUpRevert() throws JavaModelException {
- super.setUpRevert();
- factory.setTestCases(new int[0], new Object[0]);
- }
-
-// /* (non-Javadoc)
-// * @see org.eclipse.jem.tests.modelListeners.TestListeners#setupDeleteMethodNoWorkingCopy()
-// */
-// protected void setupDeleteMethodNoWorkingCopy() throws JavaModelException {
-// super.setupDeleteMethodNoWorkingCopy();
-// factory.setTestCases(new int[] {TestBeaninfoAdapterFactory.MARK_STALE_INTROSPECTION_PLUS_INNER}, new Object[] {new Object[] {"org.eclipse.jem.tests.beaninfo.Test1Class", Boolean.FALSE}});
-// }
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setupAddClass()
- */
- protected void setupAddClass() {
- super.setupAddClass();
- factory.setTestCases(new int[] {TestBeaninfoAdapterFactory.MARK_STALE_INTROSPECTION_PLUS_INNER}, new Object[] {new Object[] {"org.eclipse.jem.tests.beaninfo.NewClass", Boolean.TRUE}});
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setupDeleteClassWithWorkingCopy()
- */
- protected void setupDeleteClassWithWorkingCopy() throws JavaModelException {
- super.setupDeleteClassWithWorkingCopy();
- factory.setTestCases(new int[] {TestBeaninfoAdapterFactory.MARK_STALE_INTROSPECTION_PLUS_INNER, TestBeaninfoAdapterFactory.MARK_STALE_INTROSPECTION_PLUS_INNER}, new Object[] {new Object[] {"org.eclipse.jem.tests.beaninfo.NewClass", Boolean.FALSE}, new Object[] {"org.eclipse.jem.tests.beaninfo.NewClass", Boolean.TRUE}});
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setUpDeleteClassNoWorkingCopy()
- */
- protected void setUpDeleteClassNoWorkingCopy() throws JavaModelException {
- super.setUpDeleteClassNoWorkingCopy();
- factory.setTestCases(new int[] {TestBeaninfoAdapterFactory.MARK_STALE_INTROSPECTION_PLUS_INNER}, new Object[] {new Object[] {"org.eclipse.jem.tests.beaninfo.NewClass", Boolean.TRUE}});
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setUpAddPackage()
- */
- protected void setUpAddPackage() throws JavaModelException {
- super.setUpAddPackage();
- factory.setTestCases(new int[] {TestBeaninfoAdapterFactory.MARK_PACKAGE_STALE}, new Object[] {"test"});
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setUpDeletePackage()
- */
- protected void setUpDeletePackage() throws JavaModelException {
- super.setUpDeletePackage();
- factory.setTestCases(new int[] {TestBeaninfoAdapterFactory.MARK_PACKAGE_STALE}, new Object[] {"test"});
- }
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- sync.stopSynchronizer(true);
- super.tearDown();
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestBeaninfoAdapterFactory.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestBeaninfoAdapterFactory.java
deleted file mode 100644
index d7ed729c..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestBeaninfoAdapterFactory.java
+++ /dev/null
@@ -1,138 +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
- *******************************************************************************/
-/*
- * $RCSfile: TestBeaninfoAdapterFactory.java,v $
- * $Revision: 1.4 $ $Date: 2006/09/18 22:57:55 $
- */
-package org.eclipse.jem.tests.modelListeners;
-
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
-
-import org.eclipse.jem.internal.beaninfo.adapters.BeaninfoAdapterFactory;
-import org.eclipse.jem.internal.beaninfo.core.IBeaninfoSupplier;
-
-/**
- * Test factory to handle the calls from the listener during our tests.
- *
- * @since 1.0.0
- */
-public class TestBeaninfoAdapterFactory extends BeaninfoAdapterFactory implements IListenerTester {
-
- /**
- * @param supplier
- *
- * @since 1.0.0
- */
- public TestBeaninfoAdapterFactory(IBeaninfoSupplier supplier) {
- super(supplier);
- }
-
- int callIndex = -1; // Index of calls into control list.
-
- AssertionFailedError exception; // Set if exception occured.
-
- protected int[] callTypes; // Order of permitted calltypes. If any come out of order, then error.
-
- protected Object[] callArgs; // Corresponding args for each call types. Each type specific.
-
- public void setTestCases(int[] callTypes, Object[] callArgs) {
- this.callTypes = callTypes;
- this.callArgs = callArgs;
- }
-
- public void isException() throws AssertionFailedError {
- if (exception != null)
- throw exception;
- }
-
- public void isComplete() throws AssertionFailedError {
- Assert.assertEquals("Did not complete all notifcations. ", callTypes.length, callIndex + 1);
- }
-
- public static final int MARK_ALL_STALE = 0, MARK_STALE_INTROSPECTION = 1, MARK_STALE_INTROSPECTION_PLUS_INNER = 2, MARK_PACKAGE_STALE = 3;
-
- private static final String[] callTypeNames = new String[] { "MARK_ALL_STALE", "MARK_STALE_INTROSPECTION", "MARK_STALE_INTROSPECTION_PLUS_INNER",
- "MARK_PACKAGE_STALE",
- "UNREGISTER_INTROSPECTION", "UNREGISTER_INTROSPECTION_PLUS_INNER"};
-
- /*
- * Test the next call type, if not valid, return false.
- */
- protected boolean testCallType(int callType) {
- if (exception != null)
- return false; // Already had an error
- try {
- if (++callIndex >= callTypes.length)
- Assert.fail("An extra notification of type " + callTypeNames[callType] + " received.");
- if (callTypes[callIndex] != callType)
- Assert.assertEquals(callTypeNames[callTypes[callIndex]], callTypeNames[callType]);
- } catch (AssertionFailedError e) {
- exception = e;
- return false;
- }
- return true;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.beaninfo.adapters.BeaninfoAdapterFactory#markAllStale()
- */
- public void markAllStale() {
- testCallType(MARK_ALL_STALE);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.beaninfo.adapters.BeaninfoAdapterFactory#markStaleIntrospection(java.lang.String, boolean)
- */
- public void markStaleIntrospection(String sourceName, boolean clearResults) {
- if (testCallType(MARK_STALE_INTROSPECTION)) {
- try {
- Assert.assertEquals((String) ((Object[]) callArgs[callIndex])[0], sourceName);
- Assert.assertEquals(((Boolean) ((Object[]) callArgs[callIndex])[1]).booleanValue(), clearResults);
- } catch (AssertionFailedError e) {
- exception = e;
- }
- }
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jem.internal.beaninfo.adapters.BeaninfoAdapterFactory#markStaleIntrospectionPlusInner(java.lang.String, boolean)
- */
- public void markStaleIntrospectionPlusInner(String sourceName, boolean clearResults) {
- if (testCallType(MARK_STALE_INTROSPECTION_PLUS_INNER)) {
- try {
- Assert.assertEquals((String) ((Object[]) callArgs[callIndex])[0], sourceName);
- Assert.assertEquals(((Boolean) ((Object[]) callArgs[callIndex])[1]).booleanValue(), clearResults);
- } catch (AssertionFailedError e) {
- exception = e;
- }
- }
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.beaninfo.adapters.BeaninfoAdapterFactory#markPackageStale(java.lang.String)
- */
- public void markPackageStale(String packageName) {
- if (testCallType(MARK_PACKAGE_STALE)) {
- try {
- Assert.assertEquals((String) ((Object[]) callArgs[callIndex])[0], packageName);
- } catch (AssertionFailedError e) {
- exception = e;
- }
- }
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestJEM.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestJEM.java
deleted file mode 100644
index fb250047..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestJEM.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- *******************************************************************************/
-/*
- * $RCSfile: TestJEM.java,v $
- * $Revision: 1.8 $ $Date: 2006/09/18 22:18:02 $
- */
-package org.eclipse.jem.tests.modelListeners;
-
-import org.eclipse.jdt.core.JavaModelException;
-
-import org.eclipse.jem.internal.adapters.jdom.JavaReflectionSynchronizer;
-
-
-/**
- * This is for testing the JEM Reflection listeners
- * @since 1.0.0
- */
-public class TestJEM extends TestListeners {
-
- JavaReflectionSynchronizer sync;
- TestJavaJDOMAdapterFactory factory;
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- factory = new TestJavaJDOMAdapterFactory(); // Needs to be set first so that super.setUP() calls to special setups will have a factory.
- super.setUp(); // Called first so that any setup won't fire our synchronizer.
-
- // Basic for this is add our special listener. (Don't need full JEM model cluttering things up).
- factory.setJavaProject(jp);
- sync = factory.getSynchronizer();
- setTester(factory);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setUpClose()
- */
- protected void setUpClose() throws JavaModelException {
- super.setUpClose();
- factory.setTestCases(new int[0], new Object[0]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setUpOpen()
- */
- protected void setUpOpen() {
- super.setUpOpen();
- factory.setTestCases(new int[0], new Object[0]);
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setUpAddMethodInWorkingCopy()
- */
- protected void setUpAddMethodInWorkingCopy() throws JavaModelException {
- super.setUpAddMethodInWorkingCopy();
- factory.setTestCases(new int[0], new Object[0]);
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setUpSaveFromWorkingCopy()
- */
- protected void setUpSaveFromWorkingCopy() throws JavaModelException {
- super.setUpSaveFromWorkingCopy();
- factory.setTestCases(new int[] {TestJavaJDOMAdapterFactory.FLUSH_REFLECTION_PLUS_INNER_NO_NOTIFICATION}, new Object[] {"org.eclipse.jem.tests.beaninfo.Test1Class"});
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setUpRevert()
- */
- protected void setUpRevert() throws JavaModelException {
- super.setUpRevert();
- factory.setTestCases(new int[0], new Object[0]);
- }
-
-// /* (non-Javadoc)
-// * @see org.eclipse.jem.tests.modelListeners.TestListeners#setupDeleteMethodNoWorkingCopy()
-// */
-// protected void setupDeleteMethodNoWorkingCopy() throws JavaModelException {
-// super.setupDeleteMethodNoWorkingCopy();
-// factory.setTestCases(new int[] {TestJavaJDOMAdapterFactory.FLUSH_REFLECTION_NO_NOTIFICATION, TestJavaJDOMAdapterFactory.FLUSH_REFLECTION_PLUS_INNER_NO_NOTIFICATION}, new Object[] {"org.eclipse.jem.tests.beaninfo.Test1Class", "org.eclipse.jem.tests.beaninfo.Test1Class"});
-// }
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setupAddClass()
- */
- protected void setupAddClass() {
- super.setupAddClass();
- factory.setTestCases(new int[] {TestJavaJDOMAdapterFactory.DISASSOCIATE_SOURCE_PLUS_INNER_NOTIFY}, new Object[] {new Object[] {"org.eclipse.jem.tests.beaninfo.NewClass", Boolean.FALSE}});
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setupDeleteClassWithWorkingCopy()
- */
- protected void setupDeleteClassWithWorkingCopy() throws JavaModelException {
- super.setupDeleteClassWithWorkingCopy();
- factory.setTestCases(new int[] {TestJavaJDOMAdapterFactory.FLUSH_REFLECTION_PLUS_INNER_NO_NOTIFICATION, TestJavaJDOMAdapterFactory.DISASSOCIATE_SOURCE_PLUS_INNER_NOTIFY}, new Object[] {"org.eclipse.jem.tests.beaninfo.NewClass", new Object[] {"org.eclipse.jem.tests.beaninfo.NewClass", Boolean.FALSE}});
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setUpDeleteClassNoWorkingCopy()
- */
- protected void setUpDeleteClassNoWorkingCopy() throws JavaModelException {
- super.setUpDeleteClassNoWorkingCopy();
- factory.setTestCases(new int[] {TestJavaJDOMAdapterFactory.DISASSOCIATE_SOURCE_PLUS_INNER_NOTIFY}, new Object[] {new Object[] {"org.eclipse.jem.tests.beaninfo.NewClass", Boolean.FALSE}});
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setUpAddPackage()
- */
- protected void setUpAddPackage() throws JavaModelException {
- super.setUpAddPackage();
- factory.setTestCases(new int[] {TestJavaJDOMAdapterFactory.FLUSH_PACKAGE_NO_NOTIFICATION}, new Object[] {new Object[] {"test", Boolean.FALSE}});
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.modelListeners.TestListeners#setUpDeletePackage()
- */
- protected void setUpDeletePackage() throws JavaModelException {
- super.setUpDeletePackage();
- factory.setTestCases(new int[] {TestJavaJDOMAdapterFactory.FLUSH_PACKAGE}, new Object[] {new Object[] {"test", Boolean.FALSE}});
- }
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- sync.stopSynchronizer();
- super.tearDown();
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestJavaJDOMAdapterFactory.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestJavaJDOMAdapterFactory.java
deleted file mode 100644
index c822b7ab..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestJavaJDOMAdapterFactory.java
+++ /dev/null
@@ -1,234 +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
- *******************************************************************************/
-/*
- * $RCSfile: TestJavaJDOMAdapterFactory.java,v $
- * $Revision: 1.3 $ $Date: 2005/08/24 20:58:55 $
- */
-package org.eclipse.jem.tests.modelListeners;
-
-import java.util.Collections;
-import java.util.List;
-
-import junit.framework.Assert;
-import junit.framework.AssertionFailedError;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.jdt.core.ICompilationUnit;
-
-import org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory;
-import org.eclipse.jem.internal.adapters.jdom.JavaReflectionSynchronizer;
-
-
-/**
- * A test version of this so that it works with our test cases without having fullblown JEM model up and running.
- * @since 1.0.0
- */
-public class TestJavaJDOMAdapterFactory extends JavaJDOMAdapterFactory implements IListenerTester {
-
- int callIndex = -1; // Index of calls into control list.
- AssertionFailedError exception; // Set if exception occured.
-
- protected int[] callTypes; // Order of permitted calltypes. If any come out of order, then error.
- protected Object[] callArgs; // Corresponding args for each call types. Each type specific.
-
- public void setTestCases(int[] callTypes, Object[] callArgs) {
- this.callTypes = callTypes;
- this.callArgs = callArgs;
- }
-
- public void isException() throws AssertionFailedError {
- if (exception != null)
- throw exception;
- }
-
- public void isComplete() throws AssertionFailedError {
- Assert.assertEquals("Did not complete all notifcations. ", callTypes.length, callIndex+1);
- }
-
- public static final int FLUSH_ALL = 0, FLUSH_ALL_NO_NOTIFICATION = 1, FLUSH_PACKAGE = 2, FLUSH_PACKAGE_NO_NOTIFICATION = 3,
- FLUSH_REFLECTION = 4, FLUSH_REFLECTION_NO_NOTIFICATION = 5, FLUSH_REFLECTION_PLUS_INNER_NO_NOTIFICATION = 6, NOTIFY_CONTENT_CHANGED = 7,
- DISASSOCIATE_SOURCE_NOTIFY = 8, DISASSOCIATE_SOURCE = 9, DISASSOCIATE_SOURCE_PLUS_INNER_NOTIFY = 10, DISASSOCIATE_SOURCE_PLUS_INNER = 11;
-
- private static final String[] callTypeNames = new String[] {"FLUSH_ALL", "FLUSH_ALL_NO_NOTIFICATION", "FLUSH_PACKAGE", "FLUSH_PACKAGE_NO_NOTIFICATION",
- "FLUSH_REFLECTION", "FLUSH_REFLECTION_NO_NOTIFICATION", "FLUSH_REFLECTION_PLUS_INNER_NO_NOTIFICATION", "NOTIFY_CONTENT_CHANGED",
- "DISASSOCIATE_SOURCE_NOTIFY", "DISASSOCIATE_SOURCE", "DISASSOCIATE_SOURCE_PLUS_INNER_NOTIFY", "DISASSOCIATE_SOURCE_PLUS_INNER"};
- /*
- * Test the next call type, if not valid, return false.
- */
- protected boolean testCallType(int callType) {
- if (exception != null)
- return false; // Already had an error
- try {
- if (++callIndex >= callTypes.length)
- Assert.fail("An extra notification of type " + callTypeNames[callType] + " received.");
- if (callTypes[callIndex] != callType)
- Assert.assertEquals(callTypeNames[callTypes[callIndex]], callTypeNames[callType]);
- } catch (AssertionFailedError e) {
- exception = e;
- return false;
- }
- return true;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdapterFactory#flushAll()
- */
- public void flushAll() {
- testCallType(FLUSH_ALL);
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory#flushAllNoNotification()
- */
- public List flushAllNoNotification() {
- testCallType(FLUSH_ALL_NO_NOTIFICATION);
- return Collections.EMPTY_LIST;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory#flushPackage(java.lang.String, boolean)
- */
- public void flushPackage(String packageName, boolean noFlushIfSourceFound) {
- if (testCallType(FLUSH_PACKAGE)) {
- try {
- Assert.assertEquals((String) ((Object[]) callArgs[callIndex])[0], packageName);
- Assert.assertEquals(((Boolean) ((Object[]) callArgs[callIndex])[1]).booleanValue(), noFlushIfSourceFound);
- } catch (AssertionFailedError e) {
- exception = e;
- }
- }
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory#flushPackageNoNotification(java.lang.String, boolean)
- */
- public List flushPackageNoNotification(String packageName, boolean noFlushIfSourceFound) {
- if (testCallType(FLUSH_PACKAGE_NO_NOTIFICATION)) {
- try {
- Assert.assertEquals((String) ((Object[]) callArgs[callIndex])[0], packageName);
- Assert.assertEquals(((Boolean) ((Object[]) callArgs[callIndex])[1]).booleanValue(), noFlushIfSourceFound);
- } catch (AssertionFailedError e) {
- exception = e;
- }
- }
- return Collections.EMPTY_LIST;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdapterFactory#flushReflection(java.lang.String)
- */
- public void flushReflection(String source) {
- if (testCallType(FLUSH_REFLECTION)) {
- try {
- Assert.assertEquals((String) callArgs[callIndex], source);
- } catch (AssertionFailedError e) {
- exception = e;
- }
- }
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory#flushReflectionNoNotification(java.lang.String)
- */
- public Notification flushReflectionNoNotification(String source) {
- if (testCallType(FLUSH_REFLECTION_NO_NOTIFICATION)) {
- try {
- Assert.assertEquals((String) callArgs[callIndex], source);
- } catch (AssertionFailedError e) {
- exception = e;
- }
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory#flushReflectionPlusInnerNoNotification(java.lang.String)
- */
- public Notification flushReflectionPlusInnerNoNotification(String source) {
- if (testCallType(FLUSH_REFLECTION_PLUS_INNER_NO_NOTIFICATION)) {
- try {
- Assert.assertEquals((String) callArgs[callIndex], source);
- } catch (AssertionFailedError e) {
- exception = e;
- }
- }
- return null;
- }
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.adapters.jdom.JavaJDOMAdapterFactory#notifyContentChanged(org.eclipse.jdt.core.ICompilationUnit)
- */
- public void notifyContentChanged(ICompilationUnit targetCU) {
- if (testCallType(NOTIFY_CONTENT_CHANGED)) {
- try {
- Assert.assertEquals((String) callArgs[callIndex], targetCU.getElementName());
- } catch (AssertionFailedError e) {
- exception = e;
- }
- }
- }
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdapterFactory#disAssociateSource(java.lang.String, boolean)
- */
- public Notification disAssociateSource(String source, boolean doNotify) {
- if (testCallType(DISASSOCIATE_SOURCE_NOTIFY)) {
- try {
- Assert.assertEquals((String) ((Object[]) callArgs[callIndex])[0], source);
- Assert.assertEquals(((Boolean) ((Object[]) callArgs[callIndex])[1]).booleanValue(), doNotify);
- } catch (AssertionFailedError e) {
- exception = e;
- }
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdapterFactory#disAssociateSource(java.lang.String)
- */
- public Notification disAssociateSource(String source) {
- if (testCallType(DISASSOCIATE_SOURCE)) {
- try {
- Assert.assertEquals((String) callArgs[callIndex], source);
- } catch (AssertionFailedError e) {
- exception = e;
- }
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdapterFactory#disAssociateSourcePlusInner(java.lang.String, boolean)
- */
- public Notification disAssociateSourcePlusInner(String source, boolean doNotify) {
- if (testCallType(DISASSOCIATE_SOURCE_PLUS_INNER_NOTIFY)) {
- try {
- Assert.assertEquals((String) ((Object[]) callArgs[callIndex])[0], source);
- Assert.assertEquals(((Boolean) ((Object[]) callArgs[callIndex])[1]).booleanValue(), doNotify);
- } catch (AssertionFailedError e) {
- exception = e;
- }
- }
- return null;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.java.adapters.JavaReflectionAdapterFactory#disAssociateSourcePlusInner(java.lang.String)
- */
- public void disAssociateSourcePlusInner(String source) {
- if (testCallType(DISASSOCIATE_SOURCE_PLUS_INNER)) {
- try {
- Assert.assertEquals((String) callArgs[callIndex], source);
- } catch (AssertionFailedError e) {
- exception = e;
- }
- }
- }
-
- public JavaReflectionSynchronizer getSynchronizer() {
- return synchronizer;
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestListeners.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestListeners.java
deleted file mode 100644
index 54935529..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/modelListeners/TestListeners.java
+++ /dev/null
@@ -1,353 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2006 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
- *******************************************************************************/
-/*
- * $RCSfile: TestListeners.java,v $
- * $Revision: 1.5 $ $Date: 2006/05/17 20:13:56 $
- */
-package org.eclipse.jem.tests.modelListeners;
-
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.*;
-
-import org.eclipse.jem.tests.JavaProjectUtil;
-import org.eclipse.jem.tests.beaninfo.AbstractBeanInfoTestCase;
-
-
-/**
- *
- * @since 1.0.0
- */
-public abstract class TestListeners extends TestCase {
-
- protected IJavaProject jp;
-
- // The indexes of these lookups are found in the setup and teardown methods. They must be kept in sync.
- protected List setupSpecials = Arrays.asList(new String[] { "testOpen", "testClose", "testAddMethodInWorkcopy", "testSaveFromWorkingCopy",
- "testRevert", "testDeleteMethodNoWorkingCopy-obsolete, removed", "testAddClass", "testDeleteClassWithWorkingCopy",
- "testDeleteClassNoWorkingCopy", "testAddPackage", "testDeletePackage"});
-
- protected IListenerTester tester;
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- jp = JavaCore.create(JavaProjectUtil.getProject(AbstractBeanInfoTestCase.TEST_BEANINFO_PROJECT));
- String testname = getName();
- int index = setupSpecials.indexOf(testname);
- switch (index) {
- case 0:
- setUpOpen();
- break;
- case 1:
- setUpClose();
- break;
- case 2:
- setUpAddMethodInWorkingCopy();
- break;
- case 3:
- setUpSaveFromWorkingCopy();
- break;
- case 4:
- setUpRevert();
- break;
-// case 5:
-// setupDeleteMethodNoWorkingCopy();
-// break;
- case 6:
- setupAddClass();
- break;
- case 7:
- setupDeleteClassWithWorkingCopy();
- break;
- case 8:
- setUpDeleteClassNoWorkingCopy();
- break;
- case 9:
- setUpAddPackage();
- break;
- case 10:
- setUpDeletePackage();
- break;
- default:
- break;
- }
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- String testname = getName();
- int index = setupSpecials.indexOf(testname);
- switch (index) {
- case 0:
- tearDownOpen();
- break;
- case 1:
- tearDownClose();
- break;
- case 2:
- tearDownAddMethodInWorkingCopy();
- break;
- case 3:
- tearDownSaveFromWorkingCopy();
- break;
- case 4:
- tearDownRevert();
- break;
-// case 5:
-// tearDownDeleteMethodNoWorkingCopy();
-// break;
- case 6:
- tearDownAddClass();
- break;
- case 7:
- tearDownDeleteClassWithWorkingCopy();
- break;
- case 8:
- tearDownDeleteClassNoWorkingCopy();
- break;
- case 9:
- tearDownAddPackage();
- break;
- case 10:
- tearDownDeletePackage();
- break;
- default:
- break;
- }
- super.tearDown();
- }
-
-
- protected void setTester(IListenerTester tester) {
- this.tester = tester;
- }
-
- protected void setUpOpen() {
- }
- public void testOpen() throws JavaModelException {
- // Test open a working copy.
- testCU = (ICompilationUnit) jp.findElement(new Path("org/eclipse/jem/tests/beaninfo/Test1Class.java"));
- testCU.becomeWorkingCopy(null, null);
- tester.isException();
- tester.isComplete(); // It should of been complete.
- }
- protected void tearDownOpen() throws JavaModelException {
- if (testCU != null)
- testCU.discardWorkingCopy();
- }
-
-
- protected ICompilationUnit testCU;
- protected void setUpClose() throws JavaModelException {
- testCU = (ICompilationUnit) jp.findElement(new Path("org/eclipse/jem/tests/beaninfo/Test1Class.java"));
- testCU.becomeWorkingCopy(null, null);
- }
- public void testClose() throws JavaModelException {
- // Test close a working copy.
- testCU.discardWorkingCopy();
- tester.isException();
- tester.isComplete(); // It should of been complete.
- }
- protected void tearDownClose() throws JavaModelException {
- if (testCU != null)
- testCU.discardWorkingCopy();
- }
-
-
- protected void setUpAddMethodInWorkingCopy() throws JavaModelException {
- testCU = (ICompilationUnit) jp.findElement(new Path("org/eclipse/jem/tests/beaninfo/Test1Class.java"));
- testCU.becomeWorkingCopy(null, null);
- }
- public void testAddMethodInWorkcopy() throws JavaModelException {
- testCU.getTypes()[0].createMethod("private void getSomething() {}", null, true, new NullProgressMonitor());
- tester.isException();
- tester.isComplete(); // It should of been complete.
- }
- protected void tearDownAddMethodInWorkingCopy() throws JavaModelException {
- if (testCU != null)
- testCU.discardWorkingCopy();
- }
-
-
- protected void setUpSaveFromWorkingCopy() throws JavaModelException {
- testCU = (ICompilationUnit) jp.findElement(new Path("org/eclipse/jem/tests/beaninfo/Test1Class.java"));
- testCU.becomeWorkingCopy(null, null);
- testCU.getTypes()[0].createMethod("private void getSomething() {}", null, true, new NullProgressMonitor());
- }
- public void testSaveFromWorkingCopy() throws JavaModelException {
- testCU.commitWorkingCopy(true, new NullProgressMonitor());
- tester.isException();
- tester.isComplete(); // It should of been complete.
- }
- protected void tearDownSaveFromWorkingCopy() throws JavaModelException {
- if (testCU != null)
- testCU.discardWorkingCopy();
- }
-
- protected void setUpRevert() throws JavaModelException {
- testCU = (ICompilationUnit) jp.findElement(new Path("org/eclipse/jem/tests/beaninfo/Test1Class.java"));
- testCU.becomeWorkingCopy(null, null);
- testCU.getTypes()[0].createMethod("private void getSomething() {}", null, true, new NullProgressMonitor());
- }
- public void testRevert() throws JavaModelException {
- testCU.restore();
- tester.isException();
- tester.isComplete(); // It should of been complete.
- }
- protected void tearDownRevert() throws JavaModelException {
- if (testCU != null)
- testCU.discardWorkingCopy();
- }
-
-// With 3.2M6 delete with no working copy got way to complex. Doing this through refactoring and other stuff. Just too complicated
-// to even try to figure out. So just pulling it out.
-
-// protected void setupDeleteMethodNoWorkingCopy() throws JavaModelException {
-// testCU = (ICompilationUnit) jp.findElement(new Path("org/eclipse/jem/tests/beaninfo/Test1Class.java"));
-// IMethod m = testCU.getTypes()[0].getMethod("getSomething", new String[0]);
-// if (m.exists())
-// m.delete(true, new NullProgressMonitor());
-// testCU.getTypes()[0].createMethod("private void getSomething() {}", null, true, new NullProgressMonitor());
-// }
-// public void testDeleteMethodNoWorkingCopy() throws CoreException {
-// JavaCore.run(new IWorkspaceRunnable() {
-// public void run(IProgressMonitor monitor) throws CoreException {
-// // Actually there will be a working copy. This is to simulate what delete method from member list
-// // with no open editor. This is done by batching everything up, but there is a working copy created.
-// // But it changes the file directly then. (Confusing, no? But that is the way it does it in JDT).
-// testCU.becomeWorkingCopy(null, null);
-// IMethod method = testCU.getTypes()[0].getMethod("getSomething", new String[] {});
-// IBuffer cuBuffer = testCU.getBuffer();
-// ISourceRange sr = method.getSourceRange();
-// cuBuffer.replace(sr.getOffset(), sr.getLength(),"");
-// cuBuffer.save(monitor, true);
-// testCU.discardWorkingCopy();
-// }
-// }, new NullProgressMonitor());
-// tester.isException();
-// tester.isComplete(); // It should of been complete.
-// }
-// protected void tearDownDeleteMethodNoWorkingCopy() throws JavaModelException {
-// if (testCU != null)
-// testCU.discardWorkingCopy();
-// }
-
- protected void setupAddClass() {
-
- }
- public void testAddClass() throws JavaModelException {
- IPackageFragment pkg = (IPackageFragment) jp.findElement(new Path("org/eclipse/jem/tests/beaninfo"));
- testCU = pkg.createCompilationUnit("NewClass.java", "public class NewClass {}", true, new NullProgressMonitor());
- tester.isException();
- tester.isComplete(); // It should of been complete.
- }
- protected void tearDownAddClass() throws JavaModelException {
- if (testCU != null) {
- testCU.delete(true, new NullProgressMonitor());
- }
- }
-
- protected void setupDeleteClassWithWorkingCopy() throws JavaModelException {
- IPackageFragment pkg = (IPackageFragment) jp.findElement(new Path("org/eclipse/jem/tests/beaninfo"));
- testCU = pkg.createCompilationUnit("NewClass.java", "public class NewClass {}", true, new NullProgressMonitor());
- testCU.becomeWorkingCopy(null, null);
- }
- public void testDeleteClassWithWorkingCopy() throws CoreException {
- ResourcesPlugin.getWorkspace().run(new IWorkspaceRunnable() {
-
- public void run(IProgressMonitor monitor) throws CoreException {
- // Need to run this way to simulate what happens for real.
- testCU.delete(true, new NullProgressMonitor());
- ResourcesPlugin.getWorkspace().checkpoint(true);
- testCU.discardWorkingCopy();
- }
- }, new NullProgressMonitor());
- tester.isException();
- tester.isComplete(); // It should of been complete.
- testCU = null;
- }
- protected void tearDownDeleteClassWithWorkingCopy() throws JavaModelException {
- if (testCU != null && testCU.exists()) {
- testCU.delete(true, new NullProgressMonitor());
- }
- }
-
- protected void setUpDeleteClassNoWorkingCopy() throws JavaModelException {
- IPackageFragment pkg = (IPackageFragment) jp.findElement(new Path("org/eclipse/jem/tests/beaninfo"));
- testCU = pkg.createCompilationUnit("NewClass.java", "public class NewClass {}", true, new NullProgressMonitor());
- }
- public void testDeleteClassNoWorkingCopy() throws JavaModelException {
- testCU.delete(true, new NullProgressMonitor());
- tester.isException();
- tester.isComplete(); // It should of been complete.
- testCU = null;
- }
- protected void tearDownDeleteClassNoWorkingCopy() throws JavaModelException {
- if (testCU != null && testCU.exists()) {
- testCU.delete(true, new NullProgressMonitor());
- }
- }
-
- protected void setUpAddPackage() throws JavaModelException {
- IPackageFragment pkg = (IPackageFragment) jp.findElement(new Path("test"));
- if (pkg != null)
- pkg.delete(true, new NullProgressMonitor());
- }
- public void testAddPackage() throws JavaModelException {
- IPackageFragmentRoot[] roots = jp.getPackageFragmentRoots();
- for (int i = 0; i < roots.length; i++) {
- if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE) {
- roots[i].createPackageFragment("test", true, new NullProgressMonitor());
- break;
- }
- }
- tester.isException();
- tester.isComplete(); // It should of been complete.
- }
- protected void tearDownAddPackage() throws JavaModelException {
- IPackageFragment pkg = (IPackageFragment) jp.findElement(new Path("test"));
- if (pkg != null)
- pkg.delete(true, new NullProgressMonitor());
- }
-
- protected IPackageFragment testPkg;
- protected void setUpDeletePackage() throws JavaModelException {
- IPackageFragmentRoot[] roots = jp.getPackageFragmentRoots();
- for (int i = 0; i < roots.length; i++) {
- if (roots[i].getKind() == IPackageFragmentRoot.K_SOURCE) {
- testPkg = roots[i].createPackageFragment("test", true, new NullProgressMonitor());
- break;
- }
- }
- }
- public void testDeletePackage() throws JavaModelException {
- testPkg.delete(true, new NullProgressMonitor());
- tester.isException();
- tester.isComplete(); // It should of been complete.
- testPkg = null;
- }
- protected void tearDownDeletePackage() throws JavaModelException {
- if (testPkg != null && testPkg.exists())
- testPkg.delete(true, new NullProgressMonitor());
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/AbstractTestProxy.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/AbstractTestProxy.java
deleted file mode 100644
index f444b225..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/AbstractTestProxy.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy;
-/*
- * $RCSfile: AbstractTestProxy.java,v $
- * $Revision: 1.5 $ $Date: 2005/08/24 20:58:54 $
- */
-import java.util.Enumeration;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.IStandardBeanTypeProxyFactory;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-
-import junit.framework.*;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * @author richkulp
- *
- * Standard type of Proxy Tests.
- */
-public abstract class AbstractTestProxy extends TestCase {
-
- /**
- * @author richkulp
- *
- * Interface for registry handler. Actual implementations will place their
- * handler in the field REGISTRY_HANDLER to that the proxy tests can access it.
- */
- public interface RegistryHandler {
-
- /**
- * @return is the handler valid and setup correctly.
- */
- public boolean isValid();
-
- /**
- * Return the current registry, creating it if necessary.
- * @return The registry.
- */
- public ProxyFactoryRegistry getRegistry() throws CoreException;
-
- /**
- * Destroy the current registry.
- */
- public void destroyRegistry();
- }
-
- /**
- * Initialize the registry handler for all AbstractTestProxy tests in the
- * given suite.
- * @param suite
- */
- public static void initRegistryHandler(TestSuite suite, RegistryHandler registryHandler) {
- Enumeration tests = suite.tests();
- while (tests.hasMoreElements()) {
- Test test = (Test) tests.nextElement();
- if (test instanceof AbstractTestProxy)
- ((AbstractTestProxy) test).setRegistryHandler(registryHandler);
- else if (test instanceof TestSuite)
- initRegistryHandler((TestSuite) test, registryHandler);
- }
- }
-
- public AbstractTestProxy() {
- super();
- }
-
- public AbstractTestProxy(String name) {
- super(name);
- }
-
- private RegistryHandler registryHandler;
-
- protected ProxyFactoryRegistry registry;
- protected IStandardBeanTypeProxyFactory proxyTypeFactory;
- protected IStandardBeanProxyFactory proxyFactory;
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- assertNotNull(getRegistryHandler());
- assertTrue("Suite not setup correctly.", getRegistryHandler().isValid());
- createRegistry();
- }
-
- /*
- * @throws CoreException
- *
- * @since 1.1.0
- */
- private void createRegistry() throws CoreException {
- registry = getRegistryHandler().getRegistry();
- assertNotNull(registry);
- proxyFactory = registry.getBeanProxyFactory();
- proxyTypeFactory = registry.getBeanTypeProxyFactory();
- }
-
- public void setRegistryHandler(RegistryHandler registryHandler) {
- this.registryHandler = registryHandler;
- }
-
- public RegistryHandler getRegistryHandler() {
- return registryHandler;
- }
-
- /**
- * Recreate the registry. This is to make sure we have a clean one. Should be used with caution because expensive.
- * @throws CoreException
- *
- *
- * @since 1.1.0
- */
- public void recreateRegistry() throws CoreException {
- getRegistryHandler().destroyRegistry();
- createRegistry();
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ExpressionTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ExpressionTest.java
deleted file mode 100644
index 37eaf1df..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ExpressionTest.java
+++ /dev/null
@@ -1,3303 +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
- *******************************************************************************/
-/*
- * $RCSfile: ExpressionTest.java,v $
- * $Revision: 1.13 $ $Date: 2005/08/24 20:58:54 $
- */
-package org.eclipse.jem.tests.proxy;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent;
-import org.eclipse.jem.internal.proxy.ide.IDEStandardBeanProxyFactory;
-import org.eclipse.jem.internal.proxy.initParser.tree.*;
-
-/**
- *
- * @since 1.0.0
- */
-public class ExpressionTest extends AbstractTestProxy {
-
- /**
- *
- *
- * @since 1.0.0
- */
- public ExpressionTest() {
- super();
- }
-
- /**
- * @param name
- *
- * @since 1.0.0
- */
- public ExpressionTest(String name) {
- super(name);
- }
-
- public void testIProxyBeanTypeProxy() throws CoreException, IllegalStateException, ThrowableProxy, NoExpressionValueException {
- // Test that proxy bean type is first an expression proxy and after expression evaluation does it become a real proxy.
- // Can't test that it doesn't become a real proxy before evaluation because it may become resolved under the covers. For
- // example IDE expression immediately resolves it.
- //
- // First we must make sure we have a clean registry because it could of been resolved from a previous test.
- recreateRegistry();
-
- // Now do an expression and get a proxy.
- IExpression exp = proxyFactory.createExpression();
- IProxyBeanType beanTypeProxy = proxyTypeFactory.getBeanTypeProxy(exp, "testPackage.TestAccess");
- assertNotNull(beanTypeProxy);
- assertTrue(beanTypeProxy.isExpressionProxy());
- final IBeanTypeProxy[] resolution = new IBeanTypeProxy[1];
- ((ExpressionProxy) beanTypeProxy).addProxyListener(new ExpressionProxy.ProxyListener() {
- public void proxyResolved(ProxyEvent event) {
- resolution[0] = (IBeanTypeProxy) event.getProxy();
- }
- public void proxyVoid(ProxyEvent event) {
- fail("Proxy should not be void.");
- }
- public void proxyNotResolved(ProxyEvent event) {
- fail("Proxy should of resolved.");
- }
- });
-
- exp.invokeExpression();
- assertNotNull(resolution[0]);
- IBeanTypeProxy beanTypeProxy2 = proxyTypeFactory.getBeanTypeProxy("testPackage.TestAccess");
- assertNotNull(beanTypeProxy2);
- assertTrue(beanTypeProxy2.isBeanProxy());
- assertTrue(beanTypeProxy2.isValid());
- assertSame(beanTypeProxy2, resolution[0]); // In case of beantypes we will get identical ones back (identity not just equals).
- }
-
- public void testIProxyMethodProxy() throws CoreException, IllegalStateException, ThrowableProxy, NoExpressionValueException {
- // Test that proxy methode is first an expression proxy and after expression evaluation does it become a real proxy.
- // Can't test that it doesn't become a real proxy before evaluation because it may become resolved under the covers. For
- // example IDE expression immediately resolves it.
- //
- // First we must make sure we have a clean registry because it could of been resolved from a previous test.
- recreateRegistry();
-
- // Now do an expression and get a proxy.
- IExpression exp = proxyFactory.createExpression();
- IProxyBeanType beanTypeProxy = proxyTypeFactory.getBeanTypeProxy(exp, "testPackage.TestAccess");
- IProxyMethod methodProxy = beanTypeProxy.getMethodProxy(exp, "xyz");
- assertNotNull(methodProxy);
- assertTrue(methodProxy.isExpressionProxy());
- final IMethodProxy[] resolution = new IMethodProxy[1];
- final boolean[] wasVoid = new boolean[1];
- ((ExpressionProxy) methodProxy).addProxyListener(new ExpressionProxy.ProxyListener() {
- public void proxyResolved(ProxyEvent event) {
- resolution[0] = (IMethodProxy) event.getProxy();
- }
- public void proxyVoid(ProxyEvent event) {
- wasVoid[0] = true;
- }
- public void proxyNotResolved(ProxyEvent event) {
- }
- });
- IProxyMethod methodProxy2 = beanTypeProxy.getMethodProxy(exp, "xyz");
- assertSame(methodProxy, methodProxy2); // It should return same expression proxy each time.
-
- exp.createMethodInvocation(ForExpression.ROOTEXPRESSION, methodProxy, true, 0);
- exp.createClassInstanceCreation(ForExpression.METHOD_RECEIVER, beanTypeProxy, 0);
- exp.invokeExpression();
-
- assertFalse(wasVoid[0]);
- assertNotNull(resolution[0]);
- IMethodProxy methodProxy3 = proxyTypeFactory.getBeanTypeProxy("testPackage.TestAccess").getMethodProxy("xyz");
- assertNotNull(methodProxy3);
- assertTrue(methodProxy3.isBeanProxy());
- assertTrue(methodProxy3.isValid());
- // Can't test identity of methodproxies because some registries (IDE for example) create a new method proxy each time.
- }
-
- public void testIProxyFieldProxy() throws CoreException, IllegalStateException, ThrowableProxy, NoExpressionValueException {
- // Test that proxy field is first an expression proxy and after expression evaluation does it become a real proxy.
- // Can't test that it doesn't become a real proxy before evaluation because it may become resolved under the covers. For
- // example IDE expression immediately resolves it.
- //
- // First we must make sure we have a clean registry because it could of been resolved from a previous test.
- recreateRegistry();
-
- // Now do an expression and get a proxy.
- IExpression exp = proxyFactory.createExpression();
- IProxyBeanType beanTypeProxy = proxyTypeFactory.getBeanTypeProxy(exp, "testPackage.TestAccess");
- IProxyField fieldProxy = beanTypeProxy.getFieldProxy(exp, "STATIC_FIELD");
- assertNotNull(fieldProxy);
- assertTrue(fieldProxy.isExpressionProxy());
- final IFieldProxy[] resolution = new IFieldProxy[1];
- final boolean[] wasVoid = new boolean[1];
- ((ExpressionProxy) fieldProxy).addProxyListener(new ExpressionProxy.ProxyListener() {
- public void proxyResolved(ProxyEvent event) {
- resolution[0] = (IFieldProxy) event.getProxy();
- }
- public void proxyVoid(ProxyEvent event) {
- wasVoid[0] = true;
- }
- public void proxyNotResolved(ProxyEvent event) {
- }
- });
-
- IProxyField fieldProxy2 = beanTypeProxy.getFieldProxy(exp, "STATIC_FIELD");
- assertSame(fieldProxy, fieldProxy2); // It should return same expression proxy each time.
-
- exp.createFieldAccess(ForExpression.ROOTEXPRESSION, fieldProxy, true);
- exp.createClassInstanceCreation(ForExpression.FIELD_RECEIVER, beanTypeProxy, 0);
- IBeanProxy v = exp.getExpressionValue();
- assertNotNull(v);
- assertEquals(3, ((IIntegerBeanProxy) v).intValue());
-
- assertFalse(wasVoid[0]);
- assertNotNull(resolution[0]);
- IFieldProxy fieldProxy3 = proxyTypeFactory.getBeanTypeProxy("testPackage.TestAccess").getFieldProxy("STATIC_FIELD");
- assertNotNull(fieldProxy3);
- assertTrue(fieldProxy3.isBeanProxy());
- assertTrue(fieldProxy3.isValid());
- // Can't test identity of methodproxies because some registries (IDE for example) create a new method proxy each time.
- }
-
- public void testCastStringType() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createCastExpression(ForExpression.ROOTEXPRESSION, "short");
- exp.createPrimitiveLiteral(ForExpression.CAST_EXPRESSION, 10l);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("short", result.getTypeProxy().getTypeName());
- assertEquals((short) 10, ((INumberBeanProxy) result).shortValue());
- }
-
- public void testCastProxyType() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createCastExpression(ForExpression.ROOTEXPRESSION, proxyTypeFactory.getBeanTypeProxy("short"));
- exp.createPrimitiveLiteral(ForExpression.CAST_EXPRESSION, 'a');
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("short", result.getTypeProxy().getTypeName());
- assertEquals((short) 'a', ((INumberBeanProxy) result).shortValue());
- }
-
- public void testCastError() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createCastExpression(ForExpression.ROOTEXPRESSION, proxyTypeFactory.getBeanTypeProxy("short"));
- try {
- exp.createProxyExpression(ForExpression.CAST_EXPRESSION, proxyFactory.createBeanProxyWith(Boolean.TRUE));
- exp.getExpressionValue();
- fail("Should of thrown ClassCastException");
- } catch (ThrowableProxy e) {
- if (!e.getTypeProxy().getFormalTypeName().equals("java.lang.ClassCastException"))
- throw e; // Some other exception, rethrow it.
- }
- }
-
- public void testCastFailed() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createCastExpression(ForExpression.ROOTEXPRESSION, proxyTypeFactory.getBeanTypeProxy("short"));
- try {
- exp.getExpressionValue();
- fail("Should of gotton IllegalStateException");
- } catch (IllegalStateException e) {
- System.out.println("From testCastFailed (This is successful): "+e.getLocalizedMessage());
- }
- }
-
- public void testInstanceofStringType() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInstanceofExpression(ForExpression.ROOTEXPRESSION, "java.lang.String");
- exp.createStringLiteral(ForExpression.INSTANCEOF_VALUE, "asdf");
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(true, ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testInstanceofProxyType() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInstanceofExpression(ForExpression.ROOTEXPRESSION, proxyTypeFactory.getBeanTypeProxy("java.lang.String"));
- exp.createStringLiteral(ForExpression.INSTANCEOF_VALUE, "asdf");
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(true, ((IBooleanBeanProxy) result).booleanValue());
-
- }
-
- public void testInstanceofFailed() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInstanceofExpression(ForExpression.ROOTEXPRESSION, proxyTypeFactory.getBeanTypeProxy("java.lang.String"));
- try {
- exp.getExpressionValue();
- fail("Should of gotton IllegalStateException");
- } catch (IllegalStateException e) {
- System.out.println("From testInstanceofFailed (This is successful): "+e.getLocalizedMessage());
- }
- }
-
- public void testTypeLiteral() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createTypeLiteral(ForExpression.ROOTEXPRESSION, "java.lang.String");
- IBeanProxy result = exp.getExpressionValue();
- assertTrue("Not a bean type proxy.", result instanceof IBeanTypeProxy);
- IBeanTypeProxy type = (IBeanTypeProxy) result;
- assertTrue("Not valid.", type.isValid());
- assertEquals("java.lang.String", type.getFormalTypeName());
- }
-
- public void testTypeFails() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- try {
- exp.createTypeLiteral(ForExpression.ROOTEXPRESSION, "java.lang.Stng");
- exp.getExpressionValue();
- fail("Should not of gotton a result.");
- } catch (ThrowableProxy e) {
- assertEquals("java.lang.ClassNotFoundException", e.getTypeProxy().getFormalTypeName());
- }
- }
-
- public void testNesting() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInstanceofExpression(ForExpression.ROOTEXPRESSION, "short");
- exp.createCastExpression(ForExpression.INSTANCEOF_VALUE, "short");
- exp.createPrimitiveLiteral(ForExpression.CAST_EXPRESSION, (short) 10);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(true, ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testPrefixPlus() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createPrefixExpression(ForExpression.ROOTEXPRESSION, PrefixOperator.PRE_PLUS);
- exp.createPrimitiveLiteral(ForExpression.PREFIX_OPERAND, 10);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals(10, ((INumberBeanProxy) result).intValue());
-
- }
-
- public void testPrefixMinus() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createPrefixExpression(ForExpression.ROOTEXPRESSION, PrefixOperator.PRE_MINUS);
- exp.createPrimitiveLiteral(ForExpression.PREFIX_OPERAND, 10);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals(-10, ((INumberBeanProxy) result).intValue());
-
- }
-
- public void testPrefixMinusChar() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createPrefixExpression(ForExpression.ROOTEXPRESSION, PrefixOperator.PRE_MINUS);
- exp.createPrimitiveLiteral(ForExpression.PREFIX_OPERAND, 'a');
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals(-'a', ((INumberBeanProxy) result).intValue());
-
- }
-
- public void testPrefixComplement() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createPrefixExpression(ForExpression.ROOTEXPRESSION, PrefixOperator.PRE_COMPLEMENT);
- exp.createPrimitiveLiteral(ForExpression.PREFIX_OPERAND, (short) 10);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals(~10, ((INumberBeanProxy) result).intValue());
-
- }
-
- public void testPrefixNot() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createPrefixExpression(ForExpression.ROOTEXPRESSION, PrefixOperator.PRE_NOT);
- exp.createPrimitiveLiteral(ForExpression.PREFIX_OPERAND, true);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(false, ((IBooleanBeanProxy) result).booleanValue());
-
- }
-
- public void testPrefixFail() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createPrefixExpression(ForExpression.ROOTEXPRESSION, PrefixOperator.PRE_NOT);
- try {
- exp.createPrimitiveLiteral(ForExpression.PREFIX_OPERAND, 10);
- exp.getExpressionValue();
- fail("Should of failed.");
- } catch (ThrowableProxy e) {
- System.out.println("Test was successful: "+e.getProxyLocalizedMessage());
- }
-
- }
-
- public void testTimes() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_TIMES, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 4);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals(3*4, ((INumberBeanProxy) result).intValue());
-
- }
-
- public void testTimesExtended() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_TIMES, 1);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_EXTENDED, 5d);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("double", result.getTypeProxy().getTypeName());
- assertEquals((3*4*5d), ((INumberBeanProxy) result).doubleValue(), 0);
-
- }
-
- public void testTimesExtendedNested() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_TIMES, 1);
- exp.createInfixExpression(ForExpression.INFIX_LEFT, InfixOperator.IN_MINUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 10);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 5);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_EXTENDED, 5d);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("double", result.getTypeProxy().getTypeName());
- assertEquals(((10-5)*4*5d), ((INumberBeanProxy) result).doubleValue(), 0);
-
- }
-
- public void testDivide() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_DIVIDE, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 2);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals(4/2, ((INumberBeanProxy) result).intValue());
-
- }
-
- public void testDivideExtended() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_DIVIDE, 1);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 12);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_EXTENDED, 2d);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("double", result.getTypeProxy().getTypeName());
- assertEquals((12/3/2d), ((INumberBeanProxy) result).doubleValue(), 0);
-
- }
-
- public void testRemainder() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_REMAINDER, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals(4%3, ((INumberBeanProxy) result).intValue());
-
- }
-
- public void testRemainderExtended() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_REMAINDER, 1);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 12);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 9);
- exp.createPrimitiveLiteral(ForExpression.INFIX_EXTENDED, 2d);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("double", result.getTypeProxy().getTypeName());
- assertEquals((12%9%2d), ((INumberBeanProxy) result).doubleValue(), 0);
-
- }
-
- public void testMinus() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_MINUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals(4-3, ((INumberBeanProxy) result).intValue());
-
- }
-
- public void testMinusExtended() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_MINUS, 1);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 12);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 9);
- exp.createPrimitiveLiteral(ForExpression.INFIX_EXTENDED, 2d);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("double", result.getTypeProxy().getTypeName());
- assertEquals((12-9-2d), ((INumberBeanProxy) result).doubleValue(), 0);
-
- }
-
- public void testLeftShift() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_LEFT_SHIFT, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals(4<<3, ((INumberBeanProxy) result).intValue());
-
- }
-
- public void testLeftShiftExtended() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_LEFT_SHIFT, 1);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 12);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 9);
- exp.createPrimitiveLiteral(ForExpression.INFIX_EXTENDED, 2);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals((12<<9<<2), ((INumberBeanProxy) result).intValue(), 0);
- }
-
- public void testRightShiftSigned() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_RIGHT_SHIFT_SIGNED, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, -10000000);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals(-10000000>>3, ((INumberBeanProxy) result).intValue());
- }
-
- public void testRightShiftSignedExtended() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_RIGHT_SHIFT_SIGNED, 1);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, -10000000);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_EXTENDED, 2);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals((-10000000>>4>>2), ((INumberBeanProxy) result).intValue(), 0);
- }
- public void testRightShiftUnSigned() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_RIGHT_SHIFT_UNSIGNED, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, -10000000);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals(-10000000>>>3, ((INumberBeanProxy) result).intValue());
- }
-
- public void testRightShiftUnSignedExtended() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_RIGHT_SHIFT_UNSIGNED, 1);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, -10000000);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_EXTENDED, 2);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals((-10000000>>>4>>>2), ((INumberBeanProxy) result).intValue(), 0);
- }
-
- public void testLess() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_LESS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, -10000000);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(-10000000<3, ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testLessEquals() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_LESS_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(3<=3, ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testGreater() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_GREATER, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, -10000000);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(-10000000>3, ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testGreaterEquals() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_GREATER_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 2);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(2>=3, ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testEqualsPrimitives() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 3d);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(3d==3, ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testEqualsObjects() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_EQUALS, 0);
- exp.createTypeLiteral(ForExpression.INFIX_LEFT, "java.lang.String");
- exp.createTypeLiteral(ForExpression.INFIX_RIGHT, "java.lang.String");
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(String.class == String.class, ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testNotEqualsPrimitives() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_NOT_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 3d);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(3d!=3, ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testNotEqualsObjects() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_NOT_EQUALS, 0);
- exp.createTypeLiteral(ForExpression.INFIX_LEFT, "java.lang.String");
- exp.createTypeLiteral(ForExpression.INFIX_RIGHT, "java.lang.String");
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(String.class != String.class, ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testXOR() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_XOR, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 5);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals(5^3, ((INumberBeanProxy) result).intValue());
-
- }
-
- public void testXORExtended() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_XOR, 1);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 23);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 9);
- exp.createPrimitiveLiteral(ForExpression.INFIX_EXTENDED, 2);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals((23^9^2), ((INumberBeanProxy) result).intValue(), 0);
-
- }
-
- public void testAnd() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_AND, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 5);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals(5&3, ((INumberBeanProxy) result).intValue());
- }
-
- public void testAndExtended() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_AND, 1);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 13);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 15);
- exp.createPrimitiveLiteral(ForExpression.INFIX_EXTENDED, 1);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals((13&5&1), ((INumberBeanProxy) result).intValue(), 0);
- }
-
- public void testOr() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_OR, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 5);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 2);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals(5|2, ((INumberBeanProxy) result).intValue());
- }
-
- public void testOrExtended() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_OR, 1);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 13);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 6);
- exp.createPrimitiveLiteral(ForExpression.INFIX_EXTENDED, 2);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals((13|6|2), ((INumberBeanProxy) result).intValue(), 0);
- }
-
- public void testPlus() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 5);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 2);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getTypeName());
- assertEquals(5+2, ((INumberBeanProxy) result).intValue());
- }
-
- public void testPlusExtended() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_PLUS, 1);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 5);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 2);
- exp.createPrimitiveLiteral(ForExpression.INFIX_EXTENDED, 2l);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("long", result.getTypeProxy().getTypeName());
- assertEquals(5+2+2l, ((INumberBeanProxy) result).intValue());
- }
-
- public void testPlusStringLeft() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_PLUS, 0);
- exp.createProxyExpression(ForExpression.INFIX_LEFT, proxyFactory.createBeanProxyWith("abc"));
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 2);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("java.lang.String", result.getTypeProxy().getTypeName());
- assertEquals("abc"+2, ((IStringBeanProxy) result).stringValue());
- }
-
- public void testPlusStringRight() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 2);
- exp.createProxyExpression(ForExpression.INFIX_RIGHT, proxyFactory.createBeanProxyWith("abc"));
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("java.lang.String", result.getTypeProxy().getTypeName());
- assertEquals(2+"abc", ((IStringBeanProxy) result).stringValue());
- }
-
- public void testPlusStringLeftNull() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_PLUS, 0);
- exp.createProxyExpression(ForExpression.INFIX_LEFT, proxyFactory.createBeanProxyWith("abc"));
- exp.createNull(ForExpression.INFIX_RIGHT);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("java.lang.String", result.getTypeProxy().getTypeName());
- assertEquals("abc"+null, ((IStringBeanProxy) result).stringValue());
- }
-
- public void testPlusStringRightNull() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_PLUS, 0);
- exp.createNull(ForExpression.INFIX_LEFT);
- exp.createProxyExpression(ForExpression.INFIX_RIGHT, proxyFactory.createBeanProxyWith("abc"));
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("java.lang.String", result.getTypeProxy().getTypeName());
- assertEquals(null+"abc", ((IStringBeanProxy) result).stringValue());
- }
-
- public void testPlusStringLeftChar() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_PLUS, 0);
- exp.createProxyExpression(ForExpression.INFIX_LEFT, proxyFactory.createBeanProxyWith("abc"));
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 'a');
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("java.lang.String", result.getTypeProxy().getTypeName());
- assertEquals("abc"+'a', ((IStringBeanProxy) result).stringValue());
- }
-
- public void testPlusStringRightChar() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 'a');
- exp.createProxyExpression(ForExpression.INFIX_RIGHT, proxyFactory.createBeanProxyWith("abc"));
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("java.lang.String", result.getTypeProxy().getTypeName());
- assertEquals('a'+"abc", ((IStringBeanProxy) result).stringValue());
- }
-
- public void testConditionalAnd() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_CONDITIONAL_AND, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, true);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, true);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(true && true, ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testConditionalAndExtended() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_CONDITIONAL_AND, 1);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, true);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, true);
- exp.createInfixExpression(ForExpression.INFIX_EXTENDED, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(true && true && (3 == 3), ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testConditionalAndFalseLast() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_CONDITIONAL_AND, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, true);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, false);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(true && false, ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testConditionalAndFalseFirst() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_CONDITIONAL_AND, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, false);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, true);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(false && true, ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testConditionalAndExtendedAndFalseFirst() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_CONDITIONAL_AND, 1);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, false);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, true);
- exp.createInfixExpression(ForExpression.INFIX_EXTENDED, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(false && true && (3 == 3), ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testConditionalOr() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_CONDITIONAL_OR, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, false);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, true);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(false || true, ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testConditionalOrExtended() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_CONDITIONAL_OR, 1);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, false);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, false);
- exp.createInfixExpression(ForExpression.INFIX_EXTENDED, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(false || false || (3 == 3), ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testConditionalOrTrueFirst() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_CONDITIONAL_OR, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, true);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, false);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(true || false, ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testConditionalOrExtendedAndTrueMiddle() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_CONDITIONAL_OR, 1);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, false);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, true);
- exp.createInfixExpression(ForExpression.INFIX_EXTENDED, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(false || true || (3 == 3), ((IBooleanBeanProxy) result).booleanValue());
- }
-
- public void testArrayAccess() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IArrayBeanProxy array = proxyFactory.createBeanProxyWith(proxyTypeFactory.getBeanTypeProxy("short"), 1);
- array.set(proxyFactory.createBeanProxyWith((short) 3), 0);
-
- IExpression exp = proxyFactory.createExpression();
- exp.createArrayAccess(ForExpression.ROOTEXPRESSION, 1);
- exp.createProxyExpression(ForExpression.ARRAYACCESS_ARRAY, array);
- exp.createPrimitiveLiteral(ForExpression.ARRAYACCESS_INDEX, 0);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("short", result.getTypeProxy().getTypeName());
- assertEquals(((INumberBeanProxy) result).shortValue(), (short) 3);
- }
-
- public void testArrayAccessSet() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IArrayBeanProxy array = proxyFactory.createBeanProxyWith(proxyTypeFactory.getBeanTypeProxy("short"), 1);
- array.set(proxyFactory.createBeanProxyWith((short) 3), 0);
-
- IExpression exp = proxyFactory.createExpression();
- exp.createAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createArrayAccess(ForExpression.ASSIGNMENT_LEFT, 1);
- exp.createProxyExpression(ForExpression.ARRAYACCESS_ARRAY, array);
- exp.createPrimitiveLiteral(ForExpression.ARRAYACCESS_INDEX, 0);
- exp.createPrimitiveLiteral(ForExpression.ASSIGNMENT_RIGHT, (short) 33);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("short", result.getTypeProxy().getTypeName());
- assertEquals(((INumberBeanProxy) result).shortValue(), (short) 33);
- }
-
-
- public void testMultiArrayAccess() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IArrayBeanProxy array = proxyFactory.createBeanProxyWith(proxyTypeFactory.getBeanTypeProxy("short"), new int[] {2,1});
- array.set(proxyFactory.createBeanProxyWith((short) 3), new int[]{1,0});
-
- IExpression exp = proxyFactory.createExpression();
- exp.createArrayAccess(ForExpression.ROOTEXPRESSION, 1);
- exp.createProxyExpression(ForExpression.ARRAYACCESS_ARRAY, array);
- exp.createPrimitiveLiteral(ForExpression.ARRAYACCESS_INDEX, 1);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("short[]", result.getTypeProxy().getFormalTypeName());
- }
-
- public void testMultiArrayAccessSet() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IArrayBeanProxy array = proxyFactory.createBeanProxyWith(proxyTypeFactory.getBeanTypeProxy("short"), new int[] {2,1});
- array.set(proxyFactory.createBeanProxyWith((short) 3), new int[]{1,0});
-
- IExpression exp = proxyFactory.createExpression();
- exp.createAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createArrayAccess(ForExpression.ASSIGNMENT_LEFT, 1);
- exp.createProxyExpression(ForExpression.ARRAYACCESS_ARRAY, array);
- exp.createPrimitiveLiteral(ForExpression.ARRAYACCESS_INDEX, 1);
- IArrayBeanProxy newArray = proxyFactory.createBeanProxyWith(proxyTypeFactory.getBeanTypeProxy("short"), new int[] {3});
- exp.createProxyExpression(ForExpression.ASSIGNMENT_RIGHT, newArray);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("short[]", result.getTypeProxy().getFormalTypeName());
- assertEquals(3, ((IArrayBeanProxy) result).getLength());
- }
-
- public void testMultiArrayAccess1() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IArrayBeanProxy array = proxyFactory.createBeanProxyWith(proxyTypeFactory.getBeanTypeProxy("short"), new int[] {2,1});
- array.set(proxyFactory.createBeanProxyWith((short) 3), new int[]{1,0});
-
- IExpression exp = proxyFactory.createExpression();
- exp.createArrayAccess(ForExpression.ROOTEXPRESSION, 2);
- exp.createProxyExpression(ForExpression.ARRAYACCESS_ARRAY, array);
- exp.createPrimitiveLiteral(ForExpression.ARRAYACCESS_INDEX, 1);
- exp.createPrimitiveLiteral(ForExpression.ARRAYACCESS_INDEX, 0);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("short", result.getTypeProxy().getFormalTypeName());
- assertEquals((short) 3, ((INumberBeanProxy) result).shortValue());
- }
-
- public void testArrayCreation() throws IllegalStateException, IllegalArgumentException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createArrayCreation(ForExpression.ROOTEXPRESSION, "int[]", 1);
- exp.createPrimitiveLiteral(ForExpression.ARRAYCREATION_DIMENSION, 2);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int[]", result.getTypeProxy().getFormalTypeName());
- assertEquals(2, ((IArrayBeanProxy) result).getLength());
- }
-
- public void testMultiArrayCreation() throws IllegalStateException, IllegalArgumentException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createArrayCreation(ForExpression.ROOTEXPRESSION, "int[][]", 2);
- exp.createPrimitiveLiteral(ForExpression.ARRAYCREATION_DIMENSION, 2);
- exp.createPrimitiveLiteral(ForExpression.ARRAYCREATION_DIMENSION, 4);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int[][]", result.getTypeProxy().getFormalTypeName());
- assertEquals(2, ((IArrayBeanProxy) result).getLength());
- assertEquals(4, ((IArrayBeanProxy)((IArrayBeanProxy) result).get(0)).getLength());
- }
-
- public void testMultiPartialArrayCreation() throws IllegalStateException, IllegalArgumentException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createArrayCreation(ForExpression.ROOTEXPRESSION, "int[][][]", 2);
- exp.createPrimitiveLiteral(ForExpression.ARRAYCREATION_DIMENSION, 2);
- exp.createPrimitiveLiteral(ForExpression.ARRAYCREATION_DIMENSION, 4);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int[][][]", result.getTypeProxy().getFormalTypeName());
- assertEquals(2, ((IArrayBeanProxy) result).getLength());
- assertEquals(4, ((IArrayBeanProxy)((IArrayBeanProxy) result).get(0)).getLength());
- assertNull(((IArrayBeanProxy)((IArrayBeanProxy) result).get(0)).get(0));
- }
-
- public void testArrayInitializerEmpty() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createArrayCreation(ForExpression.ROOTEXPRESSION, "int[]", 0);
- exp.createArrayInitializer(0);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int[]", result.getTypeProxy().getFormalTypeName());
- assertEquals(0, ((IArrayBeanProxy) result).getLength());
- }
-
- public void testArrayInitializerOneDim() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createArrayCreation(ForExpression.ROOTEXPRESSION, "int[]", 0);
- exp.createArrayInitializer(1);
- exp.createPrimitiveLiteral(ForExpression.ARRAYINITIALIZER_EXPRESSION, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int[]", result.getTypeProxy().getFormalTypeName());
- assertEquals(1, ((IArrayBeanProxy) result).getLength());
- assertEquals(3, ((INumberBeanProxy) ((IArrayBeanProxy) result).get(0)).intValue());
- }
-
- public void testArrayInitializerTwoDimEmpty() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createArrayCreation(ForExpression.ROOTEXPRESSION, "int[][]", 0);
- exp.createArrayInitializer(0);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int[][]", result.getTypeProxy().getFormalTypeName());
- assertEquals(0, ((IArrayBeanProxy) result).getLength());
- }
-
- public void testArrayInitializerTwoDim() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createArrayCreation(ForExpression.ROOTEXPRESSION, "int[][]", 0);
- exp.createArrayInitializer(1);
- exp.createArrayInitializer(0);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int[][]", result.getTypeProxy().getFormalTypeName());
- assertEquals(1, ((IArrayBeanProxy) result).getLength());
- assertEquals(0, ((IArrayBeanProxy) ((IArrayBeanProxy) result).get(0)).getLength());
- }
-
- public void testArrayInitializerTwoDimNotEmpty() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createArrayCreation(ForExpression.ROOTEXPRESSION, "int[][]", 0);
- exp.createArrayInitializer(2);
- exp.createNull(ForExpression.ARRAYINITIALIZER_EXPRESSION);
- exp.createArrayInitializer(2);
- exp.createPrimitiveLiteral(ForExpression.ARRAYINITIALIZER_EXPRESSION, 3);
- exp.createPrimitiveLiteral(ForExpression.ARRAYINITIALIZER_EXPRESSION, 4);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int[][]", result.getTypeProxy().getFormalTypeName());
- assertEquals(2, ((IArrayBeanProxy) result).getLength());
- assertNull(((IArrayBeanProxy) result).get(0));
- assertEquals(2, ((IArrayBeanProxy) ((IArrayBeanProxy) result).get(1)).getLength());
- assertEquals(4, ((INumberBeanProxy)((IArrayBeanProxy) ((IArrayBeanProxy) result).get(1)).get(1)).intValue());
- }
-
- public void testArrayInitializerShortInt() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createArrayCreation(ForExpression.ROOTEXPRESSION, "short[]", 0);
- exp.createArrayInitializer(1);
- exp.createPrimitiveLiteral(ForExpression.ARRAYINITIALIZER_EXPRESSION, 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("short[]", result.getTypeProxy().getFormalTypeName());
- assertEquals(1, ((IArrayBeanProxy) result).getLength());
- assertEquals(3, ((INumberBeanProxy) ((IArrayBeanProxy) result).get(0)).intValue());
- }
-
- public void testClassInstanceCreationDefault() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createClassInstanceCreation(ForExpression.ROOTEXPRESSION, "java.lang.Object", 0);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("java.lang.Object", result.getTypeProxy().getFormalTypeName());
- }
-
- public void testClassInstanceCreationDefaultWithBeanTypeProxy() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createClassInstanceCreation(ForExpression.ROOTEXPRESSION, proxyTypeFactory.getBeanTypeProxy("java.lang.Object"), 0);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("java.lang.Object", result.getTypeProxy().getFormalTypeName());
- }
-
- public void testClassInstanceCreationOneArg() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createClassInstanceCreation(ForExpression.ROOTEXPRESSION, "java.lang.Integer", 1);
- exp.createStringLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, "3");
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("java.lang.Integer", result.getTypeProxy().getFormalTypeName());
- assertEquals(3, ((INumberBeanProxy) result).intValue());
- }
-
- public void testClassInstanceCreationOneArgWithPrimWidening() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createClassInstanceCreation(ForExpression.ROOTEXPRESSION, "java.lang.Short", 1);
- exp.createPrimitiveLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, (byte)3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("java.lang.Short", result.getTypeProxy().getFormalTypeName());
- assertEquals((short)3, ((INumberBeanProxy) result).shortValue());
- }
-
- public void testClassInstanceCreationNullArg() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createClassInstanceCreation(ForExpression.ROOTEXPRESSION, "testPackage.TestCtorWithNull", 1);
- exp.createNull(ForExpression.CLASSINSTANCECREATION_ARGUMENT);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("testPackage.TestCtorWithNull", result.getTypeProxy().getFormalTypeName());
- }
-
- public void testClassInstanceCreationMismatchArg() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createClassInstanceCreation(ForExpression.ROOTEXPRESSION, "testPackage.TestCtorWithNull", 1);
- try {
- exp.createPrimitiveLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, 1);
- exp.getExpressionValue();
- fail("Exception should of been thrown.");
- } catch (ThrowableProxy e) {
- assertEquals("java.lang.NoSuchMethodException", e.getTypeProxy().getFormalTypeName());
- }
- }
-
- public void testFieldAccessStatic() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createFieldAccess(ForExpression.ROOTEXPRESSION, "RED", true);
- exp.createTypeReceiver("java.awt.Color");
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("java.awt.Color", result.getTypeProxy().getFormalTypeName());
- IBeanTypeProxy colorType = result.getTypeProxy();
- IMethodProxy red = colorType.getMethodProxy("getRed");
- IMethodProxy green = colorType.getMethodProxy("getGreen");
- IMethodProxy blue = colorType.getMethodProxy("getBlue");
- assertEquals(255, ((INumberBeanProxy) red.invoke(result)).intValue());
- assertEquals(0, ((INumberBeanProxy) green.invoke(result)).intValue());
- assertEquals(0, ((INumberBeanProxy) blue.invoke(result)).intValue());
- }
-
- public void testFieldAccessSetStatic() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createFieldAccess(ForExpression.ASSIGNMENT_LEFT, "STATIC_FIELD", true);
- exp.createTypeReceiver("testPackage.TestAccess");
- exp.createPrimitiveLiteral(ForExpression.ASSIGNMENT_RIGHT, 23);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getFormalTypeName());
- assertEquals(23, ((INumberBeanProxy) result).intValue());
- }
-
-
- public void testFieldAccessNonStatic() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createFieldAccess(ForExpression.ROOTEXPRESSION, "x", true);
- exp.createClassInstanceCreation(ForExpression.FIELD_RECEIVER, "java.awt.Point", 2);
- exp.createPrimitiveLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, 1);
- exp.createPrimitiveLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, 2);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getFormalTypeName());
- assertEquals(1, ((INumberBeanProxy) result).intValue());
- }
-
- public void testFieldAccessSetNonStatic() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createFieldAccess(ForExpression.ASSIGNMENT_LEFT, "x", true);
- exp.createClassInstanceCreation(ForExpression.FIELD_RECEIVER, "java.awt.Point", 2);
- exp.createPrimitiveLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, 1);
- exp.createPrimitiveLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, 2);
- exp.createPrimitiveLiteral(ForExpression.ASSIGNMENT_RIGHT, 23);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getFormalTypeName());
- assertEquals(23, ((INumberBeanProxy) result).intValue());
- }
-
- public void testFieldAccessSetNonStaticSimple() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- // First create using normal proxy stuff, then test the expression processor.
- IBeanTypeProxy pointType = proxyTypeFactory.getBeanTypeProxy("java.awt.Point");
- IFieldProxy xFieldProxy = pointType.getFieldProxy("x");
- IBeanProxy pointProxy = pointType.getConstructorProxy(new String[] {"int", "int"}).newInstance(new IBeanProxy[] {proxyFactory.createBeanProxyWith(1), proxyFactory.createBeanProxyWith(2)});
-
- IExpression exp = proxyFactory.createExpression();
- ExpressionProxy ep = exp.createSimpleFieldSet(xFieldProxy, pointProxy, proxyFactory.createBeanProxyWith(23), true);
- ep.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy result = event.getProxy();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getFormalTypeName());
- assertEquals(23, ((INumberBeanProxy) result).intValue());
- }
- });
- exp.invokeExpression();
- }
-
- public void testFieldAccessNonStaticSimple() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- // First create using normal proxy stuff, then test the expression processor.
- IBeanTypeProxy pointType = proxyTypeFactory.getBeanTypeProxy("java.awt.Point");
- IFieldProxy xFieldProxy = pointType.getFieldProxy("x");
- IBeanProxy pointProxy = pointType.getConstructorProxy(new String[] {"int", "int"}).newInstance(new IBeanProxy[] {proxyFactory.createBeanProxyWith(1), proxyFactory.createBeanProxyWith(2)});
-
- IExpression exp = proxyFactory.createExpression();
- ExpressionProxy ep = exp.createSimpleFieldAccess(xFieldProxy, pointProxy);
- ep.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy result = event.getProxy();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getFormalTypeName());
- assertEquals(1, ((INumberBeanProxy) result).intValue());
- }
- });
- exp.invokeExpression();
- }
-
- public void testFieldAccessNonStaticWithProxy() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IBeanTypeProxy pointType = proxyTypeFactory.getBeanTypeProxy("java.awt.Point");
- IExpression exp = proxyFactory.createExpression();
- exp.createFieldAccess(ForExpression.ROOTEXPRESSION, pointType.getFieldProxy("x"), true);
- exp.createClassInstanceCreation(ForExpression.FIELD_RECEIVER, "java.awt.Point", 2);
- exp.createPrimitiveLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, 1);
- exp.createPrimitiveLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, 2);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getFormalTypeName());
- assertEquals(1, ((INumberBeanProxy) result).intValue());
- }
-
- public void testFieldAccessFailWithExpressionProxy() throws IllegalStateException, NoExpressionValueException {
- IBeanTypeProxy pointType = proxyTypeFactory.getBeanTypeProxy("java.awt.Point");
- IExpression exp = proxyFactory.createExpression();
- try {
- exp.createFieldAccess(ForExpression.ROOTEXPRESSION, pointType.getFieldProxy(exp, "z"), true);
- exp.createClassInstanceCreation(ForExpression.FIELD_RECEIVER, "java.awt.Point", 2);
- exp.createPrimitiveLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, 1);
- exp.createPrimitiveLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, 2);
- exp.getExpressionValue();
- fail("Should of had exception");
- } catch (ThrowableProxy e) {
- assertEquals("java.lang.NoSuchFieldException", e.getTypeProxy().getFormalTypeName());
- }
- }
-
- public void testMethodInvokeStatic() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createMethodInvocation(ForExpression.ROOTEXPRESSION, "valueOf", true, 1);
- exp.createTypeReceiver("java.lang.String");
- exp.createPrimitiveLiteral(ForExpression.METHOD_ARGUMENT, true);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("java.lang.String", result.getTypeProxy().getFormalTypeName());
- assertEquals("true", ((IStringBeanProxy) result).stringValue());
- }
-
- public void testMethodInvokeProxyFail() throws IllegalStateException, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- IBeanTypeProxy intType = proxyTypeFactory.getBeanTypeProxy("java.lang.Integer");
- try {
- exp.createMethodInvocation(ForExpression.ROOTEXPRESSION, intType.getMethodProxy(exp, "goobldy-gook"), true, 1);
- exp.createClassInstanceCreation(ForExpression.METHOD_RECEIVER, intType, 1);
- exp.createPrimitiveLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, 3);
- exp.createClassInstanceCreation(ForExpression.METHOD_ARGUMENT, "java.lang.Integer", 1);
- exp.createPrimitiveLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, 4);
- exp.getExpressionValue();
- fail("Should of gotten exception");
- } catch (ThrowableProxy e) {
- assertEquals("java.lang.NoSuchMethodException", e.getTypeProxy().getFormalTypeName());
- }
- }
-
- public void testMethodInvokeNonStatic() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createMethodInvocation(ForExpression.ROOTEXPRESSION, "compareTo", true, 1);
- exp.createClassInstanceCreation(ForExpression.METHOD_RECEIVER, "java.lang.Integer", 1);
- exp.createPrimitiveLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, 3);
- exp.createClassInstanceCreation(ForExpression.METHOD_ARGUMENT, "java.lang.Integer", 1);
- exp.createPrimitiveLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, 4);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getFormalTypeName());
- assertTrue("CompareTo wasn't less than 0.", ((INumberBeanProxy) result).intValue() < 0);
- }
-
- public void testMethodInvokeNonStaticWithProxy() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IBeanTypeProxy integerType = proxyTypeFactory.getBeanTypeProxy("java.lang.Integer");
- IExpression exp = proxyFactory.createExpression();
- exp.createMethodInvocation(ForExpression.ROOTEXPRESSION, integerType.getMethodProxy("compareTo", new IBeanTypeProxy[] {integerType}), true, 1);
- exp.createClassInstanceCreation(ForExpression.METHOD_RECEIVER, "java.lang.Integer", 1);
- exp.createPrimitiveLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, 3);
- exp.createClassInstanceCreation(ForExpression.METHOD_ARGUMENT, "java.lang.Integer", 1);
- exp.createPrimitiveLiteral(ForExpression.CLASSINSTANCECREATION_ARGUMENT, 4);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getFormalTypeName());
- assertTrue("CompareTo wasn't less than 0.", ((INumberBeanProxy) result).intValue() < 0);
- }
-
- public void testConditionalTrue() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createConditionalExpression(ForExpression.ROOTEXPRESSION);
- exp.createInfixExpression(ForExpression.CONDITIONAL_CONDITION, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createInfixExpression(ForExpression.CONDITIONAL_TRUE, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createInfixExpression(ForExpression.CONDITIONAL_FALSE, InfixOperator.IN_MINUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getFormalTypeName());
- assertEquals(6, ((INumberBeanProxy) result).intValue());
- }
-
- public void testConditionalFalse() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createConditionalExpression(ForExpression.ROOTEXPRESSION);
- exp.createInfixExpression(ForExpression.CONDITIONAL_CONDITION, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createInfixExpression(ForExpression.CONDITIONAL_TRUE, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createInfixExpression(ForExpression.CONDITIONAL_FALSE, InfixOperator.IN_MINUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getFormalTypeName());
- assertEquals(0, ((INumberBeanProxy) result).intValue());
- }
-
- public void testNestedConditionalTrueTrue() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createConditionalExpression(ForExpression.ROOTEXPRESSION);
- exp.createInfixExpression(ForExpression.CONDITIONAL_CONDITION, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createConditionalExpression(ForExpression.CONDITIONAL_TRUE);
- exp.createInfixExpression(ForExpression.CONDITIONAL_CONDITION, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createInfixExpression(ForExpression.CONDITIONAL_TRUE, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 4);
- exp.createInfixExpression(ForExpression.CONDITIONAL_FALSE, InfixOperator.IN_MINUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createInfixExpression(ForExpression.CONDITIONAL_FALSE, InfixOperator.IN_MINUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 5);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getFormalTypeName());
- assertEquals(8, ((INumberBeanProxy) result).intValue());
- }
-
- public void testNestedConditionalFalseFalse() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createConditionalExpression(ForExpression.ROOTEXPRESSION);
- exp.createInfixExpression(ForExpression.CONDITIONAL_CONDITION, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 2);
- exp.createConditionalExpression(ForExpression.CONDITIONAL_TRUE);
- exp.createInfixExpression(ForExpression.CONDITIONAL_CONDITION, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 2);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createInfixExpression(ForExpression.CONDITIONAL_TRUE, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 4);
- exp.createInfixExpression(ForExpression.CONDITIONAL_FALSE, InfixOperator.IN_MINUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createInfixExpression(ForExpression.CONDITIONAL_FALSE, InfixOperator.IN_MINUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 5);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int", result.getTypeProxy().getFormalTypeName());
- assertEquals(2, ((INumberBeanProxy) result).intValue());
- }
-
- public void testVoidReturnType() throws IllegalStateException, ThrowableProxy {
- IExpression exp = proxyFactory.createExpression();
- try {
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 3);
- exp.createMethodInvocation(ForExpression.INFIX_RIGHT, "gc", true, 0);
- exp.createTypeReceiver("java.lang.System");
- exp.getExpressionValue();
- fail("Should of received no expression value exception.");
- } catch (NoExpressionValueException e) {
- if (e.getLocalizedMessage() != null)
- System.out.println("Test was successful: "+e.getLocalizedMessage());
- }
- }
-
- public void testWrongReturnType() throws ThrowableProxy, IllegalStateException, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- try {
- exp.createInfixExpression(ForExpression.ROOTEXPRESSION, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, 3);
- exp.createMethodInvocation(ForExpression.INFIX_RIGHT, "getSecurityManager", true, 0);
- exp.createTypeReceiver("java.lang.System");
- exp.getExpressionValue();
- fail("Should of received class cast proxy exception.");
- } catch (ThrowableProxy e) {
- if (!e.getTypeProxy().getFormalTypeName().equals("java.lang.IllegalArgumentException"))
- throw e; // Some other exception, rethrow it.
- }
- }
-
- public void testInvoke() throws ThrowableProxy, IllegalStateException, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createMethodInvocation(ForExpression.ROOTEXPRESSION, "getSecurityManager", true, 0);
- exp.createTypeReceiver("java.lang.System");
- exp.invokeExpression();
- }
-
- public void testInvokeFail() throws ThrowableProxy, IllegalStateException, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- try {
- exp.createMethodInvocation(ForExpression.ROOTEXPRESSION, "getenv", true, 1);
- exp.createTypeReceiver("java.lang.System");
- exp.createStringLiteral(ForExpression.METHOD_ARGUMENT, "xyz");
- exp.invokeExpression();
- } catch (ThrowableProxy e) {
- if (!e.getTypeProxy().getFormalTypeName().equals("java.lang.Error"))
- throw e; // Some other exception, rethrow it.
- }
- }
-
- public void testAssignment() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- ExpressionProxy ep = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- final long[] time = new long[1];
- ep.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyAdapter#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- time[0] = ((INumberBeanProxy) event.getProxy()).longValue();
- }
- });
- exp.createMethodInvocation(ForExpression.ASSIGNMENT_RIGHT, "currentTimeMillis", true, 0);
- exp.createTypeReceiver("java.lang.System");
- exp.invokeExpression();
- assertTrue(0L != time[0]);
- }
-
- public void testReassignment() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- ExpressionProxy ep = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- final long[] time = new long[1];
- ep.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyAdapter#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- time[0] = ((INumberBeanProxy) event.getProxy()).longValue();
- }
- });
- exp.createMethodInvocation(ForExpression.ASSIGNMENT_RIGHT, "currentTimeMillis", true, 0);
- exp.createTypeReceiver("java.lang.System");
- exp.createProxyReassignmentExpression(ForExpression.ROOTEXPRESSION, ep);
- exp.createPrimitiveLiteral(ForExpression.ASSIGNMENT_RIGHT, -23L);
- exp.invokeExpression();
- assertEquals(-23L, time[0]);
- }
-
- public void testAssignmentVoid() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- ExpressionProxy ep = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- ExpressionVoid epl = new ExpressionVoid();
- ep.addProxyListener(epl);
- exp.createMethodInvocation(ForExpression.ASSIGNMENT_RIGHT, "testVoid", true, 0);
- exp.createTypeReceiver("testPackage.TestAccess");
- exp.invokeExpression();
- assertTrue(epl.voidCalled);
- }
-
- public void testAssignmentNot() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createConditionalExpression(ForExpression.ROOTEXPRESSION);
- exp.createPrimitiveLiteral(ForExpression.CONDITIONAL_CONDITION, true);
- exp.createPrimitiveLiteral(ForExpression.CONDITIONAL_TRUE, true);
- ExpressionProxy ep = exp.createProxyAssignmentExpression(ForExpression.CONDITIONAL_FALSE);
- exp.createPrimitiveLiteral(ForExpression.ASSIGNMENT_RIGHT, false);
- ExpressionNotResolved epl = new ExpressionNotResolved();
- ep.addProxyListener(epl);
- exp.invokeExpression();
- assertTrue(epl.notResolvedCalled);
- }
-
- public void testAssignmentLaterUsage() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- // eparg = 3;
- // epInteger = new Integer(eparg+1);
- IExpression exp = proxyFactory.createExpression();
- ExpressionProxy epArg = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createPrimitiveLiteral(ForExpression.ASSIGNMENT_RIGHT, 3);
- ExpressionProxy epInteger = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createClassInstanceCreation(ForExpression.ASSIGNMENT_RIGHT, proxyTypeFactory.getBeanTypeProxy("java.lang.Integer"), 1);
- exp.createInfixExpression(ForExpression.CLASSINSTANCECREATION_ARGUMENT, InfixOperator.IN_PLUS, 0);
- exp.createProxyExpression(ForExpression.INFIX_LEFT, epArg); // Use literal 3+1 as the argument to this.
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 1);
- epInteger.addProxyListener(new ExpressionResolved() {
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyAdapter#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- assertEquals(((INumberBeanProxy) event.getProxy()).intValue(), 4);
- }
- });
- exp.invokeExpression();
- }
-
- // TODO - for some unknown reason this test continues to fail in the build on the jvelinux machine. It seems to have
- // very very poor performance on jvelinux.
- // If we can get it working, put "test" on the front of the method name again to get it running as a test.
- public void ExpressionPerformanceSmall() throws IllegalStateException, NoExpressionValueException, ThrowableProxy, AmbiguousMethodException, NoSuchMethodException {
- // Small performance test. We are testing a small batch of expressions on each run. We then avg. the runs. This tests many small
- // expression processing performance.
-
- // Prime the proxies so they don't become part of the timings.
- IBeanTypeProxy pointType = proxyTypeFactory.getBeanTypeProxy("java.awt.Point");
- IMethodProxy setLocation = pointType.getMethodProxy("setLocation", new String[] {"int", "int"});
- IMethodProxy getLocation = pointType.getMethodProxy("getLocation");
- //
- // Now for just a simple one method invocation using method proxies (and not method lookup each time) the standard proxy calls
- // will beat out expression processing for Remote. Note that is not true of IDE vm. In that case the standard proxy calls
- // will ALWAYS out perform greatly the expression processer because there is no latency in the communications. It is basically
- // straight direct calls. While expression processing is also direct calls, the call path is much larger because it needs to
- // build/maintain/execute the processing stack, rather than just execute the command.
- //
-
- // Try to prime the communication pump. This sends about 36,000 bytes of data.
- // Doing it here means later when needed the communications costs are drastically reduced.
- IExpression exp = proxyFactory.createExpression();
- int i =1000;
- while (i-->0) {
- exp.createArrayCreation(ForExpression.ROOTEXPRESSION, registry.getBeanTypeProxyFactory()
- .getBeanTypeProxy(exp, "java.lang.Object", 1), 0);
- exp.createArrayInitializer(0);
- }
- exp.invokeExpression();
-
- int times = 100; // Number of times to run the test.
- int batchSize = 10; // Size of batch for each test.
- // Now do the actual test.
- long start = System.currentTimeMillis();
- i = times;
- while(i-->0) {
- expressionSetting(pointType, setLocation, getLocation, batchSize);
- }
-
- long expressionTime = System.currentTimeMillis()-start;
- long startNormal = System.currentTimeMillis();
- i = times;
- while(i-->0) {
- normalSetting(pointType, setLocation, getLocation, batchSize);
- }
- long normalTime = System.currentTimeMillis()-startNormal;
- System.out.println("Small Batch results: Batch size="+batchSize+" Number of runs="+times);
- System.out.println("Expression Time: " + expressionTime + " Avg: " + (expressionTime/((double) times)));
- System.out.println("Normal Time: " + normalTime+ " Avg: " + (normalTime/((double) times)));
- if (normalTime == 0)
- normalTime = 1; // So no divide by zero.
- int improvement = (int) ((1-((double) expressionTime)/normalTime)*100);
- System.out.println("Improvement of expression over normal time: "+improvement+'%');
- // Note that this test is not valid for IDE because the IDE will always be other way around because
- // there is no latency delay there.
-
- if (!(proxyFactory instanceof IDEStandardBeanProxyFactory))
- assertTrue("Less than 30% improvement: "+improvement+'%', improvement>=30); // We like this %.
- }
-
- // TODO - for some unknown reason this test continues to fail in the build on the jvelinux machine. It seems to have
- // very very poor performance on jvelinux.
- // If we can get it working, put "test" on the front of the method name again to get it running as a test.
- public void ExpressionPerformanceLarge() throws IllegalStateException, NoExpressionValueException, ThrowableProxy, AmbiguousMethodException, NoSuchMethodException {
- // Small performance test. We are testing a large batch of expressions on each run. We then avg. the runs. This tests many large
- // expression processing performance.
-
- // Prime the proxies so they don't become part of the timings.
- IBeanTypeProxy pointType = proxyTypeFactory.getBeanTypeProxy("java.awt.Point");
- IMethodProxy setLocation = pointType.getMethodProxy("setLocation", new String[] {"int", "int"});
- IMethodProxy getLocation = pointType.getMethodProxy("getLocation");
- //
- // Now for just a simple one method invocation using method proxies (and not method lookup each time) the standard proxy calls
- // will beat out expression processing for Remote. Note that is not true of IDE vm. In that case the standard proxy calls
- // will ALWAYS out perform greatly the expression processer because there is no latency in the communications. It is basically
- // straight direct calls. While expression processing is also direct calls, the call path is much larger because it needs to
- // build/maintain/execute the processing stack, rather than just execute the command.
- //
-
- // Try to prime the communication pump. This sends about 36,000 bytes of data.
- // Doing it here means later when needed the communications costs are drastically reduced.
- IExpression exp = proxyFactory.createExpression();
- int i =1000;
- while (i-->0) {
- exp.createArrayCreation(ForExpression.ROOTEXPRESSION, registry.getBeanTypeProxyFactory()
- .getBeanTypeProxy(exp, "java.lang.Object", 1), 0);
- exp.createArrayInitializer(0);
- }
- exp.invokeExpression();
-
- int times = 25; // Number of times to run the test.
- int batchSize = 100; // Size of batch for each test.
-
- // Now do the actual test.
- long start = System.currentTimeMillis();
- i = times;
- while(i-->0) {
- expressionSetting(pointType, setLocation, getLocation, batchSize);
- }
- long expressionTime = System.currentTimeMillis()-start;
- long startNormal = System.currentTimeMillis();
- i = times;
- while(i-->0) {
- normalSetting(pointType, setLocation, getLocation, batchSize);
- }
- long normalTime = System.currentTimeMillis()-startNormal;
- System.out.println("Large Batch results: Batch size="+batchSize+" Number of runs="+times);
- System.out.println("Expression Time: " + expressionTime + " Avg: " + (expressionTime/((double) times)));
- System.out.println("Normal Time: " + normalTime+ " Avg: " + (normalTime/((double) times)));
- if (normalTime == 0)
- normalTime = 1; // So no divide by zero.
- int improvement = (int) ((1-((double) expressionTime)/normalTime)*100);
- System.out.println("Improvement of expression over normal time: "+improvement+'%');
- // Note that this test is not valid for IDE because the IDE will always be other way around because
- // there is no latency delay there.
- if (!(proxyFactory instanceof IDEStandardBeanProxyFactory))
- assertTrue("Less than 75% improvement: "+improvement+'%', improvement>=75); // We like this %.
- }
-
- private void expressionSetting(IBeanTypeProxy pointType, IMethodProxy setLocation, IMethodProxy getLocation, int times) throws ThrowableProxy, NoExpressionValueException {
- // This is the same as expressionSetting except it uses regular proxy access instead of expressions. It should be
- // slower because it requires a round trip for each access. For remote only.
- // To factor out the overhead of the initialization of the expression processing, we will do the create/set/get 10 times.
- // Point p = new Point();
- // p.setLocation(3,4);
- // p.getLocation();
- IExpression exp = proxyFactory.createExpression();
- for (int i = 0; i < times; i++) {
- ExpressionProxy epPoint = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createClassInstanceCreation(ForExpression.ASSIGNMENT_RIGHT, pointType, 0);
- exp.createSimpleMethodInvoke(setLocation, epPoint, new IProxy[] {proxyFactory.createBeanProxyWith(3), proxyFactory.createBeanProxyWith(4)}, false);
- ExpressionProxy epLoc = exp.createSimpleMethodInvoke(getLocation, epPoint, null, true);
- epLoc.addProxyListener(new ExpressionProxy.ProxyAdapter()); // Just have a listener, we want the callback overhead added in.
- }
- exp.invokeExpression();
- }
-
- private void normalSetting(IBeanTypeProxy pointType, IMethodProxy setLocation, IMethodProxy getLocation, int times) throws ThrowableProxy, AmbiguousMethodException, NoSuchMethodException {
- // This is the same as expressionSetting except it uses regular proxy access instead of expressions. It should be
- // slower because it requires a round trip for each access.
- // To factor out the overhead of the initialization of the expression processing, we will do the create/set/get 10 times. This here matches that.
- // Point p = new Point();
- // p.setLocation(3,4);
- for (int i = 0; i < times; i++) {
- IBeanProxy epPoint = pointType.newInstance();
- setLocation.invokeCatchThrowableExceptions(epPoint, new IBeanProxy[] {proxyFactory.createBeanProxyWith(3), proxyFactory.createBeanProxyWith(4)});
- getLocation.invokeCatchThrowableExceptions(epPoint);
- }
- }
-
- public void testBlock() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- int blocknum = exp.createBlockBegin();
- ExpressionProxy epArg = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createPrimitiveLiteral(ForExpression.ASSIGNMENT_RIGHT, true);
- exp.createBlockBreak(blocknum);
- ExpressionProxy epBoolean = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createClassInstanceCreation(ForExpression.ASSIGNMENT_RIGHT, proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), 1);
- exp.createInfixExpression(ForExpression.CLASSINSTANCECREATION_ARGUMENT, InfixOperator.IN_CONDITIONAL_AND, 0);
- exp.createProxyExpression(ForExpression.INFIX_LEFT, epArg);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, true);
- exp.createBlockEnd();
- ExpressionNotResolved epBooleanl = new ExpressionNotResolved();
- epBoolean.addProxyListener(epBooleanl);
- exp.invokeExpression();
- assertTrue(epBooleanl.notResolvedCalled);
- }
-
- /*
- * A proxy listener class for test purposes that requires resolved but
- * won't allow not resolved or void resolution. Impliment the resolved
- * method to test for valid values.
- *
- * @since 1.1.0
- */
- protected abstract class ExpressionResolved implements ExpressionProxy.ProxyListener {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyNotResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyNotResolved(ProxyEvent event) {
- fail("Proxy must not be unresolved.");
- }
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyVoid(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyVoid(ProxyEvent event) {
- fail("Proxy must not be void assignment.");
- }
- }
-
- protected class ExpressionNotResolved implements ExpressionProxy.ProxyListener {
- public boolean notResolvedCalled = false;
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyNotResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyNotResolved(ProxyEvent event) {
- notResolvedCalled = true;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- fail("Proxy should not of been resolved. It should be unresolved.");
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyVoid(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyVoid(ProxyEvent event) {
- fail("Proxy must not be void assignment. It should be unresolved.");
- }
- };
-
- protected class ExpressionVoid implements ExpressionProxy.ProxyListener {
- public boolean voidCalled = false;
-
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyNotResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyNotResolved(ProxyEvent event) {
- fail("Proxy should of been void and not unresolved.");
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- fail("Proxy should not of been resolved, it should of been void..");
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyVoid(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyVoid(ProxyEvent event) {
- voidCalled = true;
- }
- };
-
- public void testTryCatchNoThrow() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * x = Boolean.valueOf(true);
- * } catch (RuntimeException e) {
- * y = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(true)}, true);
- ExpressionProxy runtimeCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
- xProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertTrue(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- ExpressionNotResolved yProxyResolver = new ExpressionNotResolved();
- yProxy.addProxyListener(yProxyResolver);
- ExpressionNotResolved runtimeCatchExceptionProxyResolver = new ExpressionNotResolved();
- runtimeCatchExceptionProxy.addProxyListener(runtimeCatchExceptionProxyResolver);
- exp.invokeExpression();
-
- assertTrue(yProxyResolver.notResolvedCalled);
- assertTrue(runtimeCatchExceptionProxyResolver.notResolvedCalled);
-
- }
-
- public void testTry2CatchNoThrow() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * try {
- * x = Boolean.valueOf(true);
- * } catch (RuntimeException e) {
- * y = Boolean.valueOf(false);
- * }
- * } catch (RuntimeException e) {
- * z = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(true)}, true);
- ExpressionProxy runtimeCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
- ExpressionProxy runtimeCatchExceptionProxy2 = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy zProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
-
- xProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertTrue(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- ExpressionNotResolved yProxyResolver = new ExpressionNotResolved();
- yProxy.addProxyListener(yProxyResolver);
- ExpressionNotResolved runtimeCatchExceptionProxyResolver = new ExpressionNotResolved();
- runtimeCatchExceptionProxy.addProxyListener(runtimeCatchExceptionProxyResolver);
- ExpressionNotResolved zProxyResolver = new ExpressionNotResolved();
- zProxy.addProxyListener(zProxyResolver);
- ExpressionNotResolved runtimeCatchExceptionProxyResolver2 = new ExpressionNotResolved();
- runtimeCatchExceptionProxy2.addProxyListener(runtimeCatchExceptionProxyResolver2);
-
- exp.invokeExpression();
-
- assertTrue(yProxyResolver.notResolvedCalled);
- assertTrue(runtimeCatchExceptionProxyResolver.notResolvedCalled);
- assertTrue(zProxyResolver.notResolvedCalled);
- assertTrue(runtimeCatchExceptionProxyResolver2.notResolvedCalled);
-
- }
-
- public void testTry2CatchThrowTry1() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * w = (null).booleanValue();
- * try {
- * x = Boolean.valueOf(true);
- * } catch (RuntimeException e) {
- * y = Boolean.valueOf(false);
- * }
- * } catch (RuntimeException e) {
- * z = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- ExpressionProxy wProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("booleanValue"), null, null, true);
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(true)}, true);
- ExpressionProxy runtimeCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
- ExpressionProxy runtimeCatchExceptionProxy2 = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy zProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
-
- ExpressionNotResolved wProxyResolver = new ExpressionNotResolved();
- wProxy.addProxyListener(wProxyResolver);
-
- ExpressionNotResolved xProxyResolver = new ExpressionNotResolved();
- xProxy.addProxyListener(xProxyResolver);
-
- ExpressionNotResolved yProxyResolver = new ExpressionNotResolved();
- yProxy.addProxyListener(yProxyResolver);
- ExpressionNotResolved runtimeCatchExceptionProxyResolver = new ExpressionNotResolved();
- runtimeCatchExceptionProxy.addProxyListener(runtimeCatchExceptionProxyResolver);
- zProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
- runtimeCatchExceptionProxy2.addProxyListener(new ExpressionResolved() {
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- assertEquals("java.lang.NullPointerException", event.getProxy().getTypeProxy().getTypeName());
- }
- });
-
- exp.invokeExpression();
-
- assertTrue(wProxyResolver.notResolvedCalled);
- assertTrue(xProxyResolver.notResolvedCalled);
- assertTrue(yProxyResolver.notResolvedCalled);
- assertTrue(runtimeCatchExceptionProxyResolver.notResolvedCalled);
-
- }
-
- public void testTry2CatchThrowTry2Catch() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * try {
- * x = (null).booleanValue();
- * } catch (RuntimeException e) {
- * y = Boolean.valueOf(false);
- * }
- * w = Boolean.valueOf(true);
- * } catch (RuntimeException e) {
- * z = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("booleanValue"), null, null, true);
- ExpressionProxy runtimeCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
- ExpressionProxy wProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(true)}, true);
- ExpressionProxy runtimeCatchExceptionProxy2 = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy zProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
-
- ExpressionNotResolved xProxyResolver = new ExpressionNotResolved();
- xProxy.addProxyListener(xProxyResolver);
- runtimeCatchExceptionProxy.addProxyListener(new ExpressionResolved() {
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- assertEquals("java.lang.NullPointerException", event.getProxy().getTypeProxy().getTypeName());
- }
- });
-
- yProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
- wProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertTrue(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- ExpressionNotResolved runtimeCatchExceptionProxyResolver2 = new ExpressionNotResolved();
- runtimeCatchExceptionProxy2.addProxyListener(runtimeCatchExceptionProxyResolver2);
- ExpressionNotResolved zProxyResolver = new ExpressionNotResolved();
- zProxy.addProxyListener(zProxyResolver);
-
- exp.invokeExpression();
-
- assertTrue(xProxyResolver.notResolvedCalled);
- assertTrue(runtimeCatchExceptionProxyResolver2.notResolvedCalled);
- assertTrue(zProxyResolver.notResolvedCalled);
-
- }
-
- public void testTry2CatchThrowTry2Catch1() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * try {
- * x = (null).booleanValue();
- * } catch (IllegalArgumentException e) {
- * y = Boolean.valueOf(false);
- * }
- * w = Boolean.valueOf(true);
- * } catch (RuntimeException e) {
- * z = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("booleanValue"), null, null, true);
- ExpressionProxy illegalArgumentCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.IllegalArgumentException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
- ExpressionProxy wProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(true)}, true);
- ExpressionProxy runtimeCatchExceptionProxy2 = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy zProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
-
- ExpressionNotResolved xProxyResolver = new ExpressionNotResolved();
- xProxy.addProxyListener(xProxyResolver);
- ExpressionNotResolved illegalArgumentCatchProxyResolver = new ExpressionNotResolved();
- illegalArgumentCatchExceptionProxy.addProxyListener(illegalArgumentCatchProxyResolver);
-
- ExpressionNotResolved yProxyResolver = new ExpressionNotResolved();
- yProxy.addProxyListener(yProxyResolver);
- ExpressionNotResolved wProxyResolver = new ExpressionNotResolved();
- wProxy.addProxyListener(wProxyResolver);
-
- runtimeCatchExceptionProxy2.addProxyListener(new ExpressionResolved() {
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- assertEquals("java.lang.NullPointerException", event.getProxy().getTypeProxy().getTypeName());
- }
- });
- zProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- exp.invokeExpression();
-
- assertTrue(xProxyResolver.notResolvedCalled);
- assertTrue(illegalArgumentCatchProxyResolver.notResolvedCalled);
- assertTrue(yProxyResolver.notResolvedCalled);
- assertTrue(wProxyResolver.notResolvedCalled);
-
- }
-
- public void testTry2CatchThrowTry2Finally2Catch1() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * try {
- * x = (null).booleanValue();
- * } catch (IllegalArgumentException e) {
- * y = Boolean.valueOf(false);
- * } finally {
- * v = Boolean.valueOf(false);
- * }
- * w = Boolean.valueOf(true);
- * } catch (RuntimeException e) {
- * z = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("booleanValue"), null, null, true);
- ExpressionProxy illegalArgumentCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.IllegalArgumentException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryFinallyClause();
- ExpressionProxy vProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
- ExpressionProxy wProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(true)}, true);
- ExpressionProxy runtimeCatchExceptionProxy2 = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy zProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
-
- ExpressionNotResolved xProxyResolver = new ExpressionNotResolved();
- xProxy.addProxyListener(xProxyResolver);
- ExpressionNotResolved illegalArgumentCatchProxyResolver = new ExpressionNotResolved();
- illegalArgumentCatchExceptionProxy.addProxyListener(illegalArgumentCatchProxyResolver);
-
- ExpressionNotResolved yProxyResolver = new ExpressionNotResolved();
- yProxy.addProxyListener(yProxyResolver);
- vProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- ExpressionNotResolved wProxyResolver = new ExpressionNotResolved();
- wProxy.addProxyListener(wProxyResolver);
-
- runtimeCatchExceptionProxy2.addProxyListener(new ExpressionResolved() {
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- assertEquals("java.lang.NullPointerException", event.getProxy().getTypeProxy().getTypeName());
- }
- });
- zProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- exp.invokeExpression();
-
- assertTrue(xProxyResolver.notResolvedCalled);
- assertTrue(illegalArgumentCatchProxyResolver.notResolvedCalled);
- assertTrue(yProxyResolver.notResolvedCalled);
- assertTrue(wProxyResolver.notResolvedCalled);
-
- }
-
- public void testTry2CatchThrowTry2Finally2NoCatch() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * try {
- * x = (null).booleanValue();
- * } catch (IllegalArgumentException e) {
- * y = Boolean.valueOf(false);
- * } finally {
- * v = Boolean.valueOf(false);
- * }
- * w = Boolean.valueOf(true);
- * } catch (IllegalArgumentException e) {
- * z = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("booleanValue"), null, null, true);
- ExpressionProxy illegalArgumentCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.IllegalArgumentException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryFinallyClause();
- ExpressionProxy vProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
- ExpressionProxy wProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(true)}, true);
- ExpressionProxy illegalArgumentCatchExceptionProxy2 = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.IllegalArgumentException"), true);
- ExpressionProxy zProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
-
- ExpressionNotResolved xProxyResolver = new ExpressionNotResolved();
- xProxy.addProxyListener(xProxyResolver);
- ExpressionNotResolved illegalArgumentCatchProxyResolver = new ExpressionNotResolved();
- illegalArgumentCatchExceptionProxy.addProxyListener(illegalArgumentCatchProxyResolver);
-
- ExpressionNotResolved yProxyResolver = new ExpressionNotResolved();
- yProxy.addProxyListener(yProxyResolver);
- vProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- ExpressionNotResolved wProxyResolver = new ExpressionNotResolved();
- wProxy.addProxyListener(wProxyResolver);
-
- ExpressionNotResolved illegalArgumentCatchExceptionProxyResolver2 = new ExpressionNotResolved();
- illegalArgumentCatchExceptionProxy2.addProxyListener(illegalArgumentCatchExceptionProxyResolver2);
- ExpressionNotResolved zProxyResolver = new ExpressionNotResolved();
- zProxy.addProxyListener(zProxyResolver);
-
- boolean didit = false;
- try {
- exp.invokeExpression();
- } catch (ThrowableProxy e) {
- assertEquals(proxyTypeFactory.getBeanTypeProxy("java.lang.NullPointerException"), e.getTypeProxy());
- didit = true;
- }
-
- assertTrue(didit);
- assertTrue(xProxyResolver.notResolvedCalled);
- assertTrue(illegalArgumentCatchProxyResolver.notResolvedCalled);
- assertTrue(yProxyResolver.notResolvedCalled);
- assertTrue(wProxyResolver.notResolvedCalled);
- assertTrue(illegalArgumentCatchExceptionProxyResolver2.notResolvedCalled);
- assertTrue(zProxyResolver.notResolvedCalled);
-
- }
-
- public void testTryCatchThrow() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * x = (null).booleanValue();
- * } catch (NullPointerException e) {
- * y = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("booleanValue"), null, null, true);
- ExpressionProxy nullCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
- ExpressionNotResolved xProxyResolver = new ExpressionNotResolved();
- xProxy.addProxyListener(xProxyResolver);
- yProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- nullCatchExceptionProxy.addProxyListener(new ExpressionResolved() {
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- assertEquals("java.lang.NullPointerException", event.getProxy().getTypeProxy().getTypeName());
- }
- });
- exp.invokeExpression();
- assertTrue(xProxyResolver.notResolvedCalled);
- }
-
- public void testTryCatchRethrow() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * x = (null).booleanValue();
- * } catch (NullPointerException e) {
- * y = Boolean.valueOf(false);
- * throw e; // As a rethrow.
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("booleanValue"), null, null, true);
- ExpressionProxy nullCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createRethrow();
- exp.createTryEnd();
- ExpressionNotResolved xProxyResolver = new ExpressionNotResolved();
- xProxy.addProxyListener(xProxyResolver);
- yProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- nullCatchExceptionProxy.addProxyListener(new ExpressionResolved() {
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- assertEquals("java.lang.NullPointerException", event.getProxy().getTypeProxy().getTypeName());
- }
- });
- try {
- exp.invokeExpression();
- fail("Should of thrown NPE.");
- } catch (ThrowableProxy e) {
- assertEquals("java.lang.NullPointerException", e.getTypeProxy().getTypeName());
- }
- assertTrue(xProxyResolver.notResolvedCalled);
- }
-
-
- public void testTryCatchExplicitThrow() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * x = Boolean.valueOf(true);
- * throw new NullPointerException();
- * y = Boolean.valueOf(false);
- * } catch (NullPointerException e) {
- * z = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(true)}, true);
- exp.createThrow();
- exp.createClassInstanceCreation(ForExpression.THROW_OPERAND, proxyTypeFactory.getBeanTypeProxy("java.lang.NullPointerException"), 0);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- ExpressionProxy nullCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.NullPointerException"), true);
- ExpressionProxy zProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
- xProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertTrue(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
- ExpressionNotResolved yProxyResolver = new ExpressionNotResolved();
- yProxy.addProxyListener(yProxyResolver);
-
- zProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- nullCatchExceptionProxy.addProxyListener(new ExpressionResolved() {
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- assertEquals("java.lang.NullPointerException", event.getProxy().getTypeProxy().getTypeName());
- }
- });
- exp.invokeExpression();
- assertTrue(yProxyResolver.notResolvedCalled);
- }
-
- public void testTryCatch2NoThrow() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * x = Boolean.valueOf(true);
- * } catch (IllegalArgumentException e) {
- * y = Boolean.valueOf(false);
- * } catch (RuntimeException e) {
- * z = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(true)}, true);
- ExpressionProxy illegalCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.IllegalArgumentException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- ExpressionProxy runtimeCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy zProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
- xProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertTrue(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- ExpressionNotResolved yProxyResolver = new ExpressionNotResolved();
- yProxy.addProxyListener(yProxyResolver);
- ExpressionNotResolved illegalCatchExceptionProxyResolver = new ExpressionNotResolved();
- illegalCatchExceptionProxy.addProxyListener(illegalCatchExceptionProxyResolver);
- ExpressionNotResolved runtimeCatchExceptionProxyResolver = new ExpressionNotResolved();
- runtimeCatchExceptionProxy.addProxyListener(runtimeCatchExceptionProxyResolver);
- ExpressionNotResolved zProxyResolver = new ExpressionNotResolved();
- zProxy.addProxyListener(zProxyResolver);
-
- exp.invokeExpression();
-
- assertTrue(yProxyResolver.notResolvedCalled);
- assertTrue(illegalCatchExceptionProxyResolver.notResolvedCalled);
- assertTrue(zProxyResolver.notResolvedCalled);
- assertTrue(runtimeCatchExceptionProxyResolver.notResolvedCalled);
-
- }
-
- public void testTryCatch2Throw1() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * x = (null).booleanValue();
- * } catch (NullPointerException e) {
- * y = Boolean.valueOf(false);
- * } catch (RuntimeException e) {
- * z = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("booleanValue"), null, null, true);
- ExpressionProxy nullCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.NullPointerException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- ExpressionProxy runtimeCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy zProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
- ExpressionNotResolved xProxyResolver = new ExpressionNotResolved();
- xProxy.addProxyListener(xProxyResolver);
-
- yProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
- nullCatchExceptionProxy.addProxyListener(new ExpressionResolved() {
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- assertEquals("java.lang.NullPointerException", event.getProxy().getTypeProxy().getTypeName());
- }
- });
- ExpressionNotResolved runtimeCatchExceptionProxyResolver = new ExpressionNotResolved();
- runtimeCatchExceptionProxy.addProxyListener(runtimeCatchExceptionProxyResolver);
- ExpressionNotResolved zProxyResolver = new ExpressionNotResolved();
- zProxy.addProxyListener(zProxyResolver);
-
- exp.invokeExpression();
-
- assertTrue(xProxyResolver.notResolvedCalled);
- assertTrue(zProxyResolver.notResolvedCalled);
- assertTrue(runtimeCatchExceptionProxyResolver.notResolvedCalled);
-
- }
-
- public void testTryCatch2Throw2() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * x = (null).booleanValue();
- * } catch (IllegalArgumentException e) {
- * y = Boolean.valueOf(false);
- * } catch (NullPointerException e) {
- * z = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("booleanValue"), null, null, true);
- ExpressionProxy illegalCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.IllegalArgumentException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- ExpressionProxy nullCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.NullPointerException"), true);
- ExpressionProxy zProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
- ExpressionNotResolved xProxyResolver = new ExpressionNotResolved();
- xProxy.addProxyListener(xProxyResolver);
- ExpressionNotResolved illegalCatchExceptionProxyResolver = new ExpressionNotResolved();
- illegalCatchExceptionProxy.addProxyListener(illegalCatchExceptionProxyResolver);
- ExpressionNotResolved yProxyResolver = new ExpressionNotResolved();
- yProxy.addProxyListener(yProxyResolver);
-
- zProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
- nullCatchExceptionProxy.addProxyListener(new ExpressionResolved() {
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- assertEquals("java.lang.NullPointerException", event.getProxy().getTypeProxy().getTypeName());
- }
- });
- exp.invokeExpression();
-
- assertTrue(xProxyResolver.notResolvedCalled);
- assertTrue(yProxyResolver.notResolvedCalled);
- assertTrue(illegalCatchExceptionProxyResolver.notResolvedCalled);
-
- }
-
- public void testTryCatchThrowFinally() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * x = (null).booleanValue();
- * } catch (NullPointerException e) {
- * y = Boolean.valueOf(false);
- * } finally {
- * f = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("booleanValue"), null, null, true);
- ExpressionProxy nullCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryFinallyClause();
- ExpressionProxy fProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
-
- exp.createTryEnd();
- ExpressionNotResolved xProxyResolver = new ExpressionNotResolved();
- xProxy.addProxyListener(xProxyResolver);
- yProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- nullCatchExceptionProxy.addProxyListener(new ExpressionResolved() {
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- assertEquals("java.lang.NullPointerException", event.getProxy().getTypeProxy().getTypeName());
- }
- });
-
- fProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- exp.invokeExpression();
- assertTrue(xProxyResolver.notResolvedCalled);
- }
-
- public void testTryCatch2Throw1Finally() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * x = (null).booleanValue();
- * } catch (NullPointerException e) {
- * y = Boolean.valueOf(false);
- * } catch (RuntimeException e) {
- * z = Boolean.valueOf(false);
- * } finally {
- * f = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("booleanValue"), null, null, true);
- ExpressionProxy nullCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.NullPointerException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- ExpressionProxy runtimeCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy zProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryFinallyClause();
- ExpressionProxy fProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
- ExpressionNotResolved xProxyResolver = new ExpressionNotResolved();
- xProxy.addProxyListener(xProxyResolver);
-
- yProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
- nullCatchExceptionProxy.addProxyListener(new ExpressionResolved() {
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- assertEquals("java.lang.NullPointerException", event.getProxy().getTypeProxy().getTypeName());
- }
- });
- ExpressionNotResolved runtimeCatchExceptionProxyResolver = new ExpressionNotResolved();
- runtimeCatchExceptionProxy.addProxyListener(runtimeCatchExceptionProxyResolver);
- ExpressionNotResolved zProxyResolver = new ExpressionNotResolved();
- zProxy.addProxyListener(zProxyResolver);
- fProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- exp.invokeExpression();
-
-
- assertTrue(xProxyResolver.notResolvedCalled);
- assertTrue(zProxyResolver.notResolvedCalled);
- assertTrue(runtimeCatchExceptionProxyResolver.notResolvedCalled);
-
- }
-
- public void testTryCatch2Throw2Finally() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * x = (null).booleanValue();
- * } catch (IllegalArgumentException e) {
- * y = Boolean.valueOf(false);
- * } catch (NullPointerException e) {
- * z = Boolean.valueOf(false);
- * } finally {
- * f = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("booleanValue"), null, null, true);
- ExpressionProxy illegalCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.IllegalArgumentException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- ExpressionProxy nullCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.NullPointerException"), true);
- ExpressionProxy zProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryFinallyClause();
- ExpressionProxy fProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
- ExpressionNotResolved xProxyResolver = new ExpressionNotResolved();
- xProxy.addProxyListener(xProxyResolver);
- ExpressionNotResolved illegalCatchExceptionProxyResolver = new ExpressionNotResolved();
- illegalCatchExceptionProxy.addProxyListener(illegalCatchExceptionProxyResolver);
- ExpressionNotResolved yProxyResolver = new ExpressionNotResolved();
- yProxy.addProxyListener(yProxyResolver);
-
- zProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
- nullCatchExceptionProxy.addProxyListener(new ExpressionResolved() {
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- assertEquals("java.lang.NullPointerException", event.getProxy().getTypeProxy().getTypeName());
- }
- });
-
- fProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
- exp.invokeExpression();
-
- assertTrue(xProxyResolver.notResolvedCalled);
- assertTrue(yProxyResolver.notResolvedCalled);
- assertTrue(illegalCatchExceptionProxyResolver.notResolvedCalled);
-
- }
-
-
- public void testTryCatchNoThrowFinally() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * x = Boolean.valueOf(true);
- * } catch (RuntimeException e) {
- * y = Boolean.valueOf(false);
- * } finally {
- * f = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(true)}, true);
- ExpressionProxy runtimeCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryFinallyClause();
- ExpressionProxy fProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
- xProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertTrue(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- ExpressionNotResolved yProxyResolver = new ExpressionNotResolved();
- yProxy.addProxyListener(yProxyResolver);
- ExpressionNotResolved runtimeCatchExceptionProxyResolver = new ExpressionNotResolved();
- runtimeCatchExceptionProxy.addProxyListener(runtimeCatchExceptionProxyResolver);
- fProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- exp.invokeExpression();
-
- assertTrue(yProxyResolver.notResolvedCalled);
- assertTrue(runtimeCatchExceptionProxyResolver.notResolvedCalled);
-
- }
-
- public void testTryCatch2NoThrowFinally() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- /*
- * try {
- * x = Boolean.valueOf(true);
- * } catch (IllegalArgumentException e) {
- * y = Boolean.valueOf(false);
- * } catch (RuntimeException e) {
- * z = Boolean.valueOf(false);
- * } finally {
- * f = Boolean.valueOf(false);
- * }
- */
- IExpression exp = proxyFactory.createExpression();
- exp.createTry();
- ExpressionProxy xProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(true)}, true);
- ExpressionProxy illegalCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.IllegalArgumentException"), true);
- ExpressionProxy yProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- ExpressionProxy runtimeCatchExceptionProxy = exp.createTryCatchClause(proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException"), true);
- ExpressionProxy zProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryFinallyClause();
- ExpressionProxy fProxy = exp.createSimpleMethodInvoke(proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean").getMethodProxy("valueOf", new String[] {"boolean"}), null, new IProxy[] {proxyFactory.createBeanProxyWith(false)}, true);
- exp.createTryEnd();
- xProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertTrue(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- ExpressionNotResolved yProxyResolver = new ExpressionNotResolved();
- yProxy.addProxyListener(yProxyResolver);
- ExpressionNotResolved illegalCatchExceptionProxyResolver = new ExpressionNotResolved();
- illegalCatchExceptionProxy.addProxyListener(illegalCatchExceptionProxyResolver);
- ExpressionNotResolved runtimeCatchExceptionProxyResolver = new ExpressionNotResolved();
- runtimeCatchExceptionProxy.addProxyListener(runtimeCatchExceptionProxyResolver);
- ExpressionNotResolved zProxyResolver = new ExpressionNotResolved();
- zProxy.addProxyListener(zProxyResolver);
- fProxy.addProxyListener(new ExpressionResolved() {
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyListener#proxyResolved(org.eclipse.jem.internal.proxy.core.ExpressionProxy.ProxyEvent)
- */
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy proxy = event.getProxy();
- assertEquals("Not a Boolean proxy:"+proxy.getTypeProxy().getTypeName(), proxyTypeFactory.getBeanTypeProxy("java.lang.Boolean"), proxy.getTypeProxy());
- assertFalse(((IBooleanBeanProxy) event.getProxy()).booleanValue());
- }
- });
-
- exp.invokeExpression();
-
- assertTrue(yProxyResolver.notResolvedCalled);
- assertTrue(illegalCatchExceptionProxyResolver.notResolvedCalled);
- assertTrue(zProxyResolver.notResolvedCalled);
- assertTrue(runtimeCatchExceptionProxyResolver.notResolvedCalled);
-
- }
-
-
- public void testIfElseTrueWithElse() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createIfElse(true);
- exp.createInfixExpression(ForExpression.IF_CONDITION, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- ExpressionProxy trueProxy = exp.createProxyAssignmentExpression(ForExpression.IF_TRUE);
- exp.createInfixExpression(ForExpression.ASSIGNMENT_RIGHT, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- ExpressionProxy falseProxy = exp.createProxyAssignmentExpression(ForExpression.IF_ELSE);
- exp.createInfixExpression(ForExpression.ASSIGNMENT_RIGHT, InfixOperator.IN_MINUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
-
- trueProxy.addProxyListener(new ExpressionResolved() {
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy value = event.getProxy();
- assertNotNull(value);
- assertEquals("int", value.getTypeProxy().getFormalTypeName());
- assertEquals(6, ((INumberBeanProxy) value).intValue());
- }
- });
-
- falseProxy.addProxyListener(new ExpressionNotResolved());
- exp.invokeExpression();
- }
-
- public void testIfElseFalseWithElse() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createIfElse(true);
- exp.createInfixExpression(ForExpression.IF_CONDITION, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- ExpressionProxy trueProxy = exp.createProxyAssignmentExpression(ForExpression.IF_TRUE);
- exp.createInfixExpression(ForExpression.ASSIGNMENT_RIGHT, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- ExpressionProxy falseProxy = exp.createProxyAssignmentExpression(ForExpression.IF_ELSE);
- exp.createInfixExpression(ForExpression.ASSIGNMENT_RIGHT, InfixOperator.IN_MINUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
-
- trueProxy.addProxyListener(new ExpressionNotResolved());
-
- falseProxy.addProxyListener(new ExpressionResolved() {
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy value = event.getProxy();
- assertNotNull(value);
- assertEquals("int", value.getTypeProxy().getFormalTypeName());
- assertEquals(0, ((INumberBeanProxy) value).intValue());
- }
- });
-
- exp.invokeExpression();
- }
-
- public void testIfElseTrueWithoutElse() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createIfElse(false);
- exp.createInfixExpression(ForExpression.IF_CONDITION, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- ExpressionProxy trueProxy = exp.createProxyAssignmentExpression(ForExpression.IF_TRUE);
- exp.createInfixExpression(ForExpression.ASSIGNMENT_RIGHT, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
-
- trueProxy.addProxyListener(new ExpressionResolved() {
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy value = event.getProxy();
- assertNotNull(value);
- assertEquals("int", value.getTypeProxy().getFormalTypeName());
- assertEquals(6, ((INumberBeanProxy) value).intValue());
- }
- });
-
- exp.invokeExpression();
- }
-
- public void testIfElseFalseWithoutElse() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createIfElse(false);
- exp.createInfixExpression(ForExpression.IF_CONDITION, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- ExpressionProxy trueProxy = exp.createProxyAssignmentExpression(ForExpression.IF_TRUE);
- exp.createInfixExpression(ForExpression.ASSIGNMENT_RIGHT, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
-
- trueProxy.addProxyListener(new ExpressionNotResolved());
-
- exp.invokeExpression();
- }
-
- public void testIfElseBlocksTrueWithElse() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createIfElse(true);
- exp.createInfixExpression(ForExpression.IF_CONDITION, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createBlockBegin();
- ExpressionProxy trueProxy = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createInfixExpression(ForExpression.ASSIGNMENT_RIGHT, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createBlockEnd();
- exp.createBlockBegin();
- ExpressionProxy falseProxy = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createInfixExpression(ForExpression.ASSIGNMENT_RIGHT, InfixOperator.IN_MINUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createBlockEnd();
-
- trueProxy.addProxyListener(new ExpressionResolved() {
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy value = event.getProxy();
- assertNotNull(value);
- assertEquals("int", value.getTypeProxy().getFormalTypeName());
- assertEquals(6, ((INumberBeanProxy) value).intValue());
- }
- });
-
- falseProxy.addProxyListener(new ExpressionNotResolved());
- exp.invokeExpression();
- }
-
- public void testIfElseBlocksFalseWithElse() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createIfElse(true);
- exp.createInfixExpression(ForExpression.IF_CONDITION, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createBlockBegin();
- ExpressionProxy trueProxy = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createInfixExpression(ForExpression.ASSIGNMENT_RIGHT, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createBlockEnd();
- exp.createBlockBegin();
- ExpressionProxy falseProxy = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createInfixExpression(ForExpression.ASSIGNMENT_RIGHT, InfixOperator.IN_MINUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createBlockEnd();
-
- trueProxy.addProxyListener(new ExpressionNotResolved());
-
- falseProxy.addProxyListener(new ExpressionResolved() {
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy value = event.getProxy();
- assertNotNull(value);
- assertEquals("int", value.getTypeProxy().getFormalTypeName());
- assertEquals(0, ((INumberBeanProxy) value).intValue());
- }
- });
-
- exp.invokeExpression();
- }
-
- public void testIfElseBlockTrueWithoutElse() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createIfElse(false);
- exp.createInfixExpression(ForExpression.IF_CONDITION, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createBlockBegin();
- ExpressionProxy trueProxy = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createInfixExpression(ForExpression.ASSIGNMENT_RIGHT, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createBlockEnd();
-
- trueProxy.addProxyListener(new ExpressionResolved() {
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy value = event.getProxy();
- assertNotNull(value);
- assertEquals("int", value.getTypeProxy().getFormalTypeName());
- assertEquals(6, ((INumberBeanProxy) value).intValue());
- }
- });
-
- exp.invokeExpression();
- }
-
- public void testIfElseBlockFalseWithoutElse() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createIfElse(false);
- exp.createInfixExpression(ForExpression.IF_CONDITION, InfixOperator.IN_EQUALS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 4);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createBlockBegin();
- ExpressionProxy trueProxy = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createInfixExpression(ForExpression.ASSIGNMENT_RIGHT, InfixOperator.IN_PLUS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, (byte) 3);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, (short) 3);
- exp.createBlockEnd();
-
- trueProxy.addProxyListener(new ExpressionNotResolved());
-
- exp.invokeExpression();
- }
-
- public void testNewInitStringPrimitive() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- // Use internal expression class so we can test the special method.
- Expression exp = (Expression) proxyFactory.createExpression();
- ExpressionProxy result = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createNewInstance(ForExpression.ASSIGNMENT_RIGHT, "false", proxyTypeFactory.getBeanTypeProxy("boolean"));
- result.addProxyListener(new ExpressionResolved(){
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy value = event.getProxy();
- assertNotNull(value);
- assertEquals("boolean", value.getTypeProxy().getFormalTypeName());
- assertEquals(false, ((IBooleanBeanProxy) value).booleanValue());
- }
-
- });
-
- exp.invokeExpression();
- }
-
- public void testMark() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- // Just test having a mark and no errors.
- Expression exp = (Expression) proxyFactory.createExpression();
- int mark = exp.mark();
- try {
- ExpressionProxy result = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createNewInstance(ForExpression.ASSIGNMENT_RIGHT, "false", proxyTypeFactory.getBeanTypeProxy("boolean"));
- result.addProxyListener(new ExpressionResolved(){
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy value = event.getProxy();
- assertNotNull(value);
- assertEquals("boolean", value.getTypeProxy().getFormalTypeName());
- assertEquals(false, ((IBooleanBeanProxy) value).booleanValue());
- }
-
- });
- } finally {
- exp.endMark(mark);
- }
- exp.invokeExpression();
-
- }
-
- public void testMark2() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- // Just test having a mark errors, but expressions before the mark and after the mark are successful.
- Expression exp = (Expression) proxyFactory.createExpression();
- int mark0 = exp.mark();
- final boolean[] resultResolved = new boolean[1];
- ExpressionNotResolved ep1 = null;
- final boolean[] resultResolved2 = new boolean[1];
- try {
- ExpressionProxy result = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- result.addProxyListener(new ExpressionResolved() {
-
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy value = event.getProxy();
- assertNotNull(value);
- assertEquals("boolean", value.getTypeProxy().getFormalTypeName());
- assertEquals(false, ((IBooleanBeanProxy) value).booleanValue());
- resultResolved[0] = true;
- }
-
- });
- exp.createNewInstance(ForExpression.ASSIGNMENT_RIGHT, "false", proxyTypeFactory.getBeanTypeProxy("boolean"));
- exp.createTry();
- int mark = exp.mark();
- try {
- ExpressionProxy result1 = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- result1.addProxyListener(ep1 = new ExpressionNotResolved());
- exp.createNewInstance(ForExpression.ASSIGNMENT_LEFT, "false", proxyTypeFactory.getBeanTypeProxy("boolean"));
- } catch (IllegalStateException e) {
- // This is ok, should of got this.
- } finally {
- exp.endMark(mark);
- }
- exp.createTryEnd();
- ExpressionProxy result2 = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- result2.addProxyListener(new ExpressionResolved() {
-
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy value = event.getProxy();
- assertNotNull(value);
- assertEquals("boolean", value.getTypeProxy().getFormalTypeName());
- assertEquals(false, ((IBooleanBeanProxy) value).booleanValue());
- resultResolved2[0] = true;
- }
-
- });
- exp.createNewInstance(ForExpression.ASSIGNMENT_RIGHT, "false", proxyTypeFactory.getBeanTypeProxy("boolean"));
- } finally {
- exp.endMark(mark0);
- }
-
- exp.invokeExpression();
-
- assertNotNull(ep1);
- assertTrue(ep1.notResolvedCalled);
- assertTrue(resultResolved[0]);
- assertTrue(resultResolved2[0]);
-
- }
-
-
- public void testMarkError() throws IllegalStateException, ThrowableProxy, NoExpressionValueException {
- // Test with one error and see if it restores correctly.
- Expression exp = (Expression) proxyFactory.createExpression();
- int mark = exp.mark();
- ExpressionNotResolved epl = null;
- try {
- ExpressionProxy result = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- result.addProxyListener(epl = new ExpressionNotResolved());
- exp.createNewInstance(ForExpression.ASSIGNMENT_LEFT, "false", proxyTypeFactory.getBeanTypeProxy("boolean"));
- } catch (IllegalStateException e) {
- // This is good. We should get here.
- } finally {
- exp.endMark(mark);
- }
-
- // Now we should be able to continue and get good answer.
- ExpressionProxy result = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createNewInstance(ForExpression.ASSIGNMENT_RIGHT, "false", proxyTypeFactory.getBeanTypeProxy("boolean"));
- result.addProxyListener(new ExpressionResolved(){
- public void proxyResolved(ProxyEvent event) {
- IBeanProxy value = event.getProxy();
- assertNotNull(value);
- assertEquals("boolean", value.getTypeProxy().getFormalTypeName());
- assertEquals(false, ((IBooleanBeanProxy) value).booleanValue());
- }
-
- });
-
- exp.invokeExpression();
- assertNotNull(epl);
- assertTrue(epl.notResolvedCalled);
- }
-
- public void testMarkNestError() {
- // Test mark nest error.
- // mark
- // try {
- // endmark
- // } finally <-- this should cause an exception.
- Expression exp = (Expression) proxyFactory.createExpression();
- int mark = exp.mark();
- ExpressionNotResolved epl = null;
- try {
- exp.createTry();
- ExpressionProxy result = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- result.addProxyListener(epl = new ExpressionNotResolved());
- exp.createNewInstance(ForExpression.ASSIGNMENT_RIGHT, "false", proxyTypeFactory.getBeanTypeProxy("boolean"));
- exp.endMark(mark);
- exp.createTryFinallyClause();
- exp.createTryEnd();
- } catch (IllegalStateException e) {
- // This is good. We should get here.
- exp.close();
- assertNotNull(epl);
- assertTrue(epl.notResolvedCalled);
- return;
- }
-
- exp.close();
- fail("Should not of gotten here.");
- }
-
- public void testMarkNestError2() {
- // Test mark nest error.
- // try {
- // mark
- // } finally <-- this should cause an exception.
- // endmark
- Expression exp = (Expression) proxyFactory.createExpression();
- ExpressionNotResolved epl = null;
- try {
- exp.createTry();
- int mark = exp.mark();
- ExpressionProxy result = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- result.addProxyListener(epl = new ExpressionNotResolved());
- exp.createNewInstance(ForExpression.ASSIGNMENT_RIGHT, "false", proxyTypeFactory.getBeanTypeProxy("boolean"));
- exp.createTryFinallyClause();
- exp.createTryEnd();
- exp.endMark(mark);
- } catch (IllegalStateException e) {
- // This is good. We should get here.
- exp.close();
- assertNotNull(epl);
- assertTrue(epl.notResolvedCalled);
- return;
- }
-
- exp.close();
- fail("Should not of gotten here.");
- }
-
- public void testExpressionTransfer() throws Throwable {
- // Test that thread transfer works. We will do part of the expression in one thread, more in the next, and
- // then come back and complete it.
- IExpression exp = proxyFactory.createExpression();
- ExpressionProxy epInfix = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createInfixExpression(ForExpression.ASSIGNMENT_RIGHT, InfixOperator.IN_LESS, 0);
- exp.createPrimitiveLiteral(ForExpression.INFIX_LEFT, -10000000);
- exp.createPrimitiveLiteral(ForExpression.INFIX_RIGHT, 3);
-
- // Now transfer to another thread.
- Expression expression = (Expression) exp;
- expression.beginTransferThread(); // Begin the transfer.
-
- IBeanTypeProxy callbackType = proxyTypeFactory.getBeanTypeProxy("org.eclipse.jem.tests.proxy.vm.TestExpressionThreadTransfer"); //$NON-NLS-1$
- assertNotNull(callbackType);
- IBeanProxy callbackProxy = callbackType.newInstance();
-
- ExpressionThreadTransferCallBack cb = new ExpressionThreadTransferCallBack(expression);
- registry.getCallbackRegistry().registerCallback(callbackProxy, cb);
- IInvokable start = callbackType.getInvokable("start"); //$NON-NLS-1$
- start.invokeCatchThrowableExceptions(callbackProxy); // Start the thread on the remote vm and wait for it to finish.
-
- epInfix.addProxyListener(new ExpressionResolved() {
- public void proxyResolved(ExpressionProxy.ProxyEvent event) {
- IBeanProxy result = event.getProxy();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(-10000000<3, ((IBooleanBeanProxy) result).booleanValue());
- }
- });
-
- if (cb.error != null) {
- throw cb.error;
- }
-
- cb.ep.addProxyListener(new ExpressionResolved(){
- public void proxyResolved(ExpressionProxy.ProxyEvent event) {
- IBeanProxy result = event.getProxy();
- assertNotNull(result);
- assertEquals("boolean", result.getTypeProxy().getTypeName());
- assertEquals(String.class == String.class, ((IBooleanBeanProxy) result).booleanValue());
- }
- });
-
- expression.transferThread();
- exp.invokeExpression();
- }
-
- public void testSubexpression() throws IllegalStateException, IllegalArgumentException, ThrowableProxy, NoExpressionValueException {
- IExpression exp = proxyFactory.createExpression();
- exp.createArrayCreation(ForExpression.ROOTEXPRESSION, "int[][][]", 2);
- exp.createPrimitiveLiteral(ForExpression.ARRAYCREATION_DIMENSION, 2);
- ExpressionProxy secondDimensionProxy = null;
- // This tests that we can put an expression right in the middle of another expression and
- // pick it where it left off.
- exp.createSubexpression();
- exp.createTry();
- secondDimensionProxy = exp.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- exp.createPrimitiveLiteral(ForExpression.ASSIGNMENT_RIGHT, 4);
- exp.createTryEnd();
- exp.createSubexpressionEnd();
- exp.createProxyExpression(ForExpression.ARRAYCREATION_DIMENSION, secondDimensionProxy);
- IBeanProxy result = exp.getExpressionValue();
- assertNotNull(result);
- assertEquals("int[][][]", result.getTypeProxy().getFormalTypeName());
- assertEquals(2, ((IArrayBeanProxy) result).getLength());
- assertEquals(4, ((IArrayBeanProxy)((IArrayBeanProxy) result).get(0)).getLength());
- assertNull(((IArrayBeanProxy)((IArrayBeanProxy) result).get(0)).get(0));
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ExpressionThreadTransferCallBack.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ExpressionThreadTransferCallBack.java
deleted file mode 100644
index 661048be..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ExpressionThreadTransferCallBack.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.jem.tests.proxy;
-/*
- * $RCSfile: ExpressionThreadTransferCallBack.java,v $
- * $Revision: 1.2 $ $Date: 2005/08/24 20:58:54 $
- */
-
-import java.io.InputStream;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.initParser.tree.ForExpression;
-import org.eclipse.jem.internal.proxy.initParser.tree.InfixOperator;
-/**
- * This is the callback for the expression test thread transfer. This runs on the IDE side.
- */
-public class ExpressionThreadTransferCallBack implements ICallback {
-
- Expression expression;
- public Throwable error;
- public ExpressionProxy ep;
-
- public ExpressionThreadTransferCallBack(Expression expression) {
- this.expression = expression;
- }
-
- public Object calledBack(int msgID, IBeanProxy parm){
- return null;
- }
-
- public Object calledBack(int msgID, Object parm) {
- try {
- expression.transferThread();
- // The test here is for equality.
-
- ep = expression.createProxyAssignmentExpression(ForExpression.ROOTEXPRESSION);
- expression.createInfixExpression(ForExpression.ASSIGNMENT_RIGHT, InfixOperator.IN_EQUALS, 0);
- expression.createTypeLiteral(ForExpression.INFIX_LEFT, "java.lang.String");
- expression.createTypeLiteral(ForExpression.INFIX_RIGHT, "java.lang.String");
-
-
- } catch (RuntimeException e) {
- error = e;
- } finally {
- if (expression.isValid())
- try {
- expression.beginTransferThread(); // Set to return expression to other thread.
- } catch (IllegalStateException e) {
- error = e;
- } catch (ThrowableProxy e) {
- error = e;
- }
- }
- return null;
- }
-
- public Object calledBack(int msgID, Object[] parms){
- return null;
- }
-
- public void calledBackStream(int msgID, InputStream in){
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ProxySuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ProxySuite.java
deleted file mode 100644
index 1c13dd23..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ProxySuite.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy;
-/*
- * $RCSfile: ProxySuite.java,v $
- * $Revision: 1.9 $ $Date: 2005/08/24 20:58:54 $
- */
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.tests.JavaTestsPlugin;
-
-/**
- * @author richkulp
- *
- * This suite is for testing straight Proxy independent of the type of proxy (e.g. Remote or IDE).
- * It can't run by itself. It needs to have the registry creater object stored in it so that
- * the appropriate registry can be created and recreated as necessary by the test.
- *
- * If the tests inherit from AbstractTestProxy the setRegistryHandler will be called on it.
- */
-public class ProxySuite extends TestSuite {
-
-
- // Test cases to be include in the suite
- private static Class testsList[] = {
- TestStandard.class,
- TestAWTProxy.class,
- ExpressionTest.class,
- } ;
-
- public static String pkgName = "org.eclipse.jem.tests.proxy" ;
-
- /**
- * Constructor for PackageSuite.
- */
- public ProxySuite() {
- super();
- populateSuite();
- }
-
- /**
- * Constructor for PackageSuite.
- * @param theClass
- */
- public ProxySuite(Class theClass) {
- super(theClass);
- populateSuite();
- }
-
- /**
- * Constructor for PackageSuite.
- * @param name
- */
- public ProxySuite(String name) {
- super(name);
- populateSuite() ;
- }
-
- private void populateSuite () {
- for (int i=0; i<testsList.length; i++)
- addTestSuite(testsList[i]) ;
- }
-
- /**
- * Return a contributor to be used when starting tests so that ProxySuite can contribute to it.
- * @return A contributor for Proxy Suite tests
- */
- public static IConfigurationContributor getProxySuiteContributor() {
- return new ConfigurationContributorAdapter() {
- public void contributeClasspaths(IConfigurationContributionController controller) throws CoreException {
- controller.contributeClasspath(JavaTestsPlugin.getPlugin().getBundle(), "vm/tests.jar", IConfigurationContributionController.APPEND_USER_CLASSPATH, false);
- }
- };
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/TestAWTProxy.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/TestAWTProxy.java
deleted file mode 100644
index e0c18b82..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/TestAWTProxy.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy;
-/*
- * $RCSfile: TestAWTProxy.java,v $
- * $Revision: 1.5 $ $Date: 2005/08/24 20:58:54 $
- */
-import org.eclipse.jem.internal.proxy.awt.IStandardAwtBeanProxyFactory;
-import org.eclipse.jem.internal.proxy.awt.JavaStandardAwtBeanConstants;
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * @author richkulp
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class TestAWTProxy extends AbstractTestProxy {
-
- public TestAWTProxy() {
- super();
- }
-
- public TestAWTProxy(String name) {
- super(name);
- }
-
- private JavaStandardAwtBeanConstants constants; // If this is null then don't do tests.
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
-
- constants = JavaStandardAwtBeanConstants.getConstants(registry);
- assertNotNull(constants);
- if (!constants.isAWTAvailable()) {
- // this is not an error. It just means we don't anything. This is signified by constants being null.
- constants = null;
- }
- }
-
- public void testAWTColor() throws ClassCastException, ThrowableProxy, InstantiationException {
- if (constants == null)
- return; // No AWT, so test isn't done, but still considered good.
-
- // AWT Color tests
- IBeanTypeProxy colorType = proxyTypeFactory.getBeanTypeProxy("java.awt.Color"); //$NON-NLS-1$
- assertNotNull(colorType);
- IBeanProxy colorProxy = colorType.newInstance("java.awt.Color.cyan"); //$NON-NLS-1$
- assertNotNull(colorProxy);
- assertEquals("java.awt.Color[r=0,g=255,b=255]", colorProxy.toBeanString());
- }
-
- public void testAWTProxyFactory() {
- if (constants == null)
- return; // No AWT, so test isn't done, but still considered good.
-
- IStandardAwtBeanProxyFactory awtProxyFactory = (IStandardAwtBeanProxyFactory) registry.getBeanProxyFactoryExtension(IStandardAwtBeanProxyFactory.REGISTRY_KEY);
- assertNotNull(awtProxyFactory);
-
- // Test the creation through the helpers, plus test special methods
- IDimensionBeanProxy dimBean = awtProxyFactory.createDimensionBeanProxyWith(5,6);
- assertNotNull(dimBean);
- assertEquals("java.awt.Dimension[width=5,height=6]", dimBean.toBeanString()); //$NON-NLS-1$
- assertEquals(5, dimBean.getWidth());
- assertEquals(6, dimBean.getHeight());
-
- IPointBeanProxy pointBean = awtProxyFactory.createPointBeanProxyWith(5,6);
- assertNotNull(pointBean);
- assertEquals("java.awt.Point[x=5,y=6]", pointBean.toBeanString()); //$NON-NLS-1$
- assertEquals(5, pointBean.getX());
- assertEquals(6, pointBean.getY());
-
- IRectangleBeanProxy rectBean = awtProxyFactory.createBeanProxyWith(5,6,7,8);
- assertNotNull(rectBean);
- assertEquals("java.awt.Rectangle[x=5,y=6,width=7,height=8]", rectBean.toBeanString()); //$NON-NLS-1$
- assertEquals(5, rectBean.getX());
- assertEquals(6, rectBean.getY());
- assertEquals(7, rectBean.getWidth());
- assertEquals(8, rectBean.getHeight());
- }
-
- public void testAWTSpecialsInitString() throws ClassCastException, ThrowableProxy, InstantiationException {
- if (constants == null)
- return; // No AWT, so test isn't done, but still considered good.
-
-
- // Test the creation through init strings
- IBeanTypeProxy dimType = proxyTypeFactory.getBeanTypeProxy("java.awt.Dimension"); //$NON-NLS-1$
- assertNotNull(dimType);
- IDimensionBeanProxy dimBean = (IDimensionBeanProxy) dimType.newInstance("new java.awt.Dimension(7,8)"); //$NON-NLS-1$
- assertNotNull(dimBean);
- assertEquals("java.awt.Dimension[width=7,height=8]", dimBean.toBeanString()); //$NON-NLS-1$
-
- IBeanTypeProxy pointType = proxyTypeFactory.getBeanTypeProxy("java.awt.Point"); //$NON-NLS-1$
- IPointBeanProxy pointBean = (IPointBeanProxy) pointType.newInstance("new java.awt.Point(5,6)"); //$NON-NLS-1$
- assertNotNull(pointBean);
- assertEquals("java.awt.Point[x=5,y=6]", pointBean.toBeanString()); //$NON-NLS-1$
-
- IBeanTypeProxy rectType = proxyTypeFactory.getBeanTypeProxy("java.awt.Rectangle"); //$NON-NLS-1$
- IRectangleBeanProxy rectBean = (IRectangleBeanProxy) rectType.newInstance("new java.awt.Rectangle(5,6,7,8)"); //$NON-NLS-1$
- assertNotNull(rectBean);
- assertEquals("java.awt.Rectangle[x=5,y=6,width=7,height=8]", rectBean.toBeanString()); //$NON-NLS-1$
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/TestCallback.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/TestCallback.java
deleted file mode 100644
index d79334a0..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/TestCallback.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.jem.tests.proxy;
-/*
- * $RCSfile: TestCallback.java,v $
- * $Revision: 1.5 $ $Date: 2005/08/24 20:58:54 $
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-import java.io.InputStream;
-
-import junit.framework.TestCase;
-/**
- * This is the callback for the test case. This runs on the IDE side.
- */
-public class TestCallback implements ICallback {
-
- Object tester;
- ProxyFactoryRegistry registry;
-
- int counter = 0;
-
- /**
- * This will do assert tests to make sure test completed correctly.
- */
- public void testCompleted() {
- if (badParmType != null)
- TestCase.assertEquals(IIntegerBeanProxy.class, badParmType);
- if (badParmValue != 0)
- TestCase.assertEquals(goodParmValue, badParmValue);
- if (badMsg != null)
- TestCase.fail(badMsg);
- TestCase.assertEquals(2, counter);
- }
-
- private boolean stoppedTest;
- private Class badParmType = null;
- private int badParmValue, goodParmValue;
- private String badMsg;
-
- // Normally the callback doesn't determine when to stop
- // the callback proxy. But for this test it does.
- public TestCallback(Object t, ProxyFactoryRegistry registry) {
- tester = t;
- this.registry = registry;
- }
-
- public Object calledBack(int msgID, IBeanProxy parm){
- synchronized(tester) {
- if (stoppedTest)
- return null; // We've already stopped, don't do anymore.
- }
-
- if (msgID != 0) {
- badMsg = "Msgid " + msgID + " is incorrect. It should be zero.";
- stopTest();
- } else if (parm instanceof IIntegerBeanProxy) {
- int pv = ((IIntegerBeanProxy) parm).intValue();
- if (++counter != pv) {
- badParmValue = pv;
- goodParmValue = counter;
- stopTest();
- return null;
- }
- if (counter == 2) {
- stopTest();
- }
- } else {
- // Bad parm type.
- badParmType = parm.getClass();
- stopTest();
- }
- return null;
- }
-
- public Object calledBack(int msgID, Object parm) {
- if (msgID != 1) {
- badMsg = "Msgid " + msgID + " is incorrect. It should be one.";
- stopTest();
- } else if (parm instanceof Integer){
- // We are going to use the registry to see what thread id is running when we call into it.
- IMethodProxy currentThreadMethod = registry.getMethodProxyFactory().getMethodProxy("java.lang.Thread", "currentThread", null);
- IBeanProxy thread = currentThreadMethod.invokeCatchThrowableExceptions(null);
- IMethodProxy hashcodeMethod = registry.getMethodProxyFactory().getMethodProxy("java.lang.Object", "hashCode", null);
- IBeanProxy threadID = hashcodeMethod.invokeCatchThrowableExceptions(thread);
- if (threadID instanceof INumberBeanProxy) {
- if (!parm.equals(((INumberBeanProxy) threadID).numberValue())) {
- badMsg = "ThreadID returned from call not match parm sent it. Means callback not on same thread.";
- stopTest();
- }
- } else {
- badMsg = "ThreadID returned from call is not valid.";
- stopTest();
- }
- } else {
- badMsg = "Parm is invalid for calledBack with Object";
- stopTest();
- }
- return null;
- }
-
- public Object calledBack(int msgID, Object[] parms){
- badMsg = "Failed Callback Test. Shouldn't have gotton to multi-parms"; //$NON-NLS-1$
- stopTest();
- return null;
- }
-
- public void calledBackStream(int msgID, InputStream in){
- badMsg = "Failed Callback Test. Shouldn't have gotton to input stream"; //$NON-NLS-1$
- stopTest();
- }
-
- void stopTest() {
- synchronized(tester) {
- stoppedTest = true;
- tester.notify();
- }
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/TestCallbackStream.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/TestCallbackStream.java
deleted file mode 100644
index 0cdc2743..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/TestCallbackStream.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.jem.tests.proxy;
-/*
- * $RCSfile: TestCallbackStream.java,v $
- * $Revision: 1.5 $ $Date: 2005/08/24 20:58:54 $
- */
-
-import org.eclipse.jem.internal.proxy.core.*;
-import java.io.InputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-/**
- * This is the callback for the test case of the stream. This runs on the IDE side.
- */
-public class TestCallbackStream implements ICallback {
-
- Object tester; // Notified when the test is finished.
-
- private boolean testStopped;
- private String badMsg;
- private IOException exp;
- private boolean testSuccesful;
-
- public TestCallbackStream(Object o) {
- tester = o;
- }
-
- public void testComplete() throws IOException {
- if (badMsg != null)
- TestCase.fail(badMsg);
- if (exp != null)
- throw exp;
- TestCase.assertTrue(testSuccesful);
- }
-
- public Object calledBack(int msgID, Object parm){
- badMsg = "Failed Callback Test. Shouldn't have gotton to object parm"; //$NON-NLS-1$
- stopTest();
- return null;
- }
- public Object calledBack(int msgID, IBeanProxy parm){
- badMsg = "Failed Callback Test. Shouldn't have gotton to parm"; //$NON-NLS-1$
- stopTest();
- return null;
- }
- public Object calledBack(int msgID, Object[] parms){
- badMsg = "Failed Callback Test. Shouldn't have gotton to multi-parms"; //$NON-NLS-1$
- stopTest();
- return null;
- }
- public void calledBackStream(int msgID, InputStream in){
- // Read from the stream for 30000 bytes. Verify that
- // we get an incrementing stream, i.e. 0, 1, ..., 127, -127, ...
-
- synchronized (tester) {
- if (testStopped)
- return;
- }
- for (int i=0; i<30000; i++) {
- try {
- int next = in.read();
- if (next == -1) {
- badMsg = "Failed Callback Stream test. Stream ended too soon. On counter="+String.valueOf(i); //$NON-NLS-1$
- stopTest();
- return;
- }
-
- if (((byte) next) != ((byte) i)) {
- badMsg = "Failed Callback Stream test. Did not get correct next byte at:" + i; //$NON-NLS-1$
- stopTest();
- return;
- }
- } catch (IOException e) {
- exp = e;
- stopTest();
- return;
- }
- }
-
- try {
- if (in.read() != -1) {
- badMsg = "Failed Callback Stream test. Too much data sent."; //$NON-NLS-1$
- stopTest();
- return;
- }
- } catch (IOException e) {
- exp = e;
- }
-
- testSuccesful = true;
- stopTest();
- }
-
- void stopTest() {
- synchronized(tester) {
- testStopped = true;
- tester.notify();
- }
- }
-
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/TestStandard.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/TestStandard.java
deleted file mode 100644
index 62870257..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/TestStandard.java
+++ /dev/null
@@ -1,796 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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.jem.tests.proxy;
-import java.io.IOException;
-
-import org.eclipse.jem.internal.proxy.common.AmbiguousMethodException;
-import org.eclipse.jem.internal.proxy.core.*;
-
-/**
- * @author richkulp
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public class TestStandard extends AbstractTestProxy {
-
- /**
- *
- */
- public TestStandard() {
- super();
- }
-
- /**
- * @param name
- */
- public TestStandard(String name) {
- super(name);
- }
-
- public void testObject() {
- IBeanTypeProxy objectType = proxyTypeFactory.getBeanTypeProxy("java.lang.Object"); //$NON-NLS-1$
- assertNotNull(objectType);
- assertFalse(objectType.isArray());
- assertEquals("java.lang.Object", objectType.getTypeName());
- }
-
- public void testTypeOf() {
- IBeanTypeProxy objectType = proxyTypeFactory.getBeanTypeProxy("java.lang.Object"); //$NON-NLS-1$
- IBeanTypeProxy integerType = proxyTypeFactory.getBeanTypeProxy("java.lang.Integer"); //$NON-NLS-1$
- assertNotNull(integerType);
- assertEquals("java.lang.Integer", integerType.getTypeName());
- assertTrue(integerType.isKindOf(objectType));
- }
-
- public void testMethodInvoke() throws ThrowableProxy {
- IBeanTypeProxy integerType = proxyTypeFactory.getBeanTypeProxy("java.lang.Integer"); //$NON-NLS-1$
- IMethodProxy mthd = integerType.getMethodProxy("valueOf", "java.lang.String"); //$NON-NLS-1$ //$NON-NLS-2$
- assertNotNull(mthd);
- // See if we can invoke methods.
- IIntegerBeanProxy anInt = (IIntegerBeanProxy) mthd.invoke(null, proxyFactory.createBeanProxyWith("5")); //$NON-NLS-1$
- assertNotNull(anInt);
- assertEquals(5, anInt.intValue());
- // See if invoke with bad type throws the ExceptionProxy.
- try {
- mthd.invoke(null, proxyFactory.createBeanProxyWith(5));
- fail("Exception not thrown like it should of been.");
- } catch (ThrowableProxy e) {
- // We should of gotton the exception. See if it is of the correct type.
- assertEquals("java.lang.IllegalArgumentException", e.getTypeProxy().getTypeName()); //$NON-NLS-1$
- }
- }
-
- public void testInvoke() throws ThrowableProxy {
- // Technically invokables should be used for one-shot usage, but here to test the invoke correctly
- // it will be used twice. This is not an error, just overhead.
- IBeanTypeProxy integerType = proxyTypeFactory.getBeanTypeProxy("java.lang.Integer"); //$NON-NLS-1$
- IInvokable invokable = integerType.getInvokable("valueOf", "java.lang.String"); //$NON-NLS-1$ //$NON-NLS-2$
- assertNotNull(invokable);
- // See if we can invoke methods.
- IIntegerBeanProxy anInt = (IIntegerBeanProxy) invokable.invoke(null, proxyFactory.createBeanProxyWith("5")); //$NON-NLS-1$
- assertNotNull(anInt);
- assertEquals(5, anInt.intValue());
- // See if invoke with bad type throws the ExceptionProxy.
- try {
- invokable.invoke(null, proxyFactory.createBeanProxyWith(5));
- fail("Exception not thrown like it should of been.");
- } catch (ThrowableProxy e) {
- // We should of gotton the exception. See if it is of the correct type.
- assertEquals("java.lang.IllegalArgumentException", e.getTypeProxy().getTypeName()); //$NON-NLS-1$
- }
- }
-
- public void testSimpleInitString() throws ThrowableProxy, InstantiationException {
- IBeanTypeProxy integerType = proxyTypeFactory.getBeanTypeProxy("java.lang.Integer"); //$NON-NLS-1$
- // See if we can create it from an initialization string.
- IIntegerBeanProxy anInt = (IIntegerBeanProxy) integerType.newInstance("new java.lang.Integer(6)"); //$NON-NLS-1$
- assertNotNull(anInt);
- assertEquals(6, anInt.intValue());
-
- // See if string initialization works.
- IStringBeanProxy aString = (IStringBeanProxy) proxyTypeFactory.getBeanTypeProxy("java.lang.String").newInstance("\"abcd\""); //$NON-NLS-1$ //$NON-NLS-2$
- assertNotNull(aString);
- assertEquals("abcd", aString.stringValue()); //$NON-NLS-1$
- }
-
- public void testGetConstructors() {
- IBeanTypeProxy stringType = proxyTypeFactory.getBeanTypeProxy("java.lang.String"); //$NON-NLS-1$
-
- // Get all constructors.
- IConstructorProxy[] ctors = stringType.getConstructors();
- assertNotNull(ctors);
- int expectedCtors = 11;
- if (System.getProperty("java.version","").startsWith("1.5")) {
- expectedCtors = 13;
- } else if (System.getProperty("java.version","").startsWith("1.6")) {
- expectedCtors = 15;
- }
- assertEquals(expectedCtors, ctors.length);
- }
-
- public void testGetDeclaredConstructors() {
- IBeanTypeProxy testAccessType = proxyTypeFactory.getBeanTypeProxy("testPackage.TestAccess"); //$NON-NLS-1$
-
- // Get all constructors.
- IConstructorProxy[] ctors = testAccessType.getDeclaredConstructors();
- assertNotNull(ctors);
- assertEquals(4, ctors.length);
- }
-
- public void testSimpleConstructor() throws ThrowableProxy {
- IBeanTypeProxy integerType = proxyTypeFactory.getBeanTypeProxy("java.lang.Integer"); //$NON-NLS-1$
-
- // See if we can create it from a constructor.
- IConstructorProxy ctor = integerType.getConstructorProxy(new String[] {"java.lang.String"}); //$NON-NLS-1$
- assertNotNull(ctor);
- IIntegerBeanProxy anInt = (IIntegerBeanProxy) ctor.newInstance(new IBeanProxy[] {proxyFactory.createBeanProxyWith("0")}); //$NON-NLS-1$
- assertEquals(0, anInt.intValue());
-
- // Zero is cached, let's see if that is what we got above.
- IIntegerBeanProxy aZero = proxyFactory.createBeanProxyWith(new Integer(0));
- assertSame(anInt, aZero);
- }
-
- public void testSimpleDeclaredConstructor() throws ThrowableProxy {
- IBeanTypeProxy testAccessType = proxyTypeFactory.getBeanTypeProxy("testPackage.TestAccess"); //$NON-NLS-1$
-
- // See if we can get a private constructor.
- IConstructorProxy ctor = testAccessType.getDeclaredConstructorProxy(new String[] {"java.lang.RuntimeException"}); //$NON-NLS-1$
- assertNotNull(ctor);
- }
-
- public void testPrimitiveReturn() throws ThrowableProxy {
- IBeanTypeProxy integerType = proxyTypeFactory.getBeanTypeProxy("java.lang.Integer"); //$NON-NLS-1$
-
- // See that we get a primitive back when the method return type is a primitive.
- IMethodProxy mthdPrim = integerType.getMethodProxy("intValue"); //$NON-NLS-1$
- IIntegerBeanProxy anInt = (IIntegerBeanProxy) mthdPrim.invoke(proxyFactory.createBeanProxyWith(5));
- assertEquals("int", anInt.getTypeProxy().getTypeName()); //$NON-NLS-1$
- assertEquals(5, anInt.intValue());
-
- // See that we get a primitive back when the field is a primitive.
- IFieldProxy fieldPrim = integerType.getFieldProxy("MIN_VALUE"); //$NON-NLS-1$
- anInt = (IIntegerBeanProxy) fieldPrim.get(null);
- assertEquals("int", anInt.getTypeProxy().getTypeName()); //$NON-NLS-1$
- assertEquals(Integer.MIN_VALUE, anInt.intValue());
- }
-
- public void testPrimitiveArrayType() {
- // Test Primitive arrays.
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("[I"); //$NON-NLS-1$
- assertNotNull(arrayType);
- assertTrue(arrayType.isArray());
- assertEquals("[I", arrayType.getTypeName()); //$NON-NLS-1$
- assertEquals(proxyTypeFactory.getBeanTypeProxy("int"), arrayType.getComponentType()); //$NON-NLS-1$
- }
-
- public void testObjectArrayType() {
- // Test simple object type array
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("[Ljava.lang.Integer;"); //$NON-NLS-1$
- assertNotNull(arrayType);
- assertTrue(arrayType.isArray());
- assertEquals("[Ljava.lang.Integer;", arrayType.getTypeName()); //$NON-NLS-1$
- assertEquals(proxyTypeFactory.getBeanTypeProxy("java.lang.Integer"), arrayType.getComponentType()); //$NON-NLS-1$
- }
-
- public void testPrimitive2DArrayType() {
- // Test two dimension primitive array
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("[[I"); //$NON-NLS-1$
- assertNotNull(arrayType);
- assertTrue(arrayType.isArray());
- assertEquals("[[I", arrayType.getTypeName()); //$NON-NLS-1$
- assertEquals(proxyTypeFactory.getBeanTypeProxy("[I"), arrayType.getComponentType()); //$NON-NLS-1$
-
- // Test construction using accessor.
- arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("int", 2); //$NON-NLS-1$
- assertNotNull(arrayType);
- assertTrue(arrayType.isArray());
- assertEquals("[[I", arrayType.getTypeName()); //$NON-NLS-1$
- }
-
- public void testObject2DArrayType() {
- // Test two dimension object type array
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("[[Ljava.lang.Integer;"); //$NON-NLS-1$
- assertNotNull(arrayType);
- assertTrue(arrayType.isArray());
- assertEquals("[[Ljava.lang.Integer;", arrayType.getTypeName()); //$NON-NLS-1$
- assertEquals(proxyTypeFactory.getBeanTypeProxy("[Ljava.lang.Integer;"), arrayType.getComponentType()); //$NON-NLS-1$
-
- // Test get type using accessor.
- arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("java.lang.Integer", 2); //$NON-NLS-1$
- assertNotNull(arrayType);
- assertTrue(arrayType.isArray());
- assertEquals("[[Ljava.lang.Integer;", arrayType.getTypeName()); //$NON-NLS-1$
- }
-
- public void testArrayTypeFromArrayType() {
- // Test creating an array type from an array type, i.e. adding dimensions.
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("[Ljava.lang.Integer;", 2); //$NON-NLS-1$
- assertNotNull(arrayType);
- assertTrue(arrayType.isArray());
- assertEquals("[[[Ljava.lang.Integer;", arrayType.getTypeName()); //$NON-NLS-1$
- }
-
- public void testArrayFromAccessorSimpleType() throws ThrowableProxy {
- IBeanTypeProxy integerType = proxyTypeFactory.getBeanTypeProxy("java.lang.Integer"); //$NON-NLS-1$
-
- // Test creating an array with accessor of more than one dimension with component type not an array.
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(integerType, new int[] {3, 4});
- assertNotNull(arrayProxy);
- assertEquals("[[Ljava.lang.Integer;", arrayProxy.getTypeProxy().getTypeName()); //$NON-NLS-1$
- assertEquals(3, arrayProxy.getLength());
-
- // get(0) should be an Integer[4].
- arrayProxy = (IArrayBeanProxy) arrayProxy.get(0);
- assertNotNull(arrayProxy);
- assertEquals(4, arrayProxy.getLength());
- }
-
- public void testArrayFromAccessorArrayType() throws ThrowableProxy {
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("java.lang.Integer", 1); //$NON-NLS-1$
-
- // Test creating an array with accessor but component type is an array.
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(arrayType, new int[] {1});
- assertNotNull(arrayProxy);
- assertEquals("[Ljava.lang.Integer;", arrayProxy.getTypeProxy().getTypeName()); //$NON-NLS-1$
- assertEquals(1, arrayProxy.getLength());
- }
-
- public void testArrayFromAccessorArrayTypeMultiDim() throws ThrowableProxy {
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("java.lang.Integer", 1); //$NON-NLS-1$
-
- // Test creating an array with accessor but component type is an array, but extend and add a dimension.
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(arrayType, new int[] {2 ,3});
- assertNotNull(arrayProxy);
- assertEquals("[[Ljava.lang.Integer;", arrayProxy.getTypeProxy().getTypeName()); //$NON-NLS-1$
- assertEquals(2, arrayProxy.getLength());
-
- // Test first entry is an Integer[3]
- IArrayBeanProxy idx1 = (IArrayBeanProxy) arrayProxy.get(0);
- assertNotNull(idx1);
- assertEquals(3, idx1.getLength());
-
- // Test [1][2] is null.
- IBeanProxy idx2 = arrayProxy.get(new int [] {1,2});
- assertNull(idx2);
- }
-
- public void testArraySet() throws ThrowableProxy {
- IBeanProxy anInt = proxyFactory.createBeanProxyWith(new java.lang.Integer(23));
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("java.lang.Integer", 1); //$NON-NLS-1$
-
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(arrayType, new int[] {2 ,3});
- assertNotNull(arrayProxy);
- assertEquals("[[Ljava.lang.Integer;", arrayProxy.getTypeProxy().getTypeName()); //$NON-NLS-1$
- assertEquals(2, arrayProxy.getLength());
-
- // Test first entry is an Integer[3]
- IArrayBeanProxy idx1 = (IArrayBeanProxy) arrayProxy.get(0);
-
- // Test set into array idx1, but retrieve from arrayProxy. Tests
- // 1) Set with one index into array from outer array[0]
- // 2) Get with multi index from outer array
- // 3) And that the same array is set that exists within the first array.
- idx1.set(anInt, 2);
- IBeanProxy idx3 = arrayProxy.get(new int[] {0, 2});
- assertNotNull(idx3);
- assertEquals("java.lang.Integer", idx3.getTypeProxy().getTypeName()); //$NON-NLS-1$
- assertEquals(anInt, idx3);
-
- // Inverse test of above, multi set, single get of same array.
- arrayProxy.set(anInt, new int[] {0,1});
- assertEquals(anInt, idx1.get(1));
- }
-
- public void testArraySnapshot2DimArray() throws ThrowableProxy {
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("java.lang.Integer", 2); //$NON-NLS-1$
-
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(arrayType, new int[] {2, 3});
- assertNotNull(arrayProxy);
-
- // Get the two entries which are Integer[3]
- IArrayBeanProxy idx0 = (IArrayBeanProxy) arrayProxy.get(0);
- IArrayBeanProxy idx1 = (IArrayBeanProxy) arrayProxy.get(1);
-
- // Now get the snapshot and see if the entries are idx0 and idx1.
- IBeanProxy[] snapshot = arrayProxy.getSnapshot();
- assertEquals(idx0, snapshot[0]);
- assertEquals(idx1, snapshot[1]);
- }
-
- public void testArraySnapshotPrimitiveArray() throws ThrowableProxy {
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("int", 1); //$NON-NLS-1$
-
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(arrayType, new int[] {2});
- assertNotNull(arrayProxy);
-
- // Set the two entries to int values.
- arrayProxy.set(proxyFactory.createBeanProxyWith(2), 0);
- arrayProxy.set(proxyFactory.createBeanProxyWith(3), 1);
- IIntegerBeanProxy idx0 = (IIntegerBeanProxy) arrayProxy.get(0);
- IIntegerBeanProxy idx1 = (IIntegerBeanProxy) arrayProxy.get(1);
- assertEquals(2, idx0.intValue());
- assertEquals(3, idx1.intValue());
-
- // Now get the snapshot and see if the entries are idx0 and idx1.
- IBeanProxy[] snapshot = arrayProxy.getSnapshot();
- assertEquals(idx0, snapshot[0]);
- assertEquals(idx1, snapshot[1]);
- }
-
- public void testEmptyArray() throws ThrowableProxy {
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("java.lang.Integer", 1); //$NON-NLS-1$
-
- // Create an empty one dimensional array
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(arrayType, null);
- assertNotNull(arrayProxy);
- assertEquals("[Ljava.lang.Integer;", arrayProxy.getTypeProxy().getTypeName()); //$NON-NLS-1$
- assertEquals(0, arrayProxy.getLength());
- }
-
- public void testEmpty2DArray() throws ThrowableProxy {
- // Create an emtpy two dimensional array
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(proxyTypeFactory.getBeanTypeProxy("java.lang.Integer", 2), null); //$NON-NLS-1$
- assertNotNull(arrayProxy);
- assertEquals("[[Ljava.lang.Integer;", arrayProxy.getTypeProxy().getTypeName()); //$NON-NLS-1$
- assertEquals(0, arrayProxy.getLength());
- }
-
- public void test2DArray() throws ThrowableProxy {
- // Create a 2D array with three empty entries in dim 0.
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(proxyTypeFactory.getBeanTypeProxy("java.lang.Integer", 2), 3); //$NON-NLS-1$
- assertNotNull(arrayProxy);
- assertEquals("[[Ljava.lang.Integer;", arrayProxy.getTypeProxy().getTypeName()); //$NON-NLS-1$
- assertEquals(3, arrayProxy.getLength());
- // Array entry should be empty.
- IArrayBeanProxy idx1 = (IArrayBeanProxy) arrayProxy.get(0);
- assertNull(idx1);
- }
-
- public void testPrimitiveArray() throws ThrowableProxy {
- // Make sure that if the final component type is an
- // int (primitive) that we get a primitive proxy back and not an Integer object.
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("int", 1); //$NON-NLS-1$
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- arrayProxy.set(proxyFactory.createBeanProxyWith(44), 1);
- IBeanProxy idx1 = arrayProxy.get(1);
- assertNotNull(idx1);
- assertEquals("int", idx1.getTypeProxy().getTypeName()); //$NON-NLS-1$
- assertEquals(44, ((IIntegerBeanProxy) idx1).intValue());
- }
-
- public void testArrayEquals() throws ThrowableProxy {
- // Test that array equals works (does semantic equals and not identity equals).
- primIntEquals();
- primBoolEquals();
- primByteEquals();
- primShortEquals();
- primCharEquals();
- primDoubleEquals();
- primFloatEquals();
- primLongEquals();
- objectEquals();
- }
-
- private void primIntEquals() throws ThrowableProxy {
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("int", 1); //$NON-NLS-1$
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- arrayProxy.set(proxyFactory.createBeanProxyWith(44), 1);
-
- IArrayBeanProxy array2Proxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- array2Proxy.set(proxyFactory.createBeanProxyWith(44), 1);
-
- assertTrue(arrayProxy.equals(array2Proxy));
-
- // change the value of one so now different.
- array2Proxy.set(proxyFactory.createBeanProxyWith(55), 1);
- assertFalse(arrayProxy.equals(array2Proxy));
-
- // One side test that if not compatible it should be false.
- IArrayBeanTypeProxy array3Type = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("long", 1); //$NON-NLS-1$
- IArrayBeanProxy array3Proxy = proxyFactory.createBeanProxyWith(array3Type, 3);
- array3Proxy.set(proxyFactory.createBeanProxyWith(44l), 1);
- assertFalse(arrayProxy.equals(array3Proxy));
- }
-
- private void primBoolEquals() throws ThrowableProxy {
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("boolean", 1); //$NON-NLS-1$
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- arrayProxy.set(proxyFactory.createBeanProxyWith(true), 1);
-
- IArrayBeanProxy array2Proxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- array2Proxy.set(proxyFactory.createBeanProxyWith(true), 1);
-
- assertTrue(arrayProxy.equals(array2Proxy));
-
- // change the value of one so now different.
- array2Proxy.set(proxyFactory.createBeanProxyWith(false), 1);
- assertFalse(arrayProxy.equals(array2Proxy));
- }
-
- private void primByteEquals() throws ThrowableProxy {
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("byte", 1); //$NON-NLS-1$
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- arrayProxy.set(proxyFactory.createBeanProxyWith((byte) 3), 1);
-
- IArrayBeanProxy array2Proxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- array2Proxy.set(proxyFactory.createBeanProxyWith((byte) 3), 1);
-
- assertTrue(arrayProxy.equals(array2Proxy));
-
- // change the value of one so now different.
- array2Proxy.set(proxyFactory.createBeanProxyWith((byte) 4), 1);
- assertFalse(arrayProxy.equals(array2Proxy));
- }
-
- private void primShortEquals() throws ThrowableProxy {
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("short", 1); //$NON-NLS-1$
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- arrayProxy.set(proxyFactory.createBeanProxyWith((short) 3), 1);
-
- IArrayBeanProxy array2Proxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- array2Proxy.set(proxyFactory.createBeanProxyWith((short) 3), 1);
-
- assertTrue(arrayProxy.equals(array2Proxy));
-
- // change the value of one so now different.
- array2Proxy.set(proxyFactory.createBeanProxyWith((short) 4), 1);
- assertFalse(arrayProxy.equals(array2Proxy));
- }
-
- private void primCharEquals() throws ThrowableProxy {
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("char", 1); //$NON-NLS-1$
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- arrayProxy.set(proxyFactory.createBeanProxyWith('a'), 1);
-
- IArrayBeanProxy array2Proxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- array2Proxy.set(proxyFactory.createBeanProxyWith('a'), 1);
-
- assertTrue(arrayProxy.equals(array2Proxy));
-
- // change the value of one so now different.
- array2Proxy.set(proxyFactory.createBeanProxyWith('b'), 1);
- assertFalse(arrayProxy.equals(array2Proxy));
- }
-
- private void primDoubleEquals() throws ThrowableProxy {
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("double", 1); //$NON-NLS-1$
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- arrayProxy.set(proxyFactory.createBeanProxyWith(4.3d), 1);
-
- IArrayBeanProxy array2Proxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- array2Proxy.set(proxyFactory.createBeanProxyWith(4.3d), 1);
-
- assertTrue(arrayProxy.equals(array2Proxy));
-
- // change the value of one so now different.
- array2Proxy.set(proxyFactory.createBeanProxyWith(10d), 1);
- assertFalse(arrayProxy.equals(array2Proxy));
- }
-
- private void primFloatEquals() throws ThrowableProxy {
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("float", 1); //$NON-NLS-1$
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- arrayProxy.set(proxyFactory.createBeanProxyWith(4.3f), 1);
-
- IArrayBeanProxy array2Proxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- array2Proxy.set(proxyFactory.createBeanProxyWith(4.3f), 1);
-
- assertTrue(arrayProxy.equals(array2Proxy));
-
- // change the value of one so now different.
- array2Proxy.set(proxyFactory.createBeanProxyWith(10f), 1);
- assertFalse(arrayProxy.equals(array2Proxy));
- }
-
- private void primLongEquals() throws ThrowableProxy {
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("long", 1); //$NON-NLS-1$
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- arrayProxy.set(proxyFactory.createBeanProxyWith(1l), 1);
-
- IArrayBeanProxy array2Proxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- array2Proxy.set(proxyFactory.createBeanProxyWith(1l), 1);
-
- assertTrue(arrayProxy.equals(array2Proxy));
-
- // change the value of one so now different.
- array2Proxy.set(proxyFactory.createBeanProxyWith(2l), 1);
- assertFalse(arrayProxy.equals(array2Proxy));
- }
-
- private void objectEquals() throws ThrowableProxy {
- IArrayBeanTypeProxy arrayType = (IArrayBeanTypeProxy) proxyTypeFactory.getBeanTypeProxy("java.lang.Integer", 1); //$NON-NLS-1$
- IArrayBeanProxy arrayProxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- arrayProxy.set(proxyFactory.createBeanProxyWith(new Integer(1)), 1);
-
- IArrayBeanProxy array2Proxy = proxyFactory.createBeanProxyWith(arrayType, 3);
- array2Proxy.set(proxyFactory.createBeanProxyWith(new Integer(1)), 1);
-
- assertTrue(arrayProxy.equals(array2Proxy));
-
- // change the value of one so now different.
- array2Proxy.set(proxyFactory.createBeanProxyWith(new Integer(2)), 1);
- assertFalse(arrayProxy.equals(array2Proxy));
- }
-
-
- public void testCollections() throws ThrowableProxy {
- IBeanTypeProxy vectorType = proxyTypeFactory.getBeanTypeProxy("java.util.Vector"); //$NON-NLS-1$
- IBeanProxy vectorProxy = vectorType.newInstance();
- CollectionBeanProxyWrapper col = new CollectionBeanProxyWrapper(vectorProxy);
-
- // Test adding
- assertTrue(col.add(proxyFactory.createBeanProxyWith(33)));
- assertEquals(1, col.size());
-
- // Test toArray, first entry should be 33 and length should be 1.
- IArrayBeanProxy arrayOut = col.toArray();
- assertEquals(1, arrayOut.getLength());
- assertEquals(33, ((IIntegerBeanProxy) arrayOut.get(0)).intValue());
-
- // Test toArray(array).
- IArrayBeanProxy arrayInto = proxyFactory.createBeanProxyWith(arrayOut.getTypeProxy(), arrayOut.getLength()); //$NON-NLS-1$
- IArrayBeanProxy arrayOut2 = col.toArray(arrayInto);
- // It should of been the exact same array (arrayInto == arrayOut2 under the proxies).
- assertTrue(arrayInto.sameAs(arrayOut2));
- assertEquals(33, ((IIntegerBeanProxy) arrayOut.get(0)).intValue());
-
- // Test setting with wrong type throws exception.
- try {
- // Test the setting with wrong type throws an exception
- col = new CollectionBeanProxyWrapper(arrayOut);
- fail("ClassCastException should of been thrown.");
- } catch (ClassCastException e) {
- // If here, then the test was passed
- }
- }
-
- public void testIterator() throws ThrowableProxy {
- IBeanTypeProxy vectorType = proxyTypeFactory.getBeanTypeProxy("java.util.Vector"); //$NON-NLS-1$
- IBeanProxy vectorProxy = vectorType.newInstance();
- CollectionBeanProxyWrapper col = new CollectionBeanProxyWrapper(vectorProxy);
- col.add(proxyFactory.createBeanProxyWith(33));
-
- // See if the iterator interface works.
- IteratorBeanProxyWrapper itrProxy = col.iterator();
- assertNotNull(itrProxy);
- int iterations = 0;
- while (itrProxy.hasNext()) {
- iterations++;
- assertTrue(iterations < 2);
- IBeanProxy itrValue = itrProxy.next();
- assertEquals(33, ((IIntegerBeanProxy) itrValue).intValue());
- }
- }
-
- public void testListInterface() throws ThrowableProxy {
- IBeanTypeProxy vectorType = proxyTypeFactory.getBeanTypeProxy("java.util.Vector"); //$NON-NLS-1$
- IBeanProxy vectorProxy = vectorType.newInstance();
-
- // See if the list inteface works.
- ListBeanProxyWrapper list = new ListBeanProxyWrapper(vectorProxy);
- assertTrue(list.add(proxyFactory.createBeanProxyWith(33))); // First entry.
- list.add(0, proxyFactory.createBeanProxyWith(true)); // Now becomes first entry.
- assertEquals(2, list.size());
- assertEquals(true, ((IBooleanBeanProxy) list.get(0)).booleanValue());
- assertEquals(33, ((IIntegerBeanProxy) list.get(1)).intValue()); // Swapped to second entry due to add(0,...)
- }
-
- public void testListIterator() throws ThrowableProxy {
- IBeanTypeProxy vectorType = proxyTypeFactory.getBeanTypeProxy("java.util.Vector"); //$NON-NLS-1$
- IBeanProxy vectorProxy = vectorType.newInstance();
- ListBeanProxyWrapper list = new ListBeanProxyWrapper(vectorProxy);
- list.add(proxyFactory.createBeanProxyWith(33)); // First entry.
- list.add(0, proxyFactory.createBeanProxyWith(true)); // Now becomes first entry.
-
- // See if the ListIterator interface works
- ListIteratorBeanProxyWrapper lItrProxy = list.listIterator();
- assertNotNull(lItrProxy);
- assertTrue(lItrProxy.hasNext());
- IBooleanBeanProxy bool1 = (IBooleanBeanProxy) lItrProxy.next();
- assertEquals(true, bool1.booleanValue());
- IIntegerBeanProxy int1 = (IIntegerBeanProxy) lItrProxy.next();
- assertEquals(33, int1.intValue()); // Old first entry moved to second entry by add(0,...) above.
- assertFalse(lItrProxy.hasNext());
- assertEquals(1, lItrProxy.previousIndex());
- }
-
- public void testMethodAccessors() throws ThrowableProxy {
- IBeanTypeProxy integerType = proxyTypeFactory.getBeanTypeProxy("java.lang.Integer"); //$NON-NLS-1$
-
- // Test able to access beantype proxy and invoke methods on it. This isn't
- // the approved way of getting methods, but it tests that method proxies
- // are created correctly if returned from an invoke method.
- IBeanTypeProxy classTypeProxy = proxyTypeFactory.getBeanTypeProxy("java.lang.Class"); //$NON-NLS-1$
- IMethodProxy getMethodMethod = classTypeProxy.getMethodProxy("getMethod", new String[] {"java.lang.String", "[Ljava.lang.Class;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- // Get the Integer.byteValue() method through an invoke instead of a method factory or bean type.
- IBeanProxy method = getMethodMethod.invoke(integerType, new IBeanProxy[] {
- proxyFactory.createBeanProxyWith("byteValue"), null}); //$NON-NLS-1$
- assertNotNull(method);
- assertTrue(method instanceof IMethodProxy);
-
- // Now invoke it to see if correct answer comes back.
- IBeanProxy byteValue = ((IMethodProxy) method).invoke(proxyFactory.createBeanProxyWith(new Integer(254)));
- assertNotNull(byteValue);
- assertEquals("byte", byteValue.getTypeProxy().getTypeName()); //$NON-NLS-1$
- assertEquals((byte)254, ((INumberBeanProxy) byteValue).byteValue());
- }
-
- public void testInvokableAccessors() throws ThrowableProxy {
- IBeanTypeProxy integerType = proxyTypeFactory.getBeanTypeProxy("java.lang.Integer"); //$NON-NLS-1$
-
- // Test able to access beantype proxy and invoke methods on it. This isn't
- // the approved way of getting methods, but it tests that method proxies
- // are created correctly if returned from an invoke method.
- IBeanTypeProxy classTypeProxy = proxyTypeFactory.getBeanTypeProxy("java.lang.Class"); //$NON-NLS-1$
- IInvokable getMethodInvokable = classTypeProxy.getInvokable("getMethod", new String[] {"java.lang.String", "[Ljava.lang.Class;"}); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
- // Get the Integer.byteValue() method through an invoke instead of a method factory or bean type.
- IBeanProxy method = getMethodInvokable.invoke(integerType, new IBeanProxy[] {
- proxyFactory.createBeanProxyWith("byteValue"), null}); //$NON-NLS-1$
- assertNotNull(method);
- assertTrue(method instanceof IMethodProxy);
-
- // Now invoke it to see if correct answer comes back.
- IBeanProxy byteValue = ((IMethodProxy) method).invoke(proxyFactory.createBeanProxyWith(new Integer(254)));
- assertNotNull(byteValue);
- assertEquals("byte", byteValue.getTypeProxy().getTypeName()); //$NON-NLS-1$
- assertEquals((byte)254, ((INumberBeanProxy) byteValue).byteValue());
- }
-
- public void testCallback() throws ThrowableProxy {
- System.out.println("--- Starting the callback test ---"); //$NON-NLS-1$
- IBeanTypeProxy callbackType = proxyTypeFactory.getBeanTypeProxy("org.eclipse.jem.tests.proxy.vm.TestCallback"); //$NON-NLS-1$
- assertNotNull(callbackType);
- Object testObject = new Object();
- IBeanProxy callbackProxy = callbackType.newInstance();
- TestCallback cb = new TestCallback(testObject, registry);
- registry.getCallbackRegistry().registerCallback(callbackProxy, cb);
- IInvokable start = callbackType.getInvokable("start"); //$NON-NLS-1$
- IInvokable stop = callbackType.getInvokable("stop"); //$NON-NLS-1$
- synchronized(testObject) {
- start.invokeCatchThrowableExceptions(callbackProxy);
- try {
- testObject.wait(30000); // Should be done by 30 seconds.
- } catch (InterruptedException e) {
- }
- }
- stop.invokeCatchThrowableExceptions(callbackProxy);
- registry.getCallbackRegistry().deregisterCallback(callbackProxy);
- cb.testCompleted();
- System.out.println("If there is anything in the .log file, then the test failed."); //$NON-NLS-1$
- }
-
- public void testCallbackStream() throws ThrowableProxy, IOException {
- System.out.println("--- Starting the callback stream test ---"); //$NON-NLS-1$
- IBeanTypeProxy callbackType = proxyTypeFactory.getBeanTypeProxy("org.eclipse.jem.tests.proxy.vm.TestCallbackStream"); //$NON-NLS-1$
- assertNotNull(callbackType);
- Object testObject = new Object();
- IBeanProxy callbackProxy = callbackType.newInstance();
- TestCallbackStream cb = new TestCallbackStream(testObject);
- registry.getCallbackRegistry().registerCallback(callbackProxy, cb);
- IMethodProxy start = callbackType.getMethodProxy("start"); //$NON-NLS-1$
- synchronized(testObject) {
- start.invokeCatchThrowableExceptions(callbackProxy);
- try {
- testObject.wait(30000); // Should be done by 30 seconds.
- } catch (InterruptedException e) {
- }
- }
- registry.getCallbackRegistry().deregisterCallback(callbackProxy);
- cb.testComplete();
- System.out.println("If there is anything in the .log file, then the test failed."); //$NON-NLS-1$
- }
-
- public void testSimpleGetField() throws ThrowableProxy {
- IBeanTypeProxy integerType = proxyTypeFactory.getBeanTypeProxy("java.lang.Integer"); //$NON-NLS-1$
-
- // Get the public field.
- IFieldProxy field = integerType.getFieldProxy("MAX_VALUE"); //$NON-NLS-1$
- assertNotNull(field);
- }
-
- public void testSimpleGetDeclaredField() throws ThrowableProxy {
- IBeanTypeProxy integerType = proxyTypeFactory.getBeanTypeProxy("java.lang.Integer"); //$NON-NLS-1$
-
- // Get the public field.
- IFieldProxy field = integerType.getDeclaredFieldProxy("value"); //$NON-NLS-1$
- assertNotNull(field);
- }
-
- public void testGetFields() {
- IBeanTypeProxy testAccessType = proxyTypeFactory.getBeanTypeProxy("testPackage.TestAccess"); //$NON-NLS-1$
-
- // Get all fields.
- IFieldProxy[] fields = testAccessType.getFields();
- assertNotNull(fields);
- assertEquals(2, fields.length);
- }
-
- public void testGetDeclaredFields() {
- IBeanTypeProxy testAccessType = proxyTypeFactory.getBeanTypeProxy("testPackage.TestAccess"); //$NON-NLS-1$
-
- // Get all fields.
- IFieldProxy[] fields = testAccessType.getDeclaredFields();
- assertNotNull(fields);
- assertEquals(3, fields.length);
- }
-
- public void testSimpleGetMethod() throws ThrowableProxy {
- IBeanTypeProxy testAccessType = proxyTypeFactory.getBeanTypeProxy("testPackage.TestAccess"); //$NON-NLS-1$
-
- // Get the public field.
- IMethodProxy method = testAccessType.getMethodProxy("xyz"); //$NON-NLS-1$
- assertNotNull(method);
- }
-
- public void testSimpleGetDeclaredMethod() throws ThrowableProxy {
- IBeanTypeProxy testAccessType = proxyTypeFactory.getBeanTypeProxy("testPackage.TestAccess"); //$NON-NLS-1$
-
- // Get the public field.
- IMethodProxy method = testAccessType.getDeclaredMethodProxy("qxr", (String[]) null); //$NON-NLS-1$
- assertNotNull(method);
- }
-
- public void testGetMethods() {
- IBeanTypeProxy testAccessType = proxyTypeFactory.getBeanTypeProxy("testPackage.TestAccess"); //$NON-NLS-1$
- IBeanTypeProxy testObjectType = proxyTypeFactory.getBeanTypeProxy("java.lang.Object"); //$NON-NLS-1$
-
- // Get all methods. Need to get all of Object too since getMethods() gets them all including inherited. We will
- // then take the diff to show what's only at the local level.
- IMethodProxy[] methods = testAccessType.getMethods();
- IMethodProxy[] objectMethods = testObjectType.getMethods();
- assertNotNull(methods);
- assertNotNull(objectMethods);
- assertEquals(7, methods.length-objectMethods.length);
- }
-
- public void testGetDeclaredMethods() {
- IBeanTypeProxy testAccessType = proxyTypeFactory.getBeanTypeProxy("testPackage.TestAccess"); //$NON-NLS-1$
-
- // Get all fields.
- IMethodProxy[] methods = testAccessType.getDeclaredMethods();
- assertNotNull(methods);
- assertEquals(8, methods.length);
- }
-
- public void testFindCompatibleConstructor() throws AmbiguousMethodException, NoSuchMethodException, IllegalAccessException {
- IBeanTypeProxy testAccessType = proxyTypeFactory.getBeanTypeProxy("testPackage.TestAccess"); //$NON-NLS-1$
-
- IConstructorProxy ctor = testAccessType.getCompatibleConstructor(new IBeanTypeProxy[] {proxyTypeFactory.getBeanTypeProxy("java.lang.ArrayStoreException")});
- IConstructorProxy comp = testAccessType.getDeclaredConstructorProxy(new IBeanTypeProxy[] {proxyTypeFactory.getBeanTypeProxy("java.lang.RuntimeException")});
-
- assertNotNull(ctor);
- assertNotNull(comp);
- assertEquals(ctor, comp);
- }
-
- public void testFindCompatibleMethod() throws AmbiguousMethodException, NoSuchMethodException {
- IBeanTypeProxy testAccessType = proxyTypeFactory.getBeanTypeProxy("testPackage.TestAccess"); //$NON-NLS-1$
-
- IMethodProxy method = testAccessType.getCompatibleMethod("xyz", new IBeanTypeProxy[] {proxyTypeFactory.getBeanTypeProxy("java.lang.Integer")});
- IMethodProxy comp = testAccessType.getDeclaredMethodProxy("xyz", new IBeanTypeProxy[] {proxyTypeFactory.getBeanTypeProxy("java.lang.Number")});
-
- assertNotNull(method);
- assertNotNull(comp);
- assertEquals(method, comp);
- }
-
- public void testFindAmbiguousMethod() throws NoSuchMethodException {
- IBeanTypeProxy testAccessType = proxyTypeFactory.getBeanTypeProxy("testPackage.TestAccess"); //$NON-NLS-1$
-
- try {
- testAccessType.getCompatibleMethod("ddd", new IBeanTypeProxy[] {proxyTypeFactory.getBeanTypeProxy("java.lang.Integer"), proxyTypeFactory.getBeanTypeProxy("java.lang.Integer")});
- fail("Should of been ambiguous");
- } catch (AmbiguousMethodException e) {
- }
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ide/IDEProxySuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ide/IDEProxySuite.java
deleted file mode 100644
index 14e33e43..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/ide/IDEProxySuite.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.ide;
-/*
- * $RCSfile: IDEProxySuite.java,v $
- * $Revision: 1.4 $ $Date: 2005/08/24 20:58:55 $
- */
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.CoreException;
-
-import org.eclipse.jem.internal.proxy.core.IConfigurationContributor;
-import org.eclipse.jem.internal.proxy.core.ProxyFactoryRegistry;
-import org.eclipse.jem.internal.proxy.ide.IDERegistration;
-import org.eclipse.jem.tests.proxy.AbstractTestProxy;
-import org.eclipse.jem.tests.proxy.ProxySuite;
-
-/**
- * @author richkulp
- *
- * This is the true test suite for Remote Proxy Testing. The RemoteProxyTest will use this.
- */
-public class IDEProxySuite extends TestSetup {
-
- // Test cases to be include in the suite
- private static Class testsList[] = { ProxySuite.class, };
-
- private AbstractTestProxy.RegistryHandler registryHandler = new AbstractTestProxy.RegistryHandler() {
- private ProxyFactoryRegistry registry;
-
- public boolean isValid() {
- return true;
- }
- public ProxyFactoryRegistry getRegistry() throws CoreException {
- if (registry == null) {
- registry = IDERegistration.startAnImplementation(new IConfigurationContributor[] { ProxySuite.getProxySuiteContributor()}, true, null, "JUnit Tests for IDE Proxy", "org.eclipse.jem.tests", null); //$NON-NLS-1$ //$NON-NLS-2$
- }
- return registry;
- }
-
- public void destroyRegistry() {
- if (registry != null) {
- registry.terminateRegistry();
- registry = null;
- }
- }
- };
-
- public IDEProxySuite() {
- this("Test IDE Proxy Suite");
- }
-
- public IDEProxySuite(String name) {
- super(new TestSuite(name) {
- {
- for (int i = 0; i < testsList.length; i++) {
- // We may get some tests and suites.
- if (TestSuite.class.isAssignableFrom(testsList[i]) || TestSetup.class.isAssignableFrom(testsList[i])) {
- try {
- Test ts = (Test) testsList[i].newInstance();
- addTest(ts);
- } catch (Exception e) {
- e.printStackTrace();
- }
- } else
- addTestSuite(testsList[i]);
- }
-
- }
- });
-
- AbstractTestProxy.initRegistryHandler((TestSuite) getTest(), registryHandler);
- }
-
- public static Test suite() {
- return new IDEProxySuite();
- }
-
- protected void tearDown() throws Exception {
- registryHandler.destroyRegistry();
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/AbstractInitParserTestCase.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/AbstractInitParserTestCase.java
deleted file mode 100644
index 884ae0b9..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/AbstractInitParserTestCase.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: AbstractInitParserTestCase.java,v $
- * $Revision: 1.6 $ $Date: 2005/08/24 20:58:54 $
- */
-import java.util.Enumeration;
-
-import junit.framework.*;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * @author richkulp
- *
- * To change the template for this generated type comment go to
- * Window&gt;Preferences&gt;Java&gt;Code Generation&gt;Code and Comments
- */
-public abstract class AbstractInitParserTestCase extends TestCase {
-
- /**
- * Initialize the test helper for all of the tests within the given suite.
- *
- * @param suite
- * @param testHelper
- *
- * @since 1.0.0
- */
- public static void initSuite(TestSuite suite, AbstractInitStringParserTestHelper testHelper) {
- Enumeration tests = suite.tests();
- while (tests.hasMoreElements()) {
- Test test = (Test) tests.nextElement();
- if (test instanceof AbstractInitParserTestCase)
- ((AbstractInitParserTestCase) test).setTestHelper(testHelper);
- else if (test instanceof TestSuite)
- initSuite((TestSuite) test, testHelper);
- }
- }
-
- public AbstractInitParserTestCase() {
- super();
- }
-
- public AbstractInitParserTestCase(String name) {
- super(name);
- }
-
- protected AbstractInitStringParserTestHelper testHelper;
-
- /**
- * Set the test helper to use.
- *
- * @param testHelper
- *
- * @since 1.0.0
- */
- public void setTestHelper(AbstractInitStringParserTestHelper testHelper) {
- this.testHelper = testHelper;
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/AbstractInitStringParserTestHelper.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/AbstractInitStringParserTestHelper.java
deleted file mode 100644
index 1869a231..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/AbstractInitStringParserTestHelper.java
+++ /dev/null
@@ -1,66 +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
- *******************************************************************************/
-/*
- * $RCSfile: AbstractInitStringParserTestHelper.java,v $
- * $Revision: 1.3 $ $Date: 2005/08/24 20:58:54 $
- */
-package org.eclipse.jem.tests.proxy.initParser;
-
-/**
- * Interface for init string parser helper. Allows "InitString Parser" or "AST Parser" or some other kind of testing.
- *
- * @since 1.0.0
- */
-public abstract class AbstractInitStringParserTestHelper {
- /**
- * Test the given string against the given result. equalsOnly determines how exactly it matches.
- * If allowed to throw exceptions, then the exception as the result of evaluation will be squashed.
- *
- * @param aString
- * @param expectedResult
- * @param throwsException <code>true</code> if this is expected to throw an exception and such exception will not be passed on out and will return normal.
- * @param equalsOnly <code>true</code> means if must match either ==, equals(), or toString()'s match.
- * @throws Throwable
- *
- * @since 1.0.0
- */
- public abstract void testInitString(String aString, Object expectedResult, boolean throwsException, boolean equalsOnly)
- throws Throwable;
-
- /**
- * Test the given string against the given result. It must match either ==, equals(), or toString()'s match.
- * It should not throw exceptions. If it does, the exception will be passed out.
- *
- * @param aString
- * @param expectedResult
- * @throws Throwable
- *
- * @since 1.0.0
- */
- public void testInitString(String aString, Object expectedResult) throws Throwable {
- testInitString(aString, expectedResult, false, true);
- }
-
- /**
- * Test the given string against the given result. equalsOnly determines how exactly it matches
- * It should not throw exceptions. If it does, the exception will be passed out.
- *
- * @param aString
- * @param equalsOnly <code>true</code> means if must match either ==, equals(), or toString()'s match.
- * @param expectedResult
- * @throws Throwable
- *
- * @since 1.0.0
- */
- public void testInitString(String aString, boolean equalsOnly, Object expectedResult) throws Throwable {
- testInitString(aString, expectedResult, false, equalsOnly);
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/ArrayConstructorTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/ArrayConstructorTest.java
deleted file mode 100644
index 1dc2e0b3..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/ArrayConstructorTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: ArrayConstructorTest.java,v $
- * $Revision: 1.4 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ArrayConstructorTest extends AbstractInitParserTestCase {
-
- /**
- * Constructor for ArrayContructorTest.
- * @param name
- */
- public ArrayConstructorTest(String name) {
- super(name);
- }
-
- public void testEmptyString1D() throws Throwable {
- testHelper.testInitString("new String[2]",new String[2]);
- }
- public void testEmptyString2D() throws Throwable {
- testHelper.testInitString("new String[2][2]",new String[2][2]);
- }
- public void testEmptyColor1D() throws Throwable {
- testHelper.testInitString("new java.awt.Color[3]",new java.awt.Color[3]);
- }
- public void testEmptyColor2D() throws Throwable {
- testHelper.testInitString("new java.awt.Color[3][4]",new java.awt.Color[3][4]);
- }
- public void testEmptyInt() throws Throwable {
- testHelper.testInitString("new int[3]", new int[3]);
- }
-
- // TODO: enable this test when this works
- /*
- public void testCalculatedSize() {
- testHelper.testInitString("new String[new Integer(3).intValue()]",new String[new Integer(3).intValue()]);
- }
- */
-
- public void testInitializedInts() throws Throwable {
- testHelper.testInitString("new int[] {-2,3}",new int[]{-2,3});
- }
- public void testInitializedIntsTrailingComma() throws Throwable {
- testHelper.testInitString("new int[] {-2,3,}",new int[]{-2,3,});
- }
- public void testInitializedDoubleParens() throws Throwable {
- testHelper.testInitString("new double[] {(-2), 3.0 }",new double[] {(-2), 3.0 });
- }
- public void testInitializedStringsTwo() throws Throwable {
- testHelper.testInitString("new String[] {\"1\",\"2\"}",new String[] {"1","2"});
- }
- public void testInitializedStringsThree() throws Throwable {
- testHelper.testInitString("new String[] {\"Frog\",\"Dog\",\"Cow\"}",new String[] {"Frog","Dog","Cow"});
- }
- public void testInitializedColors() throws Throwable {
- testHelper.testInitString("new java.awt.Color[] { java.awt.Color.red , new java.awt.Color(0,0,0) }",new java.awt.Color[] { java.awt.Color.red , new java.awt.Color(0,0,0) });
- }
- public void testInitalizedInts2D1() throws Throwable {
- testHelper.testInitString("new int[][] { { 2 , -3 } , { 4 , 5 } }",new int[][] { { 2 , -3 } , { 4 , 5 } });
- }
- public void testInitalizedInts2D2() throws Throwable {
- testHelper.testInitString("new int[][] {{1,2,3},{4,5,6}}",new int[][]{{1,2,3},{4,5,6}});
- }
- public void testInitalizedInts2DParensCommas() throws Throwable {
- // Much to my surprise, extra commands are valid syntax at the end of the arguments even without any following argument
- // the resolve that occurs by the Visual Editor actually inserts these, so we need tests to make sure we can deal with them correctly
- testHelper.testInitString("new int[][] { {2 ,(-3),} , { 4 , 5,}}",new int[][] { { 2 , (-3),} , { 4 , 5,}});
- }
- public void testInitalizedInts2DParensCommas2() throws Throwable {
- testHelper.testInitString("new int[][] { {2 ,(-3),} , { 4 , 5,},}",new int[][] { { 2 , (-3),} , { 4 , 5,},});
- }
- public void testInitalizedDoubles2D() throws Throwable {
- testHelper.testInitString("new double[][] { { 2 , 3 } , { 4 , 5 } }",new double[][] { { 2 , 3 } , { 4 , 5 } });
- }
- public void testInitalizedDoubles2DMany() throws Throwable {
- testHelper.testInitString("new double[][]{{ 5.0, -2.0, 5.0, -1.0, -1.0, 5.0, -2.0, 5.0 }, { 5.0, -2.0, 5.0, -2.0, 5.0, -1.0, 5.0, -2.0, 5.0 }}",new double[][]{{ 5.0, -2.0, 5.0, -1.0, -1.0, 5.0, -2.0, 5.0 }, { 5.0, -2.0, 5.0, -2.0, 5.0, -1.0, 5.0, -2.0, 5.0 }});
- }
- public void testInt2DParam() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new int[][] {{1,2,3},{3,4,5}})",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new int[][] {{1,2,3},{3,4,5}}));
- }
- public void testInt2DParamCommas() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new int[][] {{1,2,3,},{3,4,5,}})",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new int[][] {{1,2,3,},{3,4,5,}}));
- }
- public void testInt2DParamCommas2() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new int[][] {{1,2,3,},{3,4,5,},})",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new int[][] {{1,2,3,},{3,4,5,},}));
- }
- public void testDoubleParam() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new double[]{1,2,3})",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new double[]{1,2,3}));
- }
- public void testDoubleParam2() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new double[]{1.0,2,-3.5})",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new double[]{1.0,2,-3.5}));
- }
- public void testDoubleParam3() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new double[]{-1,2,-0.5})",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new double[]{-1,2,-0.5}));
- }
- public void testDouble2DParam() throws Throwable {
- // This test is one that is similar to the type of constructor used by TableLayout for SWA
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new double[][]{{ 5.0, -2.0, 5.0, -1.0, -1.0, 5.0, -2.0, 5.0 }, { 5.0, -2.0, 5.0, -2.0, 5.0, -1.0, 5.0, -2.0, 5.0 }})",
- new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new double[][]{{ 5.0, -2.0, 5.0, -1.0, -1.0, 5.0, -2.0, 5.0 }, { 5.0, -2.0, 5.0, -2.0, 5.0, -1.0, 5.0, -2.0, 5.0 }}));
- }
- public void testDouble2DParamCommas() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new double[][]{{ 5.0, -2.0, 5.0, -1.0, -1.0, 5.0, -2.0, 5.0 , }, { 5.0, -2.0, 5.0, -2.0, 5.0, -1.0, 5.0, -2.0, 5.0 , } , })",
- new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new double[][]{{ 5.0, -2.0, 5.0, -1.0, -1.0, 5.0, -2.0, 5.0 , }, { 5.0, -2.0, 5.0, -2.0, 5.0, -1.0, 5.0, -2.0, 5.0 , } , }));
- }
-
-
- // TODO: enable this test when the case is handled properly
- /*
- public void testInt3D() {
- // Needs fixing - We don't have dimensions greater than 2 working yet
- testHelper.testInitString("new int[][][] { { { 1 , 2 } , { 3 , 4 } }, { { 5 , 6 } , { 7 , 8 } } }",new int[][][] { { { 1 , 2 } , { 3 , 4 } }, { { 5 , 6 } , { 7 , 8 } } });
- }
- */
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/BlockTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/BlockTest.java
deleted file mode 100644
index 57e7d790..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/BlockTest.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: BlockTest.java,v $
- * $Revision: 1.5 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class BlockTest extends AbstractInitParserTestCase {
-
- /**
- * Constructor for BlockTest.
- * @param name
- */
- public BlockTest(String name) {
- super(name);
- }
-
-/*
- * TODO These three don't work for now. Later they may be fixed if it shows up as a general problem for customers. So far they haven't.
- public void testSetElements1() throws Throwable {
- testHelper.testInitString(
- "(((new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(3)).setElemAt(\"accountStatementDetails\",0)).setElemAt(new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(\"OpnBalance\",\"OpnBalance\",null,false,false,true,50),1)).setElemAt(new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(\"OpnDate\",\"OpnDate\",null,false,false,true,50),2);",
- (((new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(3)).setElemAt("accountStatementDetails",0)).setElemAt(new NavigationParameters("OpnBalance","OpnBalance",null,false,false,true,50),1)).setElemAt(new org.eclipse.jem.tests.proxy.initParser.NavigationParameters("OpnDate","OpnDate",null,false,false,true,50),2));
- }
- public void testSetElements2() throws Throwable {
- testHelper.testInitString(
- "(((new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(3)).setElemAt(\"accountStatementDetails\",0)).setElemAt(new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(\"OpnBalance\",\"OpnBalance\",null,false,false,true,50),1))",
- (((new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(3)).setElemAt("accountStatementDetails",0)).setElemAt(new NavigationParameters("OpnBalance","OpnBalance",null,false,false,true,50),1)));
- }
- public void testSetElements3() throws Throwable {
- testHelper.testInitString(
- "((new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(3)).setElemAt(new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(\"OpnBalance\",\"OpnBalance\",null,false,false,true,50),1))",
- ((new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(3)).setElemAt(new org.eclipse.jem.tests.proxy.initParser.NavigationParameters("OpnBalance","OpnBalance",null,false,false,true,50),1)));
- }
-*/
- public void testSetElement4() throws Throwable {
- testHelper.testInitString(
- "((new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(3)).setElemAt(\"accountStatementDetails\",0))",
- ((new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(3)).setElemAt("accountStatementDetails",0)));
- }
- public void testStringReplacement1() throws Throwable {
- testHelper.testInitString(
- "(((new String(\"Frog\")).replace('o','i')).replace('i','a')).replace('a','o')",
- (((new String("Frog")).replace('o','i')).replace('i','a')).replace('a','o'));
- }
- public void testStringReplacement2() throws Throwable {
- testHelper.testInitString(
- "((((new String(\"Frog\")).replace('o','i')).replace('i','a')).replace('a','o')).replace('o','e')",
- ((((new String("Frog")).replace('o','i')).replace('i','a')).replace('a','o')).replace('o','e'));
- }
- public void testStringCases1() throws Throwable {
- testHelper.testInitString(
- "(new String(\"Frog\").toLowerCase()).toUpperCase()",
- (new String("Frog").toLowerCase()).toUpperCase()
- );
- }
- public void testStringCases2() throws Throwable {
- testHelper.testInitString(
- "((new String(\"Frog\").toLowerCase()).toUpperCase()).toLowerCase()",
- ((new String("Frog").toLowerCase()).toUpperCase()).toLowerCase()
- );
- }
- public void testStringCases3() throws Throwable {
- testHelper.testInitString(
- "(((new String(\"Frog\").toLowerCase()).toUpperCase()).toLowerCase()).toUpperCase()",
- (((new String("Frog").toLowerCase()).toUpperCase()).toLowerCase()).toUpperCase()
- );
- }
- public void testStringConcat1() throws Throwable {
- testHelper.testInitString(
- "(new String(\"Frogs\").concat(\"are\")).concat(\"cool\")",
- (new String("Frogs").concat("are")).concat("cool")
- );
- }
- public void testStringConcat2() throws Throwable {
- testHelper.testInitString(
- "((new String(\"Frogs\").concat(\"are\")).concat(\"very\")).concat(\"cool\")",
- ((new String("Frogs").concat("are")).concat("very")).concat("cool")
- );
- }
- public void testStringConcat3() throws Throwable {
- testHelper.testInitString(
- "(((new String(\"Frogs\").concat(\"just\")).concat(\"rule\")).concat(\"cool\")).concat(\"kingdom\")",
- (((new String("Frogs").concat("just")).concat("rule")).concat("cool")).concat("kingdom")
- );
- }
- public void testStringConcat4() throws Throwable {
- testHelper.testInitString(
- "((new String(\"Frogs\").concat(\"just\")).concat(new String(\"totally\")).concat(new String(\"Rock\")))",
- ((new String("Frogs").concat("just")).concat(new String("totally")).concat(new String("Rock")))
- );
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/BorderTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/BorderTest.java
deleted file mode 100644
index e688b667..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/BorderTest.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: BorderTest.java,v $
- * $Revision: 1.5 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class BorderTest extends AbstractInitParserTestCase {
-
- /**
- * Constructor for BorderTest.
- * @param name
- */
- public BorderTest(String name) {
- super(name);
- }
-
- public void testEtchedRaised() throws Throwable {
- testHelper.testInitString(
- "javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.RAISED)" ,
- javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.RAISED));
- }
-
- public void testBevelRaised() throws Throwable {
- testHelper.testInitString(
- "javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED)",
- javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED));
- }
-
- public void testEmpty() throws Throwable {
- testHelper.testInitString(
- "javax.swing.BorderFactory.createEmptyBorder()",
- javax.swing.BorderFactory.createEmptyBorder());
- }
-
- public void testMatte() throws Throwable {
- testHelper.testInitString(
- "javax.swing.BorderFactory.createMatteBorder(2, 2, 2, 2, java.awt.Color.black)",
- false,
- javax.swing.BorderFactory.createMatteBorder(2, 2, 2, 2, java.awt.Color.black));
- }
-
- public void testSoftBevel() throws Throwable {
- testHelper.testInitString(
- "new javax.swing.border.SoftBevelBorder(0)",
- false,
- new javax.swing.border.SoftBevelBorder(0));
- }
-
- public void testEmptySize() throws Throwable {
- testHelper.testInitString(
- "javax.swing.BorderFactory.createEmptyBorder(2, 2, 2, 2)",
- false,
- javax.swing.BorderFactory.createEmptyBorder(2, 2, 2, 2));
- }
-
- public void testLine() throws Throwable {
- testHelper.testInitString(
- "javax.swing.BorderFactory.createLineBorder(java.awt.Color.black, 2)",
- false,
- javax.swing.BorderFactory.createLineBorder(java.awt.Color.black, 2));
- }
-
- public void testSoftBevelRaised() throws Throwable {
- testHelper.testInitString(
- "new javax.swing.border.SoftBevelBorder(javax.swing.border.BevelBorder.RAISED)",
- false,
- new javax.swing.border.SoftBevelBorder(javax.swing.border.BevelBorder.RAISED));
- }
-
- public void testTitledBasic() throws Throwable {
- testHelper.testInitString(
- "javax.swing.BorderFactory.createTitledBorder(null,\"frog\",2,0)",
- false,
- javax.swing.BorderFactory.createTitledBorder(null, "frog", 2, 0));
- }
-
- public void testCompoundBasic() throws Throwable {
- testHelper.testInitString(
- "new javax.swing.border.CompoundBorder(javax.swing.BorderFactory.createEmptyBorder(),javax.swing.BorderFactory.createEmptyBorder())",
- false,
- new javax.swing.border.CompoundBorder(javax.swing.BorderFactory.createEmptyBorder(),javax.swing.BorderFactory.createEmptyBorder()));
- }
-
- public void testCompoundMedium() throws Throwable {
- testHelper.testInitString(
- "javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED), javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.LOWERED))",
- false,
- javax.swing.BorderFactory.createCompoundBorder(javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.RAISED), javax.swing.BorderFactory.createBevelBorder(javax.swing.border.BevelBorder.LOWERED)));
- }
-
-
- public void testTitledAdvanced() throws Throwable {
- testHelper.testInitString(
- "javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createLineBorder(java.awt.SystemColor.activeCaption,30), \"Hello\", javax.swing.border.TitledBorder.CENTER, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font(\"Dialog\", java.awt.Font.BOLD, 18), java.awt.Color.lightGray)",
- false,
- javax.swing.BorderFactory.createTitledBorder(javax.swing.BorderFactory.createLineBorder(java.awt.SystemColor.activeCaption,30), "Hello", javax.swing.border.TitledBorder.CENTER, javax.swing.border.TitledBorder.DEFAULT_POSITION, new java.awt.Font("Dialog", java.awt.Font.BOLD, 18), java.awt.Color.lightGray));
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/CastTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/CastTest.java
deleted file mode 100644
index c4182dc6..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/CastTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: CastTest.java,v $
- * $Revision: 1.5 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class CastTest extends AbstractInitParserTestCase {
-
- /**
- * Constructor for CastTest.
- * @param name
- */
- public CastTest(String name) {
- super(name);
- }
-
- public void testIntToFloat() throws Throwable {
- testHelper.testInitString("new Float((float)10)", new Float(10));
- }
- public void testIntToFloatSpace() throws Throwable {
- testHelper.testInitString("new Float( (float) 10 )", new Float(10));
- }
- public void testFloatToFloat() throws Throwable {
- testHelper.testInitString("new Float((float)10.3)", new Float((float) 10.3));
- }
- public void testFloatToFloat2() throws Throwable {
- testHelper.testInitString("new Float((float)5.3)", new Float((float) 5.3));
- }
- public void testFloatToFloatSpace() throws Throwable {
- testHelper.testInitString("new Float( (float) 10.3 )", new Float((float) 10.3));
- }
- public void testNullToString() throws Throwable {
- testHelper.testInitString("(String)null", (String) null);
- }
- public void testStringLiteralToString() throws Throwable {
- testHelper.testInitString("(String)\"hi\"", "hi");
- }
- public void testNullToStringParam() throws Throwable {
- testHelper.testInitString("new javax.swing.JLabel( (String) null)", new javax.swing.JLabel((String) null));
- }
- public void testIntToShort() throws Throwable {
- testHelper.testInitString("(short)10", new Short((short) 10));
- }
- public void testFloatToFloatPrim() throws Throwable {
- testHelper.testInitString("(float)10.3", new Float((float)10.3));
- }
-
- // Casts statements with qualified expression used to fail
- public void testQualifiedStringReturn() throws Throwable {
- testHelper.testInitString("(java.lang.String)org.eclipse.jem.tests.proxy.initParser.NavigationParameters.getReversed(\"Frog\")",org.eclipse.jem.tests.proxy.initParser.NavigationParameters.getReversed("Frog"));
- }
- public void testStringReturn() throws Throwable {
- testHelper.testInitString("(String)org.eclipse.jem.tests.proxy.initParser.NavigationParameters.getReversed(\"Frog\")",org.eclipse.jem.tests.proxy.initParser.NavigationParameters.getReversed("Frog"));
- }
- public void testQualifiedColorReturn() throws Throwable {
- testHelper.testInitString("(java.awt.Color)org.eclipse.jem.tests.proxy.initParser.NavigationParameters.getColor(\"red\")",org.eclipse.jem.tests.proxy.initParser.NavigationParameters.getColor("red"));
- }
-
- public void testCastUpColor() throws Throwable {
- // Test where the method is typed to return Color and we cast to the more generailized subclass of SystemColor
- testHelper.testInitString("(java.awt.SystemColor)org.eclipse.jem.tests.proxy.initParser.NavigationParameters.getColor(\"window\")",org.eclipse.jem.tests.proxy.initParser.NavigationParameters.getColor("window"));
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/CharTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/CharTest.java
deleted file mode 100644
index f192be9b..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/CharTest.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: CharTest.java,v $
- * $Revision: 1.4 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class CharTest extends AbstractInitParserTestCase {
-
- /**
- * Constructor for CharTest.
- * @param name
- */
- public CharTest(String name) {
- super(name);
- }
-
- public void testChar() throws Throwable {
- testHelper.testInitString("'a'", new Character('a'));
- }
- public void testCharacter() throws Throwable {
- testHelper.testInitString("new Character('a')", new Character('a'));
- }
- public void testDoubleQuote() throws Throwable {
- testHelper.testInitString("'\"'", new Character('\"'));
- }
- public void testSingleQuote() throws Throwable {
- testHelper.testInitString("'\\''", new Character('\''));
- }
- public void testBackslash() throws Throwable {
- testHelper.testInitString("'\\\\'", new Character('\\'));
- }
- public void testCharException() throws Throwable {
- testHelper.testInitString("'asdf'", null, true, true);
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/ExceptionTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/ExceptionTest.java
deleted file mode 100644
index 6c1233d9..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/ExceptionTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: ExceptionTest.java,v $
- * $Revision: 1.4 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ExceptionTest extends AbstractInitParserTestCase {
-
- /**
- * Constructor for ExceptionTest.
- * @param name
- */
- public ExceptionTest(String name) {
- super(name);
- }
-
- public void testTooManyParams() throws Throwable {
- testHelper.testInitString("new Integer(\"3,3\")", null, true, true);
- }
- public void testUnresolvedClass() throws Throwable {
- testHelper.testInitString("new ABCD(4)", null, true, true);
- }
- public void testUnresolvedMethod() throws Throwable {
- testHelper.testInitString("getMethod()",null,true, true);
- }
- public void testUnresolvedLiteral() throws Throwable {
- testHelper.testInitString("unresolvedLiteral",null,true, true);
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/InitParserSuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/InitParserSuite.java
deleted file mode 100644
index cdf4d669..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/InitParserSuite.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: InitParserSuite.java,v $
- * $Revision: 1.7 $ $Date: 2005/08/24 20:58:54 $
- */
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class InitParserSuite extends TestSuite {
-
- // Test cases to be include in the suite
- private static Class testsList[] = {
- NeedsCodingTest.class,
- BlockTest.class,
- ArrayConstructorTest.class,
- MultiArgStaticMethodTest.class,
- MultiArgConstructorTest.class,
- MultiArgInstanceTest.class,
- NumberTest.class,
- CastTest.class,
- ExceptionTest.class,
- LiteralTest.class,
- StringTest.class,
- CharTest.class,
- JFCTest.class,
- BorderTest.class,
- OverloadingTest.class,
- SameName46376Test.class
- } ;
- public static String pkgName = "org.eclipse.jem.tests.proxy.initParser" ;
-
- /**
- * Constructor for PackageSuite.
- */
- public InitParserSuite() {
- super();
- populateSuite() ;
- }
-
- /**
- * Constructor for PackageSuite.
- * @param theClass
- */
- public InitParserSuite(Class theClass) {
- super(theClass);
- populateSuite() ;
- }
-
- /**
- * Constructor for PackageSuite.
- * @param name
- */
- public InitParserSuite(String name) {
- super(name);
- populateSuite() ;
- }
-
- private void populateSuite () {
- for (int i=0; i<testsList.length; i++)
- addTestSuite(testsList[i]) ;
-
- AbstractInitParserTestCase.initSuite(this, new InitStringParserTestHelper(this.getClass().getClassLoader()));
- }
-
- public static Test suite() {
- return new InitParserSuite("Test for: "+pkgName);
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/InitStringParserTestHelper.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/InitStringParserTestHelper.java
deleted file mode 100644
index a7c447df..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/InitStringParserTestHelper.java
+++ /dev/null
@@ -1,134 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: InitStringParserTestHelper.java,v $
- * $Revision: 1.6 $ $Date: 2005/08/24 20:58:54 $
- */
-import java.lang.reflect.Array;
-
-import junit.framework.Assert;
-import org.eclipse.jem.internal.proxy.initParser.InitializationStringEvaluationException;
-import org.eclipse.jem.internal.proxy.initParser.InitializationStringParser;
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class InitStringParserTestHelper extends AbstractInitStringParserTestHelper {
-
- private final ClassLoader classLoader;
-
- public InitStringParserTestHelper() {
- this.classLoader = null;
- }
-
- public InitStringParserTestHelper(ClassLoader classLoader) {
- this.classLoader = classLoader;
- }
-
- /**
- * TestInitializationStringParser constructor comment.
- */
- public void testInitString(String aString, Object expectedResult, boolean throwsException, boolean equalsOnly) throws Throwable {
- // Equals only means accept if == or equals(), don't try to go on and say maybe equal.
-
- try {
- InitializationStringParser parser = InitializationStringParser.createParser(aString, classLoader);
- Object result = parser.evaluate();
- if (throwsException) {
- Assert.fail("It should of thrown an exception. Instead result=" + (result != null ? result.toString() : "null"));
- } else {
- if (result == expectedResult) {
- return;
- } else if (
- (result == null && expectedResult != null) || (expectedResult == null && result != null)) {
- Assert.fail("ExpectedResult=" + expectedResult + " result=" + result);
- } else if (result.equals(expectedResult)) {
- return;
- } else {
- // It may be that the equals expression is bad. If so use the toString() to do a partial comparison
- if (result.getClass() == expectedResult.getClass()) {
- if (result.toString().equals(expectedResult.toString())) {
- return;
- } else {
- // The toStrings do not match perfectly but the classes do.
- // Try and see how close the two strings are
- if ( expectedResult.getClass().isArray() && result.getClass().isArray()){
- Class expectedResultClass = expectedResult.getClass().getComponentType();
- Class resultClass = result.getClass().getComponentType();
- int resultLength = Array.getLength(result);
- int expectedLength = Array.getLength(expectedResult);
- if ( expectedLength == resultLength ){
- if ( resultClass == expectedResultClass ) {
- // TODO Should actually step in and check each element too.
- return;
- } else {
- Assert.fail( aString
- + " ExpectedResult="
- + expectedResult
- + " ActualResult="
- + result
- + " ExpectedClass="
- + expectedResult.getClass()
- + " ActualClass="
- + result.getClass());
- }
- } else {
- Assert.fail( aString
- + " ExpectedResult="
- + expectedResult
- + " ActualResult="
- + result
- + " ExpectedClass="
- + expectedResult.getClass()
- + " ActualClass="
- + result.getClass());
- }
- } else {
- if (equalsOnly)
- Assert.fail( aString
- + " ExpectedResult="
- + expectedResult
- + " ActualResult="
- + result
- + " ExpectedClass="
- + expectedResult.getClass()
- + " ActualClass="
- + result.getClass());
- return;
- }
- }
- } else {
- Assert.fail( aString
- + " ExpectedResult="
- + expectedResult
- + " ActualResult="
- + result
- + " ExpectedClass="
- + expectedResult.getClass()
- + " ActualClass="
- + result.getClass());
- }
- }
- }
- } catch (InitializationStringEvaluationException e) {
- if (throwsException) {
- return;
- } else {
- throw e.getOriginalException();
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/JFCTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/JFCTest.java
deleted file mode 100644
index 3983a46a..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/JFCTest.java
+++ /dev/null
@@ -1,136 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: JFCTest.java,v $
- * $Revision: 1.4 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class JFCTest extends AbstractInitParserTestCase {
-
- /**
- * Constructor for JFCTest.
- * @param name
- */
- public JFCTest(String name) {
- super(name);
- }
-
- public void testDimension() throws Throwable {
- testHelper.testInitString("new java.awt.Dimension(1,1)", new java.awt.Dimension(1, 1));
- }
- public void testDimensionNeg() throws Throwable {
- testHelper.testInitString("new java.awt.Dimension(-1,-1)", new java.awt.Dimension(-1, -1));
- }
- public void testColorConstant() throws Throwable {
- testHelper.testInitString("java.awt.Color.cyan", java.awt.Color.cyan);
- }
- public void testColorString() throws Throwable {
- testHelper.testInitString("java.awt.Color.cyan.toString()", java.awt.Color.cyan.toString());
- }
- public void testColorRGB() throws Throwable {
- testHelper.testInitString("new java.awt.Color(10,20,30)", new java.awt.Color(10, 20, 30));
- }
- public void testInteger() throws Throwable {
- testHelper.testInitString("new Integer(50)", new Integer(50));
- }
- public void testIntegerNegative() throws Throwable {
- testHelper.testInitString("new java.lang.Integer(-50)", new Integer(-50));
- }
- public void testShort() throws Throwable {
- testHelper.testInitString("new Short((short)50)", new Short((short)50));
- }
- public void testShortNegative() throws Throwable {
- testHelper.testInitString("new Short((short)-50)", new Short((short)-50));
- }
- public void testLong() throws Throwable {
- testHelper.testInitString("new Long(50L)", new Long(50L));
- }
- public void testLongNegative() throws Throwable {
- testHelper.testInitString("new java.lang.Long(-50L)", new Long(-50L));
- }
- public void testByte() throws Throwable {
- testHelper.testInitString("new Byte((byte)10)", new Byte((byte)10));
- }
- public void testByteNegative() throws Throwable {
- testHelper.testInitString("new Byte((byte)-10)", new Byte((byte)-10));
- }
- public void testFloat() throws Throwable {
-// TODO Need to fix this
-// It just doesn't work w/o java.lang on front. There is a problem with Contructor going closed too early because of the'.' in 3.5,
-// but if you fix that, then (new String("Frog").concat("xyz")).concat(... gets all messed up because it
-// tries to process String().concat() together, and how that should work doesn't work the way it does.
- testHelper.testInitString("new java.lang.Float(10.3F)", new Float(10.3F));
- }
- public void testDouble() throws Throwable {
-// TODO same problem as testFloat. Need java.lang for now.
- testHelper.testInitString("new java.lang.Double(10.3D)", new Double(10.3D));
- }
- public void testIntegerString() throws NumberFormatException, Throwable {
- testHelper.testInitString("new Integer(\"50\")", new Integer("50"));
- }
- public void testFlowLayout() throws Throwable {
- testHelper.testInitString("new java.awt.FlowLayout()", new java.awt.FlowLayout());
- }
- public void testImageIcon() throws Throwable {
- testHelper.testInitString("new javax.swing.ImageIcon( \"C:/WINNT/Zapotec.bmp\")",new javax.swing.ImageIcon( "C:/WINNT/Zapotec.bmp" ));
- }
- public void testRectangle() throws Throwable {
- testHelper.testInitString(
- "new java.awt.Rectangle( 10 , 20 , 30 , 40 )",
- new java.awt.Rectangle(10, 20, 30, 40));
-
- }
- public void testLocale() throws Throwable {
- testHelper.testInitString("new java.util.Locale(\"fr\",\"FR\")", new java.util.Locale("fr", "FR"));
- }
- public void testLocaleVariant() throws Throwable {
- testHelper.testInitString("new java.util.Locale(\"fr\",\"FR\",\"\")", new java.util.Locale("fr", "FR", ""));
- }
- public void testLocaleException() throws Throwable {
- //Locale constructor cannot take null as argument like this: new Java.util.Locale("fr", "FR", null)
- //so this is expected to fail
- testHelper.testInitString("new java.util.Locale(\"fr\",\"FR\",null)", null, true, true);
- }
- public void testDialog() throws Throwable {
- testHelper.testInitString("new java.awt.Dialog(new java.awt.Frame())", false, new java.awt.Dialog(new java.awt.Frame()));
- }
- public void testLength() throws Throwable {
- testHelper.testInitString("new Integer( 50 ).toString().length()", new Integer(new Integer( 50 ).toString().length()));
- }
- public void testSize() throws Throwable {
- testHelper.testInitString("new java.util.ArrayList().size()", new Integer(new java.util.ArrayList().size()));
- }
- public void testCursor() throws Throwable {
- testHelper.testInitString("new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR)",new java.awt.Cursor(java.awt.Cursor.HAND_CURSOR));
- }
- public void testPanel() throws Throwable {
- testHelper.testInitString("new java.awt.Panel(null)", false, new java.awt.Panel(null));
- }
-
- public void testComplexFont() throws Throwable {
- testHelper.testInitString(
- "new java.awt.Font(\"Dialog\", java.awt.Font.BOLD | java.awt.Font.ITALIC, 12)",
- new java.awt.Font("Dialog", java.awt.Font.BOLD | java.awt.Font.ITALIC, 12));
- }
-
- public void testKeyStroke() throws Throwable {
- testHelper.testInitString(
- "javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_H, java.awt.Event.ALT_MASK | java.awt.Event.CTRL_MASK | java.awt.Event.SHIFT_MASK, true)",
- javax.swing.KeyStroke.getKeyStroke(java.awt.event.KeyEvent.VK_H, java.awt.Event.ALT_MASK | java.awt.Event.CTRL_MASK | java.awt.Event.SHIFT_MASK, true));
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/LiteralTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/LiteralTest.java
deleted file mode 100644
index e28a7399..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/LiteralTest.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: LiteralTest.java,v $
- * $Revision: 1.4 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class LiteralTest extends AbstractInitParserTestCase {
-
- /**
- * Constructor for LiteralTest.
- * @param name
- */
- public LiteralTest(String name) {
- super(name);
- }
-
- public void testString() throws Throwable {
- testHelper.testInitString("\"Frog\"", "Frog");
- }
- public void testNull() throws Throwable {
- testHelper.testInitString("null", null);
- }
- public void testFalse() throws Throwable {
- testHelper.testInitString("false", Boolean.FALSE);
- }
- public void testTrue() throws Throwable {
- testHelper.testInitString("true", Boolean.TRUE);
- }
- public void testBooleanTrue() throws Throwable {
- testHelper.testInitString("Boolean.TRUE", Boolean.TRUE);
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/MultiArgConstructorTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/MultiArgConstructorTest.java
deleted file mode 100644
index 7557ffa4..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/MultiArgConstructorTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: MultiArgConstructorTest.java,v $
- * $Revision: 1.7 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class MultiArgConstructorTest extends AbstractInitParserTestCase {
-
- /**
- * Constructor for MultiArgConstructorTest.
- * @param name
- */
- public MultiArgConstructorTest(String name) {
- super(name);
- }
-
- public void testTwoBooleans() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(false, false)",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(false,false));
- }
- public void testTwoInts() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(12, 24)",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(12,24));
- }
- public void testThreeFloats() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters((float)12,(float)24,(float)50)",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(12,24,50));
- }
- public void testTwoDoubles() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(12.5d, 24.5d)",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(12.5d,24.5d));
- }
- public void testTwoStrings() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(\"a\", \"b\")",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters("a","b"));
- }
- public void testTwoColors() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(java.awt.Color.red, java.awt.Color.red)",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(java.awt.Color.red,java.awt.Color.red));
- }
- public void testTwoNewColors() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new java.awt.Color(255,0,0), new java.awt.Color(255,0,0))",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new java.awt.Color(255,0,0),new java.awt.Color(255,0,0)));
- }
- public void testLots() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(\"processor\", 0, \"customerSearchClientOp\", 0, \"2343434\", \"3443234234\", \"depositRepFmt\", \"depositRepFmt\", \"\", \"\", 0, 0, 0, 0, false, false)",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters("processor", 0, "customerSearchClientOp", 0, "2343434", "3443234234", "depositRepFmt", "depositRepFmt", "", "", 0, 0, 0, 0, false, false));
- }
-
-// Testcase for Bugzilla bug #58854 - not yet fixed.
-// public void testNestedNested() throws Throwable {
-// testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new java.lang.String(new String(\"s\")), \"a\")",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(new java.lang.String(new String("s")), "a"));
-// }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/MultiArgInstanceTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/MultiArgInstanceTest.java
deleted file mode 100644
index 1f0384c2..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/MultiArgInstanceTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: MultiArgInstanceTest.java,v $
- * $Revision: 1.5 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class MultiArgInstanceTest extends AbstractInitParserTestCase {
-
- /**
- * Constructor for MultiArgInstanceTest.
- * @param name
- */
- public MultiArgInstanceTest(String name) {
- super(name);
- }
-
- public void testTwoBooleans() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters().set(false, false)",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters().set(false,false));
- }
- public void testTwoInts() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters().set(12, 24)",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters().set(12,24));
- }
- public void testThreeFloats() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters().set((float)12,(float)24,(float)50)",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters().set(12,24,50));
- }
- public void testTwoDoubles() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters().set(12.5d, 24.5d)",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters().set(12.5d,24.5d));
- }
- public void testTwoStrings() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters().set(\"a\", \"b\")",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters().set("a","b"));
- }
- public void testTwoColors() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters().set(java.awt.Color.red, java.awt.Color.red)",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters().set(java.awt.Color.red,java.awt.Color.red));
- }
- public void testTwoNewColors() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters().set(new java.awt.Color(255,0,0), new java.awt.Color(255,0,0))",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters().set(new java.awt.Color(255,0,0),new java.awt.Color(255,0,0)));
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/MultiArgStaticMethodTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/MultiArgStaticMethodTest.java
deleted file mode 100644
index 1bd2f900..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/MultiArgStaticMethodTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: MultiArgStaticMethodTest.java,v $
- * $Revision: 1.5 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class MultiArgStaticMethodTest extends AbstractInitParserTestCase {
-
- /**
- * Constructor for MultiArgStaticMethodTest.
- * @param name
- */
- public MultiArgStaticMethodTest(String name) {
- super(name);
- }
-
- public void testTwoBooleans() throws Throwable {
- testHelper.testInitString("org.eclipse.jem.tests.proxy.initParser.NavigationParameters.get(false, false)",org.eclipse.jem.tests.proxy.initParser.NavigationParameters.get(false,false));
- }
- public void testTwoInts() throws Throwable {
- testHelper.testInitString("org.eclipse.jem.tests.proxy.initParser.NavigationParameters.get(12, 24)",org.eclipse.jem.tests.proxy.initParser.NavigationParameters.get(12,24));
- }
- public void testThreeFloats() throws Throwable {
- testHelper.testInitString("org.eclipse.jem.tests.proxy.initParser.NavigationParameters.get((float)12,(float)24,(float)50)",org.eclipse.jem.tests.proxy.initParser.NavigationParameters.get(12,24,50));
- }
- public void testTwoDoubles() throws Throwable {
- testHelper.testInitString("org.eclipse.jem.tests.proxy.initParser.NavigationParameters.get(12.5d, 24.5d)",org.eclipse.jem.tests.proxy.initParser.NavigationParameters.get(12.5d,24.5d));
- }
- public void testTwoStrings() throws Throwable {
- testHelper.testInitString("org.eclipse.jem.tests.proxy.initParser.NavigationParameters.get(\"a\", \"b\")",org.eclipse.jem.tests.proxy.initParser.NavigationParameters.get("a","b"));
- }
- public void testTwoColors() throws Throwable {
- testHelper.testInitString("org.eclipse.jem.tests.proxy.initParser.NavigationParameters.get(java.awt.Color.red, java.awt.Color.red)",org.eclipse.jem.tests.proxy.initParser.NavigationParameters.get(java.awt.Color.red,java.awt.Color.red));
- }
- public void testTwoNewColors() throws Throwable {
- testHelper.testInitString("org.eclipse.jem.tests.proxy.initParser.NavigationParameters.get(new java.awt.Color(255,0,0), new java.awt.Color(255,0,0))",org.eclipse.jem.tests.proxy.initParser.NavigationParameters.get(new java.awt.Color(255,0,0),new java.awt.Color(255,0,0)));
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/NavigationParameters.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/NavigationParameters.java
deleted file mode 100644
index fe1e6fdf..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/NavigationParameters.java
+++ /dev/null
@@ -1,244 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: NavigationParameters.java,v $
- * $Revision: 1.4 $ $Date: 2005/08/24 20:58:54 $
- */
-
-import java.io.*;
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
-import java.awt.*;
-
-/**
- * Test class for the initStrimg parser - This is there after the Spanish folks found some errors with initStrings
- * that showed up deficiencies where we had methods with multiple arguments and some of the expressions inside the
- * arguments were not being closed correctly. This class is designed to have lots of methods ( constructors and statics
- * and instance methods ) with multiple argument types to test these scenarios, and nice toString() methods so that we can
- * get good hit results on the test succeeding by a perfect toString() match
- */
-public class NavigationParameters implements java.io.Serializable {
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = 5289530492833484640L;
- protected int x = Integer.MIN_VALUE;
- protected int y = Integer.MIN_VALUE;
- protected boolean boolA, boolB, boolC;
- protected Color colorA, colorB;
- protected String stringA, stringB, stringC;
- protected double d1 = Double.MIN_VALUE;
- protected double d2 = Double.MIN_VALUE;
- protected float f1 = Float.MIN_VALUE;
- protected float f2 = Float.MIN_VALUE;
- protected float f3 = Float.MIN_VALUE;
- protected int[][] fIntArray;
- protected double[][] fDoubleDoubleArray;
- protected double[] fDoubleArray;
- protected Map fElements;
-
-// The original constructor we broke on - left there for posterity
-public NavigationParameters(String newContextUsed, int newNavigation, String newOperationName, int newChainContext, String newViewName, String newViewSource, String newOutputMapFormat, String newInputMapFormat, String a, String b, int x, int y, int w, int h, boolean useP, boolean useS) {
-}
-public NavigationParameters(){
-}
-public NavigationParameters(int x){
- this.x = x;
- y = 100;
-}
-public NavigationParameters setElemAt(Object aKey, int aValue){
- if ( fElements == null ) {
- fElements = new HashMap(1);
- };
- fElements.put(aKey,new Integer(aValue));
- return this;
-}
-public NavigationParameters(String string1, String string2, String string3, boolean bool1, boolean bool2, boolean bool3, int x){
- stringA = string1;
- stringB = string2;
- stringC = string3;
- boolA = bool1;
- boolB = bool2;
- boolC = bool3;
- this.x = x;
-}
-public NavigationParameters(int[][] intArray){
- fIntArray = intArray;
-}
-public NavigationParameters(double[] doubleArray){
- fDoubleArray = doubleArray;
-}
-// Constructors with different combinations of arguments
-public NavigationParameters(boolean a, boolean b){
- boolA = a;
- boolB = b;
-}
-public NavigationParameters(int x, int y){
- this.x = x;
- this.y = y;
-}
-public NavigationParameters(float f1, float f2, float f3){
- this.f1 = f1;
- this.f2 = f2;
- this.f3 = f3;
-}
-public NavigationParameters(double[][] aDoubleDoubleArray){
- fDoubleDoubleArray = aDoubleDoubleArray;
-}
-public NavigationParameters(double d1, double d2){
- this.d1 = d1;
- this.d2 = d2;
-}
-public NavigationParameters(Color colorA, Color colorB){
- this.colorA = colorA;
- this.colorB = colorB;
-}
-public NavigationParameters(String stringA, String stringB){
- this.stringA = stringA;
- this.stringB = stringB;
-}
-// Static method calls with different combinations of arguments
-public static NavigationParameters get(boolean a, boolean b){
- return new NavigationParameters(a,b);
-}
-public static NavigationParameters get(int x, int y){
- return new NavigationParameters(x,y);
-}
-public static NavigationParameters get(float f1, float f2, float f3){
- return new NavigationParameters(f1,f2,f3);
-}
-public static NavigationParameters get(double d1, double d2){
- return new NavigationParameters(d1,d2);
-}
-public static NavigationParameters get(Color colorA, Color colorB){
- return new NavigationParameters(colorA,colorB);
-}
-public static NavigationParameters get(String stringA, String stringB){
- return new NavigationParameters(stringA,stringB);
-}
-public static Object getReversed(String arg){
- // Return the argument reversed
- StringBuffer buffer = new StringBuffer(arg.length());
- for (int i = arg.length()-1; i >= 0; i--) {
- buffer.append(arg.charAt(i));
- }
- return buffer.toString();
-}
-public static Color getColor(String colorName){
- // Return the colorName to test cast statements
- try {
- Field field = Color.class.getField(colorName);
- return (Color) field.get(Color.class);
- } catch ( NoSuchFieldException exc ) {
- try {
- // It is possible that the field is on SystemColor and not color
- Field field = SystemColor.class.getField(colorName);
- return (Color) field.get(Color.class);
- } catch ( Exception e ) {
- }
- } catch ( Exception exc ) {
- }
- return null;
-}
-// Instance method calls with different combinations of arguments
-public NavigationParameters set(boolean a, boolean b){
- boolA = a;
- boolB = b;
- return this;
-}
-public NavigationParameters set(int x, int y){
- this.x = x;
- this.y = y;
- return this;
-}
-public NavigationParameters set(float f1, float f2, float f3){
- this.f1 = f1;
- this.f2 = f2;
- this.f3 = f3;
- return this;
-}
-public NavigationParameters set(double d1, double d2){
- this.d1 = d1;
- this.d2 = d2;
- return this;
-}
-public NavigationParameters set(Color colorA, Color colorB){
- this.colorA = colorA;
- this.colorB = colorB;
- return this;
-}
-public NavigationParameters set(String stringA, String stringB){
- this.stringA = stringA;
- this.stringB = stringB;
- return this;
-}
-// To string method to help the tests be OK? with matching toString() results
-public String toString(){
- StringWriter writer = new StringWriter();
- writer.write("NavigationParameters(");
- if ( x != Integer.MIN_VALUE ) writer.write(new Integer(x).toString());
- if ( y != Integer.MIN_VALUE ) writer.write(new Integer(y).toString());
- writer.write("boolA=" + boolA);
- writer.write("boolA=" + boolB);
- writer.write("boolA=" + boolA);
- writer.write("boolC=" + boolC);
- if ( colorA != null ) writer.write("colorA=" + colorA);
- if ( colorB != null ) writer.write("colorB=" + colorB);
- if ( stringA != null ) writer.write("stringA=" + stringA);
- if ( stringB != null ) writer.write("stringB=" + stringB);
- if ( stringC != null ) writer.write("stringB=" + stringC);
- if ( d1 != Double.MIN_VALUE ) writer.write("d1=" + d1);
- if ( d2 != Double.MIN_VALUE ) writer.write("d1=" + d2);
- if ( f1 != Float.MIN_VALUE ) writer.write("f1=" + f1);
- if ( f2 != Float.MIN_VALUE ) writer.write("f2=" + f2);
- if ( f2 != Float.MIN_VALUE ) writer.write("f3=" + f3);
- if ( fIntArray != null ) {
- writer.write("int array=");
- for (int i = 0; i < fIntArray.length; i++) {
- writer.write("[");
- // The elements in the array are themselves arrays - it is two dimensional
- int[] elements = fIntArray[i];
- for (int j = 0; j < elements.length; j++) {
- writer.write(new Integer(elements[j]).toString());
- }
- writer.write("]");
- }
- }
- if ( fDoubleDoubleArray != null ) {
- writer.write("doubledouble array=");
- for (int i = 0; i < fDoubleDoubleArray.length; i++) {
- writer.write("[");
- // The elements in the array are themselves arrays - it is two dimensional
- double[] elements = fDoubleDoubleArray[i];
- for (int j = 0; j < elements.length; j++) {
- writer.write(new Double(elements[j]).toString());
- }
- writer.write("]");
- }
- }
-
- if ( fDoubleArray != null ) {
- writer.write("double array=");
- for (int i = 0; i < fDoubleArray.length; i++) {
- writer.write("(");
- writer.write(new Double(fDoubleArray[i]).toString());
- writer.write(")");
- }
- }
- writer.write(")");
- return writer.toString();
-}
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/NeedsCodingTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/NeedsCodingTest.java
deleted file mode 100644
index 02ec453e..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/NeedsCodingTest.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: NeedsCodingTest.java,v $
- * $Revision: 1.6 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class NeedsCodingTest extends AbstractInitParserTestCase {
-
- /**
- * Constructor for NeedsCodingTest.
- * @param name
- */
- public NeedsCodingTest(String name) {
- super(name);
- }
-
- // TODO: enable this test when math works
- /*
- public void testMath() {
- // Doing math is not coded yet. We don't expect to encounter any strings like this as part of GA
- testHelper.testInitString("10 + 20", new Integer(10 + 20));
- }
- */
-
- public void testInnerClasses() throws Throwable {
- // Inner classes need coding but we have a test to make sure we throw an explicit exception
- testHelper.testInitString("new javax.swing.table.DefaultTableModel(){}",new javax.swing.table.DefaultTableModel(){
-
- /**
- * Comment for <code>serialVersionUID</code>
- *
- * @since 1.1.0
- */
- private static final long serialVersionUID = 1L;},true, true);
- }
- public void testParamsThreeFloats() throws Throwable {
- testHelper.testInitString("org.eclipse.jem.tests.proxy.initParser.NavigationParameters.get((float)12,(float)24,(float)50)",org.eclipse.jem.tests.proxy.initParser.NavigationParameters.get(12,24,50));
- }
- public void testConstructThreeFloats() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters((float)12,(float)24,(float)50)",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters(12,24,50));
- }
- public void testNewParamsThreeFloats() throws Throwable {
- testHelper.testInitString("new org.eclipse.jem.tests.proxy.initParser.NavigationParameters().set((float)12,(float)24,(float)50)",new org.eclipse.jem.tests.proxy.initParser.NavigationParameters().set(12,24,50));
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/NumberTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/NumberTest.java
deleted file mode 100644
index 5863b66a..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/NumberTest.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: NumberTest.java,v $
- * $Revision: 1.4 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class NumberTest extends AbstractInitParserTestCase {
-
- /**
- * Constructor for NumberTest.
- * @param name
- */
- public NumberTest(String name) {
- super(name);
- }
-
- public void testIntPrim() throws Throwable {
- testHelper.testInitString("10", new Integer(10));
- }
- public void testShortPrim() throws Throwable {
- testHelper.testInitString("(short)10", new Short((short)10));
- }
- public void testNegativeShortPrim() throws Throwable {
- testHelper.testInitString("(short)-10", new Short((short)-10));
- }
- public void testBytePrim() throws Throwable {
- testHelper.testInitString("(byte)10", new Byte((byte)10));
- }
- public void testDoublePrimExplicit() throws Throwable {
- testHelper.testInitString("10d", new Double(10d));
- }
- public void testNegativeDoublePrimExplicit() throws Throwable {
- testHelper.testInitString("-10d", new Double(-10d));
- }
- public void testFloatPrimExplicit() throws Throwable {
- testHelper.testInitString("10f", new Float(10f));
- }
- public void testLongPrimExplicit() throws Throwable {
- testHelper.testInitString("10l", new Long(10l));
- }
- public void testDoublePrimImplicit() throws Throwable {
- testHelper.testInitString("10.75", new Double(10.75));
- }
- public void testNegativeDoublePrimImplicit() throws Throwable {
- testHelper.testInitString("-10.75", new Double(-10.75));
- }
- public void testSpacedDoublePrimImplicit() throws Throwable {
- testHelper.testInitString(" 10.75 ", new Double(10.75));
- }
- public void testNegativeDoublePrimExplicit2() throws Throwable {
- testHelper.testInitString("-10.75d", new Double(-10.75d));
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/OverloadingTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/OverloadingTest.java
deleted file mode 100644
index 983ae444..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/OverloadingTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: OverloadingTest.java,v $
- * $Revision: 1.7 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * Test that correct overloaded method is called.
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class OverloadingTest extends AbstractInitParserTestCase {
-
- /**
- * Constructor for OverloadingTest.
- * @param name
- */
- public OverloadingTest(String name) {
- super(name);
- }
-
- public void testOverloadString() throws Throwable {
- testHelper.testInitString("new Integer(\"3\")", new Integer(3));
- }
- public void testOverloadShort() throws Throwable {
- testHelper.testInitString("new Integer(5)", new Integer(5));
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/SameName46376Test.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/SameName46376Test.java
deleted file mode 100644
index 4ce5a75f..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/SameName46376Test.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: SameName46376Test.java,v $
- * $Revision: 1.3 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * This is to test for defect [46376].
- *
- * SameName test. This is test where you have this:
- * InitParserTest46376.SameNameTestClass.java
- * InitParserTest46376.java
- *
- * and
- *
- * new org.eclipse.jem.tests.proxy.initParser.SameNameTestClass.RealClass()
- *
- * Before [46376] the Static parser would find SameNameTestClass.java instead of the RealClass and would of failed.
- * To compile in Eclipse we need to have one of the classes be in the default package. Eclipse complains if we didn't.
- * But there is nothing to stop this from happening with packages too if they are spread across compile groups.
- */
-public class SameName46376Test extends AbstractInitParserTestCase {
-
- public SameName46376Test(String name) {
- super(name);
- }
-
- public void test46376() throws Throwable {
- testHelper.testInitString("new initParserTest46376.SameNameTestClass()", new initParserTest46376.SameNameTestClass());
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/StringTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/StringTest.java
deleted file mode 100644
index 77b4465d..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/StringTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.initParser;
-/*
- * $RCSfile: StringTest.java,v $
- * $Revision: 1.6 $ $Date: 2005/08/24 20:58:54 $
- */
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class StringTest extends AbstractInitParserTestCase {
-
- /**
- * Constructor for StringTest.
- * @param name
- */
- public StringTest(String name) {
- super(name);
- }
-
- public void testBasic() throws Throwable {
- testHelper.testInitString("\"Frog/123\"", "Frog/123");
- }
- public void testIntValue() throws Throwable {
- testHelper.testInitString("String.valueOf(10)", "10");
- }
- public void testParens() throws Throwable {
- testHelper.testInitString("\"Frog(123)prince\"", "Frog(123)prince");
- }
- public void testDoubleQuotes() throws Throwable {
- testHelper.testInitString("\"Frog\\\"prince\\\"123\"", "Frog\"prince\"123");
- }
- public void testBackSlashes() throws Throwable {
- testHelper.testInitString("\"Frog\\\\prince\\\\123\"", "Frog\\prince\\123");
- }
- public void testBackSlash() throws Throwable {
- testHelper.testInitString("\"\\\\Frog\"", "\\Frog");
- }
- public void testStringFunction() throws Throwable {
- testHelper.testInitString("\"Frog\".length()", new Integer(4));
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTArraysTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTArraysTest.java
deleted file mode 100644
index c25d4921..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTArraysTest.java
+++ /dev/null
@@ -1,65 +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
- *******************************************************************************/
-/*
- * $RCSfile: ASTArraysTest.java,v $
- * $Revision: 1.5 $ $Date: 2005/08/24 20:58:54 $
- */
-package org.eclipse.jem.tests.proxy.initParser.tree;
-
-import org.eclipse.jem.internal.proxy.core.IExpression;
-import org.eclipse.jem.internal.proxy.initParser.tree.ForExpression;
-import org.eclipse.jem.tests.proxy.initParser.ArrayConstructorTest;
-
-/**
- * Test Arrays for AST.
- *
- * @since 1.0.0
- */
-public class ASTArraysTest extends ArrayConstructorTest {
-
- public ASTArraysTest(String name) {
- super(name);
- }
-
- protected ASTTreeInitStringParserTestHelper getTreeParser() {
- return (ASTTreeInitStringParserTestHelper) testHelper;
- }
-
- public void testUndefinedSecondDim() throws Throwable {
- IExpression exp = getTreeParser().getRegistry().getBeanProxyFactory().createExpression();
- exp.createArrayCreation(ForExpression.ROOTEXPRESSION, "int[][]", 1);
- exp.createPrimitiveLiteral(ForExpression.ARRAYCREATION_DIMENSION, 3);
- testHelper.testInitString("new int[3][]", exp.getExpressionValue());
- }
-
- public void testArrayAccess() throws Throwable {
- IExpression exp = getTreeParser().getRegistry().getBeanProxyFactory().createExpression();
- exp.createArrayAccess(ForExpression.ROOTEXPRESSION, 1);
- exp.createArrayCreation(ForExpression.ARRAYACCESS_ARRAY, "java.lang.Integer[]", 1);
- exp.createPrimitiveLiteral(ForExpression.ARRAYCREATION_DIMENSION, 3);
- exp.createPrimitiveLiteral(ForExpression.ARRAYACCESS_INDEX, 0);
- testHelper.testInitString("(new Integer[3])[0]", exp.getExpressionValue());
- }
-
- public void testMutltiArrayAccess() throws Throwable {
- IExpression exp = getTreeParser().getRegistry().getBeanProxyFactory().createExpression();
- exp.createArrayAccess(ForExpression.ROOTEXPRESSION, 2);
- exp.createArrayCreation(ForExpression.ARRAYACCESS_ARRAY, "int[][]", 0);
- exp.createArrayInitializer(2);
- exp.createArrayInitializer(1);
- exp.createPrimitiveLiteral(ForExpression.ARRAYINITIALIZER_EXPRESSION, 2);
- exp.createArrayInitializer(1);
- exp.createPrimitiveLiteral(ForExpression.ARRAYINITIALIZER_EXPRESSION, 4);
- exp.createPrimitiveLiteral(ForExpression.ARRAYACCESS_INDEX, 0);
- exp.createPrimitiveLiteral(ForExpression.ARRAYACCESS_INDEX, 0);
- testHelper.testInitString("(new int[][] {{2}, {4}})[0][0]", exp.getExpressionValue());
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTFieldAccessTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTFieldAccessTest.java
deleted file mode 100644
index 284eadba..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTFieldAccessTest.java
+++ /dev/null
@@ -1,72 +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
- *******************************************************************************/
-/*
- * $RCSfile: ASTFieldAccessTest.java,v $
- * $Revision: 1.5 $ $Date: 2005/08/24 20:58:54 $
- */
-package org.eclipse.jem.tests.proxy.initParser.tree;
-
-import org.eclipse.jem.internal.proxy.core.IExpression;
-import org.eclipse.jem.internal.proxy.initParser.tree.ForExpression;
-import org.eclipse.jem.tests.proxy.initParser.AbstractInitParserTestCase;
-
-/**
- *
- * @since 1.0.0
- */
-public class ASTFieldAccessTest extends AbstractInitParserTestCase {
-
- /**
- * Create with name.
- * @param name
- *
- * @since 1.0.0
- */
- public ASTFieldAccessTest(String name) {
- super(name);
- }
-
- protected ASTTreeInitStringParserTestHelper getTreeParser() {
- return (ASTTreeInitStringParserTestHelper) testHelper;
- }
-
- public void testNonQualifiedFieldAccess() throws Throwable {
- getTreeParser().testInitString("Color.red", new String[] {"java.awt.*"}, getTreeParser().getRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.awt.Color").newInstance("java.awt.Color.red") );
- }
-
- public void testExpressionFieldAccess() throws Throwable {
- getTreeParser().testInitString("(Color.red).red", new String[] {"java.awt.*"}, getTreeParser().getRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.awt.Color").newInstance("java.awt.Color.red") ); // Should not use this form, but it is valid, use valid form for expected results so no warnings.
- }
-
- public void testNestedFieldAccess() throws Throwable {
- getTreeParser().testInitString("ASTNestFieldAccessTestData.acolor.red", new String[] {"org.eclipse.jem.tests.proxy.initParser.tree.ASTNestFieldAccessTestData"}, getTreeParser().getRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.awt.Color").newInstance("java.awt.Color.red")); // Should not use this form, but it is valid, use valid form for expected results so no warnings.
- }
-
- public void testNestedFieldExpressionAccess() throws Throwable {
- getTreeParser().testInitString("new ASTNestFieldAccessTestData().acolor.red", new String[] {"org.eclipse.jem.tests.proxy.initParser.tree.ASTNestFieldAccessTestData"}, getTreeParser().getRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.awt.Color").newInstance("java.awt.Color.red")); // Should not use this form, but it is valid, use valid form for expected results so no warnings.
- }
-
- public void testNonstaticFieldAccess() throws Throwable {
- IExpression exp = getTreeParser().getRegistry().getBeanProxyFactory().createExpression();
- exp.createFieldAccess(ForExpression.ROOTEXPRESSION, "arect", true);
- exp.createClassInstanceCreation(ForExpression.FIELD_RECEIVER, "org.eclipse.jem.tests.proxy.initParser.tree.ASTNestFieldAccessTestData", 0);
- getTreeParser().testInitString("new ASTNestFieldAccessTestData().arect", new String[] {"org.eclipse.jem.tests.proxy.initParser.tree.ASTNestFieldAccessTestData"}, exp.getExpressionValue());
- }
-
- public void testNonstaticNestedFieldAccess() throws Throwable {
- IExpression exp = getTreeParser().getRegistry().getBeanProxyFactory().createExpression();
- exp.createFieldAccess(ForExpression.ROOTEXPRESSION, "x", true);
- exp.createFieldAccess(ForExpression.FIELD_RECEIVER, "arect", true);
- exp.createClassInstanceCreation(ForExpression.FIELD_RECEIVER, "org.eclipse.jem.tests.proxy.initParser.tree.ASTNestFieldAccessTestData", 0);
- getTreeParser().testInitString("new ASTNestFieldAccessTestData().arect.x", new String[] {"org.eclipse.jem.tests.proxy.initParser.tree.ASTNestFieldAccessTestData"}, exp.getExpressionValue());
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTInnerClassAccessTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTInnerClassAccessTest.java
deleted file mode 100644
index 34593d2a..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTInnerClassAccessTest.java
+++ /dev/null
@@ -1,72 +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
- *******************************************************************************/
-/*
- * $RCSfile: ASTInnerClassAccessTest.java,v $
- * $Revision: 1.5 $ $Date: 2005/08/24 20:58:54 $
- */
-package org.eclipse.jem.tests.proxy.initParser.tree;
-
-import org.eclipse.jem.internal.proxy.core.IExpression;
-import org.eclipse.jem.internal.proxy.initParser.tree.ForExpression;
-import org.eclipse.jem.tests.proxy.initParser.AbstractInitParserTestCase;
-
-/**
- * This is for testing inner class access.
- * @since 1.0.0
- */
-public class ASTInnerClassAccessTest extends AbstractInitParserTestCase {
-
- /**
- * Construct with name.
- * @param name
- *
- * @since 1.0.0
- */
- public ASTInnerClassAccessTest(String name) {
- super(name);
- }
-
- protected ASTTreeInitStringParserTestHelper getTreeParser() {
- return (ASTTreeInitStringParserTestHelper) testHelper;
- }
-
- public void testInnerFieldAccess() throws Throwable {
- IExpression exp = getTreeParser().getRegistry().getBeanProxyFactory().createExpression();
- exp.createFieldAccess(ForExpression.ROOTEXPRESSION, "GREEN", true);
- exp.createTypeReceiver("org.eclipse.jem.tests.proxy.initParser.tree.InnerClassTestData$InnerInnerClass");
- getTreeParser().testInitString("InnerClassTestData.InnerInnerClass.GREEN", new String[] {"org.eclipse.jem.tests.proxy.initParser.tree.*"}, exp.getExpressionValue());
- }
-
- public void testInnerFieldAccess2() throws Throwable {
- IExpression exp = getTreeParser().getRegistry().getBeanProxyFactory().createExpression();
- exp.createFieldAccess(ForExpression.ROOTEXPRESSION, "GREEN", true);
- exp.createTypeReceiver("org.eclipse.jem.tests.proxy.initParser.tree.InnerClassTestData$InnerInnerClass");
-
- // Test where the inner class is the top level listed.
- getTreeParser().testInitString("InnerInnerClass.GREEN", new String[] {"org.eclipse.jem.tests.proxy.initParser.tree.InnerClassTestData.InnerInnerClass"}, exp.getExpressionValue());
- }
-
- public void testInnerInnerFieldAccess() throws Throwable {
- IExpression exp = getTreeParser().getRegistry().getBeanProxyFactory().createExpression();
- exp.createFieldAccess(ForExpression.ROOTEXPRESSION, "RED", true);
- exp.createTypeReceiver("org.eclipse.jem.tests.proxy.initParser.tree.InnerClassTestData$InnerInnerClass$InnerInnerInnerClass");
-
- getTreeParser().testInitString("InnerClassTestData.InnerInnerClass.InnerInnerInnerClass.RED", new String[] {"org.eclipse.jem.tests.proxy.initParser.tree.*"}, exp.getExpressionValue());
- }
-
- public void testInnerClassCreation() throws Throwable {
- IExpression exp = getTreeParser().getRegistry().getBeanProxyFactory().createExpression();
- exp.createClassInstanceCreation(ForExpression.ROOTEXPRESSION, "org.eclipse.jem.tests.proxy.initParser.tree.InnerClassTestData$InnerInnerClass", 0);
- // Create static inner class
- getTreeParser().testInitString("new InnerClassTestData.InnerInnerClass()", new String[] {"org.eclipse.jem.tests.proxy.initParser.tree.*"}, exp.getExpressionValue());
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTMiscTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTMiscTest.java
deleted file mode 100644
index 7381043c..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTMiscTest.java
+++ /dev/null
@@ -1,72 +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
- *******************************************************************************/
-/*
- * $RCSfile: ASTMiscTest.java,v $
- * $Revision: 1.5 $ $Date: 2009/01/29 14:58:45 $
- */
-package org.eclipse.jem.tests.proxy.initParser.tree;
-
-import org.eclipse.jem.internal.instantiation.*;
-import org.eclipse.jem.internal.instantiation.InstantiationFactory;
-import org.eclipse.jem.internal.instantiation.PTCharacterLiteral;
-import org.eclipse.jem.tests.proxy.initParser.AbstractInitParserTestCase;
-
-/**
- * Some misc. tests.
- * @since 1.0.0
- */
-public class ASTMiscTest extends AbstractInitParserTestCase {
-
- /**
- * Construct with name.
- * @param name
- *
- * @since 1.0.0
- */
- public ASTMiscTest(String name) {
- super(name);
- }
-
- public void testCharLiteral() {
- PTCharacterLiteral cl = InstantiationFactory.eINSTANCE.createPTCharacterLiteral();
- cl.setEscapedValue("\'a\'");
- assertEquals('a', cl.getCharValue());
- cl.setCharValue('b');
- assertEquals("\'b\'", cl.getEscapedValue());
- cl.setEscapedValue("\'\\n\'");
- assertEquals('\n', cl.getCharValue());
- cl.setCharValue('\b');
- assertEquals("\'\\b\'", cl.getEscapedValue());
- cl.setEscapedValue("\'\\u0300\'");
- assertEquals('\u0300', cl.getCharValue());
- cl.setCharValue('\u0400');
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=249019
- assertEquals("\'\u0400\'", cl.getEscapedValue());
- }
-
- public void testStringLiteral() {
- PTStringLiteral sl = InstantiationFactory.eINSTANCE.createPTStringLiteral();
- sl.setEscapedValue("\"a\"");
- assertEquals("a", sl.getLiteralValue());
- sl.setLiteralValue("\b");
- assertEquals("\"\\b\"", sl.getEscapedValue());
- sl.setEscapedValue("\"\\n\"");
- assertEquals("\n", sl.getLiteralValue());
- sl.setLiteralValue("\b");
- assertEquals("\"\\b\"", sl.getEscapedValue());
- sl.setEscapedValue("\"\\u0300\"");
- assertEquals("\u0300", sl.getLiteralValue());
- sl.setLiteralValue("\u0400");
- // https://bugs.eclipse.org/bugs/show_bug.cgi?id=249019
- assertEquals("\"\u0400\"", sl.getEscapedValue());
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTNestFieldAccessTestData.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTNestFieldAccessTestData.java
deleted file mode 100644
index ff48e735..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTNestFieldAccessTestData.java
+++ /dev/null
@@ -1,29 +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.jem.tests.proxy.initParser.tree;
-/*
- * $RCSfile: ASTNestFieldAccessTestData.java,v $
- * $Revision: 1.3 $ $Date: 2005/08/24 20:58:54 $
- */
-
-import java.awt.Color;
-import java.awt.Rectangle;
-
-/**
- * This class is used in the testing of nested field access for Parse testing.
- * This is when you access a field, and then access a field of that.
- * In this case <code>ASTNestFieldAccessTestData.acolor.red</code>
- * @since 1.0.0
- */
-public class ASTNestFieldAccessTestData {
- public static Color acolor = Color.green;
- public Rectangle arect = new Rectangle(10,20,30,40);
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTOperationsTest.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTOperationsTest.java
deleted file mode 100644
index f001d4ac..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTOperationsTest.java
+++ /dev/null
@@ -1,84 +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
- *******************************************************************************/
-/*
- * $RCSfile: ASTOperationsTest.java,v $
- * $Revision: 1.5 $ $Date: 2005/08/24 20:58:54 $
- */
-package org.eclipse.jem.tests.proxy.initParser.tree;
-
-import org.eclipse.jem.tests.proxy.initParser.AbstractInitParserTestCase;
-
-/**
- *
- * @since 1.0.0
- */
-public class ASTOperationsTest extends AbstractInitParserTestCase {
-
- /**
- * Create with name.
- * @param name
- *
- * @since 1.0.0
- */
- public ASTOperationsTest(String name) {
- super(name);
- }
-
- protected ASTTreeInitStringParserTestHelper getTreeParser() {
- return (ASTTreeInitStringParserTestHelper) testHelper;
- }
-
- public void testTwoOpers() throws Throwable {
- testHelper.testInitString("3+4", getTreeParser().getRegistry().getBeanProxyFactory().createBeanProxyWith(3+4));
- }
-
- public void testFourOpersExtended() throws Throwable {
- testHelper.testInitString("3+4+5+6", getTreeParser().getRegistry().getBeanProxyFactory().createBeanProxyWith(3+4+5+6));
- }
-
- public void testMixedOpers() throws Throwable {
- testHelper.testInitString("3+4-5", getTreeParser().getRegistry().getBeanProxyFactory().createBeanProxyWith(3+4-5));
- }
-
- public void testMixedOpersPrecedence() throws Throwable {
- testHelper.testInitString("6 | 3+4 | 8", getTreeParser().getRegistry().getBeanProxyFactory().createBeanProxyWith(6 | 3+4 | 8));
- }
-
- public void testConditional() throws Throwable {
- testHelper.testInitString("java.awt.Color.red != null ? 3 : 5", getTreeParser().getRegistry().getBeanProxyFactory().createBeanProxyWith(java.awt.Color.red != null ? 3 : 5));
- }
-
- public void testInstanceof() throws Throwable {
- testHelper.testInitString("java.awt.Color.red instanceof java.awt.Color", getTreeParser().getRegistry().getBeanProxyFactory().createBeanProxyWith(true));
- }
-
- public void testTypeLiteral() throws Throwable {
- testHelper.testInitString("Object.class", getTreeParser().getRegistry().getBeanTypeProxyFactory().getBeanTypeProxy("java.lang.Object"));
- }
-
- public void testStringPlusOperations() throws Throwable {
- testHelper.testInitString("3+\"a\"", getTreeParser().getRegistry().getBeanProxyFactory().createBeanProxyWith(3+"a"));
- }
-
- public void testStringPlusOperations1() throws Throwable {
- testHelper.testInitString("\"a\"+3", getTreeParser().getRegistry().getBeanProxyFactory().createBeanProxyWith("a"+3));
- }
-
- public void testStringPlusExtendedOperations() throws Throwable {
- testHelper.testInitString("3+4+\"a\"", getTreeParser().getRegistry().getBeanProxyFactory().createBeanProxyWith(3+4+"a"));
- }
-
- public void testStringPlusExtendedOperations1() throws Throwable {
- testHelper.testInitString("3+\"a\"+4", getTreeParser().getRegistry().getBeanProxyFactory().createBeanProxyWith(3+"a"+4));
- }
-
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTParserSuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTParserSuite.java
deleted file mode 100644
index 533904e6..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTParserSuite.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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.jem.tests.proxy.initParser.tree;
-/*
- * $RCSfile: ASTParserSuite.java,v $
- * $Revision: 1.12 $ $Date: 2006/05/17 20:13:56 $
- */
-import junit.extensions.TestSetup;
-import junit.framework.*;
-import junit.framework.Assert;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.*;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.tests.JavaProjectUtil;
-import org.eclipse.jem.tests.JavaTestsPlugin;
-import org.eclipse.jem.tests.proxy.ProxySuite;
-import org.eclipse.jem.tests.proxy.initParser.*;
-
-/**
- * @author jmyers
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ASTParserSuite extends TestSetup {
-
- // Test cases to be include in the suite
- private static Class testsList[] = {
- NeedsCodingTest.class,
- BlockTest.class,
- ASTFieldAccessTest.class,
- ASTArraysTest.class,
- MultiArgStaticMethodTest.class,
- MultiArgConstructorTest.class,
- MultiArgInstanceTest.class,
- NumberTest.class,
- CastTest.class,
-// ExceptionTest.class, // mixes parse error w/execution errors. Can't test parse errors. Need specific test for exec errors like method not found.
- LiteralTest.class,
- StringTest.class,
- CharTest.class,
- JFCTest.class,
- BorderTest.class,
- OverloadingTest.class,
- SameName46376Test.class,
- ASTOperationsTest.class,
- ASTInnerClassAccessTest.class,
- ASTMiscTest.class,
- TestCompatibleMethods.class,
- } ;
-
- public static String pkgName = "org.eclipse.jem.tests.proxy.initParser.tree" ;
-
- /**
- * Constructor for PackageSuite.
- */
- public ASTParserSuite() {
- this("AST Parser Suite");
- }
-
- /**
- * Constructor for PackageSuite.
- * @param name
- */
- public ASTParserSuite(String name) {
- super(new TestSuite(name));
- populateSuite() ;
- }
-
- ProxyFactoryRegistry registry;
-
- private void populateSuite () {
- TestSuite suite = (TestSuite) getTest();
- for (int i=0; i<testsList.length; i++)
- suite.addTestSuite(testsList[i]) ;
-
- try {
- IProject project = JavaProjectUtil.createEmptyJavaProject(ResourcesPlugin.getWorkspace(), new Path(AST_PROJECT), null);
- IJavaProject jproject = JavaCore.create(project);
- // Add javatests.jar (i.e. this plugins jar) so that the classes within the tests jar are available
- // to the jdt parser for referencing.
- JavaProjectUtil.addBundleJarToPath(JavaTestsPlugin.getPlugin().getBundle(), "javatests.jar", jproject, null);
-
- // We're going to use the remote proxy, because it is easier to start up, but we aren't really testing
- // the remote proxy expression evaluation. We are really testing AST->ParseTree->BeanProxy. If any expression
- // type errors show up (i.e. the proxy expression itself is not working correctly). Then that should be fixed
- // and a junit test in the proxy suite should be created instead.
- registry = ProxyLaunchSupport.startImplementation(
- project,
- "JUnit Parse Tree Test",
- new IConfigurationContributor[] { ProxySuite.getProxySuiteContributor()},
- new NullProgressMonitor());
-
- AbstractInitParserTestCase.initSuite(suite, new ASTTreeInitStringParserTestHelper(project, registry));
- } catch (CoreException e) {
- Assert.assertNotNull(e);
- }
- }
-
- public static Test suite() {
- return new ASTParserSuite("Test for: "+pkgName);
- }
-
- private static final String AST_PROJECT = "/AST tests/";
-
- /* (non-Javadoc)
- * @see junit.extensions.TestSetup#tearDown()
- */
- protected void tearDown() throws Exception {
- if (registry != null) {
- registry.terminateRegistry();
- Thread.sleep(5000); // Give it five seconds to REALLY go away. There is a small window between
- // terminate request and true shutdown of the remote vm. We return immediately and let a
- // job wait for the actual true termination.
- }
-
- JavaProjectUtil.deleteProject(JavaProjectUtil.getProject(AST_PROJECT));
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTTreeInitStringParserTestHelper.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTTreeInitStringParserTestHelper.java
deleted file mode 100644
index 1b29b212..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/ASTTreeInitStringParserTestHelper.java
+++ /dev/null
@@ -1,238 +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
- *******************************************************************************/
-/*
- * $RCSfile: ASTTreeInitStringParserTestHelper.java,v $
- * $Revision: 1.12 $ $Date: 2005/08/24 20:58:54 $
- */
-package org.eclipse.jem.tests.proxy.initParser.tree;
-
-import java.text.MessageFormat;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.*;
-import org.eclipse.jdt.core.compiler.IProblem;
-import org.eclipse.jdt.core.dom.*;
-
-import org.eclipse.jem.internal.instantiation.PTExpression;
-import org.eclipse.jem.internal.instantiation.base.*;
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.tests.proxy.initParser.AbstractInitStringParserTestHelper;
-import org.eclipse.jem.workbench.utility.*;
-
-/**
- * Init String parser helper for working with AST trees.
- *
- * @since 1.0.0
- */
-public class ASTTreeInitStringParserTestHelper extends AbstractInitStringParserTestHelper {
-
- private static final String TEMPLATE_CLASS = "public class TEMPLATE '{'\n public void test() '{'\n String.valueOf({0});\t// a line comment\n }\n}";
- private static final String TEMPLATE_CLASS_IMPORTS = "{0}\npublic class TEMPLATE '{'\n public void test() '{'\n String.valueOf({1});\n }\n}";
-
- private IJavaProject project;
- private ParseTreeCreationFromAST parser = new ParseTreeCreationFromAST(new ASTBoundResolver());
- private ProxyFactoryRegistry registry;
-
- public ASTTreeInitStringParserTestHelper() {
- }
-
- public ASTTreeInitStringParserTestHelper(IProject project, ProxyFactoryRegistry registry) {
- this.project = JavaCore.create(project);
- this.registry = registry;
- }
-
- public ASTTreeInitStringParserTestHelper(IProject project) {
- this(project, null);
- }
-
- public ProxyFactoryRegistry getRegistry() {
- return registry;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.jem.tests.proxy.initParser.AbstractInitStringParserTestHelper#testInitString(java.lang.String, java.lang.Object, boolean, boolean)
- */
- public void testInitString(String aString, Object expectedResult, boolean throwsException, boolean equalsOnly) throws Throwable {
- String testClass = MessageFormat.format(TEMPLATE_CLASS, new Object[] {aString});
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(testClass.toCharArray());
- parser.setUnitName("TEMPLATE.java");
- if (project != null) {
- parser.setProject(project);
- parser.setResolveBindings(true);
- }
- CompilationUnit cu = (CompilationUnit) parser.createAST(new NullProgressMonitor());
-
- // This is the only method that is called from both init string and parse allocation. So we can be assume that
- // it is a straight init string. In that case we can go ahead and do regular proxy init string parsing to
- // get a proxy to pass into the parse testing.
- IBeanProxy expectedProxy = null;
- if (expectedResult instanceof IBeanProxy)
- expectedProxy = (IBeanProxy) expectedResult;
- else if (expectedResult != null && !throwsException && registry != null) {
- expectedProxy = registry.getBeanProxyFactory().createBeanProxyFrom(aString);
- }
- testInitString(aString, cu, expectedProxy, throwsException, equalsOnly);
- }
-
- public void testInitString(String aString, String[] imports, IBeanProxy expectedResult) throws Throwable {
- testInitString(aString, imports,expectedResult, false, true);
- }
-
- public void testInitString(String aString, String[] imports, IBeanProxy expectedResult, boolean throwsException, boolean equalsOnly) throws Throwable {
- StringBuffer importLines = new StringBuffer(100);
- for (int i = 0; i < imports.length; i++) {
- importLines.append("import ");
- importLines.append(imports[i]);
- importLines.append(";\n");
- }
- String testClass = MessageFormat.format(TEMPLATE_CLASS_IMPORTS, new Object[] {importLines, aString});
- ASTParser parser = ASTParser.newParser(AST.JLS3);
- parser.setSource(testClass.toCharArray());
- parser.setUnitName("TEMPLATE.java");
- if (project != null) {
- parser.setProject(project);
- parser.setResolveBindings(true);
- }
- CompilationUnit cu = (CompilationUnit) parser.createAST(null);
- testInitString(aString, cu, expectedResult, throwsException, equalsOnly);
- }
-
- protected void testInitString(
- String aString,
- CompilationUnit cu,
- IBeanProxy expectedResult,
- boolean throwsException,
- boolean equalsOnly)
- throws Throwable {
- IProblem[] problems = cu.getProblems();
- if (problems.length > 0) {
- boolean errors = false;
- StringBuffer buf = new StringBuffer(100);
- for (int i = 0; i < problems.length; i++) {
- errors = errors | problems[i].isError();
- buf.append(" " + problems[i].getMessage());
- }
- // If only warnings, try going on. Only errors should cause a failure.
- if (errors)
- if (!throwsException)
- Assert.fail("Problems with \"" + aString + "\": " + buf);
- else
- return; // Treat this as an exception.
- else {
- // Else just log the warnings.
- System.err.println("Warnings ocurred for \"" + aString + "\":" + buf);
- }
- }
-
- TypeDeclaration td = (TypeDeclaration) cu.types().get(0);
- ExpressionStatement es = (ExpressionStatement) td.getMethods()[0].getBody().statements().get(0);
- MethodInvocation mi = (MethodInvocation) es.getExpression();
- org.eclipse.jdt.core.dom.Expression exp = (org.eclipse.jdt.core.dom.Expression) mi.arguments().get(0);
- PTExpression parseExp = parser.createExpression(exp);
-
- if (registry != null) {
- ParseTreeAllocationInstantiationVisitor v = new ParseTreeAllocationInstantiationVisitor();
- try {
- IBeanProxy bean = v.getBeanProxy(parseExp, registry);
- if (throwsException)
- Assert.fail("Should of thrown exception. Instead result was \"" + (bean != null ? bean.toBeanString() : null) + "\"");
- if (bean == expectedResult)
- return;
- if ((bean == null && expectedResult != null) || (expectedResult == null && bean != null))
- Assert.fail(
- "ExpectedResult="
- + (expectedResult != null ? expectedResult.toBeanString() : null)
- + " result="
- + (bean != null ? bean.toBeanString() : null));
- if (bean.equals(expectedResult))
- return;
- // It may be that the equals expression is bad. If so use the toString() to do
- // a partial comparison
- if (bean.getTypeProxy() == expectedResult.getTypeProxy()) {
- if (bean.toBeanString().equals(expectedResult.toBeanString())) {
- return;
- } else {
- // The toStrings do not match perfectly but the classes do.
- // Try and see how close the two strings are
- if (expectedResult.getTypeProxy().isArray() && bean.getTypeProxy().isArray()) {
- IBeanTypeProxy expectedResultClass = ((IArrayBeanTypeProxy) expectedResult.getTypeProxy()).getComponentType();
- IBeanTypeProxy resultClass = ((IArrayBeanTypeProxy) bean.getTypeProxy()).getComponentType();
- int resultLength = ((IArrayBeanProxy) bean).getLength();
- int expectedLength = ((IArrayBeanProxy) expectedResult).getLength();
- if (expectedLength == resultLength) {
- if (resultClass == expectedResultClass) {
- // TODO Should actually step in and check each element too.
- return;
- } else {
- Assert.fail(
- aString
- + " ExpectedResult="
- + expectedResult.toBeanString()
- + " ActualResult="
- + bean.toBeanString()
- + " ExpectedClass="
- + expectedResult.getTypeProxy().getFormalTypeName()
- + " ActualClass="
- + bean.getTypeProxy().getFormalTypeName());
- }
- } else {
- Assert.fail(
- aString
- + " ExpectedResult="
- + expectedResult.toBeanString()
- + " ActualResult="
- + bean.toBeanString()
- + " ExpectedClass="
- + expectedResult.getTypeProxy().getFormalTypeName()
- + " ActualClass="
- + bean.getTypeProxy().getFormalTypeName());
- }
- } else {
- if (equalsOnly)
- Assert.fail(
- aString
- + " ExpectedResult="
- + expectedResult.toBeanString()
- + " ActualResult="
- + bean.toBeanString()
- + " ExpectedClass="
- + expectedResult.getTypeProxy().getFormalTypeName()
- + " ActualClass="
- + bean.getTypeProxy().getFormalTypeName());
- return;
- }
- }
- } else {
- Assert.fail(
- aString
- + " ExpectedResult="
- + expectedResult.toBeanString()
- + " ActualResult="
- + bean.toBeanString()
- + " ExpectedClass="
- + expectedResult.getTypeProxy().getFormalTypeName()
- + " ActualClass="
- + bean.getTypeProxy().getFormalTypeName());
- }
- } catch (Exception e) {
- if (throwsException)
- return; // This is ok, it should of thrown exception.
- else
- throw e;
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/InnerClassTestData.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/InnerClassTestData.java
deleted file mode 100644
index 3013f2a0..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/InnerClassTestData.java
+++ /dev/null
@@ -1,76 +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
- *******************************************************************************/
-/*
- * $RCSfile: InnerClassTestData.java,v $
- * $Revision: 1.4 $ $Date: 2005/08/24 20:58:54 $
- */
-package org.eclipse.jem.tests.proxy.initParser.tree;
-
-import java.awt.Color;
-
-/**
- * This is for testing inner class access.
- * @since 1.0.0
- */
-public class InnerClassTestData {
-
- /**
- *
- * @since 1.0.0
- */
- public static class InnerInnerClass extends Object {
- public final static Color GREEN = Color.green;
-
- /**
- *
- * @since 1.0.0
- */
- public static class InnerInnerInnerClass extends Object {
- public final static Color RED = Color.red;
-
- /**
- *
- * @since 1.0.0
- */
- public class InnerInnerInnerInnerClass {
-
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- return super.equals(obj) || obj instanceof InnerInnerInnerInnerClass;
- }
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- return super.equals(obj) || obj instanceof InnerInnerInnerClass;
- }
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- return super.equals(obj) || obj instanceof InnerInnerClass;
- }
- }
-
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
- public boolean equals(Object obj) {
- return super.equals(obj) || obj instanceof InnerClassTestData;
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/TestCompatibleMethods.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/TestCompatibleMethods.java
deleted file mode 100644
index ed2e5c87..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/TestCompatibleMethods.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- *******************************************************************************/
-/*
- * $RCSfile: TestCompatibleMethods.java,v $
- * $Revision: 1.1 $ $Date: 2006/03/19 18:27:12 $
- */
-package org.eclipse.jem.tests.proxy.initParser.tree;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.initParser.tree.ForExpression;
-import org.eclipse.jem.internal.proxy.initParser.tree.NoExpressionValueException;
-import org.eclipse.jem.tests.proxy.initParser.AbstractInitParserTestCase;
-
-
-/**
- *
- * @since 1.2.0
- */
-public class TestCompatibleMethods extends AbstractInitParserTestCase {
-
- /**
- * @param name
- *
- * @since 1.2.0
- */
- public TestCompatibleMethods(String name) {
- super(name);
- }
-
- protected ASTTreeInitStringParserTestHelper getTreeParser() {
- return (ASTTreeInitStringParserTestHelper) testHelper;
- }
-
- protected IBeanProxy executeQQQ(IBeanProxy a1, IBeanProxy a2) throws ThrowableProxy, IllegalStateException, NoExpressionValueException {
- ProxyFactoryRegistry registry = getTreeParser().getRegistry();
- IExpression exp = registry.getBeanProxyFactory().createExpression();
- exp.createMethodInvocation(ForExpression.ROOTEXPRESSION, "qqq", true, 2);
- exp.createClassInstanceCreation(ForExpression.METHOD_RECEIVER, "org.eclipse.jem.tests.proxy.initParser.tree.TestCompatibleMethodsData1", 0);
- exp.createProxyExpression(ForExpression.METHOD_ARGUMENT, a1);
- exp.createProxyExpression(ForExpression.METHOD_ARGUMENT, a2);
- return exp.getExpressionValue();
- }
-
- public void testAmbiguous() throws Throwable {
- ProxyFactoryRegistry registry = getTreeParser().getRegistry();
- try {
- executeQQQ(registry.getBeanProxyFactory().createBeanProxyWith(new Integer(1)), registry.getBeanProxyFactory().createBeanProxyWith(
- new Integer(1)));
- } catch (ThrowableProxy e) {
- if (e.getTypeProxy().getTypeName().equals("org.eclipse.jem.internal.proxy.common.AmbiguousMethodException"))
- return; // This is good.
- throw e;
- }
- fail("Should of thrown ambiquous.");
- }
-
- public void testExactMatch() throws Throwable {
- ProxyFactoryRegistry registry = getTreeParser().getRegistry();
- IIntegerBeanProxy result = (IIntegerBeanProxy) executeQQQ(registry.getBeanProxyFactory().createBeanProxyWith(new Integer(1)), registry.getBeanProxyFactory().createBeanProxyFrom("new Object()"));
- assertEquals(2, result.intValue());
-
- result = (IIntegerBeanProxy) executeQQQ(registry.getBeanProxyFactory().createBeanProxyFrom("new Object()"), registry.getBeanProxyFactory().createBeanProxyFrom("new Object()"));
- assertEquals(0, result.intValue());
- }
-
- public void testCompatibleMatch() throws Throwable {
- ProxyFactoryRegistry registry = getTreeParser().getRegistry();
- IIntegerBeanProxy result = (IIntegerBeanProxy) executeQQQ(registry.getBeanProxyFactory().createBeanProxyWith(new Float(1)), registry.getBeanProxyFactory().createBeanProxyWith(new Integer(1)));
- assertEquals(1, result.intValue());
-
- result = (IIntegerBeanProxy) executeQQQ(registry.getBeanProxyFactory().createBeanProxyWith(new Float(1)), registry.getBeanProxyFactory().createBeanProxyFrom("new Object()"));
- assertEquals(0, result.intValue());
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/TestCompatibleMethodsData.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/TestCompatibleMethodsData.java
deleted file mode 100644
index 9ca52fe6..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/TestCompatibleMethodsData.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- *******************************************************************************/
-/*
- * $RCSfile: TestCompatibleMethodsData.java,v $
- * $Revision: 1.1 $ $Date: 2006/03/19 18:27:12 $
- */
-package org.eclipse.jem.tests.proxy.initParser.tree;
-
-
-/**
- * Used to test compatible methods searching.
- * @since 1.2.0
- */
-public class TestCompatibleMethodsData {
-
- protected void t() {
- qqq(new Integer(1), new Object());
- }
-
- protected int qqq(Object o, Object o1) {
- return 0;
- }
-
- private int qqq(Integer i, Object o) {
- return -1;
- }
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/TestCompatibleMethodsData1.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/TestCompatibleMethodsData1.java
deleted file mode 100644
index a08e4896..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/initParser/tree/TestCompatibleMethodsData1.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2006 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
- *******************************************************************************/
-/*
- * $RCSfile: TestCompatibleMethodsData1.java,v $
- * $Revision: 1.1 $ $Date: 2006/03/19 18:27:12 $
- */
-package org.eclipse.jem.tests.proxy.initParser.tree;
-
-
-
-/**
- * Used for testing most compatible protected methods
- * @since 1.2.0
- */
-public class TestCompatibleMethodsData1 extends TestCompatibleMethodsData {
-
- protected int qqq(Number n, Integer i1) {
- return 1;
- }
-
- protected int qqq(Integer i, Object o1) {
- return 2;
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/remote/RemoteProxySuite.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/remote/RemoteProxySuite.java
deleted file mode 100644
index 591edfa2..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/remote/RemoteProxySuite.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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.jem.tests.proxy.remote;
-/*
- * $RCSfile: RemoteProxySuite.java,v $
- * $Revision: 1.11 $ $Date: 2006/09/14 18:31:06 $
- */
-import java.net.URL;
-
-import junit.extensions.TestSetup;
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.*;
-
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.tests.JavaProjectUtil;
-import org.eclipse.jem.tests.JavaTestsPlugin;
-import org.eclipse.jem.tests.proxy.AbstractTestProxy;
-import org.eclipse.jem.tests.proxy.ProxySuite;
-
-/**
- * @author richkulp
- *
- * This is the true test suite for Remote Proxy Testing. The RemoteProxyTest will use this.
- */
-public class RemoteProxySuite extends TestSetup {
-
- // Test cases to be include in the suite
- private static final Class testsList[] = { ProxySuite.class, TestProjectAccess.class, };
-
- private IProject project; // The project to start the proxy factory on.
- private AbstractTestProxy.RegistryHandler registryHandler = new AbstractTestProxy.RegistryHandler() {
- private ProxyFactoryRegistry registry;
-
- public boolean isValid() {
- return project != null;
- }
- public ProxyFactoryRegistry getRegistry() throws CoreException {
- if (registry == null) {
- registry =
- ProxyLaunchSupport.startImplementation(
- project,
- "JUnit Remote Proxy Test",
- new IConfigurationContributor[] { ProxySuite.getProxySuiteContributor()},
- new NullProgressMonitor());
- }
- return registry;
- }
-
- public void destroyRegistry() {
- if (registry != null) {
- registry.terminateRegistry();
- registry = null;
- }
- }
- };
-
- public RemoteProxySuite() {
- this("Test Remote Proxy Suite");
- }
-
- public RemoteProxySuite(String name) {
- super(new TestSuite(name) {
- {
- for (int i = 0; i < testsList.length; i++) {
- // We may get some tests and suites.
- if (TestSuite.class.isAssignableFrom(testsList[i]) || TestSetup.class.isAssignableFrom(testsList[i])) {
- try {
- Test ts = (Test) testsList[i].newInstance();
- addTest(ts);
- } catch (Exception e) {
- e.printStackTrace();
- }
- } else
- addTestSuite(testsList[i]);
- }
- }
- });
-
- AbstractTestProxy.initRegistryHandler((TestSuite) this.getTest(), registryHandler);
- }
-
- public static Test suite() {
- return new RemoteProxySuite();
- }
-
- private final static String TEST_PROJECT_NAME = "Test Remote Proxy";
- private boolean oldAutoBuildingState; // autoBuilding state before we started.
- protected void setUp() throws Exception {
- System.out.println("-- Initializing the Proxy Remote test data --"); //$NON-NLS-1$
- oldAutoBuildingState = JavaProjectUtil.setAutoBuild(true);
- String zipPath =
- FileLocator.toFileURL(new URL(JavaTestsPlugin.getPlugin().getBundle().getEntry("/"), "testdata/testremoteproject.zip"))
- .getFile();
- IProject[] projects = JavaProjectUtil.importProjects(new String[] { TEST_PROJECT_NAME }, new String[] { zipPath });
- assertNotNull(projects[0]);
- JavaProjectUtil.waitForAutoBuild();
- project = projects[0];
- System.out.println("-- Data initialized --"); //$NON-NLS-1$
-
- }
-
- protected void tearDown() throws Exception {
- registryHandler.destroyRegistry();
- if (project != null) {
- try {
- Thread.sleep(500); // Wait because some times the other vm isn't quite down so a file stays locked.
- } catch (InterruptedException e) {
- }
- project.delete(true, false, null); // Get rid of the project and the files themselves.
- project = null;
- }
- JavaProjectUtil.setAutoBuild(oldAutoBuildingState);
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/remote/TestProjectAccess.java b/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/remote/TestProjectAccess.java
deleted file mode 100644
index 013c1fa0..00000000
--- a/tests/org.eclipse.jem.tests/javatests/org/eclipse/jem/tests/proxy/remote/TestProjectAccess.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.jem.tests.proxy.remote;
-/*
- * $RCSfile: TestProjectAccess.java,v $
- * $Revision: 1.4 $ $Date: 2005/08/24 20:58:55 $
- */
-import org.eclipse.jem.internal.proxy.core.*;
-import org.eclipse.jem.internal.proxy.core.IBeanProxy;
-import org.eclipse.jem.internal.proxy.core.IBeanTypeProxy;
-import org.eclipse.jem.tests.proxy.AbstractTestProxy;
-
-/**
- * @author richkulp
- *
- * Test Project Access.
- */
-public class TestProjectAccess extends AbstractTestProxy {
-
- public TestProjectAccess() {
- super();
- }
-
- public TestProjectAccess(String name) {
- super(name);
- }
-
- public void testClassFromProject() {
- IBeanTypeProxy testClassType = proxyTypeFactory.getBeanTypeProxy("org.eclipse.jem.testing.proxy.remote.TestClass"); //$NON-NLS-1$
- assertNotNull(testClassType);
- }
-
- public void testProjectClassInstantiation() throws ThrowableProxy {
- IBeanTypeProxy testClassType = proxyTypeFactory.getBeanTypeProxy("org.eclipse.jem.testing.proxy.remote.TestClass"); //$NON-NLS-1$
- IBeanProxy testClass = testClassType.newInstance();
- assertNotNull(testClass);
- }
-
- public void testProjectClassMethod() throws ThrowableProxy {
- IBeanTypeProxy testClassType = proxyTypeFactory.getBeanTypeProxy("org.eclipse.jem.testing.proxy.remote.TestClass"); //$NON-NLS-1$
- IMethodProxy testMethod = testClassType.getMethodProxy("getTestString"); //$NON-NLS-1$
- assertNotNull(testMethod);
- }
-
- public void testProjectClassMethodInvoke() throws ThrowableProxy {
- IBeanTypeProxy testClassType = proxyTypeFactory.getBeanTypeProxy("org.eclipse.jem.testing.proxy.remote.TestClass"); //$NON-NLS-1$
- IMethodProxy testMethod = testClassType.getMethodProxy("getTestString"); //$NON-NLS-1$
- IBeanProxy testClass = testClassType.newInstance();
- IStringBeanProxy aString = (IStringBeanProxy) testMethod.invoke(testClass);
- assertNotNull(aString);
- assertEquals("TESTSTRING", aString.stringValue());
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/plugin.properties b/tests/org.eclipse.jem.tests/plugin.properties
deleted file mode 100644
index 70ee8b9a..00000000
--- a/tests/org.eclipse.jem.tests/plugin.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-###############################################################################
-# Copyright (c) 2003, 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
-###############################################################################
-#
-# $Source: /cvsroot/webtools/jeetools.move/webtools.javaee.tests.git/tests/org.eclipse.jem.tests/plugin.properties,v $
-# $Revision: 1.3 $ $Date: 2005/08/24 20:58:55 $
-#
-
-
-pluginName=Java EMF Model JUnit Test Cases
-providerName = Eclipse.org
diff --git a/tests/org.eclipse.jem.tests/plugin.xml b/tests/org.eclipse.jem.tests/plugin.xml
deleted file mode 100644
index b5ee425f..00000000
--- a/tests/org.eclipse.jem.tests/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin>
-
- <extension
- point="org.eclipse.jem.beaninfo.registrations">
- <registration
- container="org.eclipse.jdt.launching.JRE_CONTAINER">
- <override
- package="org.eclipse.jem.tests.beaninfo"
- path="testdata/overrides/beaninfo">
- </override>
- </registration>
- </extension>
-<!--
- <extension
- point="org.eclipse.jem.util.uiTester">
- <uiTester className="org.eclipse.jem.tests.UITester"/>
- </extension>
--->
-</plugin>
diff --git a/tests/org.eclipse.jem.tests/proxy.jars b/tests/org.eclipse.jem.tests/proxy.jars
deleted file mode 100644
index 7a7029ac..00000000
--- a/tests/org.eclipse.jem.tests/proxy.jars
+++ /dev/null
@@ -1,2 +0,0 @@
-vm/tests.jar=/org.eclipse.jem.tests/bin/
-javatests.jar=/org.eclipse.jem.tests/bin/ \ No newline at end of file
diff --git a/tests/org.eclipse.jem.tests/test.xml.off b/tests/org.eclipse.jem.tests/test.xml.off
deleted file mode 100644
index a37f160b..00000000
--- a/tests/org.eclipse.jem.tests/test.xml.off
+++ /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}\..\.."/>
-
- <!-- sets the properties plugin-name, and library-file -->
- <property name="plugin-name" value="org.eclipse.jem.tests"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml"/>
-
- <!-- 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="jem-folder" value="${eclipse-home}/jem_folder"/>
- <delete dir="${jem-folder}" quiet="true"/>
- <!-- Note: Doesn't really need to be UI test but launching remote VM's with
- DebugUI plugin present but not launching UI causes severe errrors
- because it tries to start DebugUI in headless env. Big Pain! -->
- <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${jem-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jem.tests.AllSuites"/>
- </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>
diff --git a/tests/org.eclipse.jem.tests/testdata/JDK5BinTests.jar b/tests/org.eclipse.jem.tests/testdata/JDK5BinTests.jar
deleted file mode 100644
index 19862e5b..00000000
--- a/tests/org.eclipse.jem.tests/testdata/JDK5BinTests.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jem.tests/testdata/JDK5Tests.zip b/tests/org.eclipse.jem.tests/testdata/JDK5Tests.zip
deleted file mode 100644
index 5488bd0e..00000000
--- a/tests/org.eclipse.jem.tests/testdata/JDK5Tests.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jem.tests/testdata/extjarops.txt b/tests/org.eclipse.jem.tests/testdata/extjarops.txt
deleted file mode 100644
index a5cfb7d9..00000000
--- a/tests/org.eclipse.jem.tests/testdata/extjarops.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-getActionCommand
-getLabel
-setActionCommand
-setLabel
diff --git a/tests/org.eclipse.jem.tests/testdata/extjarprops.txt b/tests/org.eclipse.jem.tests/testdata/extjarprops.txt
deleted file mode 100644
index 737ed621..00000000
--- a/tests/org.eclipse.jem.tests/testdata/extjarprops.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-alignmentX
-alignmentY
-background
-bounds
-colorModel
-cursor
-enabled
-focusTraversable
-componentOrientation
-font
-foreground
-graphics
-locale
-location
-locationOnScreen
-maximumSize
-minimumSize
-name
-parent
-preferredSize
-showing
-size
-toolkit
-treeLock
-valid
-visible
-actionCommand
-label
diff --git a/tests/org.eclipse.jem.tests/testdata/jlabelops.txt b/tests/org.eclipse.jem.tests/testdata/jlabelops.txt
deleted file mode 100644
index 0dad8d6f..00000000
--- a/tests/org.eclipse.jem.tests/testdata/jlabelops.txt
+++ /dev/null
@@ -1,173 +0,0 @@
-hashCode
-notify
-notifyAll
-wait
-wait
-wait
-getClass
-equals
-toString
-add
-addNotify
-checkImage
-contains
-createImage
-createImage
-dispatchEvent
-doLayout
-getBackground
-getBounds
-getColorModel
-getCursor
-getFont
-getFontMetrics
-getForeground
-getGraphics
-getLocale
-getLocation
-getLocationOnScreen
-getMaximumSize
-getMinimumSize
-getName
-getParent
-getPreferredSize
-getSize
-getToolkit
-getTreeLock
-invalidate
-isEnabled
-isShowing
-isValid
-isVisible
-list
-list
-paintAll
-prepareImage
-printAll
-remove
-removeNotify
-repaint
-requestFocus
-setBackground
-setBounds
-setCursor
-setEnabled
-setForeground
-setLocale
-setLocation
-setLocation
-setName
-setSize
-setSize
-transferFocus
-validate
-add
-add
-add
-add
-add
-getAlignmentX
-getAlignmentY
-getComponent
-getComponentAt
-getComponentAt
-getComponentCount
-getComponents
-getInsets
-getLayout
-isAncestorOf
-list
-list
-print
-remove
-remove
-removeAll
-setLayout
-computeVisibleRect
-contains
-createToolTip
-firePropertyChange
-firePropertyChange
-firePropertyChange
-firePropertyChange
-firePropertyChange
-firePropertyChange
-firePropertyChange
-getAccessibleContext
-getActionForKeyStroke
-getAutoscrolls
-getBorder
-getBounds
-getClientProperty
-getConditionForKeyStroke
-getHeight
-getLocation
-getNextFocusableComponent
-getRegisteredKeyStrokes
-getRootPane
-getSize
-getToolTipText
-getTopLevelAncestor
-getVisibleRect
-getWidth
-getX
-getY
-grabFocus
-hasFocus
-isDoubleBuffered
-isFocusCycleRoot
-isFocusTraversable
-isManagingFocus
-isOpaque
-isOptimizedDrawingEnabled
-isRequestFocusEnabled
-isValidateRoot
-paint
-paintImmediately
-putClientProperty
-repaint
-requestDefaultFocus
-resetKeyboardActions
-revalidate
-scrollRectToVisible
-setAlignmentX
-setAlignmentY
-setAutoscrolls
-setBorder
-setBounds
-setDebugGraphicsOptions
-setDoubleBuffered
-setMaximumSize
-setMinimumSize
-setNextFocusableComponent
-setOpaque
-setPreferredSize
-setRequestFocusEnabled
-setToolTipText
-setVisible
-unregisterKeyboardAction
-update
-getDisabledIcon
-getDisplayedMnemonic
-getHorizontalAlignment
-getHorizontalTextPosition
-getIcon
-getIconTextGap
-getLabelFor
-getText
-getUI
-getVerticalAlignment
-getVerticalTextPosition
-setDisabledIcon
-setDisplayedMnemonic
-setFont
-setHorizontalAlignment
-setHorizontalTextPosition
-setIcon
-setIconTextGap
-setLabelFor
-setText
-setUI
-setVerticalAlignment
-setVerticalTextPosition
-updateUI
diff --git a/tests/org.eclipse.jem.tests/testdata/jlabelprops.txt b/tests/org.eclipse.jem.tests/testdata/jlabelprops.txt
deleted file mode 100644
index 24bc7078..00000000
--- a/tests/org.eclipse.jem.tests/testdata/jlabelprops.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-background
-bounds
-colorModel
-cursor
-enabled
-focusTraversable
-foreground
-locale
-location
-locationOnScreen
-componentOrientation
-name
-parent
-showing
-size
-toolkit
-treeLock
-valid
-visible
-componentCount
-components
-layout
-alignmentX
-alignmentY
-autoscrolls
-border
-debugGraphicsOptions
-doubleBuffered
-focusCycleRoot
-graphics
-height
-insets
-managingFocus
-maximumSize
-minimumSize
-nextFocusableComponent
-opaque
-optimizedDrawingEnabled
-paintingTile
-preferredSize
-registeredKeyStrokes
-requestFocusEnabled
-rootPane
-toolTipText
-topLevelAncestor
-validateRoot
-visibleRect
-width
-x
-y
-disabledIcon
-displayedMnemonic
-font
-horizontalAlignment
-horizontalTextPosition
-icon
-iconTextGap
-labelFor
-text
-verticalAlignment
-verticalTextPosition
diff --git a/tests/org.eclipse.jem.tests/testdata/overrides/beaninfo/TestOverrides.override b/tests/org.eclipse.jem.tests/testdata/overrides/beaninfo/TestOverrides.override
deleted file mode 100644
index c09ebe5c..00000000
--- a/tests/org.eclipse.jem.tests/testdata/overrides/beaninfo/TestOverrides.override
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<change:ChangeDescription xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.jem.java="java.xmi" xmlns:org.eclipse.ve.internal.cde.decorators="http:///org/eclipse/ve/internal/cde/decorators.ecore" xmlns:org.eclipse.ve.internal.cde.utility="http:///org/eclipse/ve/internal/cde/utility.ecore" xmlns:org.eclipse.ve.internal.jcm="http:///org/eclipse/ve/internal/jcm.ecore" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:change="http://www.eclipse.org/emf/2003/Change" xmi:version="2.0">
- <objectChanges key="X:ROOT#//@root">
- <value featureName="eStructuralFeatures">
- <listChanges referenceValues="_eStructuralFeatures _eStructuralFeatures1"/>
- </value>
- </objectChanges>
- <objectsToAttach xmi:id="_eStructuralFeatures" xsi:type="ecore:EReference" name="xyz">
- <eAnnotations source="Override Annotation"/>
- </objectsToAttach>
- <objectsToAttach xmi:id="_eStructuralFeatures1" xsi:type="ecore:EReference" name="test79083"/>
-</change:ChangeDescription> \ No newline at end of file
diff --git a/tests/org.eclipse.jem.tests/testdata/testbasic.zip b/tests/org.eclipse.jem.tests/testdata/testbasic.zip
deleted file mode 100644
index e7e76026..00000000
--- a/tests/org.eclipse.jem.tests/testdata/testbasic.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jem.tests/testdata/testbeaninfo.zip b/tests/org.eclipse.jem.tests/testdata/testbeaninfo.zip
deleted file mode 100644
index bf70abfd..00000000
--- a/tests/org.eclipse.jem.tests/testdata/testbeaninfo.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jem.tests/testdata/testbeaninfobeaninfos.zip b/tests/org.eclipse.jem.tests/testdata/testbeaninfobeaninfos.zip
deleted file mode 100644
index aa69c1a6..00000000
--- a/tests/org.eclipse.jem.tests/testdata/testbeaninfobeaninfos.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jem.tests/testdata/testbeaninfopreq.zip b/tests/org.eclipse.jem.tests/testdata/testbeaninfopreq.zip
deleted file mode 100644
index 913e8af5..00000000
--- a/tests/org.eclipse.jem.tests/testdata/testbeaninfopreq.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jem.tests/testdata/testbuttonbeaninfoui1projectjar.zip b/tests/org.eclipse.jem.tests/testdata/testbuttonbeaninfoui1projectjar.zip
deleted file mode 100644
index ac2b5870..00000000
--- a/tests/org.eclipse.jem.tests/testdata/testbuttonbeaninfoui1projectjar.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jem.tests/testdata/testremoteproject.zip b/tests/org.eclipse.jem.tests/testdata/testremoteproject.zip
deleted file mode 100644
index 4a230228..00000000
--- a/tests/org.eclipse.jem.tests/testdata/testremoteproject.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jem.tests/testdata/unzip.xml b/tests/org.eclipse.jem.tests/testdata/unzip.xml
deleted file mode 100644
index 0097a759..00000000
--- a/tests/org.eclipse.jem.tests/testdata/unzip.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<project name="zip" default="zip" basedir=".">
- <target name="zip">
- <unzip src="${zipfrom}" dest="${zipto}" />
- </target>
-</project> \ No newline at end of file
diff --git a/tests/org.eclipse.jem.tests/vm_tests/org/eclipse/jem/tests/proxy/vm/TestCallback.java b/tests/org.eclipse.jem.tests/vm_tests/org/eclipse/jem/tests/proxy/vm/TestCallback.java
deleted file mode 100644
index 0f218db2..00000000
--- a/tests/org.eclipse.jem.tests/vm_tests/org/eclipse/jem/tests/proxy/vm/TestCallback.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.jem.tests.proxy.vm;
-/*
- * $RCSfile: TestCallback.java,v $
- * $Revision: 1.6 $ $Date: 2005/08/24 20:58:54 $
- */
-
-import org.eclipse.jem.internal.proxy.common.*;
-/**
- * This is a test for testing callbacks.
- */
-public class TestCallback implements ICallback {
-
- IVMCallbackServer vmServer;
- int callbackID;
- boolean stop = false;
-
- /**
- * When told to start, it will send a callback
- * once every half second until told to stop.
- */
- public void start() {
- new Thread(new Runnable() {
- public void run() {
- // First send back test for IDE calling back on same thread. We do this by sending the thread id
- // as a constant and the other side will then call back to remote, ask for the thread id, and
- // see if it matches.
- try {
- vmServer.doCallback(new ICallbackRunnable() {
- public Object run(ICallbackHandler handler) throws CommandException {
- return handler.callbackAsConstants(callbackID, 1, new Integer(Thread.currentThread().hashCode()));
- }
- });
-
- } catch (CommandException e) {
- }
-
- // Now do the regular testing.
- final Integer[] p = new Integer[] {new Integer(0)};
- while(!stop) {
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- continue;
- }
- if (stop)
- break;
- // Now signal the callback.
- p[0] = new Integer(p[0].intValue()+1);
- try {
- vmServer.doCallback(new ICallbackRunnable() {
- public Object run(ICallbackHandler handler) throws CommandException {
- return handler.callbackWithParms(callbackID, 0, p);
- }
- });
- } catch (CommandException e) {
- }
- }
- }
- }).start();
- }
-
- /**
- * Tell it stop.
- */
- public void stop() {
- stop = true;
- }
-
- /**
- * It is being initialized.
- */
- public void initializeCallback(IVMCallbackServer server, int id) {
- vmServer = server;
- callbackID = id;
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/vm_tests/org/eclipse/jem/tests/proxy/vm/TestCallbackStream.java b/tests/org.eclipse.jem.tests/vm_tests/org/eclipse/jem/tests/proxy/vm/TestCallbackStream.java
deleted file mode 100644
index dd83eb57..00000000
--- a/tests/org.eclipse.jem.tests/vm_tests/org/eclipse/jem/tests/proxy/vm/TestCallbackStream.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.jem.tests.proxy.vm;
-/*
- * $RCSfile: TestCallbackStream.java,v $
- * $Revision: 1.4 $ $Date: 2005/08/24 20:58:54 $
- */
-
-import java.io.IOException;
-import java.io.OutputStream;
-
-import org.eclipse.jem.internal.proxy.common.ICallback;
-import org.eclipse.jem.internal.proxy.common.IVMCallbackServer;
-/**
- * This is a test for testing callback streams.
- */
-public class TestCallbackStream implements ICallback {
-
- IVMCallbackServer vmServer;
- int callbackID;
- boolean stop = false;
-
- /**
- * When told to start, it will send a stream of 30000 bytes of incrementing
- * value (i.e. 0, 1, 2, ..., 127, -127, ...)
- */
- public void start() {
- new Thread(new Runnable() {
- public void run() {
- OutputStream os = null;
- try {
- os = vmServer.requestStream(callbackID, 0);
- if (os != null)
- for (int i=0; i<30000; i++)
- os.write(i);
- } catch (Exception e) {
- e.printStackTrace();
- }
- try {
- if (os != null)
- os.close();
- } catch (IOException e) {
- }
- }}).start();
- }
-
- /**
- * It is being initialized.
- */
- public void initializeCallback(IVMCallbackServer server, int id) {
- vmServer = server;
- callbackID = id;
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/vm_tests/org/eclipse/jem/tests/proxy/vm/TestExpressionThreadTransfer.java b/tests/org.eclipse.jem.tests/vm_tests/org/eclipse/jem/tests/proxy/vm/TestExpressionThreadTransfer.java
deleted file mode 100644
index 575b5ad2..00000000
--- a/tests/org.eclipse.jem.tests/vm_tests/org/eclipse/jem/tests/proxy/vm/TestExpressionThreadTransfer.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2001, 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.jem.tests.proxy.vm;
-/*
- * $RCSfile: TestExpressionThreadTransfer.java,v $
- * $Revision: 1.3 $ $Date: 2005/08/24 20:58:54 $
- */
-
-import org.eclipse.jem.internal.proxy.common.*;
-/**
- * This is a test for testing callbacks.
- */
-public class TestExpressionThreadTransfer implements ICallback {
-
- IVMCallbackServer vmServer;
- int callbackID;
- boolean stop = false;
-
- /**
- * When told to start, it will send a callback
- * once every half second until told to stop.
- */
- public void start() {
- // Need to put it into a new thread.
- // Then we'll just wait until the thread is done.
- // This will cause callback onto a different thread in IDE.
- Thread t = new Thread(new Runnable() {
- public void run() {
- // Calback to IDE on this thread. It won't return until complete on the other side.
- try {
- vmServer.doCallback(new ICallbackRunnable() {
- public Object run(ICallbackHandler handler) throws CommandException {
- return handler.callbackAsConstants(callbackID, 0, null);
- }
- });
-
- } catch (CommandException e) {
- }
- }
- });
- t.start();
- while (true) {
- try {
- t.join();
- break;
- } catch (InterruptedException e) {
- }
- }
- // Now we return and original thread on IDE resumes processing.
- }
-
- /**
- * It is being initialized.
- */
- public void initializeCallback(IVMCallbackServer server, int id) {
- vmServer = server;
- callbackID = id;
- }
-
-}
diff --git a/tests/org.eclipse.jem.tests/vm_tests/testPackage/TestAccess.java b/tests/org.eclipse.jem.tests/vm_tests/testPackage/TestAccess.java
deleted file mode 100644
index cf0bd611..00000000
--- a/tests/org.eclipse.jem.tests/vm_tests/testPackage/TestAccess.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 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
- *******************************************************************************/
-/*
- * $RCSfile: TestAccess.java,v $
- * $Revision: 1.3 $ $Date: 2005/05/11 19:01:32 $
- */
-package testPackage;
-
-
-/**
- * Used for testing fields.
- * @since 1.1.0
- */
-public class TestAccess {
-
- public static void testVoid() {
-
- }
-
- public int field1;
- protected int field2;
-
- public static int STATIC_FIELD = 3;
-
- TestAccess(RuntimeException i) {
-
- }
-
- TestAccess(Throwable n) {
-
- }
-
- public TestAccess() {
-
- }
-
- public TestAccess(Exception o) {
-
- }
-
- public void ddd(Integer o, Number n) {
-
- }
-
- public void ddd(Number o, Integer n) {
-
- }
-
- public void ddd(Number n, Number n1) {
-
- }
-
-
- public void xyz() {
- }
-
- public void xyz(Number n) {
- }
-
- public void xyz(Object n) {
- }
-
- protected void qxr() {
-
- }
-}
diff --git a/tests/org.eclipse.jem.tests/vm_tests/testPackage/TestCtorWithNull.java b/tests/org.eclipse.jem.tests/vm_tests/testPackage/TestCtorWithNull.java
deleted file mode 100644
index 7edf5c26..00000000
--- a/tests/org.eclipse.jem.tests/vm_tests/testPackage/TestCtorWithNull.java
+++ /dev/null
@@ -1,27 +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 testPackage;
-/*
- * $RCSfile: TestCtorWithNull.java,v $
- * $Revision: 1.3 $ $Date: 2005/08/24 20:58:55 $
- */
-
-/**
- *
- * @since 1.0.0
- */
-public class TestCtorWithNull {
-
- public TestCtorWithNull(String x) {
- // This is just a test to see that ctor will be selected if it has a null passed in for Tree Expression Processing.
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests.performance/.classpath b/tests/org.eclipse.jst.j2ee.core.tests.performance/.classpath
deleted file mode 100644
index 751c8f2e..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests.performance/.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.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests.performance/.cvsignore b/tests/org.eclipse.jst.j2ee.core.tests.performance/.cvsignore
deleted file mode 100644
index d586ee14..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests.performance/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-core-performance.jar
diff --git a/tests/org.eclipse.jst.j2ee.core.tests.performance/.project b/tests/org.eclipse.jst.j2ee.core.tests.performance/.project
deleted file mode 100644
index a3e12fb3..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests.performance/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.core.tests.performance</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.core.tests.performance/about.html b/tests/org.eclipse.jst.j2ee.core.tests.performance/about.html
deleted file mode 100644
index 2199df3f..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests.performance/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>June, 2008</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 Redistributor’s 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.core.tests.performance/build.properties b/tests/org.eclipse.jst.j2ee.core.tests.performance/build.properties
deleted file mode 100644
index 80a90d30..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests.performance/build.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-source.core-performance.jar = src/
-output.core-performance.jar = bin/
-bin.includes = plugin.xml,\
- core-performance.jar,\
- test.xml,\
- testcase.xml,\
- about.html
diff --git a/tests/org.eclipse.jst.j2ee.core.tests.performance/plugin.xml b/tests/org.eclipse.jst.j2ee.core.tests.performance/plugin.xml
deleted file mode 100644
index 77fd5132..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests.performance/plugin.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.jst.j2ee.core.tests.performance"
- name="Core Performance Plug-in"
- version="1.1.0"
- provider-name=""
- class="org.eclipse.jst.j2ee.core.tests.performance.CorePerformanceTestPlugin">
-
- <runtime>
- <library name="core-performance.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.junit"/>
- <import plugin="org.eclipse.jst.j2ee.tests.performance"/>
- <import plugin="org.eclipse.wst.common.tests"/>
- <import plugin="org.eclipse.jst.j2ee.core.tests"/>
- <import plugin="org.eclipse.jst.j2ee.tests"/>
- </requires>
-
-</plugin>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests.performance/src/org/eclipse/jst/j2ee/core/tests/performance/AllCorePerformanceTests.java b/tests/org.eclipse.jst.j2ee.core.tests.performance/src/org/eclipse/jst/j2ee/core/tests/performance/AllCorePerformanceTests.java
deleted file mode 100644
index 26d42337..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests.performance/src/org/eclipse/jst/j2ee/core/tests/performance/AllCorePerformanceTests.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Created on Nov 28, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.core.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.archive.emftests.AppClientEMFEditTest;
-import org.eclipse.jst.j2ee.archive.emftests.AppClientEMFTest;
-import org.eclipse.jst.j2ee.archive.emftests.EarEMFEditTest;
-import org.eclipse.jst.j2ee.archive.emftests.EarEMFTest;
-import org.eclipse.jst.j2ee.archive.emftests.EjbEMFEditTest;
-import org.eclipse.jst.j2ee.archive.emftests.RarEMFEditTest;
-import org.eclipse.jst.j2ee.archive.emftests.RarEMFTest;
-import org.eclipse.jst.j2ee.archive.emftests.WarEMFEditTest;
-import org.eclipse.jst.j2ee.archive.emftests.WarEMFTest;
-import org.eclipse.jst.j2ee.archive.emftests.WebServicesEMFTest;
-import org.eclipse.jst.j2ee.tests.performance.BasePerformanceTestCase;
-import org.eclipse.jst.j2ee.tests.performance.PerformanceTestCaseWrapper;
-import org.eclipse.wtp.j2ee.headless.tests.appclient.operations.AppClientProjectCreationOperationTest;
-import org.eclipse.wtp.j2ee.headless.tests.ejb.operations.EJBImportOperationTest;
-import org.eclipse.wtp.j2ee.headless.tests.ejb.operations.EJBProjectCreationOperationTest;
-import org.eclipse.wtp.j2ee.headless.tests.jca.operations.JCAProjectCreationOperationTest;
-import org.eclipse.wtp.j2ee.headless.tests.web.operations.WebProjectCreationOperationTest;
-
-/**
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class AllCorePerformanceTests extends BasePerformanceTestCase{
-
- public static Test suite() {
-
- TestSuite suite = new TestSuite("Performance Test for com.ibm.etools.archive.emftest");
- addPerformanceTest(suite, new AppClientEMFEditTest("testApplicationClientEdit"), PerformanceTestCaseWrapper.GLOBAL, "Application Client emf edit test" );
- addPerformanceTest(suite, new AppClientEMFTest("testApplicationClientPopulation"), PerformanceTestCaseWrapper.LOCAL, "Application Client emf test" );
- addPerformanceTest(suite, new AppClientEMFTest("test14ApplicationClientPopulation"), PerformanceTestCaseWrapper.GLOBAL, "Application Client 14 emf test" );
-
- addPerformanceTest(suite, new EarEMFEditTest("testEAREdit"), PerformanceTestCaseWrapper.GLOBAL, "EAR emf edit test" );
- //addPerformanceTest(suite, new EarEMFTest("testEARPopulation"), PerformanceTestCaseWrapper.LOCAL, "EAR emf test" );
- addPerformanceTest(suite, new EarEMFTest("test14EARPopulation"), PerformanceTestCaseWrapper.GLOBAL, "EAR 14 emf test" );
-
- //addPerformanceTest(suite, new EjbEMFEditTest("testEJBJarEdit"), PerformanceTestCaseWrapper.GLOBAL, "EJB emf edit test -testEJBJarEdit" );
- addPerformanceTest(suite, new EjbEMFEditTest("testWCCMJar"), PerformanceTestCaseWrapper.LOCAL, "EJB emf edit test - testWCCMJar" );
- //addPerformanceTest(suite, new EjbEMFTest("testEJBJarPopulation"), PerformanceTestCaseWrapper.LOCAL, "EJB emf test" );
- //addPerformanceTest(suite, new EjbEMFTest("test14EJBJarPopulation"), PerformanceTestCaseWrapper.GLOBAL, "EJB 14 emf test" );
-
- addPerformanceTest(suite, new RarEMFEditTest("testRAREdit"), PerformanceTestCaseWrapper.GLOBAL, "RAR emf edit test" );
- addPerformanceTest(suite, new RarEMFTest("testRARPopulation"), PerformanceTestCaseWrapper.LOCAL, "RAR emf test" );
- addPerformanceTest(suite, new RarEMFTest("test14RARPopulation"), PerformanceTestCaseWrapper.GLOBAL, "RAR 14 emf test" );
-
- addPerformanceTest(suite, new WarEMFEditTest("testWAREdit"), PerformanceTestCaseWrapper.GLOBAL, "WAR emf edit test" );
- //addPerformanceTest(suite, new WarEMFTest("testWARPopulation"), PerformanceTestCaseWrapper.LOCAL, "WAR emf test" );
- addPerformanceTest(suite, new WarEMFTest("test14WARPopulation"), PerformanceTestCaseWrapper.GLOBAL, "WAR 14 emf test" );
-
- addPerformanceTest(suite, new WebServicesEMFTest("test13WebServicesClientPopulation"), PerformanceTestCaseWrapper.NONE, "Web Service Client 13 emf test" );
- addPerformanceTest(suite, new WebServicesEMFTest("test13WebServicesDDPopulation"), PerformanceTestCaseWrapper.LOCAL, "Web services 13 emf test" );
- addPerformanceTest(suite, new WebServicesEMFTest("test14WebServicesDDPopulation"), PerformanceTestCaseWrapper.GLOBAL, "Web services 14 emf test" );
- addPerformanceTest(suite, new WebServicesEMFTest("testJaxRPCMapPopulation"), PerformanceTestCaseWrapper.GLOBAL, "JaxRPCMapping emf test" );
-
-
- //Creation tests
- addPerformanceTest(suite, new EJBProjectCreationOperationTest("testEJB21_Defaults"), PerformanceTestCaseWrapper.NONE, "EJB Component creation test" );
- addPerformanceTest(suite, new AppClientProjectCreationOperationTest("testAC50_Defaults"), PerformanceTestCaseWrapper.LOCAL, "App Client Component creation test" );
- addPerformanceTest(suite, new JCAProjectCreationOperationTest("testConnector15_Defaults"), PerformanceTestCaseWrapper.GLOBAL, "Connector Component creation test" );
- addPerformanceTest(suite, new WebProjectCreationOperationTest("testWeb24_Defaults"), PerformanceTestCaseWrapper.GLOBAL, "Web Component creation test" );
-
- addPerformanceTest(suite, new EJBImportOperationTest("testEJBImport21_Defaults"), PerformanceTestCaseWrapper.NONE, "EJB Component import test" );
- return suite;
- }
-
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests.performance/src/org/eclipse/jst/j2ee/core/tests/performance/CorePerformanceTestPlugin.java b/tests/org.eclipse.jst.j2ee.core.tests.performance/src/org/eclipse/jst/j2ee/core/tests/performance/CorePerformanceTestPlugin.java
deleted file mode 100644
index 08769ebb..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests.performance/src/org/eclipse/jst/j2ee/core/tests/performance/CorePerformanceTestPlugin.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.eclipse.jst.j2ee.core.tests.performance;
-
-import org.eclipse.ui.plugin.*;
-import org.osgi.framework.BundleContext;
-import java.util.*;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class CorePerformanceTestPlugin extends AbstractUIPlugin {
- //The shared instance.
- private static CorePerformanceTestPlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public CorePerformanceTestPlugin() {
- 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 CorePerformanceTestPlugin 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 = CorePerformanceTestPlugin.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.core.tests.performance.PerformancePluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests.performance/test.xml b/tests/org.eclipse.jst.j2ee.core.tests.performance/test.xml
deleted file mode 100644
index ab3cfd52..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests.performance/test.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0"?>
-
-<project name="J2EE Performance test" default="performance" 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}/../.."/>
-
- <!-- sets the properties eclipse-home, and library-file -->
- <property name="plugin-name" value="org.eclipse.jst.j2ee.core.tests.performance"/>
- <property name="library-file"
- value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
- <property name="perf-tests-file"
- value="${testDir}/performance-tests.xml"/>
- <property name="extraVMargs" value="-Xmx512M"/>
-
- <!-- 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 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 defines the performance tests that need to be run. -->
-<target name="performance-suite">
- <property name="performance-folder" value="${eclipse-home}/performance_folder"/>
- <delete dir="${performance-folder}" quiet="true"/>
- <ant target="core-test" antfile="${perf-tests-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${performance-folder}"/>
- <property name="plugin-name" value="${plugin-name}"/>
- <property name="classname" value="org.eclipse.jst.j2ee.core.tests.performance.AllCorePerformanceTests"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
-</target>
-
-<!-- This target runs the performance test suite. Any actions that need to happen -->
-<!-- after all the tests have been run should go here. -->
-<target name="performance" depends="init,performance-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>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests.performance/testcase.xml b/tests/org.eclipse.jst.j2ee.core.tests.performance/testcase.xml
deleted file mode 100644
index 41718647..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests.performance/testcase.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<testCases>
- <testCase class="org.eclipse.jst.j2ee.archive.emftests.EarEMFEditTest">
- <method name="testEAREdit" tagging="GLOBAL" shortName="EAR emf edit" />
- </testCase>
- <testCase class="org.eclipse.jst.j2ee.archive.emftests.EarEMFTest">
- <method name="test14EARPopulation" tagging="GLOBAL" shortName="EAR 14 emf test" />
- </testCase>
- <testCase class="org.eclipse.jst.j2ee.archive.emftests.EjbEMFEditTest">
- <method name="testEJBJarEdit" tagging="GLOBAL" shortName="EJB emf edit" />
- </testCase>
- <testCase class="org.eclipse.jst.j2ee.archive.emftests.EjbEMFEditTest">
- <method name="testWCCMJar" tagging="GLOBAL" shortName="EJB emf edit" />
- </testCase>
- <testCase class="org.eclipse.jst.j2ee.archive.emftests.EjbEMFTest">
- <method name="testEJBJarPopulation" tagging="GLOBAL" shortName="EJB emf test" />
- </testCase>
- <testCase class="org.eclipse.jst.j2ee.archive.emftests.EjbEMFTest">
- <method name="test14EJBJarPopulation" tagging="GLOBAL" shortName="EJB 14 emf test" />
- </testCase>
- <testCase class="org.eclipse.jst.j2ee.archive.emftests.AppClientEMFEditTest">
- <method name="testApplicationClientEdit" tagging="GLOBAL" shortName="Application Client emf edit" />
- </testCase>
- <testCase class="org.eclipse.jst.j2ee.archive.emftests.AppClientEMFTest">
- <method name="test14ApplicationClientPopulation" tagging="GLOBAL" shortName="Application Client 14 emf test" />
- </testCase>
-
- <testCase class="org.eclipse.jst.j2ee.archive.emftests.RarEMFEditTest">
- <method name="testRAREdit" tagging="GLOBAL" shortName="Connector emf edit" />
- </testCase>
-
- <testCase class="org.eclipse.jst.j2ee.archive.emftests.RarEMFTest">
- <method name="test14RARPopulation" tagging="GLOBAL" shortName="Connector 14 emf test" />
- </testCase>
- <testCase class="org.eclipse.jst.j2ee.archive.emftests.WarEMFEditTest">
- <method name="testWAREdit" tagging="GLOBAL" shortName="Web emf edit" />
- </testCase>
- <testCase class="org.eclipse.jst.j2ee.archive.emftests.WarEMFTest">
- <method name="test14WARPopulation" tagging="GLOBAL" shortName="Web 14 emf test" />
- </testCase>
-
- <testCase class="org.eclipse.jst.j2ee.archive.emftests.WebServicesEMFTest">
- <method name="test14WebServicesDDPopulation" tagging="GLOBAL" shortName="Web services 14 emf test" />
- </testCase>
-
-</testCases>
- \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/.classpath b/tests/org.eclipse.jst.j2ee.core.tests/.classpath
deleted file mode 100644
index 8d900559..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="commonArchiveTests"/>
- <classpathentry kind="src" path="mofj2eeTests"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/.cvsignore b/tests/org.eclipse.jst.j2ee.core.tests/.cvsignore
deleted file mode 100644
index 5c699695..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-bin
-testOutput
-build.xml
-temp.folder
-tests.jar
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/.project b/tests/org.eclipse.jst.j2ee.core.tests/.project
deleted file mode 100644
index ecd7aaa3..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/.project
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.core.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.core.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.j2ee.core.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index ffaa1668..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,58 +0,0 @@
-#Thu Apr 26 13:28:24 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
-org.eclipse.jdt.core.compiler.compliance=1.4
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=ignore
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.3
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jst.j2ee.core.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 37116e22..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Apr 26 13:28:24 EDT 2007
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.j2ee.core.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index 58a05346..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,35 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name.0
-Bundle-SymbolicName: org.eclipse.jst.j2ee.core.tests
-Bundle-Version: 1.1.401.qualifier
-Bundle-ClassPath: tests.jar
-Bundle-Vendor: %Bundle-Vendor.0
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.j2ee.application.test,
- org.eclipse.jst.j2ee.archive.emftests,
- org.eclipse.jst.j2ee.archive.test,
- org.eclipse.jst.j2ee.archive.testutilities,
- org.eclipse.jst.j2ee.client.test,
- org.eclipse.jst.j2ee.common.test,
- org.eclipse.jst.j2ee.common.tests,
- org.eclipse.jst.j2ee.core.api.test,
- org.eclipse.jst.j2ee.core.tests.api,
- org.eclipse.jst.j2ee.core.tests.bvt,
- org.eclipse.jst.j2ee.ejb.test,
- org.eclipse.jst.j2ee.emfload,
- org.eclipse.jst.j2ee.jca.test,
- org.eclipse.jst.j2ee.jsp.test,
- org.eclipse.jst.j2ee.webapplication.test,
- org.eclipse.jst.j2ee.webservice.wscommon.test,
- org.eclipse.jst.j2ee.webservice.wsdd.test
-Require-Bundle: org.junit,
- org.eclipse.jem.util,
- org.eclipse.jst.j2ee.core,
- org.eclipse.wst.common.emf,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.jem,
- org.eclipse.core.runtime,
- org.eclipse.wst.common.tests,
- org.eclipse.wst.validation;bundle-version="1.2.1"
-Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/META-INF/eclipse.inf b/tests/org.eclipse.jst.j2ee.core.tests/META-INF/eclipse.inf
deleted file mode 100644
index fdcf47ef..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/META-INF/eclipse.inf
+++ /dev/null
@@ -1,6 +0,0 @@
-# We do not want any nested jars
-# signed or normalized for packing
-# see bug 274743 Some unit tests are sensitive to details of build
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=274743
-
-jarprocessor.exclude.children=true \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/about.html b/tests/org.eclipse.jst.j2ee.core.tests/about.html
deleted file mode 100644
index 2199df3f..00000000
--- a/tests/org.eclipse.jst.j2ee.core.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>June, 2008</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 Redistributor’s 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.core.tests/build.properties b/tests/org.eclipse.jst.j2ee.core.tests/build.properties
deleted file mode 100644
index 0343e020..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/build.properties
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 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
-###############################################################################
-bin.includes = tests.jar,\
- test.xml,\
- commonArchiveResources/,\
- testData/,\
- about.html,\
- META-INF/,\
- plugin.properties
-output.tests.jar = bin/
-jars.compile.order = tests.jar
-source.tests.jar = commonArchiveTests/,\
- mofj2eeTests/
-bin.excludes = commonArchiveResources/.cvsignore
-src.includes = out.xmi,\
- about.html,\
- build/,\
- testData/,\
- test.xml
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/build/buildcontrol.properties b/tests/org.eclipse.jst.j2ee.core.tests/build/buildcontrol.properties
deleted file mode 100644
index 082a9930..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/build/buildcontrol.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-CONTACT=danberg@us.ibm.com
-ComponentShortName=com.ibm.etools.j2ee.core.test
-ComponentFullName=com.ibm.etools.j2ee.core.test
-ComponentCompetency=TESTS
-JavaCompile.1=srcjar
-BuildVerification.1=dir
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/build/package.xml b/tests/org.eclipse.jst.j2ee.core.tests/build/package.xml
deleted file mode 100644
index 191f326d..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/build/package.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<project name="com.ibm.etools.j2ee.core.test" default="packagingPlugin" basedir="./..">
- <target name="init">
- <property name="packageDir" value=""/>
- <property name="plugin.directory" value="${basedir}"/>
- <property name="plugin.id" value="com.ibm.etools.j2ee.core.test"/>
- <property name="plugin.version" value=""/>
- </target>
- <target name="packagingPlugin" depends="init">
- <echo message="${plugin.id}"/>
- <copy todir="${packageDir}/plugins/${plugin.id}_${plugin.version}">
- <fileset dir="${plugin.directory}">
- <include name="plugin.xml"/>
- <include name="test.xml"/>
- <include name="runtime/commonArchiveTests.jar"/>
- <include name="runtime/modelTests.jar"/>
- <include name="runtime/javaTests.jar"/>
- </fileset>
- </copy>
- </target>
-</project>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/build/wsBuild.xml b/tests/org.eclipse.jst.j2ee.core.tests/build/wsBuild.xml
deleted file mode 100644
index bb538851..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/build/wsBuild.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE project [
- <!ENTITY baseBuild SYSTEM "file:../../wsBuildDef.xml">
-]>
-
-<project name="buildPlugin" default="build" basedir="./..">
-
-<!-- include the common xml build file -->
-&baseBuild;
-
-<target name="build" depends="prepare" if="plugin.id">
-
- <antcall target="unzipsrcjar"> <param name="jarname" value="commonArchiveTests"/> </antcall>
- <antcall target="unzipsrcjar"> <param name="jarname" value="modelTests"/> </antcall>
- <antcall target="unzipsrcjar"> <param name="jarname" value="javaTests"/> </antcall>
-
- <mkdir dir= "${plugin.build.directory}/commonbld"/>
- <javac failonerror="false" destdir="${plugin.build.directory}/commonbld" includeAntRuntime="false">
- <src path="${plugin.src.directory}/commonArchiveTests"/>
- <src path="${plugin.src.directory}/modelTests"/>
- <src path="${plugin.src.directory}/javaTests"/>
- <bootclasspath path="${bootclasspath}"/>
- <classpath path="${plugin.classpath}"/>
- </javac>
-
- <antcall target="buildjar">
- <param name="jarname" value="commonArchiveTests"/>
- <param name="jarclasspath" value="${plugin.classpath};${plugin.build.directory}/commonbld"/>
- </antcall>
- <antcall target="buildjar">
- <param name="jarname" value="modelTests"/>
- <param name="jarclasspath" value="${plugin.classpath};${plugin.build.directory}/commonbld"/>
- </antcall>
- <antcall target="buildjar">
- <param name="jarname" value="javaTests"/>
- <param name="jarclasspath" value="${plugin.classpath};${plugin.build.directory}/commonbld"/>
- </antcall>
-
-</target>
-</project>
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/.cvsignore b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/.cvsignore
deleted file mode 100644
index 09178ee6..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-bin
-testOutput \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/application-client.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/application-client.xml
deleted file mode 100644
index 8796e23a..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/application-client.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application-client PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN" "http://java.sun.com/dtd/application-client_1_3.dtd">
-
- <application-client id="Application-client_ID">
- <icon>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- </icon>
- <display-name>displayName_0</display-name>
- <description>description_0</description>
- <env-entry>
- <description>description_0</description>
- <env-entry-name>name_0</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_0</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_1</description>
- <env-entry-name>name_1</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_1</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_2</description>
- <env-entry-name>name_2</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_2</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_3</description>
- <env-entry-name>name_3</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_3</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_4</description>
- <env-entry-name>name_4</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_4</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_0</description>
- <ejb-ref-name>name_0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_0</home>
- <remote>remote_0</remote>
- <ejb-link>link_0</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_1</description>
- <ejb-ref-name>name_1</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_1</home>
- <remote>remote_1</remote>
- <ejb-link>link_1</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_2</description>
- <ejb-ref-name>name_2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_2</home>
- <remote>remote_2</remote>
- <ejb-link>link_2</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_3</description>
- <ejb-ref-name>name_3</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_3</home>
- <remote>remote_3</remote>
- <ejb-link>link_3</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_4</description>
- <ejb-ref-name>name_4</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_4</home>
- <remote>remote_4</remote>
- <ejb-link>link_4</ejb-link>
- </ejb-ref>
- <resource-ref>
- <description>description_0</description>
- <res-ref-name>name_0</res-ref-name>
- <res-type>type_0</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_1</description>
- <res-ref-name>name_1</res-ref-name>
- <res-type>type_1</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_2</description>
- <res-ref-name>name_2</res-ref-name>
- <res-type>type_2</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_3</description>
- <res-ref-name>name_3</res-ref-name>
- <res-type>type_3</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_4</description>
- <res-ref-name>name_4</res-ref-name>
- <res-type>type_4</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_0</description>
- <resource-env-ref-name>name_0</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_1</description>
- <resource-env-ref-name>name_1</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_2</description>
- <resource-env-ref-name>name_2</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_3</description>
- <resource-env-ref-name>name_3</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_4</description>
- <resource-env-ref-name>name_4</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <callback-handler>java.util.HashTable</callback-handler>
- </application-client>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/application.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/application.xml
deleted file mode 100644
index dbe77457..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/application.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
-
- <application id="Application_ID">
- <icon>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- </icon>
- <display-name>displayName_0</display-name>
- <description>description_0</description>
- <module>
- <java>uri_0</java>
- <alt-dd>altDD_0</alt-dd>
- </module>
- <module>
- <ejb>uri_0</ejb>
- <alt-dd>altDD_0</alt-dd>
- </module>
- <module>
- <web>
- <web-uri>uri_0</web-uri>
- <context-root>contextRoot_0</context-root>
- </web>
- <alt-dd>altDD_0</alt-dd>
- </module>
- <module>
- <connector>uri_0</connector>
- <alt-dd>altDD_0</alt-dd>
- </module>
- <module>
- <java>uri_1</java>
- <alt-dd>altDD_1</alt-dd>
- </module>
- <security-role>
- <description>description_0</description>
- <role-name>roleName_0</role-name>
- </security-role>
- <security-role>
- <description>description_1</description>
- <role-name>roleName_1</role-name>
- </security-role>
- <security-role>
- <description>description_2</description>
- <role-name>roleName_2</role-name>
- </security-role>
- <security-role>
- <description>description_3</description>
- <role-name>roleName_3</role-name>
- </security-role>
- <security-role>
- <description>description_4</description>
- <role-name>roleName_4</role-name>
- </security-role>
- </application>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/ejb-jar.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/ejb-jar.xml
deleted file mode 100644
index 739d68d7..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/ejb-jar.xml
+++ /dev/null
@@ -1,2869 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-
- <ejb-jar id="ejb-jar_ID">
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <enterprise-beans>
- <entity>
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <ejb-name>name_0</ejb-name>
- <home>java.util.HashTable</home>
- <remote>java.util.HashTable</remote>
- <local-home>java.util.HashTable</local-home>
- <local>java.util.HashTable</local>
- <ejb-class>java.util.HashTable</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.HashTable</prim-key-class>
- <reentrant>True</reentrant>
- <env-entry>
- <description>description_0</description>
- <env-entry-name>name_0</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_0</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_1</description>
- <env-entry-name>name_1</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_1</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_2</description>
- <env-entry-name>name_2</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_2</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_3</description>
- <env-entry-name>name_3</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_3</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_4</description>
- <env-entry-name>name_4</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_4</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_0</description>
- <ejb-ref-name>name_0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_0</home>
- <remote>remote_0</remote>
- <ejb-link>link_0</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_1</description>
- <ejb-ref-name>name_1</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_1</home>
- <remote>remote_1</remote>
- <ejb-link>link_1</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_2</description>
- <ejb-ref-name>name_2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_2</home>
- <remote>remote_2</remote>
- <ejb-link>link_2</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_3</description>
- <ejb-ref-name>name_3</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_3</home>
- <remote>remote_3</remote>
- <ejb-link>link_3</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_4</description>
- <ejb-ref-name>name_4</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_4</home>
- <remote>remote_4</remote>
- <ejb-link>link_4</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_0</description>
- <ejb-ref-name>name_0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_0</local-home>
- <local>remote_0</local>
- <ejb-link>link_0</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_1</description>
- <ejb-ref-name>name_1</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_1</local-home>
- <local>remote_1</local>
- <ejb-link>link_1</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_2</description>
- <ejb-ref-name>name_2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_2</local-home>
- <local>remote_2</local>
- <ejb-link>link_2</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_3</description>
- <ejb-ref-name>name_3</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_3</local-home>
- <local>remote_3</local>
- <ejb-link>link_3</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_4</description>
- <ejb-ref-name>name_4</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_4</local-home>
- <local>remote_4</local>
- <ejb-link>link_4</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_0</description>
- <role-name>name_0</role-name>
- <role-link>link_0</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_1</description>
- <role-name>name_1</role-name>
- <role-link>link_1</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_2</description>
- <role-name>name_2</role-name>
- <role-link>link_2</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_3</description>
- <role-name>name_3</role-name>
- <role-link>link_3</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_4</description>
- <role-name>name_4</role-name>
- <role-link>link_4</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_0</description>
- <run-as>
- <description>description_0</description>
- <role-name>roleName_0</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_0</description>
- <res-ref-name>name_0</res-ref-name>
- <res-type>type_0</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_1</description>
- <res-ref-name>name_1</res-ref-name>
- <res-type>type_1</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_2</description>
- <res-ref-name>name_2</res-ref-name>
- <res-type>type_2</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_3</description>
- <res-ref-name>name_3</res-ref-name>
- <res-type>type_3</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_4</description>
- <res-ref-name>name_4</res-ref-name>
- <res-type>type_4</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_0</description>
- <resource-env-ref-name>name_0</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_1</description>
- <resource-env-ref-name>name_1</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_2</description>
- <resource-env-ref-name>name_2</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_3</description>
- <resource-env-ref-name>name_3</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_4</description>
- <resource-env-ref-name>name_4</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_1</description>
- <display-name>displayName_1</display-name>
- <small-icon>smallIcon_1</small-icon>
- <large-icon>largeIcon_1</large-icon>
- <ejb-name>name_1</ejb-name>
- <home>java.util.List</home>
- <remote>java.util.List</remote>
- <local-home>java.util.List</local-home>
- <local>java.util.List</local>
- <ejb-class>java.util.List</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.List</prim-key-class>
- <reentrant>False</reentrant>
- <env-entry>
- <description>description_5</description>
- <env-entry-name>name_5</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_5</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_6</description>
- <env-entry-name>name_6</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_6</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_7</description>
- <env-entry-name>name_7</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_7</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_8</description>
- <env-entry-name>name_8</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_8</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_9</description>
- <env-entry-name>name_9</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_9</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_5</description>
- <ejb-ref-name>name_5</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_5</home>
- <remote>remote_5</remote>
- <ejb-link>link_5</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_6</description>
- <ejb-ref-name>name_6</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_6</home>
- <remote>remote_6</remote>
- <ejb-link>link_6</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_7</description>
- <ejb-ref-name>name_7</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_7</home>
- <remote>remote_7</remote>
- <ejb-link>link_7</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_8</description>
- <ejb-ref-name>name_8</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_8</home>
- <remote>remote_8</remote>
- <ejb-link>link_8</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_9</description>
- <ejb-ref-name>name_9</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_9</home>
- <remote>remote_9</remote>
- <ejb-link>link_9</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_5</description>
- <ejb-ref-name>name_5</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_5</local-home>
- <local>remote_5</local>
- <ejb-link>link_5</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_6</description>
- <ejb-ref-name>name_6</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_6</local-home>
- <local>remote_6</local>
- <ejb-link>link_6</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_7</description>
- <ejb-ref-name>name_7</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_7</local-home>
- <local>remote_7</local>
- <ejb-link>link_7</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_8</description>
- <ejb-ref-name>name_8</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_8</local-home>
- <local>remote_8</local>
- <ejb-link>link_8</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_9</description>
- <ejb-ref-name>name_9</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_9</local-home>
- <local>remote_9</local>
- <ejb-link>link_9</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_5</description>
- <role-name>name_5</role-name>
- <role-link>link_5</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_6</description>
- <role-name>name_6</role-name>
- <role-link>link_6</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_7</description>
- <role-name>name_7</role-name>
- <role-link>link_7</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_8</description>
- <role-name>name_8</role-name>
- <role-link>link_8</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_9</description>
- <role-name>name_9</role-name>
- <role-link>link_9</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_0</description>
- <use-caller-identity></use-caller-identity>
- </security-identity>
- <resource-ref>
- <description>description_5</description>
- <res-ref-name>name_5</res-ref-name>
- <res-type>type_5</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_6</description>
- <res-ref-name>name_6</res-ref-name>
- <res-type>type_6</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_7</description>
- <res-ref-name>name_7</res-ref-name>
- <res-type>type_7</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_8</description>
- <res-ref-name>name_8</res-ref-name>
- <res-type>type_8</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_9</description>
- <res-ref-name>name_9</res-ref-name>
- <res-type>type_9</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_5</description>
- <resource-env-ref-name>name_5</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_6</description>
- <resource-env-ref-name>name_6</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_7</description>
- <resource-env-ref-name>name_7</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_8</description>
- <resource-env-ref-name>name_8</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_9</description>
- <resource-env-ref-name>name_9</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <ejb-name>name_2</ejb-name>
- <home>java.util.HashTable</home>
- <remote>java.util.HashTable</remote>
- <local-home>java.util.HashTable</local-home>
- <local>java.util.HashTable</local>
- <ejb-class>java.util.HashTable</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>java.util.HashTable</prim-key-class>
- <reentrant>True</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>abstractSchemaName_0</abstract-schema-name>
- <cmp-field>
- <field-name>name_0</field-name>
- </cmp-field>
- <cmp-field>
- <field-name>name_1</field-name>
- </cmp-field>
- <cmp-field>
- <field-name>name_2</field-name>
- </cmp-field>
- <cmp-field>
- <field-name>name_3</field-name>
- </cmp-field>
- <cmp-field>
- <field-name>name_4</field-name>
- </cmp-field>
- <primkey-field>name_0</primkey-field>
- <env-entry>
- <description>description_10</description>
- <env-entry-name>name_10</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_10</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_11</description>
- <env-entry-name>name_11</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_11</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_12</description>
- <env-entry-name>name_12</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_12</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_13</description>
- <env-entry-name>name_13</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_13</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_14</description>
- <env-entry-name>name_14</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_14</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_10</description>
- <ejb-ref-name>name_10</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_10</home>
- <remote>remote_10</remote>
- <ejb-link>link_10</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_11</description>
- <ejb-ref-name>name_11</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_11</home>
- <remote>remote_11</remote>
- <ejb-link>link_11</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_12</description>
- <ejb-ref-name>name_12</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_12</home>
- <remote>remote_12</remote>
- <ejb-link>link_12</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_13</description>
- <ejb-ref-name>name_13</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_13</home>
- <remote>remote_13</remote>
- <ejb-link>link_13</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_14</description>
- <ejb-ref-name>name_14</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_14</home>
- <remote>remote_14</remote>
- <ejb-link>link_14</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_10</description>
- <ejb-ref-name>name_10</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_10</local-home>
- <local>remote_10</local>
- <ejb-link>link_10</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_11</description>
- <ejb-ref-name>name_11</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_11</local-home>
- <local>remote_11</local>
- <ejb-link>link_11</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_12</description>
- <ejb-ref-name>name_12</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_12</local-home>
- <local>remote_12</local>
- <ejb-link>link_12</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_13</description>
- <ejb-ref-name>name_13</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_13</local-home>
- <local>remote_13</local>
- <ejb-link>link_13</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_14</description>
- <ejb-ref-name>name_14</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_14</local-home>
- <local>remote_14</local>
- <ejb-link>link_14</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_10</description>
- <role-name>name_10</role-name>
- <role-link>link_10</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_11</description>
- <role-name>name_11</role-name>
- <role-link>link_11</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_12</description>
- <role-name>name_12</role-name>
- <role-link>link_12</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_13</description>
- <role-name>name_13</role-name>
- <role-link>link_13</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_14</description>
- <role-name>name_14</role-name>
- <role-link>link_14</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_1</description>
- <run-as>
- <description>description_1</description>
- <role-name>roleName_1</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_10</description>
- <res-ref-name>name_10</res-ref-name>
- <res-type>type_10</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_11</description>
- <res-ref-name>name_11</res-ref-name>
- <res-type>type_11</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_12</description>
- <res-ref-name>name_12</res-ref-name>
- <res-type>type_12</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_13</description>
- <res-ref-name>name_13</res-ref-name>
- <res-type>type_13</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_14</description>
- <res-ref-name>name_14</res-ref-name>
- <res-type>type_14</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_10</description>
- <resource-env-ref-name>name_10</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_11</description>
- <resource-env-ref-name>name_11</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_12</description>
- <resource-env-ref-name>name_12</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_13</description>
- <resource-env-ref-name>name_13</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_14</description>
- <resource-env-ref-name>name_14</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <query>
- <description>description_0</description>
- <query-method>
- <method-name>name_0</method-name>
- <method-params></method-params>
- </query-method>
- <result-type-mapping>Remote</result-type-mapping>
- <ejb-ql>ejbQL_0</ejb-ql>
- </query>
- <query>
- <description>description_1</description>
- <query-method>
- <method-name>name_1</method-name>
- <method-params>
- <method-param>parms_0</method-param>
- </method-params>
- </query-method>
- <result-type-mapping>Local</result-type-mapping>
- <ejb-ql>ejbQL_1</ejb-ql>
- </query>
- <query>
- <description>description_2</description>
- <query-method>
- <method-name>name_2</method-name>
- <method-params>
- <method-param>parms_1</method-param>
- <method-param>parms_2</method-param>
- </method-params>
- </query-method>
- <result-type-mapping>Remote</result-type-mapping>
- <ejb-ql>ejbQL_2</ejb-ql>
- </query>
- <query>
- <description>description_3</description>
- <query-method>
- <method-name>name_3</method-name>
- <method-params>
- <method-param>parms_3</method-param>
- <method-param>parms_4</method-param>
- <method-param>parms_5</method-param>
- </method-params>
- </query-method>
- <result-type-mapping>Local</result-type-mapping>
- <ejb-ql>ejbQL_3</ejb-ql>
- </query>
- <query>
- <description>description_4</description>
- <query-method>
- <method-name>name_4</method-name>
- <method-params></method-params>
- </query-method>
- <result-type-mapping>Remote</result-type-mapping>
- <ejb-ql>ejbQL_4</ejb-ql>
- </query>
- </entity>
- <session>
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <ejb-name>name_3</ejb-name>
- <home>java.util.HashTable</home>
- <remote>java.util.HashTable</remote>
- <local-home>java.util.HashTable</local-home>
- <local>java.util.HashTable</local>
- <ejb-class>java.util.HashTable</ejb-class>
- <session-type>Stateful</session-type>
- <transaction-type>Bean</transaction-type>
- <env-entry>
- <description>description_15</description>
- <env-entry-name>name_15</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_15</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_16</description>
- <env-entry-name>name_16</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_16</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_17</description>
- <env-entry-name>name_17</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_17</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_18</description>
- <env-entry-name>name_18</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_18</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_19</description>
- <env-entry-name>name_19</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_19</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_15</description>
- <ejb-ref-name>name_15</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_15</home>
- <remote>remote_15</remote>
- <ejb-link>link_15</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_16</description>
- <ejb-ref-name>name_16</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_16</home>
- <remote>remote_16</remote>
- <ejb-link>link_16</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_17</description>
- <ejb-ref-name>name_17</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_17</home>
- <remote>remote_17</remote>
- <ejb-link>link_17</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_18</description>
- <ejb-ref-name>name_18</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_18</home>
- <remote>remote_18</remote>
- <ejb-link>link_18</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_19</description>
- <ejb-ref-name>name_19</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_19</home>
- <remote>remote_19</remote>
- <ejb-link>link_19</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_15</description>
- <ejb-ref-name>name_15</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_15</local-home>
- <local>remote_15</local>
- <ejb-link>link_15</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_16</description>
- <ejb-ref-name>name_16</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_16</local-home>
- <local>remote_16</local>
- <ejb-link>link_16</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_17</description>
- <ejb-ref-name>name_17</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_17</local-home>
- <local>remote_17</local>
- <ejb-link>link_17</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_18</description>
- <ejb-ref-name>name_18</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_18</local-home>
- <local>remote_18</local>
- <ejb-link>link_18</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_19</description>
- <ejb-ref-name>name_19</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_19</local-home>
- <local>remote_19</local>
- <ejb-link>link_19</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_15</description>
- <role-name>name_15</role-name>
- <role-link>link_15</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_16</description>
- <role-name>name_16</role-name>
- <role-link>link_16</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_17</description>
- <role-name>name_17</role-name>
- <role-link>link_17</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_18</description>
- <role-name>name_18</role-name>
- <role-link>link_18</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_19</description>
- <role-name>name_19</role-name>
- <role-link>link_19</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_1</description>
- <use-caller-identity></use-caller-identity>
- </security-identity>
- <resource-ref>
- <description>description_15</description>
- <res-ref-name>name_15</res-ref-name>
- <res-type>type_15</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_16</description>
- <res-ref-name>name_16</res-ref-name>
- <res-type>type_16</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_17</description>
- <res-ref-name>name_17</res-ref-name>
- <res-type>type_17</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_18</description>
- <res-ref-name>name_18</res-ref-name>
- <res-type>type_18</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_19</description>
- <res-ref-name>name_19</res-ref-name>
- <res-type>type_19</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_15</description>
- <resource-env-ref-name>name_15</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_16</description>
- <resource-env-ref-name>name_16</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_17</description>
- <resource-env-ref-name>name_17</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_18</description>
- <resource-env-ref-name>name_18</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_19</description>
- <resource-env-ref-name>name_19</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </session>
- <entity>
- <description>description_2</description>
- <display-name>displayName_2</display-name>
- <small-icon>smallIcon_2</small-icon>
- <large-icon>largeIcon_2</large-icon>
- <ejb-name>name_4</ejb-name>
- <home>java.sql.Data</home>
- <remote>java.sql.Data</remote>
- <local-home>java.sql.Data</local-home>
- <local>java.sql.Data</local>
- <ejb-class>java.sql.Data</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.sql.Data</prim-key-class>
- <reentrant>True</reentrant>
- <env-entry>
- <description>description_20</description>
- <env-entry-name>name_20</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_20</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_21</description>
- <env-entry-name>name_21</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_21</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_22</description>
- <env-entry-name>name_22</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_22</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_23</description>
- <env-entry-name>name_23</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_23</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_24</description>
- <env-entry-name>name_24</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_24</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_20</description>
- <ejb-ref-name>name_20</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_20</home>
- <remote>remote_20</remote>
- <ejb-link>link_20</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_21</description>
- <ejb-ref-name>name_21</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_21</home>
- <remote>remote_21</remote>
- <ejb-link>link_21</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_22</description>
- <ejb-ref-name>name_22</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_22</home>
- <remote>remote_22</remote>
- <ejb-link>link_22</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_23</description>
- <ejb-ref-name>name_23</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_23</home>
- <remote>remote_23</remote>
- <ejb-link>link_23</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_24</description>
- <ejb-ref-name>name_24</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_24</home>
- <remote>remote_24</remote>
- <ejb-link>link_24</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_20</description>
- <ejb-ref-name>name_20</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_20</local-home>
- <local>remote_20</local>
- <ejb-link>link_20</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_21</description>
- <ejb-ref-name>name_21</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_21</local-home>
- <local>remote_21</local>
- <ejb-link>link_21</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_22</description>
- <ejb-ref-name>name_22</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_22</local-home>
- <local>remote_22</local>
- <ejb-link>link_22</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_23</description>
- <ejb-ref-name>name_23</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_23</local-home>
- <local>remote_23</local>
- <ejb-link>link_23</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_24</description>
- <ejb-ref-name>name_24</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_24</local-home>
- <local>remote_24</local>
- <ejb-link>link_24</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_20</description>
- <role-name>name_20</role-name>
- <role-link>link_20</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_21</description>
- <role-name>name_21</role-name>
- <role-link>link_21</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_22</description>
- <role-name>name_22</role-name>
- <role-link>link_22</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_23</description>
- <role-name>name_23</role-name>
- <role-link>link_23</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_24</description>
- <role-name>name_24</role-name>
- <role-link>link_24</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_2</description>
- <run-as>
- <description>description_2</description>
- <role-name>roleName_2</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_20</description>
- <res-ref-name>name_20</res-ref-name>
- <res-type>type_20</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_21</description>
- <res-ref-name>name_21</res-ref-name>
- <res-type>type_21</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_22</description>
- <res-ref-name>name_22</res-ref-name>
- <res-type>type_22</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_23</description>
- <res-ref-name>name_23</res-ref-name>
- <res-type>type_23</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_24</description>
- <res-ref-name>name_24</res-ref-name>
- <res-type>type_24</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_20</description>
- <resource-env-ref-name>name_20</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_21</description>
- <resource-env-ref-name>name_21</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_22</description>
- <resource-env-ref-name>name_22</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_23</description>
- <resource-env-ref-name>name_23</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_24</description>
- <resource-env-ref-name>name_24</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_3</description>
- <display-name>displayName_3</display-name>
- <small-icon>smallIcon_3</small-icon>
- <large-icon>largeIcon_3</large-icon>
- <ejb-name>name_5</ejb-name>
- <home>java.lang.Integer</home>
- <remote>java.lang.Integer</remote>
- <local-home>java.lang.Integer</local-home>
- <local>java.lang.Integer</local>
- <ejb-class>java.lang.Integer</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.lang.Integer</prim-key-class>
- <reentrant>False</reentrant>
- <env-entry>
- <description>description_25</description>
- <env-entry-name>name_25</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_25</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_26</description>
- <env-entry-name>name_26</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_26</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_27</description>
- <env-entry-name>name_27</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_27</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_28</description>
- <env-entry-name>name_28</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_28</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_29</description>
- <env-entry-name>name_29</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_29</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_25</description>
- <ejb-ref-name>name_25</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_25</home>
- <remote>remote_25</remote>
- <ejb-link>link_25</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_26</description>
- <ejb-ref-name>name_26</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_26</home>
- <remote>remote_26</remote>
- <ejb-link>link_26</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_27</description>
- <ejb-ref-name>name_27</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_27</home>
- <remote>remote_27</remote>
- <ejb-link>link_27</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_28</description>
- <ejb-ref-name>name_28</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_28</home>
- <remote>remote_28</remote>
- <ejb-link>link_28</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_29</description>
- <ejb-ref-name>name_29</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_29</home>
- <remote>remote_29</remote>
- <ejb-link>link_29</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_25</description>
- <ejb-ref-name>name_25</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_25</local-home>
- <local>remote_25</local>
- <ejb-link>link_25</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_26</description>
- <ejb-ref-name>name_26</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_26</local-home>
- <local>remote_26</local>
- <ejb-link>link_26</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_27</description>
- <ejb-ref-name>name_27</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_27</local-home>
- <local>remote_27</local>
- <ejb-link>link_27</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_28</description>
- <ejb-ref-name>name_28</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_28</local-home>
- <local>remote_28</local>
- <ejb-link>link_28</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_29</description>
- <ejb-ref-name>name_29</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_29</local-home>
- <local>remote_29</local>
- <ejb-link>link_29</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_25</description>
- <role-name>name_25</role-name>
- <role-link>link_25</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_26</description>
- <role-name>name_26</role-name>
- <role-link>link_26</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_27</description>
- <role-name>name_27</role-name>
- <role-link>link_27</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_28</description>
- <role-name>name_28</role-name>
- <role-link>link_28</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_29</description>
- <role-name>name_29</role-name>
- <role-link>link_29</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_2</description>
- <use-caller-identity></use-caller-identity>
- </security-identity>
- <resource-ref>
- <description>description_25</description>
- <res-ref-name>name_25</res-ref-name>
- <res-type>type_25</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_26</description>
- <res-ref-name>name_26</res-ref-name>
- <res-type>type_26</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_27</description>
- <res-ref-name>name_27</res-ref-name>
- <res-type>type_27</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_28</description>
- <res-ref-name>name_28</res-ref-name>
- <res-type>type_28</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_29</description>
- <res-ref-name>name_29</res-ref-name>
- <res-type>type_29</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_25</description>
- <resource-env-ref-name>name_25</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_26</description>
- <resource-env-ref-name>name_26</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_27</description>
- <resource-env-ref-name>name_27</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_28</description>
- <resource-env-ref-name>name_28</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_29</description>
- <resource-env-ref-name>name_29</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <message-driven>
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <ejb-name>name_6</ejb-name>
- <ejb-class>java.util.HashTable</ejb-class>
- <transaction-type>Bean</transaction-type>
- <message-selector>messageSelector_0</message-selector>
- <acknowledge-mode>Auto-acknowledge</acknowledge-mode>
- <message-driven-destination>
- <destination-type>javax.jms.Queue</destination-type>
- <subscription-durability>Durable</subscription-durability>
- </message-driven-destination>
- <env-entry>
- <description>description_30</description>
- <env-entry-name>name_30</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_30</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_31</description>
- <env-entry-name>name_31</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_31</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_32</description>
- <env-entry-name>name_32</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_32</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_33</description>
- <env-entry-name>name_33</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_33</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_34</description>
- <env-entry-name>name_34</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_34</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_30</description>
- <ejb-ref-name>name_30</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_30</home>
- <remote>remote_30</remote>
- <ejb-link>link_30</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_31</description>
- <ejb-ref-name>name_31</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_31</home>
- <remote>remote_31</remote>
- <ejb-link>link_31</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_32</description>
- <ejb-ref-name>name_32</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_32</home>
- <remote>remote_32</remote>
- <ejb-link>link_32</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_33</description>
- <ejb-ref-name>name_33</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_33</home>
- <remote>remote_33</remote>
- <ejb-link>link_33</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_34</description>
- <ejb-ref-name>name_34</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_34</home>
- <remote>remote_34</remote>
- <ejb-link>link_34</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_30</description>
- <ejb-ref-name>name_30</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_30</local-home>
- <local>remote_30</local>
- <ejb-link>link_30</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_31</description>
- <ejb-ref-name>name_31</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_31</local-home>
- <local>remote_31</local>
- <ejb-link>link_31</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_32</description>
- <ejb-ref-name>name_32</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_32</local-home>
- <local>remote_32</local>
- <ejb-link>link_32</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_33</description>
- <ejb-ref-name>name_33</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_33</local-home>
- <local>remote_33</local>
- <ejb-link>link_33</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_34</description>
- <ejb-ref-name>name_34</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_34</local-home>
- <local>remote_34</local>
- <ejb-link>link_34</ejb-link>
- </ejb-local-ref>
- <security-identity>
- <description>description_3</description>
- <run-as>
- <description>description_3</description>
- <role-name>roleName_3</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_30</description>
- <res-ref-name>name_30</res-ref-name>
- <res-type>type_30</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_31</description>
- <res-ref-name>name_31</res-ref-name>
- <res-type>type_31</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_32</description>
- <res-ref-name>name_32</res-ref-name>
- <res-type>type_32</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_33</description>
- <res-ref-name>name_33</res-ref-name>
- <res-type>type_33</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_34</description>
- <res-ref-name>name_34</res-ref-name>
- <res-type>type_34</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_30</description>
- <resource-env-ref-name>name_30</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_31</description>
- <resource-env-ref-name>name_31</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_32</description>
- <resource-env-ref-name>name_32</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_33</description>
- <resource-env-ref-name>name_33</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_34</description>
- <resource-env-ref-name>name_34</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </message-driven>
- <session>
- <description>description_1</description>
- <display-name>displayName_1</display-name>
- <small-icon>smallIcon_1</small-icon>
- <large-icon>largeIcon_1</large-icon>
- <ejb-name>name_7</ejb-name>
- <home>java.util.List</home>
- <remote>java.util.List</remote>
- <local-home>java.util.List</local-home>
- <local>java.util.List</local>
- <ejb-class>java.util.List</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <env-entry>
- <description>description_35</description>
- <env-entry-name>name_35</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_35</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_36</description>
- <env-entry-name>name_36</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_36</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_37</description>
- <env-entry-name>name_37</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_37</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_38</description>
- <env-entry-name>name_38</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_38</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_39</description>
- <env-entry-name>name_39</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_39</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_35</description>
- <ejb-ref-name>name_35</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_35</home>
- <remote>remote_35</remote>
- <ejb-link>link_35</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_36</description>
- <ejb-ref-name>name_36</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_36</home>
- <remote>remote_36</remote>
- <ejb-link>link_36</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_37</description>
- <ejb-ref-name>name_37</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_37</home>
- <remote>remote_37</remote>
- <ejb-link>link_37</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_38</description>
- <ejb-ref-name>name_38</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_38</home>
- <remote>remote_38</remote>
- <ejb-link>link_38</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_39</description>
- <ejb-ref-name>name_39</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_39</home>
- <remote>remote_39</remote>
- <ejb-link>link_39</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_35</description>
- <ejb-ref-name>name_35</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_35</local-home>
- <local>remote_35</local>
- <ejb-link>link_35</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_36</description>
- <ejb-ref-name>name_36</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_36</local-home>
- <local>remote_36</local>
- <ejb-link>link_36</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_37</description>
- <ejb-ref-name>name_37</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_37</local-home>
- <local>remote_37</local>
- <ejb-link>link_37</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_38</description>
- <ejb-ref-name>name_38</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_38</local-home>
- <local>remote_38</local>
- <ejb-link>link_38</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_39</description>
- <ejb-ref-name>name_39</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_39</local-home>
- <local>remote_39</local>
- <ejb-link>link_39</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_30</description>
- <role-name>name_30</role-name>
- <role-link>link_30</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_31</description>
- <role-name>name_31</role-name>
- <role-link>link_31</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_32</description>
- <role-name>name_32</role-name>
- <role-link>link_32</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_33</description>
- <role-name>name_33</role-name>
- <role-link>link_33</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_34</description>
- <role-name>name_34</role-name>
- <role-link>link_34</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_3</description>
- <use-caller-identity></use-caller-identity>
- </security-identity>
- <resource-ref>
- <description>description_35</description>
- <res-ref-name>name_35</res-ref-name>
- <res-type>type_35</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_36</description>
- <res-ref-name>name_36</res-ref-name>
- <res-type>type_36</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_37</description>
- <res-ref-name>name_37</res-ref-name>
- <res-type>type_37</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_38</description>
- <res-ref-name>name_38</res-ref-name>
- <res-type>type_38</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_39</description>
- <res-ref-name>name_39</res-ref-name>
- <res-type>type_39</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_35</description>
- <resource-env-ref-name>name_35</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_36</description>
- <resource-env-ref-name>name_36</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_37</description>
- <resource-env-ref-name>name_37</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_38</description>
- <resource-env-ref-name>name_38</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_39</description>
- <resource-env-ref-name>name_39</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </session>
- <entity>
- <description>description_4</description>
- <display-name>displayName_4</display-name>
- <small-icon>smallIcon_4</small-icon>
- <large-icon>largeIcon_4</large-icon>
- <ejb-name>name_8</ejb-name>
- <home>java.lang.String</home>
- <remote>java.lang.String</remote>
- <local-home>java.lang.String</local-home>
- <local>java.lang.String</local>
- <ejb-class>java.lang.String</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.lang.String</prim-key-class>
- <reentrant>True</reentrant>
- <env-entry>
- <description>description_40</description>
- <env-entry-name>name_40</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_40</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_41</description>
- <env-entry-name>name_41</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_41</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_42</description>
- <env-entry-name>name_42</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_42</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_43</description>
- <env-entry-name>name_43</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_43</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_44</description>
- <env-entry-name>name_44</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_44</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_40</description>
- <ejb-ref-name>name_40</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_40</home>
- <remote>remote_40</remote>
- <ejb-link>link_40</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_41</description>
- <ejb-ref-name>name_41</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_41</home>
- <remote>remote_41</remote>
- <ejb-link>link_41</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_42</description>
- <ejb-ref-name>name_42</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_42</home>
- <remote>remote_42</remote>
- <ejb-link>link_42</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_43</description>
- <ejb-ref-name>name_43</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_43</home>
- <remote>remote_43</remote>
- <ejb-link>link_43</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_44</description>
- <ejb-ref-name>name_44</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_44</home>
- <remote>remote_44</remote>
- <ejb-link>link_44</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_40</description>
- <ejb-ref-name>name_40</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_40</local-home>
- <local>remote_40</local>
- <ejb-link>link_40</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_41</description>
- <ejb-ref-name>name_41</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_41</local-home>
- <local>remote_41</local>
- <ejb-link>link_41</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_42</description>
- <ejb-ref-name>name_42</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_42</local-home>
- <local>remote_42</local>
- <ejb-link>link_42</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_43</description>
- <ejb-ref-name>name_43</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_43</local-home>
- <local>remote_43</local>
- <ejb-link>link_43</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_44</description>
- <ejb-ref-name>name_44</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_44</local-home>
- <local>remote_44</local>
- <ejb-link>link_44</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_35</description>
- <role-name>name_35</role-name>
- <role-link>link_35</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_36</description>
- <role-name>name_36</role-name>
- <role-link>link_36</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_37</description>
- <role-name>name_37</role-name>
- <role-link>link_37</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_38</description>
- <role-name>name_38</role-name>
- <role-link>link_38</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_39</description>
- <role-name>name_39</role-name>
- <role-link>link_39</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_4</description>
- <run-as>
- <description>description_4</description>
- <role-name>roleName_4</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_40</description>
- <res-ref-name>name_40</res-ref-name>
- <res-type>type_40</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_41</description>
- <res-ref-name>name_41</res-ref-name>
- <res-type>type_41</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_42</description>
- <res-ref-name>name_42</res-ref-name>
- <res-type>type_42</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_43</description>
- <res-ref-name>name_43</res-ref-name>
- <res-type>type_43</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_44</description>
- <res-ref-name>name_44</res-ref-name>
- <res-type>type_44</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_40</description>
- <resource-env-ref-name>name_40</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_41</description>
- <resource-env-ref-name>name_41</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_42</description>
- <resource-env-ref-name>name_42</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_43</description>
- <resource-env-ref-name>name_43</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_44</description>
- <resource-env-ref-name>name_44</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_5</description>
- <display-name>displayName_5</display-name>
- <small-icon>smallIcon_5</small-icon>
- <large-icon>largeIcon_5</large-icon>
- <ejb-name>name_9</ejb-name>
- <home>java.util.HashTable</home>
- <remote>java.util.HashTable</remote>
- <local-home>java.util.HashTable</local-home>
- <local>java.util.HashTable</local>
- <ejb-class>java.util.HashTable</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.HashTable</prim-key-class>
- <reentrant>False</reentrant>
- <env-entry>
- <description>description_45</description>
- <env-entry-name>name_45</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_45</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_46</description>
- <env-entry-name>name_46</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_46</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_47</description>
- <env-entry-name>name_47</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_47</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_48</description>
- <env-entry-name>name_48</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_48</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_49</description>
- <env-entry-name>name_49</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_49</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_45</description>
- <ejb-ref-name>name_45</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_45</home>
- <remote>remote_45</remote>
- <ejb-link>link_45</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_46</description>
- <ejb-ref-name>name_46</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_46</home>
- <remote>remote_46</remote>
- <ejb-link>link_46</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_47</description>
- <ejb-ref-name>name_47</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_47</home>
- <remote>remote_47</remote>
- <ejb-link>link_47</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_48</description>
- <ejb-ref-name>name_48</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_48</home>
- <remote>remote_48</remote>
- <ejb-link>link_48</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_49</description>
- <ejb-ref-name>name_49</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_49</home>
- <remote>remote_49</remote>
- <ejb-link>link_49</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_45</description>
- <ejb-ref-name>name_45</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_45</local-home>
- <local>remote_45</local>
- <ejb-link>link_45</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_46</description>
- <ejb-ref-name>name_46</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_46</local-home>
- <local>remote_46</local>
- <ejb-link>link_46</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_47</description>
- <ejb-ref-name>name_47</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_47</local-home>
- <local>remote_47</local>
- <ejb-link>link_47</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_48</description>
- <ejb-ref-name>name_48</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_48</local-home>
- <local>remote_48</local>
- <ejb-link>link_48</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_49</description>
- <ejb-ref-name>name_49</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_49</local-home>
- <local>remote_49</local>
- <ejb-link>link_49</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_40</description>
- <role-name>name_40</role-name>
- <role-link>link_40</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_41</description>
- <role-name>name_41</role-name>
- <role-link>link_41</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_42</description>
- <role-name>name_42</role-name>
- <role-link>link_42</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_43</description>
- <role-name>name_43</role-name>
- <role-link>link_43</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_44</description>
- <role-name>name_44</role-name>
- <role-link>link_44</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_4</description>
- <use-caller-identity></use-caller-identity>
- </security-identity>
- <resource-ref>
- <description>description_45</description>
- <res-ref-name>name_45</res-ref-name>
- <res-type>type_45</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_46</description>
- <res-ref-name>name_46</res-ref-name>
- <res-type>type_46</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_47</description>
- <res-ref-name>name_47</res-ref-name>
- <res-type>type_47</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_48</description>
- <res-ref-name>name_48</res-ref-name>
- <res-type>type_48</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_49</description>
- <res-ref-name>name_49</res-ref-name>
- <res-type>type_49</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_45</description>
- <resource-env-ref-name>name_45</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_46</description>
- <resource-env-ref-name>name_46</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_47</description>
- <resource-env-ref-name>name_47</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_48</description>
- <resource-env-ref-name>name_48</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_49</description>
- <resource-env-ref-name>name_49</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- </enterprise-beans>
- <relationships>
- <description>description_0</description>
- <ejb-relation>
- <description>description_0</description>
- <ejb-relation-name>name_0</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_0</description>
- <ejb-relationship-role-name>roleName_0</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <relationship-role-source>
- <description>description_0</description>
- <ejb-name>name_2</ejb-name>
- </relationship-role-source>
- <cmr-field>
- <cmr-field-name>name_8</cmr-field-name>
- <cmr-field-type>java.util.Collection</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_1</description>
- <ejb-relationship-role-name>roleName_1</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <cascade-delete/>
- <relationship-role-source>
- <description>description_1</description>
- <ejb-name>name_2</ejb-name>
- </relationship-role-source>
- <cmr-field>
- <cmr-field-name>name_9</cmr-field-name>
- <cmr-field-type>java.util.Collection</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <description>description_1</description>
- <ejb-relation-name>name_1</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_2</description>
- <ejb-relationship-role-name>roleName_2</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <relationship-role-source>
- <description>description_2</description>
- <ejb-name>name_2</ejb-name>
- </relationship-role-source>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_3</description>
- <ejb-relationship-role-name>roleName_3</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_3</description>
- <ejb-name>name_2</ejb-name>
- </relationship-role-source>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <description>description_2</description>
- <ejb-relation-name>name_2</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_4</description>
- <ejb-relationship-role-name>roleName_4</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <relationship-role-source>
- <description>description_4</description>
- <ejb-name>name_2</ejb-name>
- </relationship-role-source>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_5</description>
- <ejb-relationship-role-name>roleName_5</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <cascade-delete/>
- <relationship-role-source>
- <description>description_5</description>
- <ejb-name>name_2</ejb-name>
- </relationship-role-source>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <description>description_3</description>
- <ejb-relation-name>name_3</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_6</description>
- <ejb-relationship-role-name>roleName_6</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <relationship-role-source>
- <description>description_6</description>
- <ejb-name>name_2</ejb-name>
- </relationship-role-source>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_7</description>
- <ejb-relationship-role-name>roleName_7</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_7</description>
- <ejb-name>name_2</ejb-name>
- </relationship-role-source>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <description>description_4</description>
- <ejb-relation-name>name_4</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_8</description>
- <ejb-relationship-role-name>roleName_8</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <relationship-role-source>
- <description>description_8</description>
- <ejb-name>name_2</ejb-name>
- </relationship-role-source>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_9</description>
- <ejb-relationship-role-name>roleName_9</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <cascade-delete/>
- <relationship-role-source>
- <description>description_9</description>
- <ejb-name>name_2</ejb-name>
- </relationship-role-source>
- </ejb-relationship-role>
- </ejb-relation>
- </relationships>
- <assembly-descriptor>
- <security-role>
- <description>description_0</description>
- <role-name>roleName_0</role-name>
- </security-role>
- <security-role>
- <description>description_1</description>
- <role-name>roleName_1</role-name>
- </security-role>
- <security-role>
- <description>description_2</description>
- <role-name>roleName_2</role-name>
- </security-role>
- <security-role>
- <description>description_3</description>
- <role-name>roleName_3</role-name>
- </security-role>
- <security-role>
- <description>description_4</description>
- <role-name>roleName_4</role-name>
- </security-role>
- <method-permission>
- <description>description_0</description>
- <unchecked/>
- <method>
- <description>description_0</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_0</method-name>
- </method>
- <method>
- <description>description_1</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_1</method-name>
- <method-params></method-params>
- </method>
- <method>
- <description>description_2</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_2</method-name>
- <method-params>
- <method-param>parms_0</method-param>
- </method-params>
- </method>
- <method>
- <description>description_3</description>
- <ejb-name>name_3</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_3</method-name>
- <method-params>
- <method-param>parms_1</method-param>
- <method-param>parms_2</method-param>
- </method-params>
- </method>
- <method>
- <description>description_4</description>
- <ejb-name>name_4</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_4</method-name>
- <method-params>
- <method-param>parms_3</method-param>
- <method-param>parms_4</method-param>
- <method-param>parms_5</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <description>description_1</description>
- <role-name>roleName_0</role-name>
- <method>
- <description>description_5</description>
- <ejb-name>name_5</ejb-name>
- <method-name>name_5</method-name>
- </method>
- <method>
- <description>description_6</description>
- <ejb-name>name_6</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_6</method-name>
- <method-params></method-params>
- </method>
- <method>
- <description>description_7</description>
- <ejb-name>name_7</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_7</method-name>
- <method-params>
- <method-param>parms_6</method-param>
- </method-params>
- </method>
- <method>
- <description>description_8</description>
- <ejb-name>name_8</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_8</method-name>
- <method-params>
- <method-param>parms_7</method-param>
- <method-param>parms_8</method-param>
- </method-params>
- </method>
- <method>
- <description>description_9</description>
- <ejb-name>name_9</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_9</method-name>
- <method-params>
- <method-param>parms_9</method-param>
- <method-param>parms_10</method-param>
- <method-param>parms_11</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <description>description_2</description>
- <role-name>roleName_0</role-name>
- <role-name>roleName_1</role-name>
- <method>
- <description>description_10</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_10</method-name>
- </method>
- <method>
- <description>description_11</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_11</method-name>
- <method-params></method-params>
- </method>
- <method>
- <description>description_12</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_12</method-name>
- <method-params>
- <method-param>parms_12</method-param>
- </method-params>
- </method>
- <method>
- <description>description_13</description>
- <ejb-name>name_3</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_13</method-name>
- <method-params>
- <method-param>parms_13</method-param>
- <method-param>parms_14</method-param>
- </method-params>
- </method>
- <method>
- <description>description_14</description>
- <ejb-name>name_4</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_14</method-name>
- <method-params>
- <method-param>parms_15</method-param>
- <method-param>parms_16</method-param>
- <method-param>parms_17</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <description>description_3</description>
- <role-name>roleName_0</role-name>
- <role-name>roleName_1</role-name>
- <role-name>roleName_2</role-name>
- <method>
- <description>description_15</description>
- <ejb-name>name_5</ejb-name>
- <method-name>name_15</method-name>
- </method>
- <method>
- <description>description_16</description>
- <ejb-name>name_6</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_16</method-name>
- <method-params></method-params>
- </method>
- <method>
- <description>description_17</description>
- <ejb-name>name_7</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_17</method-name>
- <method-params>
- <method-param>parms_18</method-param>
- </method-params>
- </method>
- <method>
- <description>description_18</description>
- <ejb-name>name_8</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_18</method-name>
- <method-params>
- <method-param>parms_19</method-param>
- <method-param>parms_20</method-param>
- </method-params>
- </method>
- <method>
- <description>description_19</description>
- <ejb-name>name_9</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_19</method-name>
- <method-params>
- <method-param>parms_21</method-param>
- <method-param>parms_22</method-param>
- <method-param>parms_23</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <description>description_4</description>
- <role-name>roleName_0</role-name>
- <role-name>roleName_1</role-name>
- <role-name>roleName_2</role-name>
- <role-name>roleName_3</role-name>
- <method>
- <description>description_20</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_20</method-name>
- </method>
- <method>
- <description>description_21</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_21</method-name>
- <method-params></method-params>
- </method>
- <method>
- <description>description_22</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_22</method-name>
- <method-params>
- <method-param>parms_24</method-param>
- </method-params>
- </method>
- <method>
- <description>description_23</description>
- <ejb-name>name_3</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_23</method-name>
- <method-params>
- <method-param>parms_25</method-param>
- <method-param>parms_26</method-param>
- </method-params>
- </method>
- <method>
- <description>description_24</description>
- <ejb-name>name_4</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_24</method-name>
- <method-params>
- <method-param>parms_27</method-param>
- <method-param>parms_28</method-param>
- <method-param>parms_29</method-param>
- </method-params>
- </method>
- </method-permission>
- <container-transaction>
- <description>description_0</description>
- <method>
- <description>description_25</description>
- <ejb-name>name_5</ejb-name>
- <method-name>name_25</method-name>
- </method>
- <method>
- <description>description_26</description>
- <ejb-name>name_6</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_26</method-name>
- <method-params></method-params>
- </method>
- <method>
- <description>description_27</description>
- <ejb-name>name_7</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_27</method-name>
- <method-params>
- <method-param>parms_30</method-param>
- </method-params>
- </method>
- <method>
- <description>description_28</description>
- <ejb-name>name_8</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_28</method-name>
- <method-params>
- <method-param>parms_31</method-param>
- <method-param>parms_32</method-param>
- </method-params>
- </method>
- <method>
- <description>description_29</description>
- <ejb-name>name_9</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_29</method-name>
- <method-params>
- <method-param>parms_33</method-param>
- <method-param>parms_34</method-param>
- <method-param>parms_35</method-param>
- </method-params>
- </method>
- <trans-attribute>NotSupported</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>description_1</description>
- <method>
- <description>description_30</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_30</method-name>
- </method>
- <method>
- <description>description_31</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_31</method-name>
- <method-params></method-params>
- </method>
- <method>
- <description>description_32</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_32</method-name>
- <method-params>
- <method-param>parms_36</method-param>
- </method-params>
- </method>
- <method>
- <description>description_33</description>
- <ejb-name>name_3</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_33</method-name>
- <method-params>
- <method-param>parms_37</method-param>
- <method-param>parms_38</method-param>
- </method-params>
- </method>
- <method>
- <description>description_34</description>
- <ejb-name>name_4</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_34</method-name>
- <method-params>
- <method-param>parms_39</method-param>
- <method-param>parms_40</method-param>
- <method-param>parms_41</method-param>
- </method-params>
- </method>
- <trans-attribute>Supports</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>description_2</description>
- <method>
- <description>description_35</description>
- <ejb-name>name_5</ejb-name>
- <method-name>name_35</method-name>
- </method>
- <method>
- <description>description_36</description>
- <ejb-name>name_6</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_36</method-name>
- <method-params></method-params>
- </method>
- <method>
- <description>description_37</description>
- <ejb-name>name_7</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_37</method-name>
- <method-params>
- <method-param>parms_42</method-param>
- </method-params>
- </method>
- <method>
- <description>description_38</description>
- <ejb-name>name_8</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_38</method-name>
- <method-params>
- <method-param>parms_43</method-param>
- <method-param>parms_44</method-param>
- </method-params>
- </method>
- <method>
- <description>description_39</description>
- <ejb-name>name_9</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_39</method-name>
- <method-params>
- <method-param>parms_45</method-param>
- <method-param>parms_46</method-param>
- <method-param>parms_47</method-param>
- </method-params>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>description_3</description>
- <method>
- <description>description_40</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_40</method-name>
- </method>
- <method>
- <description>description_41</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_41</method-name>
- <method-params></method-params>
- </method>
- <method>
- <description>description_42</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_42</method-name>
- <method-params>
- <method-param>parms_48</method-param>
- </method-params>
- </method>
- <method>
- <description>description_43</description>
- <ejb-name>name_3</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_43</method-name>
- <method-params>
- <method-param>parms_49</method-param>
- <method-param>parms_50</method-param>
- </method-params>
- </method>
- <method>
- <description>description_44</description>
- <ejb-name>name_4</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_44</method-name>
- <method-params>
- <method-param>parms_51</method-param>
- <method-param>parms_52</method-param>
- <method-param>parms_53</method-param>
- </method-params>
- </method>
- <trans-attribute>RequiresNew</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>description_4</description>
- <method>
- <description>description_45</description>
- <ejb-name>name_5</ejb-name>
- <method-name>name_45</method-name>
- </method>
- <method>
- <description>description_46</description>
- <ejb-name>name_6</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_46</method-name>
- <method-params></method-params>
- </method>
- <method>
- <description>description_47</description>
- <ejb-name>name_7</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_47</method-name>
- <method-params>
- <method-param>parms_54</method-param>
- </method-params>
- </method>
- <method>
- <description>description_48</description>
- <ejb-name>name_8</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_48</method-name>
- <method-params>
- <method-param>parms_55</method-param>
- <method-param>parms_56</method-param>
- </method-params>
- </method>
- <method>
- <description>description_49</description>
- <ejb-name>name_9</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_49</method-name>
- <method-params>
- <method-param>parms_57</method-param>
- <method-param>parms_58</method-param>
- <method-param>parms_59</method-param>
- </method-params>
- </method>
- <trans-attribute>Mandatory</trans-attribute>
- </container-transaction>
- <exclude-list>
- <description>description_0</description>
- <method>
- <description>description_50</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_50</method-name>
- </method>
- <method>
- <description>description_51</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_51</method-name>
- <method-params></method-params>
- </method>
- <method>
- <description>description_52</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_52</method-name>
- <method-params>
- <method-param>parms_60</method-param>
- </method-params>
- </method>
- <method>
- <description>description_53</description>
- <ejb-name>name_3</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_53</method-name>
- <method-params>
- <method-param>parms_61</method-param>
- <method-param>parms_62</method-param>
- </method-params>
- </method>
- <method>
- <description>description_54</description>
- <ejb-name>name_4</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_54</method-name>
- <method-params>
- <method-param>parms_63</method-param>
- <method-param>parms_64</method-param>
- <method-param>parms_65</method-param>
- </method-params>
- </method>
- </exclude-list>
- </assembly-descriptor>
- <ejb-client-jar>ejbClientJar_0</ejb-client-jar>
- </ejb-jar>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/ra.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/ra.xml
deleted file mode 100644
index 2e2a262c..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/ra.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE connector PUBLIC "-//Sun Microsystems, Inc.//DTD Connector 1.0//EN" "http://java.sun.com/dtd/connector_1_0.dtd">
-<connector>
- <display-name>displayName_0</display-name>
- <description>description_0</description>
- <icon>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- </icon>
- <vendor-name>vendorName_0</vendor-name>
- <spec-version>1.0</spec-version>
- <eis-type>eisType_0</eis-type>
- <version>1.0</version>
- <license>
- <description>description_0</description>
- <license-required>true</license-required>
- </license>
- <resourceadapter>
- <managedconnectionfactory-class>managedConnectionFactoryClass_0</managedconnectionfactory-class>
- <connectionfactory-interface>connectionFactoryInterface_0</connectionfactory-interface>
- <connectionfactory-impl-class>connectionFactoryImplClass_0</connectionfactory-impl-class>
- <connection-interface>connectionInterface_0</connection-interface>
- <connection-impl-class>connectionImplClass_0</connection-impl-class>
- <transaction-support>NoTransaction</transaction-support>
- <config-property>
- <description>description_0</description>
- <config-property-name>name_0</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>value_0</config-property-value>
- </config-property>
- <config-property>
- <description>description_1</description>
- <config-property-name>name_1</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>value_1</config-property-value>
- </config-property>
- <config-property>
- <description>description_2</description>
- <config-property-name>name_2</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>value_2</config-property-value>
- </config-property>
- <config-property>
- <description>description_3</description>
- <config-property-name>name_3</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>value_3</config-property-value>
- </config-property>
- <config-property>
- <description>description_4</description>
- <config-property-name>name_4</config-property-name>
- <config-property-type>java.lang.String</config-property-type>
- <config-property-value>value_4</config-property-value>
- </config-property>
- <authentication-mechanism>
- <description>description_0</description>
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
- </authentication-mechanism>
- <authentication-mechanism>
- <description>description_1</description>
- <authentication-mechanism-type>Kerbv5</authentication-mechanism-type>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
- </authentication-mechanism>
- <authentication-mechanism>
- <description>description_2</description>
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
- </authentication-mechanism>
- <authentication-mechanism>
- <description>description_3</description>
- <authentication-mechanism-type>Kerbv5</authentication-mechanism-type>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
- </authentication-mechanism>
- <authentication-mechanism>
- <description>description_4</description>
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
- <credential-interface>javax.resource.spi.security.PasswordCredential</credential-interface>
- </authentication-mechanism>
- <reauthentication-support>true</reauthentication-support>
- <security-permission>
- <description>description_0</description>
- <security-permission-spec>specification_0</security-permission-spec>
- </security-permission>
- <security-permission>
- <description>description_1</description>
- <security-permission-spec>specification_1</security-permission-spec>
- </security-permission>
- <security-permission>
- <description>description_2</description>
- <security-permission-spec>specification_2</security-permission-spec>
- </security-permission>
- <security-permission>
- <description>description_3</description>
- <security-permission-spec>specification_3</security-permission-spec>
- </security-permission>
- <security-permission>
- <description>description_4</description>
- <security-permission-spec>specification_4</security-permission-spec>
- </security-permission>
- </resourceadapter>
-</connector>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/web.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/web.xml
deleted file mode 100644
index 409f958f..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTestNoID/web.xml
+++ /dev/null
@@ -1,1284 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app id="WebApp_ID">
- <icon>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- </icon>
- <display-name>displayName_0</display-name>
- <description>description_0</description>
- <distributable/>
- <context-param>
- <param-name>paramName_0</param-name>
- <param-value>paramValue_0</param-value>
- <description>description_0</description>
- </context-param>
- <context-param>
- <param-name>paramName_1</param-name>
- <param-value>paramValue_1</param-value>
- <description>description_1</description>
- </context-param>
- <context-param>
- <param-name>paramName_2</param-name>
- <param-value>paramValue_2</param-value>
- <description>description_2</description>
- </context-param>
- <context-param>
- <param-name>paramName_3</param-name>
- <param-value>paramValue_3</param-value>
- <description>description_3</description>
- </context-param>
- <context-param>
- <param-name>paramName_4</param-name>
- <param-value>paramValue_4</param-value>
- <description>description_4</description>
- </context-param>
- <filter>
- <icon>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- </icon>
- <filter-name>name_0</filter-name>
- <display-name>displayName_0</display-name>
- <description>description_0</description>
- <filter-class>java.util.HashTable</filter-class>
- <init-param>
- <param-name>paramName_25</param-name>
- <param-value>paramValue_25</param-value>
- <description>description_25</description>
- </init-param>
- <init-param>
- <param-name>paramName_26</param-name>
- <param-value>paramValue_26</param-value>
- <description>description_26</description>
- </init-param>
- <init-param>
- <param-name>paramName_27</param-name>
- <param-value>paramValue_27</param-value>
- <description>description_27</description>
- </init-param>
- <init-param>
- <param-name>paramName_28</param-name>
- <param-value>paramValue_28</param-value>
- <description>description_28</description>
- </init-param>
- <init-param>
- <param-name>paramName_29</param-name>
- <param-value>paramValue_29</param-value>
- <description>description_29</description>
- </init-param>
- </filter>
- <filter>
- <icon>
- <small-icon>smallIcon_1</small-icon>
- <large-icon>largeIcon_1</large-icon>
- </icon>
- <filter-name>name_1</filter-name>
- <display-name>displayName_1</display-name>
- <description>description_1</description>
- <filter-class>java.util.List</filter-class>
- <init-param>
- <param-name>paramName_30</param-name>
- <param-value>paramValue_30</param-value>
- <description>description_30</description>
- </init-param>
- <init-param>
- <param-name>paramName_31</param-name>
- <param-value>paramValue_31</param-value>
- <description>description_31</description>
- </init-param>
- <init-param>
- <param-name>paramName_32</param-name>
- <param-value>paramValue_32</param-value>
- <description>description_32</description>
- </init-param>
- <init-param>
- <param-name>paramName_33</param-name>
- <param-value>paramValue_33</param-value>
- <description>description_33</description>
- </init-param>
- <init-param>
- <param-name>paramName_34</param-name>
- <param-value>paramValue_34</param-value>
- <description>description_34</description>
- </init-param>
- </filter>
- <filter>
- <icon>
- <small-icon>smallIcon_2</small-icon>
- <large-icon>largeIcon_2</large-icon>
- </icon>
- <filter-name>name_2</filter-name>
- <display-name>displayName_2</display-name>
- <description>description_2</description>
- <filter-class>java.sql.Data</filter-class>
- <init-param>
- <param-name>paramName_35</param-name>
- <param-value>paramValue_35</param-value>
- <description>description_35</description>
- </init-param>
- <init-param>
- <param-name>paramName_36</param-name>
- <param-value>paramValue_36</param-value>
- <description>description_36</description>
- </init-param>
- <init-param>
- <param-name>paramName_37</param-name>
- <param-value>paramValue_37</param-value>
- <description>description_37</description>
- </init-param>
- <init-param>
- <param-name>paramName_38</param-name>
- <param-value>paramValue_38</param-value>
- <description>description_38</description>
- </init-param>
- <init-param>
- <param-name>paramName_39</param-name>
- <param-value>paramValue_39</param-value>
- <description>description_39</description>
- </init-param>
- </filter>
- <filter>
- <icon>
- <small-icon>smallIcon_3</small-icon>
- <large-icon>largeIcon_3</large-icon>
- </icon>
- <filter-name>name_3</filter-name>
- <display-name>displayName_3</display-name>
- <description>description_3</description>
- <filter-class>java.lang.Integer</filter-class>
- <init-param>
- <param-name>paramName_40</param-name>
- <param-value>paramValue_40</param-value>
- <description>description_40</description>
- </init-param>
- <init-param>
- <param-name>paramName_41</param-name>
- <param-value>paramValue_41</param-value>
- <description>description_41</description>
- </init-param>
- <init-param>
- <param-name>paramName_42</param-name>
- <param-value>paramValue_42</param-value>
- <description>description_42</description>
- </init-param>
- <init-param>
- <param-name>paramName_43</param-name>
- <param-value>paramValue_43</param-value>
- <description>description_43</description>
- </init-param>
- <init-param>
- <param-name>paramName_44</param-name>
- <param-value>paramValue_44</param-value>
- <description>description_44</description>
- </init-param>
- </filter>
- <filter>
- <icon>
- <small-icon>smallIcon_4</small-icon>
- <large-icon>largeIcon_4</large-icon>
- </icon>
- <filter-name>name_4</filter-name>
- <display-name>displayName_4</display-name>
- <description>description_4</description>
- <filter-class>java.lang.String</filter-class>
- <init-param>
- <param-name>paramName_45</param-name>
- <param-value>paramValue_45</param-value>
- <description>description_45</description>
- </init-param>
- <init-param>
- <param-name>paramName_46</param-name>
- <param-value>paramValue_46</param-value>
- <description>description_46</description>
- </init-param>
- <init-param>
- <param-name>paramName_47</param-name>
- <param-value>paramValue_47</param-value>
- <description>description_47</description>
- </init-param>
- <init-param>
- <param-name>paramName_48</param-name>
- <param-value>paramValue_48</param-value>
- <description>description_48</description>
- </init-param>
- <init-param>
- <param-name>paramName_49</param-name>
- <param-value>paramValue_49</param-value>
- <description>description_49</description>
- </init-param>
- </filter>
- <filter-mapping>
- <filter-name>name_0</filter-name>
- <url-pattern>urlPattern_0</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>name_1</filter-name>
- <url-pattern>urlPattern_1</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>name_2</filter-name>
- <url-pattern>urlPattern_2</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>name_3</filter-name>
- <url-pattern>urlPattern_3</url-pattern>
- </filter-mapping>
- <filter-mapping>
- <filter-name>name_4</filter-name>
- <url-pattern>urlPattern_4</url-pattern>
- </filter-mapping>
- <listener>
- <listener-class>java.util.HashTable</listener-class>
- </listener>
- <listener>
- <listener-class>java.util.List</listener-class>
- </listener>
- <listener>
- <listener-class>java.sql.Data</listener-class>
- </listener>
- <listener>
- <listener-class>java.lang.Integer</listener-class>
- </listener>
- <listener>
- <listener-class>java.lang.String</listener-class>
- </listener>
- <servlet>
- <icon>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- </icon>
- <servlet-name>servletName_0</servlet-name>
- <display-name>displayName_0</display-name>
- <description>description_0</description>
- <jsp-file>jspFile_0</jsp-file>
- <init-param>
- <param-name>paramName_0</param-name>
- <param-value>paramValue_0</param-value>
- <description>description_0</description>
- </init-param>
- <init-param>
- <param-name>paramName_1</param-name>
- <param-value>paramValue_1</param-value>
- <description>description_1</description>
- </init-param>
- <init-param>
- <param-name>paramName_2</param-name>
- <param-value>paramValue_2</param-value>
- <description>description_2</description>
- </init-param>
- <init-param>
- <param-name>paramName_3</param-name>
- <param-value>paramValue_3</param-value>
- <description>description_3</description>
- </init-param>
- <init-param>
- <param-name>paramName_4</param-name>
- <param-value>paramValue_4</param-value>
- <description>description_4</description>
- </init-param>
- <load-on-startup>0</load-on-startup>
- <run-as>
- <description>description_0</description>
- <role-name>roleName_0</role-name>
- </run-as>
- <security-role-ref>
- <description>description_0</description>
- <role-name>name_0</role-name>
- <role-link>link_0</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_1</description>
- <role-name>name_1</role-name>
- <role-link>link_1</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_2</description>
- <role-name>name_2</role-name>
- <role-link>link_2</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_3</description>
- <role-name>name_3</role-name>
- <role-link>link_3</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_4</description>
- <role-name>name_4</role-name>
- <role-link>link_4</role-link>
- </security-role-ref>
- </servlet>
- <servlet>
- <icon>
- <small-icon>smallIcon_1</small-icon>
- <large-icon>largeIcon_1</large-icon>
- </icon>
- <servlet-name>servletName_1</servlet-name>
- <display-name>displayName_1</display-name>
- <description>description_1</description>
- <servlet-class>className_0</servlet-class>
- <init-param>
- <param-name>paramName_5</param-name>
- <param-value>paramValue_5</param-value>
- <description>description_5</description>
- </init-param>
- <init-param>
- <param-name>paramName_6</param-name>
- <param-value>paramValue_6</param-value>
- <description>description_6</description>
- </init-param>
- <init-param>
- <param-name>paramName_7</param-name>
- <param-value>paramValue_7</param-value>
- <description>description_7</description>
- </init-param>
- <init-param>
- <param-name>paramName_8</param-name>
- <param-value>paramValue_8</param-value>
- <description>description_8</description>
- </init-param>
- <init-param>
- <param-name>paramName_9</param-name>
- <param-value>paramValue_9</param-value>
- <description>description_9</description>
- </init-param>
- <load-on-startup>1</load-on-startup>
- <run-as>
- <description>description_1</description>
- <role-name>roleName_1</role-name>
- </run-as>
- <security-role-ref>
- <description>description_5</description>
- <role-name>name_5</role-name>
- <role-link>link_5</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_6</description>
- <role-name>name_6</role-name>
- <role-link>link_6</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_7</description>
- <role-name>name_7</role-name>
- <role-link>link_7</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_8</description>
- <role-name>name_8</role-name>
- <role-link>link_8</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_9</description>
- <role-name>name_9</role-name>
- <role-link>link_9</role-link>
- </security-role-ref>
- </servlet>
- <servlet>
- <icon>
- <small-icon>smallIcon_2</small-icon>
- <large-icon>largeIcon_2</large-icon>
- </icon>
- <servlet-name>servletName_2</servlet-name>
- <display-name>displayName_2</display-name>
- <description>description_2</description>
- <jsp-file>jspFile_1</jsp-file>
- <init-param>
- <param-name>paramName_10</param-name>
- <param-value>paramValue_10</param-value>
- <description>description_10</description>
- </init-param>
- <init-param>
- <param-name>paramName_11</param-name>
- <param-value>paramValue_11</param-value>
- <description>description_11</description>
- </init-param>
- <init-param>
- <param-name>paramName_12</param-name>
- <param-value>paramValue_12</param-value>
- <description>description_12</description>
- </init-param>
- <init-param>
- <param-name>paramName_13</param-name>
- <param-value>paramValue_13</param-value>
- <description>description_13</description>
- </init-param>
- <init-param>
- <param-name>paramName_14</param-name>
- <param-value>paramValue_14</param-value>
- <description>description_14</description>
- </init-param>
- <load-on-startup>2</load-on-startup>
- <run-as>
- <description>description_2</description>
- <role-name>roleName_2</role-name>
- </run-as>
- <security-role-ref>
- <description>description_10</description>
- <role-name>name_10</role-name>
- <role-link>link_10</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_11</description>
- <role-name>name_11</role-name>
- <role-link>link_11</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_12</description>
- <role-name>name_12</role-name>
- <role-link>link_12</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_13</description>
- <role-name>name_13</role-name>
- <role-link>link_13</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_14</description>
- <role-name>name_14</role-name>
- <role-link>link_14</role-link>
- </security-role-ref>
- </servlet>
- <servlet>
- <icon>
- <small-icon>smallIcon_3</small-icon>
- <large-icon>largeIcon_3</large-icon>
- </icon>
- <servlet-name>servletName_3</servlet-name>
- <display-name>displayName_3</display-name>
- <description>description_3</description>
- <servlet-class>className_1</servlet-class>
- <init-param>
- <param-name>paramName_15</param-name>
- <param-value>paramValue_15</param-value>
- <description>description_15</description>
- </init-param>
- <init-param>
- <param-name>paramName_16</param-name>
- <param-value>paramValue_16</param-value>
- <description>description_16</description>
- </init-param>
- <init-param>
- <param-name>paramName_17</param-name>
- <param-value>paramValue_17</param-value>
- <description>description_17</description>
- </init-param>
- <init-param>
- <param-name>paramName_18</param-name>
- <param-value>paramValue_18</param-value>
- <description>description_18</description>
- </init-param>
- <init-param>
- <param-name>paramName_19</param-name>
- <param-value>paramValue_19</param-value>
- <description>description_19</description>
- </init-param>
- <load-on-startup>3</load-on-startup>
- <run-as>
- <description>description_3</description>
- <role-name>roleName_3</role-name>
- </run-as>
- <security-role-ref>
- <description>description_15</description>
- <role-name>name_15</role-name>
- <role-link>link_15</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_16</description>
- <role-name>name_16</role-name>
- <role-link>link_16</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_17</description>
- <role-name>name_17</role-name>
- <role-link>link_17</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_18</description>
- <role-name>name_18</role-name>
- <role-link>link_18</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_19</description>
- <role-name>name_19</role-name>
- <role-link>link_19</role-link>
- </security-role-ref>
- </servlet>
- <servlet>
- <icon>
- <small-icon>smallIcon_4</small-icon>
- <large-icon>largeIcon_4</large-icon>
- </icon>
- <servlet-name>servletName_4</servlet-name>
- <display-name>displayName_4</display-name>
- <description>description_4</description>
- <jsp-file>jspFile_2</jsp-file>
- <init-param>
- <param-name>paramName_20</param-name>
- <param-value>paramValue_20</param-value>
- <description>description_20</description>
- </init-param>
- <init-param>
- <param-name>paramName_21</param-name>
- <param-value>paramValue_21</param-value>
- <description>description_21</description>
- </init-param>
- <init-param>
- <param-name>paramName_22</param-name>
- <param-value>paramValue_22</param-value>
- <description>description_22</description>
- </init-param>
- <init-param>
- <param-name>paramName_23</param-name>
- <param-value>paramValue_23</param-value>
- <description>description_23</description>
- </init-param>
- <init-param>
- <param-name>paramName_24</param-name>
- <param-value>paramValue_24</param-value>
- <description>description_24</description>
- </init-param>
- <load-on-startup>4</load-on-startup>
- <run-as>
- <description>description_4</description>
- <role-name>roleName_4</role-name>
- </run-as>
- <security-role-ref>
- <description>description_20</description>
- <role-name>name_20</role-name>
- <role-link>link_20</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_21</description>
- <role-name>name_21</role-name>
- <role-link>link_21</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_22</description>
- <role-name>name_22</role-name>
- <role-link>link_22</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_23</description>
- <role-name>name_23</role-name>
- <role-link>link_23</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_24</description>
- <role-name>name_24</role-name>
- <role-link>link_24</role-link>
- </security-role-ref>
- </servlet>
- <servlet-mapping>
- <servlet-name>servletName_0</servlet-name>
- <url-pattern>urlPattern_0</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>servletName_1</servlet-name>
- <url-pattern>urlPattern_1</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>servletName_2</servlet-name>
- <url-pattern>urlPattern_2</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>servletName_3</servlet-name>
- <url-pattern>urlPattern_3</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>servletName_4</servlet-name>
- <url-pattern>urlPattern_4</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>0</session-timeout>
- </session-config>
- <mime-mapping>
- <extension>extension_0</extension>
- <mime-type>mimeType_0</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>extension_1</extension>
- <mime-type>mimeType_1</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>extension_2</extension>
- <mime-type>mimeType_2</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>extension_3</extension>
- <mime-type>mimeType_3</mime-type>
- </mime-mapping>
- <mime-mapping>
- <extension>extension_4</extension>
- <mime-type>mimeType_4</mime-type>
- </mime-mapping>
- <welcome-file-list>
- <welcome-file>welcomeFile_0</welcome-file>
- <welcome-file>welcomeFile_1</welcome-file>
- <welcome-file>welcomeFile_2</welcome-file>
- <welcome-file>welcomeFile_3</welcome-file>
- <welcome-file>welcomeFile_4</welcome-file>
- </welcome-file-list>
- <error-page>
- <exception-type>java.util.HashTable</exception-type>
- <location>location_0</location>
- </error-page>
- <error-page>
- <error-code>errorCode_0</error-code>
- <location>location_0</location>
- </error-page>
- <error-page>
- <exception-type>java.util.List</exception-type>
- <location>location_1</location>
- </error-page>
- <error-page>
- <error-code>errorCode_1</error-code>
- <location>location_1</location>
- </error-page>
- <error-page>
- <exception-type>java.sql.Data</exception-type>
- <location>location_2</location>
- </error-page>
- <taglib>
- <taglib-uri>taglibURI_0</taglib-uri>
- <taglib-location>taglibLocation_0</taglib-location>
- </taglib>
- <taglib>
- <taglib-uri>taglibURI_1</taglib-uri>
- <taglib-location>taglibLocation_1</taglib-location>
- </taglib>
- <taglib>
- <taglib-uri>taglibURI_2</taglib-uri>
- <taglib-location>taglibLocation_2</taglib-location>
- </taglib>
- <taglib>
- <taglib-uri>taglibURI_3</taglib-uri>
- <taglib-location>taglibLocation_3</taglib-location>
- </taglib>
- <taglib>
- <taglib-uri>taglibURI_4</taglib-uri>
- <taglib-location>taglibLocation_4</taglib-location>
- </taglib>
- <resource-env-ref>
- <description>description_0</description>
- <resource-env-ref-name>name_0</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_1</description>
- <resource-env-ref-name>name_1</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_2</description>
- <resource-env-ref-name>name_2</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_3</description>
- <resource-env-ref-name>name_3</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_4</description>
- <resource-env-ref-name>name_4</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-ref>
- <description>description_0</description>
- <res-ref-name>name_0</res-ref-name>
- <res-type>type_0</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_1</description>
- <res-ref-name>name_1</res-ref-name>
- <res-type>type_1</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_2</description>
- <res-ref-name>name_2</res-ref-name>
- <res-type>type_2</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_3</description>
- <res-ref-name>name_3</res-ref-name>
- <res-type>type_3</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_4</description>
- <res-ref-name>name_4</res-ref-name>
- <res-type>type_4</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <security-constraint>
- <display-name>displayName_0</display-name>
- <web-resource-collection>
- <web-resource-name>webResourceName_0</web-resource-name>
- <description>description_0</description>
- <url-pattern>urlPattern_0</url-pattern>
- <url-pattern>urlPattern_1</url-pattern>
- <url-pattern>urlPattern_2</url-pattern>
- <url-pattern>urlPattern_3</url-pattern>
- <url-pattern>urlPattern_4</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_1</web-resource-name>
- <description>description_1</description>
- <url-pattern>urlPattern_5</url-pattern>
- <url-pattern>urlPattern_6</url-pattern>
- <url-pattern>urlPattern_7</url-pattern>
- <url-pattern>urlPattern_8</url-pattern>
- <url-pattern>urlPattern_9</url-pattern>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- <http-method>ACL</http-method>
- <http-method>BASELINE-CONTROL</http-method>
- <http-method>BIND</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_2</web-resource-name>
- <description>description_2</description>
- <url-pattern>urlPattern_10</url-pattern>
- <url-pattern>urlPattern_11</url-pattern>
- <url-pattern>urlPattern_12</url-pattern>
- <url-pattern>urlPattern_13</url-pattern>
- <url-pattern>urlPattern_14</url-pattern>
- <http-method>CHECKIN</http-method>
- <http-method>CHECKOUT</http-method>
- <http-method>LABEL</http-method>
- <http-method>MERGE</http-method>
- <http-method>MKACTIVITY</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_3</web-resource-name>
- <description>description_3</description>
- <url-pattern>urlPattern_15</url-pattern>
- <url-pattern>urlPattern_16</url-pattern>
- <url-pattern>urlPattern_17</url-pattern>
- <url-pattern>urlPattern_18</url-pattern>
- <url-pattern>urlPattern_19</url-pattern>
- <http-method>MKWORKSPACE</http-method>
- <http-method>REBIND</http-method>
- <http-method>REPORT</http-method>
- <http-method>SEARCH</http-method>
- <http-method>UNBIND</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_4</web-resource-name>
- <description>description_4</description>
- <url-pattern>urlPattern_20</url-pattern>
- <url-pattern>urlPattern_21</url-pattern>
- <url-pattern>urlPattern_22</url-pattern>
- <url-pattern>urlPattern_23</url-pattern>
- <url-pattern>urlPattern_24</url-pattern>
- <http-method>UNCHECKOUT</http-method>
- <http-method>UPDATE</http-method>
- <http-method>VERSION-CONTROL</http-method>
- <http-method>ACK</http-method>
- <http-method>BYE</http-method>
- </web-resource-collection>
- <auth-constraint>
- <description>description_0</description>
- <role-name>roles_0</role-name>
- <role-name>roles_1</role-name>
- <role-name>roles_2</role-name>
- <role-name>roles_3</role-name>
- <role-name>roles_4</role-name>
- </auth-constraint>
- <user-data-constraint>
- <description>description_0</description>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <security-constraint>
- <display-name>displayName_1</display-name>
- <web-resource-collection>
- <web-resource-name>webResourceName_5</web-resource-name>
- <description>description_5</description>
- <url-pattern>urlPattern_25</url-pattern>
- <url-pattern>urlPattern_26</url-pattern>
- <url-pattern>urlPattern_27</url-pattern>
- <url-pattern>urlPattern_28</url-pattern>
- <url-pattern>urlPattern_29</url-pattern>
- <http-method>CANCEL</http-method>
- <http-method>COPY</http-method>
- <http-method>ERRORRESPONSE</http-method>
- <http-method>INFO</http-method>
- <http-method>INVITE</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_6</web-resource-name>
- <description>description_6</description>
- <url-pattern>urlPattern_30</url-pattern>
- <url-pattern>urlPattern_31</url-pattern>
- <url-pattern>urlPattern_32</url-pattern>
- <url-pattern>urlPattern_33</url-pattern>
- <url-pattern>urlPattern_34</url-pattern>
- <http-method>LOCK</http-method>
- <http-method>MESSAGE</http-method>
- <http-method>MKCOL</http-method>
- <http-method>MOVE</http-method>
- <http-method>NOTIFY</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_7</web-resource-name>
- <description>description_7</description>
- <url-pattern>urlPattern_35</url-pattern>
- <url-pattern>urlPattern_36</url-pattern>
- <url-pattern>urlPattern_37</url-pattern>
- <url-pattern>urlPattern_38</url-pattern>
- <url-pattern>urlPattern_39</url-pattern>
- <http-method>PRACK</http-method>
- <http-method>PROPFIND</http-method>
- <http-method>PROPPATCH</http-method>
- <http-method>PROVISIONALRESPONSE</http-method>
- <http-method>PUBLISH</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_8</web-resource-name>
- <description>description_8</description>
- <url-pattern>urlPattern_40</url-pattern>
- <url-pattern>urlPattern_41</url-pattern>
- <url-pattern>urlPattern_42</url-pattern>
- <url-pattern>urlPattern_43</url-pattern>
- <url-pattern>urlPattern_44</url-pattern>
- <http-method>REDIRECTRESPONSE</http-method>
- <http-method>REGISTER</http-method>
- <http-method>REQUEST</http-method>
- <http-method>RESPONSE</http-method>
- <http-method>SUCCESSRESPONSE</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_9</web-resource-name>
- <description>description_9</description>
- <url-pattern>urlPattern_45</url-pattern>
- <url-pattern>urlPattern_46</url-pattern>
- <url-pattern>urlPattern_47</url-pattern>
- <url-pattern>urlPattern_48</url-pattern>
- <url-pattern>urlPattern_49</url-pattern>
- <http-method>UNLOCK</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- </web-resource-collection>
- <auth-constraint>
- <description>description_1</description>
- <role-name>roles_5</role-name>
- <role-name>roles_6</role-name>
- <role-name>roles_7</role-name>
- <role-name>roles_8</role-name>
- <role-name>roles_9</role-name>
- </auth-constraint>
- <user-data-constraint>
- <description>description_1</description>
- <transport-guarantee>INTEGRAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <security-constraint>
- <display-name>displayName_2</display-name>
- <web-resource-collection>
- <web-resource-name>webResourceName_10</web-resource-name>
- <description>description_10</description>
- <url-pattern>urlPattern_50</url-pattern>
- <url-pattern>urlPattern_51</url-pattern>
- <url-pattern>urlPattern_52</url-pattern>
- <url-pattern>urlPattern_53</url-pattern>
- <url-pattern>urlPattern_54</url-pattern>
- <http-method>HEAD</http-method>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- <http-method>ACL</http-method>
- <http-method>BASELINE-CONTROL</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_11</web-resource-name>
- <description>description_11</description>
- <url-pattern>urlPattern_55</url-pattern>
- <url-pattern>urlPattern_56</url-pattern>
- <url-pattern>urlPattern_57</url-pattern>
- <url-pattern>urlPattern_58</url-pattern>
- <url-pattern>urlPattern_59</url-pattern>
- <http-method>BIND</http-method>
- <http-method>CHECKIN</http-method>
- <http-method>CHECKOUT</http-method>
- <http-method>LABEL</http-method>
- <http-method>MERGE</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_12</web-resource-name>
- <description>description_12</description>
- <url-pattern>urlPattern_60</url-pattern>
- <url-pattern>urlPattern_61</url-pattern>
- <url-pattern>urlPattern_62</url-pattern>
- <url-pattern>urlPattern_63</url-pattern>
- <url-pattern>urlPattern_64</url-pattern>
- <http-method>MKACTIVITY</http-method>
- <http-method>MKWORKSPACE</http-method>
- <http-method>REBIND</http-method>
- <http-method>REPORT</http-method>
- <http-method>SEARCH</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_13</web-resource-name>
- <description>description_13</description>
- <url-pattern>urlPattern_65</url-pattern>
- <url-pattern>urlPattern_66</url-pattern>
- <url-pattern>urlPattern_67</url-pattern>
- <url-pattern>urlPattern_68</url-pattern>
- <url-pattern>urlPattern_69</url-pattern>
- <http-method>UNBIND</http-method>
- <http-method>UNCHECKOUT</http-method>
- <http-method>UPDATE</http-method>
- <http-method>VERSION-CONTROL</http-method>
- <http-method>ACK</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_14</web-resource-name>
- <description>description_14</description>
- <url-pattern>urlPattern_70</url-pattern>
- <url-pattern>urlPattern_71</url-pattern>
- <url-pattern>urlPattern_72</url-pattern>
- <url-pattern>urlPattern_73</url-pattern>
- <url-pattern>urlPattern_74</url-pattern>
- <http-method>BYE</http-method>
- <http-method>CANCEL</http-method>
- <http-method>COPY</http-method>
- <http-method>ERRORRESPONSE</http-method>
- <http-method>INFO</http-method>
- </web-resource-collection>
- <auth-constraint>
- <description>description_2</description>
- <role-name>roles_10</role-name>
- <role-name>roles_11</role-name>
- <role-name>roles_12</role-name>
- <role-name>roles_13</role-name>
- <role-name>roles_14</role-name>
- </auth-constraint>
- <user-data-constraint>
- <description>description_2</description>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <security-constraint>
- <display-name>displayName_3</display-name>
- <web-resource-collection>
- <web-resource-name>webResourceName_15</web-resource-name>
- <description>description_15</description>
- <url-pattern>urlPattern_75</url-pattern>
- <url-pattern>urlPattern_76</url-pattern>
- <url-pattern>urlPattern_77</url-pattern>
- <url-pattern>urlPattern_78</url-pattern>
- <url-pattern>urlPattern_79</url-pattern>
- <http-method>INVITE</http-method>
- <http-method>LOCK</http-method>
- <http-method>MESSAGE</http-method>
- <http-method>MKCOL</http-method>
- <http-method>MOVE</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_16</web-resource-name>
- <description>description_16</description>
- <url-pattern>urlPattern_80</url-pattern>
- <url-pattern>urlPattern_81</url-pattern>
- <url-pattern>urlPattern_82</url-pattern>
- <url-pattern>urlPattern_83</url-pattern>
- <url-pattern>urlPattern_84</url-pattern>
- <http-method>NOTIFY</http-method>
- <http-method>PRACK</http-method>
- <http-method>PROPFIND</http-method>
- <http-method>PROPPATCH</http-method>
- <http-method>PROVISIONALRESPONSE</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_17</web-resource-name>
- <description>description_17</description>
- <url-pattern>urlPattern_85</url-pattern>
- <url-pattern>urlPattern_86</url-pattern>
- <url-pattern>urlPattern_87</url-pattern>
- <url-pattern>urlPattern_88</url-pattern>
- <url-pattern>urlPattern_89</url-pattern>
- <http-method>PUBLISH</http-method>
- <http-method>REDIRECTRESPONSE</http-method>
- <http-method>REGISTER</http-method>
- <http-method>REQUEST</http-method>
- <http-method>RESPONSE</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_18</web-resource-name>
- <description>description_18</description>
- <url-pattern>urlPattern_90</url-pattern>
- <url-pattern>urlPattern_91</url-pattern>
- <url-pattern>urlPattern_92</url-pattern>
- <url-pattern>urlPattern_93</url-pattern>
- <url-pattern>urlPattern_94</url-pattern>
- <http-method>SUCCESSRESPONSE</http-method>
- <http-method>UNLOCK</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_19</web-resource-name>
- <description>description_19</description>
- <url-pattern>urlPattern_95</url-pattern>
- <url-pattern>urlPattern_96</url-pattern>
- <url-pattern>urlPattern_97</url-pattern>
- <url-pattern>urlPattern_98</url-pattern>
- <url-pattern>urlPattern_99</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- <http-method>ACL</http-method>
- </web-resource-collection>
- <auth-constraint>
- <description>description_3</description>
- <role-name>roles_15</role-name>
- <role-name>roles_16</role-name>
- <role-name>roles_17</role-name>
- <role-name>roles_18</role-name>
- <role-name>roles_19</role-name>
- </auth-constraint>
- <user-data-constraint>
- <description>description_3</description>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <security-constraint>
- <display-name>displayName_4</display-name>
- <web-resource-collection>
- <web-resource-name>webResourceName_20</web-resource-name>
- <description>description_20</description>
- <url-pattern>urlPattern_100</url-pattern>
- <url-pattern>urlPattern_101</url-pattern>
- <url-pattern>urlPattern_102</url-pattern>
- <url-pattern>urlPattern_103</url-pattern>
- <url-pattern>urlPattern_104</url-pattern>
- <http-method>BASELINE-CONTROL</http-method>
- <http-method>BIND</http-method>
- <http-method>CHECKIN</http-method>
- <http-method>CHECKOUT</http-method>
- <http-method>LABEL</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_21</web-resource-name>
- <description>description_21</description>
- <url-pattern>urlPattern_105</url-pattern>
- <url-pattern>urlPattern_106</url-pattern>
- <url-pattern>urlPattern_107</url-pattern>
- <url-pattern>urlPattern_108</url-pattern>
- <url-pattern>urlPattern_109</url-pattern>
- <http-method>MERGE</http-method>
- <http-method>MKACTIVITY</http-method>
- <http-method>MKWORKSPACE</http-method>
- <http-method>REBIND</http-method>
- <http-method>REPORT</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_22</web-resource-name>
- <description>description_22</description>
- <url-pattern>urlPattern_110</url-pattern>
- <url-pattern>urlPattern_111</url-pattern>
- <url-pattern>urlPattern_112</url-pattern>
- <url-pattern>urlPattern_113</url-pattern>
- <url-pattern>urlPattern_114</url-pattern>
- <http-method>SEARCH</http-method>
- <http-method>UNBIND</http-method>
- <http-method>UNCHECKOUT</http-method>
- <http-method>UPDATE</http-method>
- <http-method>VERSION-CONTROL</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_23</web-resource-name>
- <description>description_23</description>
- <url-pattern>urlPattern_115</url-pattern>
- <url-pattern>urlPattern_116</url-pattern>
- <url-pattern>urlPattern_117</url-pattern>
- <url-pattern>urlPattern_118</url-pattern>
- <url-pattern>urlPattern_119</url-pattern>
- <http-method>ACK</http-method>
- <http-method>BYE</http-method>
- <http-method>CANCEL</http-method>
- <http-method>COPY</http-method>
- <http-method>ERRORRESPONSE</http-method>
- </web-resource-collection>
- <web-resource-collection>
- <web-resource-name>webResourceName_24</web-resource-name>
- <description>description_24</description>
- <url-pattern>urlPattern_120</url-pattern>
- <url-pattern>urlPattern_121</url-pattern>
- <url-pattern>urlPattern_122</url-pattern>
- <url-pattern>urlPattern_123</url-pattern>
- <url-pattern>urlPattern_124</url-pattern>
- <http-method>INFO</http-method>
- <http-method>INVITE</http-method>
- <http-method>LOCK</http-method>
- <http-method>MESSAGE</http-method>
- <http-method>MKCOL</http-method>
- </web-resource-collection>
- <auth-constraint>
- <description>description_4</description>
- <role-name>roles_20</role-name>
- <role-name>roles_21</role-name>
- <role-name>roles_22</role-name>
- <role-name>roles_23</role-name>
- <role-name>roles_24</role-name>
- </auth-constraint>
- <user-data-constraint>
- <description>description_4</description>
- <transport-guarantee>INTEGRAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <login-config>
- <auth-method>BASIC</auth-method>
- <realm-name>realmName_0</realm-name>
- <form-login-config>
- <form-login-page>formLoginPage_0</form-login-page>
- <form-error-page>formErrorPage_0</form-error-page>
- </form-login-config>
- </login-config>
- <security-role>
- <description>description_0</description>
- <role-name>roleName_0</role-name>
- </security-role>
- <security-role>
- <description>description_1</description>
- <role-name>roleName_1</role-name>
- </security-role>
- <security-role>
- <description>description_2</description>
- <role-name>roleName_2</role-name>
- </security-role>
- <security-role>
- <description>description_3</description>
- <role-name>roleName_3</role-name>
- </security-role>
- <security-role>
- <description>description_4</description>
- <role-name>roleName_4</role-name>
- </security-role>
- <env-entry>
- <description>description_0</description>
- <env-entry-name>name_0</env-entry-name>
- <env-entry-value>value_0</env-entry-value>
- <env-entry-type>java.lang.String</env-entry-type>
- </env-entry>
- <env-entry>
- <description>description_1</description>
- <env-entry-name>name_1</env-entry-name>
- <env-entry-value>value_1</env-entry-value>
- <env-entry-type>java.lang.Integer</env-entry-type>
- </env-entry>
- <env-entry>
- <description>description_2</description>
- <env-entry-name>name_2</env-entry-name>
- <env-entry-value>value_2</env-entry-value>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- </env-entry>
- <env-entry>
- <description>description_3</description>
- <env-entry-name>name_3</env-entry-name>
- <env-entry-value>value_3</env-entry-value>
- <env-entry-type>java.lang.Double</env-entry-type>
- </env-entry>
- <env-entry>
- <description>description_4</description>
- <env-entry-name>name_4</env-entry-name>
- <env-entry-value>value_4</env-entry-value>
- <env-entry-type>java.lang.Byte</env-entry-type>
- </env-entry>
- <ejb-ref>
- <description>description_0</description>
- <ejb-ref-name>name_0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_0</home>
- <remote>remote_0</remote>
- <ejb-link>link_0</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_1</description>
- <ejb-ref-name>name_1</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_1</home>
- <remote>remote_1</remote>
- <ejb-link>link_1</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_2</description>
- <ejb-ref-name>name_2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_2</home>
- <remote>remote_2</remote>
- <ejb-link>link_2</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_3</description>
- <ejb-ref-name>name_3</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_3</home>
- <remote>remote_3</remote>
- <ejb-link>link_3</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_4</description>
- <ejb-ref-name>name_4</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_4</home>
- <remote>remote_4</remote>
- <ejb-link>link_4</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_0</description>
- <ejb-ref-name>name_0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_0</local-home>
- <local>remote_0</local>
- <ejb-link>link_0</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_1</description>
- <ejb-ref-name>name_1</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_1</local-home>
- <local>remote_1</local>
- <ejb-link>link_1</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_2</description>
- <ejb-ref-name>name_2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_2</local-home>
- <local>remote_2</local>
- <ejb-link>link_2</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_3</description>
- <ejb-ref-name>name_3</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_3</local-home>
- <local>remote_3</local>
- <ejb-link>link_3</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_4</description>
- <ejb-ref-name>name_4</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_4</local-home>
- <local>remote_4</local>
- <ejb-link>link_4</ejb-link>
- </ejb-local-ref>
-</web-app>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/application-client.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/application-client.xml
deleted file mode 100644
index 325960cc..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/application-client.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application-client PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN" "http://java.sun.com/dtd/application-client_1_3.dtd">
-
- <application-client id="Application-client_ID">
- <icon>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- </icon>
- <display-name>displayName_0</display-name>
- <description>description_0</description>
- <env-entry id="EnvEntry_1051639763239">
- <description>description_0</description>
- <env-entry-name>name_0</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_0</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639763240">
- <description>description_1</description>
- <env-entry-name>name_1</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_1</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639763241">
- <description>description_2</description>
- <env-entry-name>name_2</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_2</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639763259">
- <description>description_3</description>
- <env-entry-name>name_3</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_3</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639763260">
- <description>description_4</description>
- <env-entry-name>name_4</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_4</env-entry-value>
- </env-entry>
- <ejb-ref id="EjbRef_1051639763279">
- <description>description_0</description>
- <ejb-ref-name>name_0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_0</home>
- <remote>remote_0</remote>
- <ejb-link>link_0</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639763280">
- <description>description_1</description>
- <ejb-ref-name>name_1</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_1</home>
- <remote>remote_1</remote>
- <ejb-link>link_1</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639763281">
- <description>description_2</description>
- <ejb-ref-name>name_2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_2</home>
- <remote>remote_2</remote>
- <ejb-link>link_2</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639763282">
- <description>description_3</description>
- <ejb-ref-name>name_3</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_3</home>
- <remote>remote_3</remote>
- <ejb-link>link_3</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639763283">
- <description>description_4</description>
- <ejb-ref-name>name_4</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_4</home>
- <remote>remote_4</remote>
- <ejb-link>link_4</ejb-link>
- </ejb-ref>
- <resource-ref id="ResourceRef_1051639763299">
- <description>description_0</description>
- <res-ref-name>name_0</res-ref-name>
- <res-type>type_0</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639763300">
- <description>description_1</description>
- <res-ref-name>name_1</res-ref-name>
- <res-type>type_1</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639763301">
- <description>description_2</description>
- <res-ref-name>name_2</res-ref-name>
- <res-type>type_2</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639763302">
- <description>description_3</description>
- <res-ref-name>name_3</res-ref-name>
- <res-type>type_3</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639763303">
- <description>description_4</description>
- <res-ref-name>name_4</res-ref-name>
- <res-type>type_4</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref id="ResourceEnvRef_1051639763319">
- <description>description_0</description>
- <resource-env-ref-name>name_0</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639763349">
- <description>description_1</description>
- <resource-env-ref-name>name_1</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639763350">
- <description>description_2</description>
- <resource-env-ref-name>name_2</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639763351">
- <description>description_3</description>
- <resource-env-ref-name>name_3</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639763352">
- <description>description_4</description>
- <resource-env-ref-name>name_4</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <callback-handler>java.util.HashTable</callback-handler>
- </application-client>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/application.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/application.xml
deleted file mode 100644
index faf46bd0..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/application.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
-
- <application id="Application_ID">
- <icon>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- </icon>
- <display-name>displayName_0</display-name>
- <description>description_0</description>
- <module id="JavaClientModule_1051639778160">
- <java>uri_0</java>
- <alt-dd>altDD_0</alt-dd>
- </module>
- <module id="EjbModule_1051639778160">
- <ejb>uri_1</ejb>
- <alt-dd>altDD_1</alt-dd>
- </module>
- <module id="WebModule_1051639778160">
- <web>
- <web-uri>uri_2</web-uri>
- <context-root>contextRoot_0</context-root>
- </web>
- <alt-dd>altDD_2</alt-dd>
- </module>
- <module id="ConnectorModule_1051639778160">
- <connector>uri_3</connector>
- <alt-dd>altDD_3</alt-dd>
- </module>
- <module id="JavaClientModule_1051639778161">
- <java>uri_4</java>
- <alt-dd>altDD_4</alt-dd>
- </module>
- <security-role id="SecurityRole_1051639778170">
- <description>description_0</description>
- <role-name>roleName_0</role-name>
- </security-role>
- <security-role id="SecurityRole_1051639778190">
- <description>description_1</description>
- <role-name>roleName_1</role-name>
- </security-role>
- <security-role id="SecurityRole_1051639778191">
- <description>description_2</description>
- <role-name>roleName_2</role-name>
- </security-role>
- <security-role id="SecurityRole_1051639778192">
- <description>description_3</description>
- <role-name>roleName_3</role-name>
- </security-role>
- <security-role id="SecurityRole_1051639778193">
- <description>description_4</description>
- <role-name>roleName_4</role-name>
- </security-role>
- </application>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ejb-jar.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ejb-jar.xml
deleted file mode 100644
index e875eae0..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ejb-jar.xml
+++ /dev/null
@@ -1,1864 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-
- <ejb-jar id="ejb-jar_ID">
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <enterprise-beans>
- <entity id="Entity_1051639788645">
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <ejb-name>name_0</ejb-name>
- <home>java.util.List</home>
- <remote>java.sql.Data</remote>
- <local-home>java.lang.Integer</local-home>
- <local>java.lang.String</local>
- <ejb-class>java.util.HashTable</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.HashTable</prim-key-class>
- <reentrant>True</reentrant>
- <env-entry id="EnvEntry_1051639788695">
- <description>description_0</description>
- <env-entry-name>name_0</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_0</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788705">
- <description>description_1</description>
- <env-entry-name>name_1</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_1</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788706">
- <description>description_2</description>
- <env-entry-name>name_2</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_2</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788707">
- <description>description_3</description>
- <env-entry-name>name_3</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_3</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788715">
- <description>description_4</description>
- <env-entry-name>name_4</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_4</env-entry-value>
- </env-entry>
- <ejb-ref id="EjbRef_1051639788725">
- <description>description_0</description>
- <ejb-ref-name>name_0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_0</home>
- <remote>remote_0</remote>
- <ejb-link>link_0</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788726">
- <description>description_1</description>
- <ejb-ref-name>name_1</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_1</home>
- <remote>remote_1</remote>
- <ejb-link>link_1</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788727">
- <description>description_2</description>
- <ejb-ref-name>name_2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_2</home>
- <remote>remote_2</remote>
- <ejb-link>link_2</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788728">
- <description>description_3</description>
- <ejb-ref-name>name_3</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_3</home>
- <remote>remote_3</remote>
- <ejb-link>link_3</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788729">
- <description>description_4</description>
- <ejb-ref-name>name_4</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_4</home>
- <remote>remote_4</remote>
- <ejb-link>link_4</ejb-link>
- </ejb-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788745">
- <description>description_5</description>
- <ejb-ref-name>name_5</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_5</local-home>
- <local>remote_5</local>
- <ejb-link>link_5</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788746">
- <description>description_6</description>
- <ejb-ref-name>name_6</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_6</local-home>
- <local>remote_6</local>
- <ejb-link>link_6</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788747">
- <description>description_7</description>
- <ejb-ref-name>name_7</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_7</local-home>
- <local>remote_7</local>
- <ejb-link>link_7</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788748">
- <description>description_8</description>
- <ejb-ref-name>name_8</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_8</local-home>
- <local>remote_8</local>
- <ejb-link>link_8</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788749">
- <description>description_9</description>
- <ejb-ref-name>name_9</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_9</local-home>
- <local>remote_9</local>
- <ejb-link>link_9</ejb-link>
- </ejb-local-ref>
- <security-role-ref id="SecurityRoleRef_1051639788775">
- <description>description_0</description>
- <role-name>name_0</role-name>
- <role-link>link_0</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788776">
- <description>description_1</description>
- <role-name>name_1</role-name>
- <role-link>link_1</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788777">
- <description>description_2</description>
- <role-name>name_2</role-name>
- <role-link>link_2</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788778">
- <description>description_3</description>
- <role-name>name_3</role-name>
- <role-link>link_3</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788779">
- <description>description_4</description>
- <role-name>name_4</role-name>
- <role-link>link_4</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_0</description>
- <run-as id="RunAsSpecifiedIdentity_1051639788775">
- <description>description_0</description>
- <role-name>roleName_0</role-name>
- </run-as>
- </security-identity>
- <resource-ref id="ResourceRef_1051639788785">
- <description>description_0</description>
- <res-ref-name>name_0</res-ref-name>
- <res-type>type_0</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788786">
- <description>description_1</description>
- <res-ref-name>name_1</res-ref-name>
- <res-type>type_1</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788787">
- <description>description_2</description>
- <res-ref-name>name_2</res-ref-name>
- <res-type>type_2</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788788">
- <description>description_3</description>
- <res-ref-name>name_3</res-ref-name>
- <res-type>type_3</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788795">
- <description>description_4</description>
- <res-ref-name>name_4</res-ref-name>
- <res-type>type_4</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788805">
- <description>description_0</description>
- <resource-env-ref-name>name_0</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788806">
- <description>description_1</description>
- <resource-env-ref-name>name_1</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788807">
- <description>description_2</description>
- <resource-env-ref-name>name_2</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788808">
- <description>description_3</description>
- <resource-env-ref-name>name_3</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788809">
- <description>description_4</description>
- <resource-env-ref-name>name_4</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity id="Entity_1051639788805">
- <description>description_1</description>
- <display-name>displayName_1</display-name>
- <small-icon>smallIcon_1</small-icon>
- <large-icon>largeIcon_1</large-icon>
- <ejb-name>name_1</ejb-name>
- <home>java.sql.Data</home>
- <remote>java.lang.Integer</remote>
- <local-home>java.lang.String</local-home>
- <local>java.util.HashTable</local>
- <ejb-class>java.util.List</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.List</prim-key-class>
- <reentrant>False</reentrant>
- <env-entry id="EnvEntry_1051639788805">
- <description>description_5</description>
- <env-entry-name>name_5</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_5</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788815">
- <description>description_6</description>
- <env-entry-name>name_6</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_6</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788816">
- <description>description_7</description>
- <env-entry-name>name_7</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_7</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788817">
- <description>description_8</description>
- <env-entry-name>name_8</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_8</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788818">
- <description>description_9</description>
- <env-entry-name>name_9</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_9</env-entry-value>
- </env-entry>
- <ejb-ref id="EjbRef_1051639788815">
- <description>description_10</description>
- <ejb-ref-name>name_10</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_10</home>
- <remote>remote_10</remote>
- <ejb-link>link_10</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788816">
- <description>description_11</description>
- <ejb-ref-name>name_11</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_11</home>
- <remote>remote_11</remote>
- <ejb-link>link_11</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788817">
- <description>description_12</description>
- <ejb-ref-name>name_12</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_12</home>
- <remote>remote_12</remote>
- <ejb-link>link_12</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788818">
- <description>description_13</description>
- <ejb-ref-name>name_13</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_13</home>
- <remote>remote_13</remote>
- <ejb-link>link_13</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788819">
- <description>description_14</description>
- <ejb-ref-name>name_14</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_14</home>
- <remote>remote_14</remote>
- <ejb-link>link_14</ejb-link>
- </ejb-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788815">
- <description>description_15</description>
- <ejb-ref-name>name_15</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_15</local-home>
- <local>remote_15</local>
- <ejb-link>link_15</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788816">
- <description>description_16</description>
- <ejb-ref-name>name_16</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_16</local-home>
- <local>remote_16</local>
- <ejb-link>link_16</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788817">
- <description>description_17</description>
- <ejb-ref-name>name_17</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_17</local-home>
- <local>remote_17</local>
- <ejb-link>link_17</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788818">
- <description>description_18</description>
- <ejb-ref-name>name_18</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_18</local-home>
- <local>remote_18</local>
- <ejb-link>link_18</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788819">
- <description>description_19</description>
- <ejb-ref-name>name_19</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_19</local-home>
- <local>remote_19</local>
- <ejb-link>link_19</ejb-link>
- </ejb-local-ref>
- <security-role-ref id="SecurityRoleRef_1051639788825">
- <description>description_5</description>
- <role-name>name_5</role-name>
- <role-link>link_5</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788826">
- <description>description_6</description>
- <role-name>name_6</role-name>
- <role-link>link_6</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788827">
- <description>description_7</description>
- <role-name>name_7</role-name>
- <role-link>link_7</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788828">
- <description>description_8</description>
- <role-name>name_8</role-name>
- <role-link>link_8</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788829">
- <description>description_9</description>
- <role-name>name_9</role-name>
- <role-link>link_9</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_1</description>
- <use-caller-identity id="UseCallerIdentity_1051639788825"></use-caller-identity>
- </security-identity>
- <resource-ref id="ResourceRef_1051639788825">
- <description>description_5</description>
- <res-ref-name>name_5</res-ref-name>
- <res-type>type_5</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788826">
- <description>description_6</description>
- <res-ref-name>name_6</res-ref-name>
- <res-type>type_6</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788827">
- <description>description_7</description>
- <res-ref-name>name_7</res-ref-name>
- <res-type>type_7</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788828">
- <description>description_8</description>
- <res-ref-name>name_8</res-ref-name>
- <res-type>type_8</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788829">
- <description>description_9</description>
- <res-ref-name>name_9</res-ref-name>
- <res-type>type_9</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788825">
- <description>description_5</description>
- <resource-env-ref-name>name_5</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788826">
- <description>description_6</description>
- <resource-env-ref-name>name_6</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788827">
- <description>description_7</description>
- <resource-env-ref-name>name_7</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788828">
- <description>description_8</description>
- <resource-env-ref-name>name_8</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788829">
- <description>description_9</description>
- <resource-env-ref-name>name_9</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity id="ContainerManagedEntity_1051639788825">
- <description>description_2</description>
- <display-name>displayName_2</display-name>
- <small-icon>smallIcon_2</small-icon>
- <large-icon>largeIcon_2</large-icon>
- <ejb-name>name_2</ejb-name>
- <home>java.lang.Integer</home>
- <remote>java.lang.String</remote>
- <local-home>java.util.HashTable</local-home>
- <local>java.util.List</local>
- <ejb-class>java.sql.Data</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>java.sql.Data</prim-key-class>
- <reentrant>True</reentrant>
- <cmp-version>2.0</cmp-version>
- <abstract-schema-name>abstractSchemaName_0</abstract-schema-name>
- <cmp-field id="CMPAttribute_1051639788845">
- <field-name>name_3</field-name>
- </cmp-field>
- <cmp-field id="CMPAttribute_1051639788846">
- <field-name>name_4</field-name>
- </cmp-field>
- <cmp-field id="CMPAttribute_1051639788847">
- <field-name>name_5</field-name>
- </cmp-field>
- <cmp-field id="CMPAttribute_1051639788848">
- <field-name>name_6</field-name>
- </cmp-field>
- <cmp-field id="CMPAttribute_1051639788849">
- <field-name>name_7</field-name>
- </cmp-field>
- <env-entry id="EnvEntry_1051639788885">
- <description>description_10</description>
- <env-entry-name>name_10</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_10</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788886">
- <description>description_11</description>
- <env-entry-name>name_11</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_11</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788887">
- <description>description_12</description>
- <env-entry-name>name_12</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_12</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788888">
- <description>description_13</description>
- <env-entry-name>name_13</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_13</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788889">
- <description>description_14</description>
- <env-entry-name>name_14</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_14</env-entry-value>
- </env-entry>
- <ejb-ref id="EjbRef_1051639788885">
- <description>description_20</description>
- <ejb-ref-name>name_20</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_20</home>
- <remote>remote_20</remote>
- <ejb-link>link_20</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788886">
- <description>description_21</description>
- <ejb-ref-name>name_21</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_21</home>
- <remote>remote_21</remote>
- <ejb-link>link_21</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788887">
- <description>description_22</description>
- <ejb-ref-name>name_22</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_22</home>
- <remote>remote_22</remote>
- <ejb-link>link_22</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788888">
- <description>description_23</description>
- <ejb-ref-name>name_23</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_23</home>
- <remote>remote_23</remote>
- <ejb-link>link_23</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788889">
- <description>description_24</description>
- <ejb-ref-name>name_24</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_24</home>
- <remote>remote_24</remote>
- <ejb-link>link_24</ejb-link>
- </ejb-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788895">
- <description>description_25</description>
- <ejb-ref-name>name_25</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_25</local-home>
- <local>remote_25</local>
- <ejb-link>link_25</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788896">
- <description>description_26</description>
- <ejb-ref-name>name_26</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_26</local-home>
- <local>remote_26</local>
- <ejb-link>link_26</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788897">
- <description>description_27</description>
- <ejb-ref-name>name_27</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_27</local-home>
- <local>remote_27</local>
- <ejb-link>link_27</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788898">
- <description>description_28</description>
- <ejb-ref-name>name_28</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_28</local-home>
- <local>remote_28</local>
- <ejb-link>link_28</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788899">
- <description>description_29</description>
- <ejb-ref-name>name_29</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_29</local-home>
- <local>remote_29</local>
- <ejb-link>link_29</ejb-link>
- </ejb-local-ref>
- <security-role-ref id="SecurityRoleRef_1051639788895">
- <description>description_10</description>
- <role-name>name_10</role-name>
- <role-link>link_10</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788896">
- <description>description_11</description>
- <role-name>name_11</role-name>
- <role-link>link_11</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788897">
- <description>description_12</description>
- <role-name>name_12</role-name>
- <role-link>link_12</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788898">
- <description>description_13</description>
- <role-name>name_13</role-name>
- <role-link>link_13</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788899">
- <description>description_14</description>
- <role-name>name_14</role-name>
- <role-link>link_14</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_2</description>
- <run-as id="RunAsSpecifiedIdentity_1051639788895">
- <description>description_1</description>
- <role-name>roleName_1</role-name>
- </run-as>
- </security-identity>
- <resource-ref id="ResourceRef_1051639788895">
- <description>description_10</description>
- <res-ref-name>name_10</res-ref-name>
- <res-type>type_10</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788896">
- <description>description_11</description>
- <res-ref-name>name_11</res-ref-name>
- <res-type>type_11</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788897">
- <description>description_12</description>
- <res-ref-name>name_12</res-ref-name>
- <res-type>type_12</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788898">
- <description>description_13</description>
- <res-ref-name>name_13</res-ref-name>
- <res-type>type_13</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788905">
- <description>description_14</description>
- <res-ref-name>name_14</res-ref-name>
- <res-type>type_14</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788905">
- <description>description_10</description>
- <resource-env-ref-name>name_10</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788906">
- <description>description_11</description>
- <resource-env-ref-name>name_11</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788907">
- <description>description_12</description>
- <resource-env-ref-name>name_12</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788908">
- <description>description_13</description>
- <resource-env-ref-name>name_13</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788909">
- <description>description_14</description>
- <resource-env-ref-name>name_14</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <query id="Query_1051639788936">
- <description>description_0</description>
- <query-method id="QueryMethod_1051639788936">
- <method-name>name_55</method-name>
- <method-params>
- </method-params>
- </query-method>
- <result-type-mapping>Remote</result-type-mapping>
- <ejb-ql>ejbQL_0</ejb-ql>
- </query>
- <query id="Query_1051639788937">
- <description>description_1</description>
- <query-method id="QueryMethod_1051639788937">
- <method-name>name_56</method-name>
- <method-params>
- <method-param>parms_66</method-param>
- </method-params>
- </query-method>
- <result-type-mapping>Local</result-type-mapping>
- <ejb-ql>ejbQL_1</ejb-ql>
- </query>
- <query id="Query_1051639788938">
- <description>description_2</description>
- <query-method id="QueryMethod_1051639788938">
- <method-name>name_57</method-name>
- <method-params>
- <method-param>parms_67</method-param>
- <method-param>parms_68</method-param>
- </method-params>
- </query-method>
- <result-type-mapping>Remote</result-type-mapping>
- <ejb-ql>ejbQL_2</ejb-ql>
- </query>
- <query id="Query_1051639788939">
- <description>description_3</description>
- <query-method id="QueryMethod_1051639788939">
- <method-name>name_58</method-name>
- <method-params>
- <method-param>parms_69</method-param>
- <method-param>parms_70</method-param>
- <method-param>parms_71</method-param>
- </method-params>
- </query-method>
- <result-type-mapping>Local</result-type-mapping>
- <ejb-ql>ejbQL_3</ejb-ql>
- </query>
- <query id="Query_1051639788940">
- <description>description_4</description>
- <query-method id="QueryMethod_1051639788940">
- <method-name>name_59</method-name>
- <method-params>
- </method-params>
- </query-method>
- <result-type-mapping>Remote</result-type-mapping>
- <ejb-ql>ejbQL_4</ejb-ql>
- </query>
- </entity>
- <session id="Session_1051639788946">
- <description>description_3</description>
- <display-name>displayName_3</display-name>
- <small-icon>smallIcon_3</small-icon>
- <large-icon>largeIcon_3</large-icon>
- <ejb-name>name_8</ejb-name>
- <home>java.lang.String</home>
- <remote>java.util.HashTable</remote>
- <local-home>java.util.List</local-home>
- <local>java.sql.Data</local>
- <ejb-class>java.lang.Integer</ejb-class>
- <session-type>Stateful</session-type>
- <transaction-type>Bean</transaction-type>
- <env-entry id="EnvEntry_1051639788946">
- <description>description_15</description>
- <env-entry-name>name_15</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_15</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788947">
- <description>description_16</description>
- <env-entry-name>name_16</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_16</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788948">
- <description>description_17</description>
- <env-entry-name>name_17</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_17</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788949">
- <description>description_18</description>
- <env-entry-name>name_18</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_18</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788950">
- <description>description_19</description>
- <env-entry-name>name_19</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_19</env-entry-value>
- </env-entry>
- <ejb-ref id="EjbRef_1051639788946">
- <description>description_30</description>
- <ejb-ref-name>name_30</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_30</home>
- <remote>remote_30</remote>
- <ejb-link>link_30</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788947">
- <description>description_31</description>
- <ejb-ref-name>name_31</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_31</home>
- <remote>remote_31</remote>
- <ejb-link>link_31</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788948">
- <description>description_32</description>
- <ejb-ref-name>name_32</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_32</home>
- <remote>remote_32</remote>
- <ejb-link>link_32</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788949">
- <description>description_33</description>
- <ejb-ref-name>name_33</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_33</home>
- <remote>remote_33</remote>
- <ejb-link>link_33</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788950">
- <description>description_34</description>
- <ejb-ref-name>name_34</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_34</home>
- <remote>remote_34</remote>
- <ejb-link>link_34</ejb-link>
- </ejb-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788946">
- <description>description_35</description>
- <ejb-ref-name>name_35</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_35</local-home>
- <local>remote_35</local>
- <ejb-link>link_35</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788947">
- <description>description_36</description>
- <ejb-ref-name>name_36</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_36</local-home>
- <local>remote_36</local>
- <ejb-link>link_36</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788948">
- <description>description_37</description>
- <ejb-ref-name>name_37</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_37</local-home>
- <local>remote_37</local>
- <ejb-link>link_37</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788949">
- <description>description_38</description>
- <ejb-ref-name>name_38</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_38</local-home>
- <local>remote_38</local>
- <ejb-link>link_38</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788950">
- <description>description_39</description>
- <ejb-ref-name>name_39</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_39</local-home>
- <local>remote_39</local>
- <ejb-link>link_39</ejb-link>
- </ejb-local-ref>
- <security-role-ref id="SecurityRoleRef_1051639788946">
- <description>description_15</description>
- <role-name>name_15</role-name>
- <role-link>link_15</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788947">
- <description>description_16</description>
- <role-name>name_16</role-name>
- <role-link>link_16</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788948">
- <description>description_17</description>
- <role-name>name_17</role-name>
- <role-link>link_17</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788949">
- <description>description_18</description>
- <role-name>name_18</role-name>
- <role-link>link_18</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788950">
- <description>description_19</description>
- <role-name>name_19</role-name>
- <role-link>link_19</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_3</description>
- <use-caller-identity id="UseCallerIdentity_1051639788946"></use-caller-identity>
- </security-identity>
- <resource-ref id="ResourceRef_1051639788946">
- <description>description_15</description>
- <res-ref-name>name_15</res-ref-name>
- <res-type>type_15</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788947">
- <description>description_16</description>
- <res-ref-name>name_16</res-ref-name>
- <res-type>type_16</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788948">
- <description>description_17</description>
- <res-ref-name>name_17</res-ref-name>
- <res-type>type_17</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788949">
- <description>description_18</description>
- <res-ref-name>name_18</res-ref-name>
- <res-type>type_18</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788956">
- <description>description_19</description>
- <res-ref-name>name_19</res-ref-name>
- <res-type>type_19</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788956">
- <description>description_15</description>
- <resource-env-ref-name>name_15</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788957">
- <description>description_16</description>
- <resource-env-ref-name>name_16</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788958">
- <description>description_17</description>
- <resource-env-ref-name>name_17</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788959">
- <description>description_18</description>
- <resource-env-ref-name>name_18</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788960">
- <description>description_19</description>
- <resource-env-ref-name>name_19</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- </session>
- <entity id="Entity_1051639788956">
- <description>description_4</description>
- <display-name>displayName_4</display-name>
- <small-icon>smallIcon_4</small-icon>
- <large-icon>largeIcon_4</large-icon>
- <ejb-name>name_9</ejb-name>
- <home>java.lang.String</home>
- <remote>java.util.HashTable</remote>
- <local-home>java.util.List</local-home>
- <local>java.sql.Data</local>
- <ejb-class>java.lang.Integer</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.lang.Integer</prim-key-class>
- <reentrant>False</reentrant>
- <env-entry id="EnvEntry_1051639788956">
- <description>description_20</description>
- <env-entry-name>name_20</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_20</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788957">
- <description>description_21</description>
- <env-entry-name>name_21</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_21</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788958">
- <description>description_22</description>
- <env-entry-name>name_22</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_22</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788959">
- <description>description_23</description>
- <env-entry-name>name_23</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_23</env-entry-value>
- </env-entry>
- <env-entry id="EnvEntry_1051639788960">
- <description>description_24</description>
- <env-entry-name>name_24</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_24</env-entry-value>
- </env-entry>
- <ejb-ref id="EjbRef_1051639788956">
- <description>description_40</description>
- <ejb-ref-name>name_40</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_40</home>
- <remote>remote_40</remote>
- <ejb-link>link_40</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788957">
- <description>description_41</description>
- <ejb-ref-name>name_41</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_41</home>
- <remote>remote_41</remote>
- <ejb-link>link_41</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788958">
- <description>description_42</description>
- <ejb-ref-name>name_42</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_42</home>
- <remote>remote_42</remote>
- <ejb-link>link_42</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788959">
- <description>description_43</description>
- <ejb-ref-name>name_43</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_43</home>
- <remote>remote_43</remote>
- <ejb-link>link_43</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051639788960">
- <description>description_44</description>
- <ejb-ref-name>name_44</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_44</home>
- <remote>remote_44</remote>
- <ejb-link>link_44</ejb-link>
- </ejb-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788956">
- <description>description_45</description>
- <ejb-ref-name>name_45</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_45</local-home>
- <local>remote_45</local>
- <ejb-link>link_45</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788957">
- <description>description_46</description>
- <ejb-ref-name>name_46</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_46</local-home>
- <local>remote_46</local>
- <ejb-link>link_46</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788958">
- <description>description_47</description>
- <ejb-ref-name>name_47</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_47</local-home>
- <local>remote_47</local>
- <ejb-link>link_47</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788959">
- <description>description_48</description>
- <ejb-ref-name>name_48</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_48</local-home>
- <local>remote_48</local>
- <ejb-link>link_48</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051639788960">
- <description>description_49</description>
- <ejb-ref-name>name_49</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_49</local-home>
- <local>remote_49</local>
- <ejb-link>link_49</ejb-link>
- </ejb-local-ref>
- <security-role-ref id="SecurityRoleRef_1051639788956">
- <description>description_20</description>
- <role-name>name_20</role-name>
- <role-link>link_20</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788957">
- <description>description_21</description>
- <role-name>name_21</role-name>
- <role-link>link_21</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788958">
- <description>description_22</description>
- <role-name>name_22</role-name>
- <role-link>link_22</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788959">
- <description>description_23</description>
- <role-name>name_23</role-name>
- <role-link>link_23</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051639788960">
- <description>description_24</description>
- <role-name>name_24</role-name>
- <role-link>link_24</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_4</description>
- <run-as id="RunAsSpecifiedIdentity_1051639788956">
- <description>description_2</description>
- <role-name>roleName_2</role-name>
- </run-as>
- </security-identity>
- <resource-ref id="ResourceRef_1051639788957">
- <description>description_20</description>
- <res-ref-name>name_20</res-ref-name>
- <res-type>type_20</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788958">
- <description>description_21</description>
- <res-ref-name>name_21</res-ref-name>
- <res-type>type_21</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788959">
- <description>description_22</description>
- <res-ref-name>name_22</res-ref-name>
- <res-type>type_22</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788960">
- <description>description_23</description>
- <res-ref-name>name_23</res-ref-name>
- <res-type>type_23</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051639788961">
- <description>description_24</description>
- <res-ref-name>name_24</res-ref-name>
- <res-type>type_24</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788961">
- <description>description_20</description>
- <resource-env-ref-name>name_20</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788962">
- <description>description_21</description>
- <resource-env-ref-name>name_21</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788963">
- <description>description_22</description>
- <resource-env-ref-name>name_22</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788964">
- <description>description_23</description>
- <resource-env-ref-name>name_23</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051639788965">
- <description>description_24</description>
- <resource-env-ref-name>name_24</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- </enterprise-beans>
- <relationships id="Relationships_1051639788956">
- <description>description_0</description>
- <ejb-relation id="EJBRelation_1051639788996">
- <description>description_0</description>
- <ejb-relation-name>name_0</ejb-relation-name>
- <ejb-relationship-role id="EJBRelationshipRole_1051639788996">
- <description>description_0</description>
- <ejb-relationship-role-name>roleName_0</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete></cascade-delete>
- <relationship-role-source id="RoleSource_1051639788996">
- <description>description_0</description>
- <ejb-name>name_0</ejb-name>
- </relationship-role-source>
- <cmr-field id="CMRField_1051639788996">
- <description>description_0</description>
- <cmr-field-name>name_10</cmr-field-name>
- <cmr-field-type>java.lang.String</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role id="EJBRelationshipRole_1051639788997">
- <description>description_1</description>
- <ejb-relationship-role-name>roleName_1</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source id="RoleSource_1051639788997">
- <description>description_1</description>
- <ejb-name>name_1</ejb-name>
- </relationship-role-source>
- <cmr-field id="CMRField_1051639788997">
- <description>description_1</description>
- <cmr-field-name>name_11</cmr-field-name>
- <cmr-field-type>java.util.HashTable</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation id="EJBRelation_1051639788997">
- <description>description_1</description>
- <ejb-relation-name>name_1</ejb-relation-name>
- <ejb-relationship-role id="EJBRelationshipRole_1051639788998">
- <description>description_5</description>
- <ejb-relationship-role-name>roleName_5</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source id="RoleSource_1051639788998">
- <description>description_5</description>
- <ejb-name>name_1</ejb-name>
- </relationship-role-source>
- <cmr-field id="CMRField_1051639788998">
- <description>description_5</description>
- <cmr-field-name>name_15</cmr-field-name>
- <cmr-field-type>java.lang.String</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role id="EJBRelationshipRole_1051639788999">
- <description>description_6</description>
- <ejb-relationship-role-name>roleName_6</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete></cascade-delete>
- <relationship-role-source id="RoleSource_1051639788999">
- <description>description_6</description>
- <ejb-name>name_2</ejb-name>
- </relationship-role-source>
- <cmr-field id="CMRField_1051639788999">
- <description>description_6</description>
- <cmr-field-name>name_16</cmr-field-name>
- <cmr-field-type>java.util.HashTable</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation id="EJBRelation_1051639789006">
- <description>description_2</description>
- <ejb-relation-name>name_2</ejb-relation-name>
- <ejb-relationship-role id="EJBRelationshipRole_1051639789006">
- <description>description_10</description>
- <ejb-relationship-role-name>roleName_10</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete></cascade-delete>
- <relationship-role-source id="RoleSource_1051639789006">
- <description>description_10</description>
- <ejb-name>name_2</ejb-name>
- </relationship-role-source>
- <cmr-field id="CMRField_1051639789006">
- <description>description_10</description>
- <cmr-field-name>name_20</cmr-field-name>
- <cmr-field-type>java.lang.String</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role id="EJBRelationshipRole_1051639789007">
- <description>description_11</description>
- <ejb-relationship-role-name>roleName_11</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source id="RoleSource_1051639789007">
- <description>description_11</description>
- <ejb-name>name_9</ejb-name>
- </relationship-role-source>
- <cmr-field id="CMRField_1051639789007">
- <description>description_11</description>
- <cmr-field-name>name_21</cmr-field-name>
- <cmr-field-type>java.util.HashTable</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation id="EJBRelation_1051639789007">
- <description>description_3</description>
- <ejb-relation-name>name_3</ejb-relation-name>
- <ejb-relationship-role id="EJBRelationshipRole_1051639789008">
- <description>description_15</description>
- <ejb-relationship-role-name>roleName_15</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source id="RoleSource_1051639789008">
- <description>description_15</description>
- <ejb-name>name_9</ejb-name>
- </relationship-role-source>
- <cmr-field id="CMRField_1051639789008">
- <description>description_15</description>
- <cmr-field-name>name_25</cmr-field-name>
- <cmr-field-type>java.lang.String</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role id="EJBRelationshipRole_1051639789009">
- <description>description_16</description>
- <ejb-relationship-role-name>roleName_16</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete></cascade-delete>
- <relationship-role-source id="RoleSource_1051639789009">
- <description>description_16</description>
- <ejb-name>name_0</ejb-name>
- </relationship-role-source>
- <cmr-field id="CMRField_1051639789009">
- <description>description_16</description>
- <cmr-field-name>name_26</cmr-field-name>
- <cmr-field-type>java.util.HashTable</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation id="EJBRelation_1051639789008">
- <description>description_4</description>
- <ejb-relation-name>name_4</ejb-relation-name>
- <ejb-relationship-role id="EJBRelationshipRole_1051639789010">
- <description>description_20</description>
- <ejb-relationship-role-name>roleName_20</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete></cascade-delete>
- <relationship-role-source id="RoleSource_1051639789010">
- <description>description_20</description>
- <ejb-name>name_0</ejb-name>
- </relationship-role-source>
- <cmr-field id="CMRField_1051639789010">
- <description>description_20</description>
- <cmr-field-name>name_30</cmr-field-name>
- <cmr-field-type>java.lang.String</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role id="EJBRelationshipRole_1051639789011">
- <description>description_21</description>
- <ejb-relationship-role-name>roleName_21</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source id="RoleSource_1051639789011">
- <description>description_21</description>
- <ejb-name>name_1</ejb-name>
- </relationship-role-source>
- <cmr-field id="CMRField_1051639789011">
- <description>description_21</description>
- <cmr-field-name>name_31</cmr-field-name>
- <cmr-field-type>java.util.HashTable</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- </relationships>
- <assembly-descriptor id="AssemblyDescriptor_1051639789016">
- <security-role id="SecurityRole_1051639789036">
- <description>description_0</description>
- <role-name>roleName_0</role-name>
- </security-role>
- <security-role id="SecurityRole_1051639789037">
- <description>description_1</description>
- <role-name>roleName_1</role-name>
- </security-role>
- <security-role id="SecurityRole_1051639789046">
- <description>description_2</description>
- <role-name>roleName_2</role-name>
- </security-role>
- <security-role id="SecurityRole_1051639789047">
- <description>description_3</description>
- <role-name>roleName_3</role-name>
- </security-role>
- <security-role id="SecurityRole_1051639789048">
- <description>description_4</description>
- <role-name>roleName_4</role-name>
- </security-role>
- <method-permission id="MethodPermission_1051639789056">
- <description>description_0</description>
- <method id="MethodElement_1051639789106">
- <description>description_0</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_0</method-name>
- </method>
- <method id="MethodElement_1051639789107">
- <description>description_1</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_1</method-name>
- <method-params>
- </method-params>
- </method>
- <method id="MethodElement_1051639789108">
- <description>description_2</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_2</method-name>
- <method-params>
- <method-param>parms_0</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789109">
- <description>description_3</description>
- <ejb-name>name_8</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_3</method-name>
- <method-params>
- <method-param>parms_1</method-param>
- <method-param>parms_2</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789110">
- <description>description_4</description>
- <ejb-name>name_9</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_4</method-name>
- <method-params>
- <method-param>parms_3</method-param>
- <method-param>parms_4</method-param>
- <method-param>parms_5</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission id="MethodPermission_1051639789116">
- <description>description_1</description>
- <method id="MethodElement_1051639789116">
- <description>description_5</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_5</method-name>
- </method>
- <method id="MethodElement_1051639789117">
- <description>description_6</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_6</method-name>
- <method-params>
- </method-params>
- </method>
- <method id="MethodElement_1051639789118">
- <description>description_7</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_7</method-name>
- <method-params>
- <method-param>parms_6</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789119">
- <description>description_8</description>
- <ejb-name>name_8</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_8</method-name>
- <method-params>
- <method-param>parms_7</method-param>
- <method-param>parms_8</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789120">
- <description>description_9</description>
- <ejb-name>name_9</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_9</method-name>
- <method-params>
- <method-param>parms_9</method-param>
- <method-param>parms_10</method-param>
- <method-param>parms_11</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission id="MethodPermission_1051639789117">
- <description>description_2</description>
- <method id="MethodElement_1051639789121">
- <description>description_10</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_10</method-name>
- </method>
- <method id="MethodElement_1051639789122">
- <description>description_11</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_11</method-name>
- <method-params>
- </method-params>
- </method>
- <method id="MethodElement_1051639789123">
- <description>description_12</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_12</method-name>
- <method-params>
- <method-param>parms_12</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789124">
- <description>description_13</description>
- <ejb-name>name_8</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_13</method-name>
- <method-params>
- <method-param>parms_13</method-param>
- <method-param>parms_14</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789125">
- <description>description_14</description>
- <ejb-name>name_9</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_14</method-name>
- <method-params>
- <method-param>parms_15</method-param>
- <method-param>parms_16</method-param>
- <method-param>parms_17</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission id="MethodPermission_1051639789126">
- <description>description_3</description>
- <method id="MethodElement_1051639789126">
- <description>description_15</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_15</method-name>
- </method>
- <method id="MethodElement_1051639789127">
- <description>description_16</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_16</method-name>
- <method-params>
- </method-params>
- </method>
- <method id="MethodElement_1051639789128">
- <description>description_17</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_17</method-name>
- <method-params>
- <method-param>parms_18</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789129">
- <description>description_18</description>
- <ejb-name>name_8</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_18</method-name>
- <method-params>
- <method-param>parms_19</method-param>
- <method-param>parms_20</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789130">
- <description>description_19</description>
- <ejb-name>name_9</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_19</method-name>
- <method-params>
- <method-param>parms_21</method-param>
- <method-param>parms_22</method-param>
- <method-param>parms_23</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission id="MethodPermission_1051639789127">
- <description>description_4</description>
- <method id="MethodElement_1051639789131">
- <description>description_20</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_20</method-name>
- </method>
- <method id="MethodElement_1051639789132">
- <description>description_21</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_21</method-name>
- <method-params>
- </method-params>
- </method>
- <method id="MethodElement_1051639789133">
- <description>description_22</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_22</method-name>
- <method-params>
- <method-param>parms_24</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789134">
- <description>description_23</description>
- <ejb-name>name_8</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_23</method-name>
- <method-params>
- <method-param>parms_25</method-param>
- <method-param>parms_26</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789135">
- <description>description_24</description>
- <ejb-name>name_9</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_24</method-name>
- <method-params>
- <method-param>parms_27</method-param>
- <method-param>parms_28</method-param>
- <method-param>parms_29</method-param>
- </method-params>
- </method>
- </method-permission>
- <container-transaction id="MethodTransaction_1051639789146">
- <description>description_0</description>
- <method id="MethodElement_1051639789146">
- <description>description_25</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_25</method-name>
- </method>
- <method id="MethodElement_1051639789147">
- <description>description_26</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_26</method-name>
- <method-params>
- </method-params>
- </method>
- <method id="MethodElement_1051639789148">
- <description>description_27</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_27</method-name>
- <method-params>
- <method-param>parms_30</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789149">
- <description>description_28</description>
- <ejb-name>name_8</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_28</method-name>
- <method-params>
- <method-param>parms_31</method-param>
- <method-param>parms_32</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789150">
- <description>description_29</description>
- <ejb-name>name_9</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_29</method-name>
- <method-params>
- <method-param>parms_33</method-param>
- <method-param>parms_34</method-param>
- <method-param>parms_35</method-param>
- </method-params>
- </method>
- <trans-attribute>NotSupported</trans-attribute>
- </container-transaction>
- <container-transaction id="MethodTransaction_1051639789147">
- <description>description_1</description>
- <method id="MethodElement_1051639789151">
- <description>description_30</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_30</method-name>
- </method>
- <method id="MethodElement_1051639789152">
- <description>description_31</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_31</method-name>
- <method-params>
- </method-params>
- </method>
- <method id="MethodElement_1051639789153">
- <description>description_32</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_32</method-name>
- <method-params>
- <method-param>parms_36</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789154">
- <description>description_33</description>
- <ejb-name>name_8</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_33</method-name>
- <method-params>
- <method-param>parms_37</method-param>
- <method-param>parms_38</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789156">
- <description>description_34</description>
- <ejb-name>name_9</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_34</method-name>
- <method-params>
- <method-param>parms_39</method-param>
- <method-param>parms_40</method-param>
- <method-param>parms_41</method-param>
- </method-params>
- </method>
- <trans-attribute>Supports</trans-attribute>
- </container-transaction>
- <container-transaction id="MethodTransaction_1051639789156">
- <description>description_2</description>
- <method id="MethodElement_1051639789157">
- <description>description_35</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_35</method-name>
- </method>
- <method id="MethodElement_1051639789158">
- <description>description_36</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_36</method-name>
- <method-params>
- </method-params>
- </method>
- <method id="MethodElement_1051639789159">
- <description>description_37</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_37</method-name>
- <method-params>
- <method-param>parms_42</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789160">
- <description>description_38</description>
- <ejb-name>name_8</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_38</method-name>
- <method-params>
- <method-param>parms_43</method-param>
- <method-param>parms_44</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789161">
- <description>description_39</description>
- <ejb-name>name_9</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_39</method-name>
- <method-params>
- <method-param>parms_45</method-param>
- <method-param>parms_46</method-param>
- <method-param>parms_47</method-param>
- </method-params>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction id="MethodTransaction_1051639789157">
- <description>description_3</description>
- <method id="MethodElement_1051639789162">
- <description>description_40</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_40</method-name>
- </method>
- <method id="MethodElement_1051639789163">
- <description>description_41</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_41</method-name>
- <method-params>
- </method-params>
- </method>
- <method id="MethodElement_1051639789164">
- <description>description_42</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_42</method-name>
- <method-params>
- <method-param>parms_48</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789165">
- <description>description_43</description>
- <ejb-name>name_8</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_43</method-name>
- <method-params>
- <method-param>parms_49</method-param>
- <method-param>parms_50</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789166">
- <description>description_44</description>
- <ejb-name>name_9</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_44</method-name>
- <method-params>
- <method-param>parms_51</method-param>
- <method-param>parms_52</method-param>
- <method-param>parms_53</method-param>
- </method-params>
- </method>
- <trans-attribute>RequiresNew</trans-attribute>
- </container-transaction>
- <container-transaction id="MethodTransaction_1051639789158">
- <description>description_4</description>
- <method id="MethodElement_1051639789167">
- <description>description_45</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_45</method-name>
- </method>
- <method id="MethodElement_1051639789168">
- <description>description_46</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_46</method-name>
- <method-params>
- </method-params>
- </method>
- <method id="MethodElement_1051639789169">
- <description>description_47</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_47</method-name>
- <method-params>
- <method-param>parms_54</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789170">
- <description>description_48</description>
- <ejb-name>name_8</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_48</method-name>
- <method-params>
- <method-param>parms_55</method-param>
- <method-param>parms_56</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789171">
- <description>description_49</description>
- <ejb-name>name_9</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_49</method-name>
- <method-params>
- <method-param>parms_57</method-param>
- <method-param>parms_58</method-param>
- <method-param>parms_59</method-param>
- </method-params>
- </method>
- <trans-attribute>Mandatory</trans-attribute>
- </container-transaction>
- <exclude-list id="ExcludeList_1051639789166">
- <description>description_0</description>
- <method id="MethodElement_1051639789172">
- <description>description_50</description>
- <ejb-name>name_0</ejb-name>
- <method-name>name_50</method-name>
- </method>
- <method id="MethodElement_1051639789176">
- <description>description_51</description>
- <ejb-name>name_1</ejb-name>
- <method-intf>Remote</method-intf>
- <method-name>name_51</method-name>
- <method-params>
- </method-params>
- </method>
- <method id="MethodElement_1051639789177">
- <description>description_52</description>
- <ejb-name>name_2</ejb-name>
- <method-intf>Home</method-intf>
- <method-name>name_52</method-name>
- <method-params>
- <method-param>parms_60</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789178">
- <description>description_53</description>
- <ejb-name>name_8</ejb-name>
- <method-intf>Local</method-intf>
- <method-name>name_53</method-name>
- <method-params>
- <method-param>parms_61</method-param>
- <method-param>parms_62</method-param>
- </method-params>
- </method>
- <method id="MethodElement_1051639789179">
- <description>description_54</description>
- <ejb-name>name_9</ejb-name>
- <method-intf>LocalHome</method-intf>
- <method-name>name_54</method-name>
- <method-params>
- <method-param>parms_63</method-param>
- <method-param>parms_64</method-param>
- <method-param>parms_65</method-param>
- </method-params>
- </method>
- </exclude-list>
- </assembly-descriptor>
- <ejb-client-jar>ejbClientJar_0</ejb-client-jar>
- </ejb-jar>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ejb-jar1-1.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ejb-jar1-1.xml
deleted file mode 100644
index d70d2d40..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ejb-jar1-1.xml
+++ /dev/null
@@ -1,2831 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN" "http://java.sun.com/j2ee/dtds/ejb-jar_1_1.dtd">
-<ejb-jar id="ejb-jar_ID">
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <enterprise-beans>
- <entity id="MyCMP">
- <ejb-name>MyCMP</ejb-name>
- <home>com.ibm.test.ejb.MyCMPHome</home>
- <remote>com.ibm.test.ejb.MyCMP</remote>
- <ejb-class>com.ibm.test.ejb.MyCMPBean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>com.ibm.test.ejb.MyCMPKey</prim-key-class>
- <reentrant>False</reentrant>
- <cmp-field>
- <field-name>k1</field-name>
- </cmp-field>
- </entity>
- <entity id="MyCMP1">
- <ejb-name>MyCMP1</ejb-name>
- <home>com.ibm.test.ejb.MyCMP1Home</home>
- <remote>com.ibm.test.ejb.MyCMP1</remote>
- <ejb-class>com.ibm.test.ejb.MyCMP1Bean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>com.ibm.test.ejb.MyCMP1Key</prim-key-class>
- <reentrant>False</reentrant>
- <cmp-field>
- <field-name>k1</field-name>
- </cmp-field>
- </entity>
- <entity id="MyCMP2">
- <ejb-name>MyCMP2</ejb-name>
- <home>com.ibm.test.ejb.MyCMP2Home</home>
- <remote>com.ibm.test.ejb.MyCMP2</remote>
- <ejb-class>com.ibm.test.ejb.MyCMP2Bean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>com.ibm.test.ejb.MyCMP2Key</prim-key-class>
- <reentrant>False</reentrant>
- <cmp-field>
- <field-name>k1</field-name>
- </cmp-field>
- </entity>
- <entity>
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <ejb-name>name_0</ejb-name>
- <home>java.util.List</home>
- <remote>java.sql.Data</remote>
- <local-home>java.lang.Integer</local-home>
- <local>java.lang.String</local>
- <ejb-class>java.util.HashTable</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.HashTable</prim-key-class>
- <reentrant>True</reentrant>
- <env-entry>
- <description>description_0</description>
- <env-entry-name>name_0</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_0</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_1</description>
- <env-entry-name>name_1</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_1</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_2</description>
- <env-entry-name>name_2</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_2</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_3</description>
- <env-entry-name>name_3</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_3</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_4</description>
- <env-entry-name>name_4</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_4</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_0</description>
- <ejb-ref-name>name_0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_0</home>
- <remote>remote_0</remote>
- <ejb-link>link_0</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_1</description>
- <ejb-ref-name>name_1</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_1</home>
- <remote>remote_1</remote>
- <ejb-link>link_1</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_2</description>
- <ejb-ref-name>name_2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_2</home>
- <remote>remote_2</remote>
- <ejb-link>link_2</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_3</description>
- <ejb-ref-name>name_3</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_3</home>
- <remote>remote_3</remote>
- <ejb-link>link_3</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_4</description>
- <ejb-ref-name>name_4</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_4</home>
- <remote>remote_4</remote>
- <ejb-link>link_4</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_0</description>
- <ejb-ref-name>name_0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_0</local-home>
- <local>local_0</local>
- <ejb-link>link_0</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_1</description>
- <ejb-ref-name>name_1</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_1</local-home>
- <local>local_1</local>
- <ejb-link>link_1</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_2</description>
- <ejb-ref-name>name_2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_2</local-home>
- <local>local_2</local>
- <ejb-link>link_2</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_3</description>
- <ejb-ref-name>name_3</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_3</local-home>
- <local>local_3</local>
- <ejb-link>link_3</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_4</description>
- <ejb-ref-name>name_4</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_4</local-home>
- <local>local_4</local>
- <ejb-link>link_4</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_0</description>
- <role-name>name_0</role-name>
- <role-link>link_0</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_1</description>
- <role-name>name_1</role-name>
- <role-link>link_1</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_2</description>
- <role-name>name_2</role-name>
- <role-link>link_2</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_3</description>
- <role-name>name_3</role-name>
- <role-link>link_3</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_4</description>
- <role-name>name_4</role-name>
- <role-link>link_4</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_0</description>
- <run-as>
- <description>description_0</description>
- <role-name>roleName_0</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_0</description>
- <res-ref-name>name_0</res-ref-name>
- <res-type>type_0</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_1</description>
- <res-ref-name>name_1</res-ref-name>
- <res-type>type_1</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_2</description>
- <res-ref-name>name_2</res-ref-name>
- <res-type>type_2</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_3</description>
- <res-ref-name>name_3</res-ref-name>
- <res-type>type_3</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_4</description>
- <res-ref-name>name_4</res-ref-name>
- <res-type>type_4</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_0</description>
- <resource-env-ref-name>name_0</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_1</description>
- <resource-env-ref-name>name_1</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_2</description>
- <resource-env-ref-name>name_2</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_3</description>
- <resource-env-ref-name>name_3</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_4</description>
- <resource-env-ref-name>name_4</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_1</description>
- <display-name>displayName_1</display-name>
- <small-icon>smallIcon_1</small-icon>
- <large-icon>largeIcon_1</large-icon>
- <ejb-name>name_1</ejb-name>
- <home>java.sql.Data</home>
- <remote>java.lang.Integer</remote>
- <local-home>java.lang.String</local-home>
- <local>java.util.HashTable</local>
- <ejb-class>java.util.List</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.List</prim-key-class>
- <reentrant>False</reentrant>
- <env-entry>
- <description>description_5</description>
- <env-entry-name>name_5</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_5</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_6</description>
- <env-entry-name>name_6</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_6</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_7</description>
- <env-entry-name>name_7</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_7</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_8</description>
- <env-entry-name>name_8</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_8</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_9</description>
- <env-entry-name>name_9</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_9</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_5</description>
- <ejb-ref-name>name_5</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_5</home>
- <remote>remote_5</remote>
- <ejb-link>link_5</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_6</description>
- <ejb-ref-name>name_6</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_6</home>
- <remote>remote_6</remote>
- <ejb-link>link_6</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_7</description>
- <ejb-ref-name>name_7</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_7</home>
- <remote>remote_7</remote>
- <ejb-link>link_7</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_8</description>
- <ejb-ref-name>name_8</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_8</home>
- <remote>remote_8</remote>
- <ejb-link>link_8</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_9</description>
- <ejb-ref-name>name_9</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_9</home>
- <remote>remote_9</remote>
- <ejb-link>link_9</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_5</description>
- <ejb-ref-name>name_5</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_5</local-home>
- <local>local_5</local>
- <ejb-link>link_5</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_6</description>
- <ejb-ref-name>name_6</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_6</local-home>
- <local>local_6</local>
- <ejb-link>link_6</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_7</description>
- <ejb-ref-name>name_7</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_7</local-home>
- <local>local_7</local>
- <ejb-link>link_7</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_8</description>
- <ejb-ref-name>name_8</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_8</local-home>
- <local>local_8</local>
- <ejb-link>link_8</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_9</description>
- <ejb-ref-name>name_9</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_9</local-home>
- <local>local_9</local>
- <ejb-link>link_9</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_5</description>
- <role-name>name_5</role-name>
- <role-link>link_5</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_6</description>
- <role-name>name_6</role-name>
- <role-link>link_6</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_7</description>
- <role-name>name_7</role-name>
- <role-link>link_7</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_8</description>
- <role-name>name_8</role-name>
- <role-link>link_8</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_9</description>
- <role-name>name_9</role-name>
- <role-link>link_9</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_0</description>
- <use-caller-identity/>
- </security-identity>
- <resource-ref>
- <description>description_5</description>
- <res-ref-name>name_5</res-ref-name>
- <res-type>type_5</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_6</description>
- <res-ref-name>name_6</res-ref-name>
- <res-type>type_6</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_7</description>
- <res-ref-name>name_7</res-ref-name>
- <res-type>type_7</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_8</description>
- <res-ref-name>name_8</res-ref-name>
- <res-type>type_8</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_9</description>
- <res-ref-name>name_9</res-ref-name>
- <res-type>type_9</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_5</description>
- <resource-env-ref-name>name_5</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_6</description>
- <resource-env-ref-name>name_6</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_7</description>
- <resource-env-ref-name>name_7</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_8</description>
- <resource-env-ref-name>name_8</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_9</description>
- <resource-env-ref-name>name_9</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_2</description>
- <display-name>displayName_2</display-name>
- <small-icon>smallIcon_2</small-icon>
- <large-icon>largeIcon_2</large-icon>
- <ejb-name>name_2</ejb-name>
- <home>java.lang.Integer</home>
- <remote>java.lang.String</remote>
- <local-home>java.util.HashTable</local-home>
- <local>java.util.List</local>
- <ejb-class>java.sql.Data</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.sql.Data</prim-key-class>
- <reentrant>True</reentrant>
- <env-entry>
- <description>description_10</description>
- <env-entry-name>name_10</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_10</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_11</description>
- <env-entry-name>name_11</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_11</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_12</description>
- <env-entry-name>name_12</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_12</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_13</description>
- <env-entry-name>name_13</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_13</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_14</description>
- <env-entry-name>name_14</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_14</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_10</description>
- <ejb-ref-name>name_10</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_10</home>
- <remote>remote_10</remote>
- <ejb-link>link_10</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_11</description>
- <ejb-ref-name>name_11</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_11</home>
- <remote>remote_11</remote>
- <ejb-link>link_11</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_12</description>
- <ejb-ref-name>name_12</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_12</home>
- <remote>remote_12</remote>
- <ejb-link>link_12</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_13</description>
- <ejb-ref-name>name_13</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_13</home>
- <remote>remote_13</remote>
- <ejb-link>link_13</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_14</description>
- <ejb-ref-name>name_14</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_14</home>
- <remote>remote_14</remote>
- <ejb-link>link_14</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_10</description>
- <ejb-ref-name>name_10</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_10</local-home>
- <local>local_10</local>
- <ejb-link>link_10</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_11</description>
- <ejb-ref-name>name_11</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_11</local-home>
- <local>local_11</local>
- <ejb-link>link_11</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_12</description>
- <ejb-ref-name>name_12</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_12</local-home>
- <local>local_12</local>
- <ejb-link>link_12</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_13</description>
- <ejb-ref-name>name_13</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_13</local-home>
- <local>local_13</local>
- <ejb-link>link_13</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_14</description>
- <ejb-ref-name>name_14</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_14</local-home>
- <local>local_14</local>
- <ejb-link>link_14</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_10</description>
- <role-name>name_10</role-name>
- <role-link>link_10</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_11</description>
- <role-name>name_11</role-name>
- <role-link>link_11</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_12</description>
- <role-name>name_12</role-name>
- <role-link>link_12</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_13</description>
- <role-name>name_13</role-name>
- <role-link>link_13</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_14</description>
- <role-name>name_14</role-name>
- <role-link>link_14</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_1</description>
- <run-as>
- <description>description_1</description>
- <role-name>roleName_1</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_10</description>
- <res-ref-name>name_10</res-ref-name>
- <res-type>type_10</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_11</description>
- <res-ref-name>name_11</res-ref-name>
- <res-type>type_11</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_12</description>
- <res-ref-name>name_12</res-ref-name>
- <res-type>type_12</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_13</description>
- <res-ref-name>name_13</res-ref-name>
- <res-type>type_13</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_14</description>
- <res-ref-name>name_14</res-ref-name>
- <res-type>type_14</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_10</description>
- <resource-env-ref-name>name_10</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_11</description>
- <resource-env-ref-name>name_11</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_12</description>
- <resource-env-ref-name>name_12</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_13</description>
- <resource-env-ref-name>name_13</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_14</description>
- <resource-env-ref-name>name_14</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_3</description>
- <display-name>displayName_3</display-name>
- <small-icon>smallIcon_3</small-icon>
- <large-icon>largeIcon_3</large-icon>
- <ejb-name>name_3</ejb-name>
- <home>java.lang.String</home>
- <remote>java.util.HashTable</remote>
- <local-home>java.util.List</local-home>
- <local>java.sql.Data</local>
- <ejb-class>java.lang.Integer</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.lang.Integer</prim-key-class>
- <reentrant>False</reentrant>
- <env-entry>
- <description>description_15</description>
- <env-entry-name>name_15</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_15</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_16</description>
- <env-entry-name>name_16</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_16</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_17</description>
- <env-entry-name>name_17</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_17</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_18</description>
- <env-entry-name>name_18</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_18</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_19</description>
- <env-entry-name>name_19</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_19</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_15</description>
- <ejb-ref-name>name_15</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_15</home>
- <remote>remote_15</remote>
- <ejb-link>link_15</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_16</description>
- <ejb-ref-name>name_16</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_16</home>
- <remote>remote_16</remote>
- <ejb-link>link_16</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_17</description>
- <ejb-ref-name>name_17</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_17</home>
- <remote>remote_17</remote>
- <ejb-link>link_17</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_18</description>
- <ejb-ref-name>name_18</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_18</home>
- <remote>remote_18</remote>
- <ejb-link>link_18</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_19</description>
- <ejb-ref-name>name_19</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_19</home>
- <remote>remote_19</remote>
- <ejb-link>link_19</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_15</description>
- <ejb-ref-name>name_15</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_15</local-home>
- <local>local_15</local>
- <ejb-link>link_15</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_16</description>
- <ejb-ref-name>name_16</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_16</local-home>
- <local>local_16</local>
- <ejb-link>link_16</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_17</description>
- <ejb-ref-name>name_17</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_17</local-home>
- <local>local_17</local>
- <ejb-link>link_17</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_18</description>
- <ejb-ref-name>name_18</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_18</local-home>
- <local>local_18</local>
- <ejb-link>link_18</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_19</description>
- <ejb-ref-name>name_19</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_19</local-home>
- <local>local_19</local>
- <ejb-link>link_19</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_15</description>
- <role-name>name_15</role-name>
- <role-link>link_15</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_16</description>
- <role-name>name_16</role-name>
- <role-link>link_16</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_17</description>
- <role-name>name_17</role-name>
- <role-link>link_17</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_18</description>
- <role-name>name_18</role-name>
- <role-link>link_18</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_19</description>
- <role-name>name_19</role-name>
- <role-link>link_19</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_1</description>
- <use-caller-identity/>
- </security-identity>
- <resource-ref>
- <description>description_15</description>
- <res-ref-name>name_15</res-ref-name>
- <res-type>type_15</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_16</description>
- <res-ref-name>name_16</res-ref-name>
- <res-type>type_16</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_17</description>
- <res-ref-name>name_17</res-ref-name>
- <res-type>type_17</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_18</description>
- <res-ref-name>name_18</res-ref-name>
- <res-type>type_18</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_19</description>
- <res-ref-name>name_19</res-ref-name>
- <res-type>type_19</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_15</description>
- <resource-env-ref-name>name_15</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_16</description>
- <resource-env-ref-name>name_16</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_17</description>
- <resource-env-ref-name>name_17</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_18</description>
- <resource-env-ref-name>name_18</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_19</description>
- <resource-env-ref-name>name_19</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_4</description>
- <display-name>displayName_4</display-name>
- <small-icon>smallIcon_4</small-icon>
- <large-icon>largeIcon_4</large-icon>
- <ejb-name>name_4</ejb-name>
- <home>java.util.HashTable</home>
- <remote>java.util.List</remote>
- <local-home>java.sql.Data</local-home>
- <local>java.lang.Integer</local>
- <ejb-class>java.lang.String</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.lang.String</prim-key-class>
- <reentrant>True</reentrant>
- <env-entry>
- <description>description_20</description>
- <env-entry-name>name_20</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_20</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_21</description>
- <env-entry-name>name_21</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_21</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_22</description>
- <env-entry-name>name_22</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_22</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_23</description>
- <env-entry-name>name_23</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_23</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_24</description>
- <env-entry-name>name_24</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_24</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_20</description>
- <ejb-ref-name>name_20</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_20</home>
- <remote>remote_20</remote>
- <ejb-link>link_20</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_21</description>
- <ejb-ref-name>name_21</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_21</home>
- <remote>remote_21</remote>
- <ejb-link>link_21</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_22</description>
- <ejb-ref-name>name_22</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_22</home>
- <remote>remote_22</remote>
- <ejb-link>link_22</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_23</description>
- <ejb-ref-name>name_23</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_23</home>
- <remote>remote_23</remote>
- <ejb-link>link_23</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_24</description>
- <ejb-ref-name>name_24</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_24</home>
- <remote>remote_24</remote>
- <ejb-link>link_24</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_20</description>
- <ejb-ref-name>name_20</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_20</local-home>
- <local>local_20</local>
- <ejb-link>link_20</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_21</description>
- <ejb-ref-name>name_21</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_21</local-home>
- <local>local_21</local>
- <ejb-link>link_21</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_22</description>
- <ejb-ref-name>name_22</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_22</local-home>
- <local>local_22</local>
- <ejb-link>link_22</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_23</description>
- <ejb-ref-name>name_23</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_23</local-home>
- <local>local_23</local>
- <ejb-link>link_23</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_24</description>
- <ejb-ref-name>name_24</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_24</local-home>
- <local>local_24</local>
- <ejb-link>link_24</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_20</description>
- <role-name>name_20</role-name>
- <role-link>link_20</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_21</description>
- <role-name>name_21</role-name>
- <role-link>link_21</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_22</description>
- <role-name>name_22</role-name>
- <role-link>link_22</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_23</description>
- <role-name>name_23</role-name>
- <role-link>link_23</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_24</description>
- <role-name>name_24</role-name>
- <role-link>link_24</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_2</description>
- <run-as>
- <description>description_2</description>
- <role-name>roleName_2</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_20</description>
- <res-ref-name>name_20</res-ref-name>
- <res-type>type_20</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_21</description>
- <res-ref-name>name_21</res-ref-name>
- <res-type>type_21</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_22</description>
- <res-ref-name>name_22</res-ref-name>
- <res-type>type_22</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_23</description>
- <res-ref-name>name_23</res-ref-name>
- <res-type>type_23</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_24</description>
- <res-ref-name>name_24</res-ref-name>
- <res-type>type_24</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_20</description>
- <resource-env-ref-name>name_20</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_21</description>
- <resource-env-ref-name>name_21</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_22</description>
- <resource-env-ref-name>name_22</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_23</description>
- <resource-env-ref-name>name_23</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_24</description>
- <resource-env-ref-name>name_24</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_5</description>
- <display-name>displayName_5</display-name>
- <small-icon>smallIcon_5</small-icon>
- <large-icon>largeIcon_5</large-icon>
- <ejb-name>name_5</ejb-name>
- <home>java.util.List</home>
- <remote>java.sql.Data</remote>
- <local-home>java.lang.Integer</local-home>
- <local>java.lang.String</local>
- <ejb-class>java.util.HashTable</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.HashTable</prim-key-class>
- <reentrant>False</reentrant>
- <env-entry>
- <description>description_25</description>
- <env-entry-name>name_25</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_25</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_26</description>
- <env-entry-name>name_26</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_26</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_27</description>
- <env-entry-name>name_27</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_27</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_28</description>
- <env-entry-name>name_28</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_28</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_29</description>
- <env-entry-name>name_29</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_29</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_25</description>
- <ejb-ref-name>name_25</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_25</home>
- <remote>remote_25</remote>
- <ejb-link>link_25</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_26</description>
- <ejb-ref-name>name_26</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_26</home>
- <remote>remote_26</remote>
- <ejb-link>link_26</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_27</description>
- <ejb-ref-name>name_27</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_27</home>
- <remote>remote_27</remote>
- <ejb-link>link_27</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_28</description>
- <ejb-ref-name>name_28</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_28</home>
- <remote>remote_28</remote>
- <ejb-link>link_28</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_29</description>
- <ejb-ref-name>name_29</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_29</home>
- <remote>remote_29</remote>
- <ejb-link>link_29</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_25</description>
- <ejb-ref-name>name_25</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_25</local-home>
- <local>local_25</local>
- <ejb-link>link_25</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_26</description>
- <ejb-ref-name>name_26</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_26</local-home>
- <local>local_26</local>
- <ejb-link>link_26</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_27</description>
- <ejb-ref-name>name_27</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_27</local-home>
- <local>local_27</local>
- <ejb-link>link_27</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_28</description>
- <ejb-ref-name>name_28</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_28</local-home>
- <local>local_28</local>
- <ejb-link>link_28</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_29</description>
- <ejb-ref-name>name_29</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_29</local-home>
- <local>local_29</local>
- <ejb-link>link_29</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_25</description>
- <role-name>name_25</role-name>
- <role-link>link_25</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_26</description>
- <role-name>name_26</role-name>
- <role-link>link_26</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_27</description>
- <role-name>name_27</role-name>
- <role-link>link_27</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_28</description>
- <role-name>name_28</role-name>
- <role-link>link_28</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_29</description>
- <role-name>name_29</role-name>
- <role-link>link_29</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_2</description>
- <use-caller-identity/>
- </security-identity>
- <resource-ref>
- <description>description_25</description>
- <res-ref-name>name_25</res-ref-name>
- <res-type>type_25</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_26</description>
- <res-ref-name>name_26</res-ref-name>
- <res-type>type_26</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_27</description>
- <res-ref-name>name_27</res-ref-name>
- <res-type>type_27</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_28</description>
- <res-ref-name>name_28</res-ref-name>
- <res-type>type_28</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_29</description>
- <res-ref-name>name_29</res-ref-name>
- <res-type>type_29</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_25</description>
- <resource-env-ref-name>name_25</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_26</description>
- <resource-env-ref-name>name_26</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_27</description>
- <resource-env-ref-name>name_27</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_28</description>
- <resource-env-ref-name>name_28</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_29</description>
- <resource-env-ref-name>name_29</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_6</description>
- <display-name>displayName_6</display-name>
- <small-icon>smallIcon_6</small-icon>
- <large-icon>largeIcon_6</large-icon>
- <ejb-name>name_6</ejb-name>
- <home>java.sql.Data</home>
- <remote>java.lang.Integer</remote>
- <local-home>java.lang.String</local-home>
- <local>java.util.HashTable</local>
- <ejb-class>java.util.List</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.List</prim-key-class>
- <reentrant>True</reentrant>
- <env-entry>
- <description>description_30</description>
- <env-entry-name>name_30</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_30</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_31</description>
- <env-entry-name>name_31</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_31</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_32</description>
- <env-entry-name>name_32</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_32</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_33</description>
- <env-entry-name>name_33</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_33</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_34</description>
- <env-entry-name>name_34</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_34</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_30</description>
- <ejb-ref-name>name_30</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_30</home>
- <remote>remote_30</remote>
- <ejb-link>link_30</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_31</description>
- <ejb-ref-name>name_31</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_31</home>
- <remote>remote_31</remote>
- <ejb-link>link_31</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_32</description>
- <ejb-ref-name>name_32</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_32</home>
- <remote>remote_32</remote>
- <ejb-link>link_32</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_33</description>
- <ejb-ref-name>name_33</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_33</home>
- <remote>remote_33</remote>
- <ejb-link>link_33</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_34</description>
- <ejb-ref-name>name_34</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_34</home>
- <remote>remote_34</remote>
- <ejb-link>link_34</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_30</description>
- <ejb-ref-name>name_30</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_30</local-home>
- <local>local_30</local>
- <ejb-link>link_30</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_31</description>
- <ejb-ref-name>name_31</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_31</local-home>
- <local>local_31</local>
- <ejb-link>link_31</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_32</description>
- <ejb-ref-name>name_32</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_32</local-home>
- <local>local_32</local>
- <ejb-link>link_32</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_33</description>
- <ejb-ref-name>name_33</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_33</local-home>
- <local>local_33</local>
- <ejb-link>link_33</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_34</description>
- <ejb-ref-name>name_34</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_34</local-home>
- <local>local_34</local>
- <ejb-link>link_34</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_30</description>
- <role-name>name_30</role-name>
- <role-link>link_30</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_31</description>
- <role-name>name_31</role-name>
- <role-link>link_31</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_32</description>
- <role-name>name_32</role-name>
- <role-link>link_32</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_33</description>
- <role-name>name_33</role-name>
- <role-link>link_33</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_34</description>
- <role-name>name_34</role-name>
- <role-link>link_34</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_3</description>
- <run-as>
- <description>description_3</description>
- <role-name>roleName_3</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_30</description>
- <res-ref-name>name_30</res-ref-name>
- <res-type>type_30</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_31</description>
- <res-ref-name>name_31</res-ref-name>
- <res-type>type_31</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_32</description>
- <res-ref-name>name_32</res-ref-name>
- <res-type>type_32</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_33</description>
- <res-ref-name>name_33</res-ref-name>
- <res-type>type_33</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_34</description>
- <res-ref-name>name_34</res-ref-name>
- <res-type>type_34</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_30</description>
- <resource-env-ref-name>name_30</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_31</description>
- <resource-env-ref-name>name_31</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_32</description>
- <resource-env-ref-name>name_32</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_33</description>
- <resource-env-ref-name>name_33</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_34</description>
- <resource-env-ref-name>name_34</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_7</description>
- <display-name>displayName_7</display-name>
- <small-icon>smallIcon_7</small-icon>
- <large-icon>largeIcon_7</large-icon>
- <ejb-name>name_7</ejb-name>
- <home>java.lang.Integer</home>
- <remote>java.lang.String</remote>
- <local-home>java.util.HashTable</local-home>
- <local>java.util.List</local>
- <ejb-class>java.sql.Data</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.sql.Data</prim-key-class>
- <reentrant>False</reentrant>
- <env-entry>
- <description>description_35</description>
- <env-entry-name>name_35</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_35</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_36</description>
- <env-entry-name>name_36</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_36</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_37</description>
- <env-entry-name>name_37</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_37</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_38</description>
- <env-entry-name>name_38</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_38</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_39</description>
- <env-entry-name>name_39</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_39</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_35</description>
- <ejb-ref-name>name_35</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_35</home>
- <remote>remote_35</remote>
- <ejb-link>link_35</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_36</description>
- <ejb-ref-name>name_36</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_36</home>
- <remote>remote_36</remote>
- <ejb-link>link_36</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_37</description>
- <ejb-ref-name>name_37</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_37</home>
- <remote>remote_37</remote>
- <ejb-link>link_37</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_38</description>
- <ejb-ref-name>name_38</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_38</home>
- <remote>remote_38</remote>
- <ejb-link>link_38</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_39</description>
- <ejb-ref-name>name_39</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_39</home>
- <remote>remote_39</remote>
- <ejb-link>link_39</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_35</description>
- <ejb-ref-name>name_35</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_35</local-home>
- <local>local_35</local>
- <ejb-link>link_35</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_36</description>
- <ejb-ref-name>name_36</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_36</local-home>
- <local>local_36</local>
- <ejb-link>link_36</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_37</description>
- <ejb-ref-name>name_37</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_37</local-home>
- <local>local_37</local>
- <ejb-link>link_37</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_38</description>
- <ejb-ref-name>name_38</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_38</local-home>
- <local>local_38</local>
- <ejb-link>link_38</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_39</description>
- <ejb-ref-name>name_39</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_39</local-home>
- <local>local_39</local>
- <ejb-link>link_39</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_35</description>
- <role-name>name_35</role-name>
- <role-link>link_35</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_36</description>
- <role-name>name_36</role-name>
- <role-link>link_36</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_37</description>
- <role-name>name_37</role-name>
- <role-link>link_37</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_38</description>
- <role-name>name_38</role-name>
- <role-link>link_38</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_39</description>
- <role-name>name_39</role-name>
- <role-link>link_39</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_3</description>
- <use-caller-identity/>
- </security-identity>
- <resource-ref>
- <description>description_35</description>
- <res-ref-name>name_35</res-ref-name>
- <res-type>type_35</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_36</description>
- <res-ref-name>name_36</res-ref-name>
- <res-type>type_36</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_37</description>
- <res-ref-name>name_37</res-ref-name>
- <res-type>type_37</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_38</description>
- <res-ref-name>name_38</res-ref-name>
- <res-type>type_38</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_39</description>
- <res-ref-name>name_39</res-ref-name>
- <res-type>type_39</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_35</description>
- <resource-env-ref-name>name_35</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_36</description>
- <resource-env-ref-name>name_36</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_37</description>
- <resource-env-ref-name>name_37</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_38</description>
- <resource-env-ref-name>name_38</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_39</description>
- <resource-env-ref-name>name_39</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_8</description>
- <display-name>displayName_8</display-name>
- <small-icon>smallIcon_8</small-icon>
- <large-icon>largeIcon_8</large-icon>
- <ejb-name>name_8</ejb-name>
- <home>java.lang.String</home>
- <remote>java.util.HashTable</remote>
- <local-home>java.util.List</local-home>
- <local>java.sql.Data</local>
- <ejb-class>java.lang.Integer</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.lang.Integer</prim-key-class>
- <reentrant>True</reentrant>
- <env-entry>
- <description>description_40</description>
- <env-entry-name>name_40</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_40</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_41</description>
- <env-entry-name>name_41</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_41</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_42</description>
- <env-entry-name>name_42</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_42</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_43</description>
- <env-entry-name>name_43</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_43</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_44</description>
- <env-entry-name>name_44</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_44</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_40</description>
- <ejb-ref-name>name_40</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_40</home>
- <remote>remote_40</remote>
- <ejb-link>link_40</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_41</description>
- <ejb-ref-name>name_41</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_41</home>
- <remote>remote_41</remote>
- <ejb-link>link_41</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_42</description>
- <ejb-ref-name>name_42</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_42</home>
- <remote>remote_42</remote>
- <ejb-link>link_42</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_43</description>
- <ejb-ref-name>name_43</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_43</home>
- <remote>remote_43</remote>
- <ejb-link>link_43</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_44</description>
- <ejb-ref-name>name_44</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_44</home>
- <remote>remote_44</remote>
- <ejb-link>link_44</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_40</description>
- <ejb-ref-name>name_40</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_40</local-home>
- <local>local_40</local>
- <ejb-link>link_40</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_41</description>
- <ejb-ref-name>name_41</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_41</local-home>
- <local>local_41</local>
- <ejb-link>link_41</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_42</description>
- <ejb-ref-name>name_42</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_42</local-home>
- <local>local_42</local>
- <ejb-link>link_42</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_43</description>
- <ejb-ref-name>name_43</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_43</local-home>
- <local>local_43</local>
- <ejb-link>link_43</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_44</description>
- <ejb-ref-name>name_44</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_44</local-home>
- <local>local_44</local>
- <ejb-link>link_44</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_40</description>
- <role-name>name_40</role-name>
- <role-link>link_40</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_41</description>
- <role-name>name_41</role-name>
- <role-link>link_41</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_42</description>
- <role-name>name_42</role-name>
- <role-link>link_42</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_43</description>
- <role-name>name_43</role-name>
- <role-link>link_43</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_44</description>
- <role-name>name_44</role-name>
- <role-link>link_44</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_4</description>
- <run-as>
- <description>description_4</description>
- <role-name>roleName_4</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_40</description>
- <res-ref-name>name_40</res-ref-name>
- <res-type>type_40</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_41</description>
- <res-ref-name>name_41</res-ref-name>
- <res-type>type_41</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_42</description>
- <res-ref-name>name_42</res-ref-name>
- <res-type>type_42</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_43</description>
- <res-ref-name>name_43</res-ref-name>
- <res-type>type_43</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_44</description>
- <res-ref-name>name_44</res-ref-name>
- <res-type>type_44</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_40</description>
- <resource-env-ref-name>name_40</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_41</description>
- <resource-env-ref-name>name_41</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_42</description>
- <resource-env-ref-name>name_42</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_43</description>
- <resource-env-ref-name>name_43</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_44</description>
- <resource-env-ref-name>name_44</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_9</description>
- <display-name>displayName_9</display-name>
- <small-icon>smallIcon_9</small-icon>
- <large-icon>largeIcon_9</large-icon>
- <ejb-name>name_9</ejb-name>
- <home>java.util.HashTable</home>
- <remote>java.util.List</remote>
- <local-home>java.sql.Data</local-home>
- <local>java.lang.Integer</local>
- <ejb-class>java.lang.String</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.lang.String</prim-key-class>
- <reentrant>False</reentrant>
- <env-entry>
- <description>description_45</description>
- <env-entry-name>name_45</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_45</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_46</description>
- <env-entry-name>name_46</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_46</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_47</description>
- <env-entry-name>name_47</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_47</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_48</description>
- <env-entry-name>name_48</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_48</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_49</description>
- <env-entry-name>name_49</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_49</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_45</description>
- <ejb-ref-name>name_45</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_45</home>
- <remote>remote_45</remote>
- <ejb-link>link_45</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_46</description>
- <ejb-ref-name>name_46</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_46</home>
- <remote>remote_46</remote>
- <ejb-link>link_46</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_47</description>
- <ejb-ref-name>name_47</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_47</home>
- <remote>remote_47</remote>
- <ejb-link>link_47</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_48</description>
- <ejb-ref-name>name_48</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_48</home>
- <remote>remote_48</remote>
- <ejb-link>link_48</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_49</description>
- <ejb-ref-name>name_49</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_49</home>
- <remote>remote_49</remote>
- <ejb-link>link_49</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_45</description>
- <ejb-ref-name>name_45</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_45</local-home>
- <local>local_45</local>
- <ejb-link>link_45</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_46</description>
- <ejb-ref-name>name_46</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_46</local-home>
- <local>local_46</local>
- <ejb-link>link_46</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_47</description>
- <ejb-ref-name>name_47</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_47</local-home>
- <local>local_47</local>
- <ejb-link>link_47</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_48</description>
- <ejb-ref-name>name_48</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>localHome_48</local-home>
- <local>local_48</local>
- <ejb-link>link_48</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_49</description>
- <ejb-ref-name>name_49</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>localHome_49</local-home>
- <local>local_49</local>
- <ejb-link>link_49</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_45</description>
- <role-name>name_45</role-name>
- <role-link>link_45</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_46</description>
- <role-name>name_46</role-name>
- <role-link>link_46</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_47</description>
- <role-name>name_47</role-name>
- <role-link>link_47</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_48</description>
- <role-name>name_48</role-name>
- <role-link>link_48</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_49</description>
- <role-name>name_49</role-name>
- <role-link>link_49</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_4</description>
- <use-caller-identity/>
- </security-identity>
- <resource-ref>
- <description>description_45</description>
- <res-ref-name>name_45</res-ref-name>
- <res-type>type_45</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_46</description>
- <res-ref-name>name_46</res-ref-name>
- <res-type>type_46</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_47</description>
- <res-ref-name>name_47</res-ref-name>
- <res-type>type_47</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_48</description>
- <res-ref-name>name_48</res-ref-name>
- <res-type>type_48</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_49</description>
- <res-ref-name>name_49</res-ref-name>
- <res-type>type_49</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_45</description>
- <resource-env-ref-name>name_45</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_46</description>
- <resource-env-ref-name>name_46</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_47</description>
- <resource-env-ref-name>name_47</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_48</description>
- <resource-env-ref-name>name_48</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_49</description>
- <resource-env-ref-name>name_49</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- </enterprise-beans>
- <relationships>
- <description>description_0</description>
- <ejb-relation>
- <description>description_0</description>
- <ejb-relation-name>name_0</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_0</description>
- <ejb-relationship-role-name>roleName_0</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete/>
- <relationship-role-source>
- <description>description_0</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_0</description>
- <cmr-field-name>name_0</cmr-field-name>
- <cmr-field-type>java.util.HashTable</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_1</description>
- <ejb-relationship-role-name>roleName_1</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_1</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_1</description>
- <cmr-field-name>name_1</cmr-field-name>
- <cmr-field-type>java.util.List</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <description>description_1</description>
- <ejb-relation-name>name_1</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_2</description>
- <ejb-relationship-role-name>roleName_2</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete/>
- <relationship-role-source>
- <description>description_2</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_2</description>
- <cmr-field-name>name_2</cmr-field-name>
- <cmr-field-type>java.sql.Data</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_3</description>
- <ejb-relationship-role-name>roleName_3</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_3</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_3</description>
- <cmr-field-name>name_3</cmr-field-name>
- <cmr-field-type>java.lang.Integer</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <description>description_2</description>
- <ejb-relation-name>name_2</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_4</description>
- <ejb-relationship-role-name>roleName_4</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete/>
- <relationship-role-source>
- <description>description_4</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_4</description>
- <cmr-field-name>name_4</cmr-field-name>
- <cmr-field-type>java.lang.String</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_5</description>
- <ejb-relationship-role-name>roleName_5</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_5</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_5</description>
- <cmr-field-name>name_5</cmr-field-name>
- <cmr-field-type>java.util.HashTable</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <description>description_3</description>
- <ejb-relation-name>name_3</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_6</description>
- <ejb-relationship-role-name>roleName_6</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete/>
- <relationship-role-source>
- <description>description_6</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_6</description>
- <cmr-field-name>name_6</cmr-field-name>
- <cmr-field-type>java.util.List</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_7</description>
- <ejb-relationship-role-name>roleName_7</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_7</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_7</description>
- <cmr-field-name>name_7</cmr-field-name>
- <cmr-field-type>java.sql.Data</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <description>description_4</description>
- <ejb-relation-name>name_4</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_8</description>
- <ejb-relationship-role-name>roleName_8</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete/>
- <relationship-role-source>
- <description>description_8</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_8</description>
- <cmr-field-name>name_8</cmr-field-name>
- <cmr-field-type>java.lang.Integer</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_9</description>
- <ejb-relationship-role-name>roleName_9</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_9</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_9</description>
- <cmr-field-name>name_9</cmr-field-name>
- <cmr-field-type>java.lang.String</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- </relationships>
- <assembly-descriptor>
- <security-role>
- <description>description_5</description>
- <role-name>roleName_5</role-name>
- </security-role>
- <security-role>
- <description>description_6</description>
- <role-name>roleName_6</role-name>
- </security-role>
- <security-role>
- <description>description_7</description>
- <role-name>roleName_7</role-name>
- </security-role>
- <security-role>
- <description>description_8</description>
- <role-name>roleName_8</role-name>
- </security-role>
- <security-role>
- <description>description_9</description>
- <role-name>roleName_9</role-name>
- </security-role>
- <method-permission>
- <description>description_0</description>
- <unchecked/>
- <method>
- <description>description_0</description>
- <method-name>name_0</method-name>
- </method>
- <method>
- <description>description_1</description>
- <method-intf>Remote</method-intf>
- <method-name>name_1</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_2</description>
- <method-intf>Home</method-intf>
- <method-name>name_2</method-name>
- <method-params>
- <method-param>parms_0</method-param>
- </method-params>
- </method>
- <method>
- <description>description_3</description>
- <method-intf>Local</method-intf>
- <method-name>name_3</method-name>
- <method-params>
- <method-param>parms_1</method-param>
- <method-param>parms_2</method-param>
- </method-params>
- </method>
- <method>
- <description>description_4</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_4</method-name>
- <method-params>
- <method-param>parms_3</method-param>
- <method-param>parms_4</method-param>
- <method-param>parms_5</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <description>description_1</description>
- <method>
- <description>description_5</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_5</method-name>
- </method>
- <method>
- <description>description_6</description>
- <method-name>name_6</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_7</description>
- <method-intf>Remote</method-intf>
- <method-name>name_7</method-name>
- <method-params>
- <method-param>parms_6</method-param>
- </method-params>
- </method>
- <method>
- <description>description_8</description>
- <method-intf>Home</method-intf>
- <method-name>name_8</method-name>
- <method-params>
- <method-param>parms_7</method-param>
- <method-param>parms_8</method-param>
- </method-params>
- </method>
- <method>
- <description>description_9</description>
- <method-intf>Local</method-intf>
- <method-name>name_9</method-name>
- <method-params>
- <method-param>parms_9</method-param>
- <method-param>parms_10</method-param>
- <method-param>parms_11</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <description>description_2</description>
- <unchecked/>
- <method>
- <description>description_10</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_10</method-name>
- </method>
- <method>
- <description>description_11</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_11</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_12</description>
- <method-name>name_12</method-name>
- <method-params>
- <method-param>parms_12</method-param>
- </method-params>
- </method>
- <method>
- <description>description_13</description>
- <method-intf>Remote</method-intf>
- <method-name>name_13</method-name>
- <method-params>
- <method-param>parms_13</method-param>
- <method-param>parms_14</method-param>
- </method-params>
- </method>
- <method>
- <description>description_14</description>
- <method-intf>Home</method-intf>
- <method-name>name_14</method-name>
- <method-params>
- <method-param>parms_15</method-param>
- <method-param>parms_16</method-param>
- <method-param>parms_17</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <description>description_3</description>
- <method>
- <description>description_15</description>
- <method-intf>Local</method-intf>
- <method-name>name_15</method-name>
- </method>
- <method>
- <description>description_16</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_16</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_17</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_17</method-name>
- <method-params>
- <method-param>parms_18</method-param>
- </method-params>
- </method>
- <method>
- <description>description_18</description>
- <method-name>name_18</method-name>
- <method-params>
- <method-param>parms_19</method-param>
- <method-param>parms_20</method-param>
- </method-params>
- </method>
- <method>
- <description>description_19</description>
- <method-intf>Remote</method-intf>
- <method-name>name_19</method-name>
- <method-params>
- <method-param>parms_21</method-param>
- <method-param>parms_22</method-param>
- <method-param>parms_23</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <description>description_4</description>
- <unchecked/>
- <method>
- <description>description_20</description>
- <method-intf>Home</method-intf>
- <method-name>name_20</method-name>
- </method>
- <method>
- <description>description_21</description>
- <method-intf>Local</method-intf>
- <method-name>name_21</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_22</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_22</method-name>
- <method-params>
- <method-param>parms_24</method-param>
- </method-params>
- </method>
- <method>
- <description>description_23</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_23</method-name>
- <method-params>
- <method-param>parms_25</method-param>
- <method-param>parms_26</method-param>
- </method-params>
- </method>
- <method>
- <description>description_24</description>
- <method-name>name_24</method-name>
- <method-params>
- <method-param>parms_27</method-param>
- <method-param>parms_28</method-param>
- <method-param>parms_29</method-param>
- </method-params>
- </method>
- </method-permission>
- <container-transaction>
- <description>description_0</description>
- <method>
- <description>description_25</description>
- <method-intf>Remote</method-intf>
- <method-name>name_25</method-name>
- </method>
- <method>
- <description>description_26</description>
- <method-intf>Home</method-intf>
- <method-name>name_26</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_27</description>
- <method-intf>Local</method-intf>
- <method-name>name_27</method-name>
- <method-params>
- <method-param>parms_30</method-param>
- </method-params>
- </method>
- <method>
- <description>description_28</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_28</method-name>
- <method-params>
- <method-param>parms_31</method-param>
- <method-param>parms_32</method-param>
- </method-params>
- </method>
- <method>
- <description>description_29</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_29</method-name>
- <method-params>
- <method-param>parms_33</method-param>
- <method-param>parms_34</method-param>
- <method-param>parms_35</method-param>
- </method-params>
- </method>
- <trans-attribute>NotSupported</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>description_1</description>
- <method>
- <description>description_30</description>
- <method-name>name_30</method-name>
- </method>
- <method>
- <description>description_31</description>
- <method-intf>Remote</method-intf>
- <method-name>name_31</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_32</description>
- <method-intf>Home</method-intf>
- <method-name>name_32</method-name>
- <method-params>
- <method-param>parms_36</method-param>
- </method-params>
- </method>
- <method>
- <description>description_33</description>
- <method-intf>Local</method-intf>
- <method-name>name_33</method-name>
- <method-params>
- <method-param>parms_37</method-param>
- <method-param>parms_38</method-param>
- </method-params>
- </method>
- <method>
- <description>description_34</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_34</method-name>
- <method-params>
- <method-param>parms_39</method-param>
- <method-param>parms_40</method-param>
- <method-param>parms_41</method-param>
- </method-params>
- </method>
- <trans-attribute>Supports</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>description_2</description>
- <method>
- <description>description_35</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_35</method-name>
- </method>
- <method>
- <description>description_36</description>
- <method-name>name_36</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_37</description>
- <method-intf>Remote</method-intf>
- <method-name>name_37</method-name>
- <method-params>
- <method-param>parms_42</method-param>
- </method-params>
- </method>
- <method>
- <description>description_38</description>
- <method-intf>Home</method-intf>
- <method-name>name_38</method-name>
- <method-params>
- <method-param>parms_43</method-param>
- <method-param>parms_44</method-param>
- </method-params>
- </method>
- <method>
- <description>description_39</description>
- <method-intf>Local</method-intf>
- <method-name>name_39</method-name>
- <method-params>
- <method-param>parms_45</method-param>
- <method-param>parms_46</method-param>
- <method-param>parms_47</method-param>
- </method-params>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>description_3</description>
- <method>
- <description>description_40</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_40</method-name>
- </method>
- <method>
- <description>description_41</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_41</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_42</description>
- <method-name>name_42</method-name>
- <method-params>
- <method-param>parms_48</method-param>
- </method-params>
- </method>
- <method>
- <description>description_43</description>
- <method-intf>Remote</method-intf>
- <method-name>name_43</method-name>
- <method-params>
- <method-param>parms_49</method-param>
- <method-param>parms_50</method-param>
- </method-params>
- </method>
- <method>
- <description>description_44</description>
- <method-intf>Home</method-intf>
- <method-name>name_44</method-name>
- <method-params>
- <method-param>parms_51</method-param>
- <method-param>parms_52</method-param>
- <method-param>parms_53</method-param>
- </method-params>
- </method>
- <trans-attribute>RequiresNew</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>description_4</description>
- <method>
- <description>description_45</description>
- <method-intf>Local</method-intf>
- <method-name>name_45</method-name>
- </method>
- <method>
- <description>description_46</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_46</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_47</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_47</method-name>
- <method-params>
- <method-param>parms_54</method-param>
- </method-params>
- </method>
- <method>
- <description>description_48</description>
- <method-name>name_48</method-name>
- <method-params>
- <method-param>parms_55</method-param>
- <method-param>parms_56</method-param>
- </method-params>
- </method>
- <method>
- <description>description_49</description>
- <method-intf>Remote</method-intf>
- <method-name>name_49</method-name>
- <method-params>
- <method-param>parms_57</method-param>
- <method-param>parms_58</method-param>
- <method-param>parms_59</method-param>
- </method-params>
- </method>
- <trans-attribute>Mandatory</trans-attribute>
- </container-transaction>
- <exclude-list>
- <description>description_0</description>
- <method>
- <description>description_50</description>
- <method-intf>Home</method-intf>
- <method-name>name_50</method-name>
- </method>
- <method>
- <description>description_51</description>
- <method-intf>Local</method-intf>
- <method-name>name_51</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_52</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_52</method-name>
- <method-params>
- <method-param>parms_60</method-param>
- </method-params>
- </method>
- <method>
- <description>description_53</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_53</method-name>
- <method-params>
- <method-param>parms_61</method-param>
- <method-param>parms_62</method-param>
- </method-params>
- </method>
- <method>
- <description>description_54</description>
- <method-name>name_54</method-name>
- <method-params>
- <method-param>parms_63</method-param>
- <method-param>parms_64</method-param>
- <method-param>parms_65</method-param>
- </method-params>
- </method>
- </exclude-list>
- </assembly-descriptor>
- <ejb-client-jar>ejbClientJar_0</ejb-client-jar>
-</ejb-jar> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ejb-jar2-0.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ejb-jar2-0.xml
deleted file mode 100644
index aa8dc0f1..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ejb-jar2-0.xml
+++ /dev/null
@@ -1,2863 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-<ejb-jar id="ejb-jar_ID">
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <enterprise-beans>
- <entity id="CMP1">
- <ejb-name>CMP1</ejb-name>
- <local-home>ejbs.CMP1LocalHome</local-home>
- <local>ejbs.CMP1Local</local>
- <ejb-class>ejbs.CMP1Bean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>ejbs.CMP1Key</prim-key-class>
- <reentrant>False</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>CMP1</abstract-schema-name>
- <cmp-field>
- <field-name>id</field-name>
- </cmp-field>
- </entity>
- <entity id="CMP2">
- <ejb-name>CMP2</ejb-name>
- <local-home>ejbs.CMP2LocalHome</local-home>
- <local>ejbs.CMP2Local</local>
- <ejb-class>ejbs.CMP2Bean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>ejbs.CMP2Key</prim-key-class>
- <reentrant>False</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>CMP2</abstract-schema-name>
- <cmp-field>
- <field-name>id</field-name>
- </cmp-field>
- </entity>
- <entity>
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <ejb-name>name_0</ejb-name>
- <home>java.util.List</home>
- <remote>java.sql.Data</remote>
- <local-home>java.lang.Integer</local-home>
- <local>java.lang.String</local>
- <ejb-class>java.util.HashTable</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.HashTable</prim-key-class>
- <reentrant>True</reentrant>
- <env-entry>
- <description>description_0</description>
- <env-entry-name>name_0</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_0</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_1</description>
- <env-entry-name>name_1</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_1</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_2</description>
- <env-entry-name>name_2</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_2</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_3</description>
- <env-entry-name>name_3</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_3</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_4</description>
- <env-entry-name>name_4</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_4</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_0</description>
- <ejb-ref-name>name_0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_0</home>
- <remote>remote_0</remote>
- <ejb-link>link_0</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_1</description>
- <ejb-ref-name>name_1</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_1</home>
- <remote>remote_1</remote>
- <ejb-link>link_1</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_2</description>
- <ejb-ref-name>name_2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_2</home>
- <remote>remote_2</remote>
- <ejb-link>link_2</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_3</description>
- <ejb-ref-name>name_3</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_3</home>
- <remote>remote_3</remote>
- <ejb-link>link_3</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_4</description>
- <ejb-ref-name>name_4</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_4</home>
- <remote>remote_4</remote>
- <ejb-link>link_4</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_0</description>
- <ejb-ref-name>name_0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_1</local-home>
- <local>remote_1</local>
- <ejb-link>link_0</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_1</description>
- <ejb-ref-name>name_1</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_3</local-home>
- <local>remote_3</local>
- <ejb-link>link_1</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_2</description>
- <ejb-ref-name>name_2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_5</local-home>
- <local>remote_5</local>
- <ejb-link>link_2</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_3</description>
- <ejb-ref-name>name_3</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_7</local-home>
- <local>remote_7</local>
- <ejb-link>link_3</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_4</description>
- <ejb-ref-name>name_4</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_9</local-home>
- <local>remote_9</local>
- <ejb-link>link_4</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_0</description>
- <role-name>name_0</role-name>
- <role-link>link_0</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_1</description>
- <role-name>name_1</role-name>
- <role-link>link_1</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_2</description>
- <role-name>name_2</role-name>
- <role-link>link_2</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_3</description>
- <role-name>name_3</role-name>
- <role-link>link_3</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_4</description>
- <role-name>name_4</role-name>
- <role-link>link_4</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_0</description>
- <run-as>
- <description>description_0</description>
- <role-name>roleName_0</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_0</description>
- <res-ref-name>name_0</res-ref-name>
- <res-type>type_0</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_1</description>
- <res-ref-name>name_1</res-ref-name>
- <res-type>type_1</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_2</description>
- <res-ref-name>name_2</res-ref-name>
- <res-type>type_2</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_3</description>
- <res-ref-name>name_3</res-ref-name>
- <res-type>type_3</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_4</description>
- <res-ref-name>name_4</res-ref-name>
- <res-type>type_4</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_0</description>
- <resource-env-ref-name>name_0</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_1</description>
- <resource-env-ref-name>name_1</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_2</description>
- <resource-env-ref-name>name_2</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_3</description>
- <resource-env-ref-name>name_3</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_4</description>
- <resource-env-ref-name>name_4</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_1</description>
- <display-name>displayName_1</display-name>
- <small-icon>smallIcon_1</small-icon>
- <large-icon>largeIcon_1</large-icon>
- <ejb-name>name_1</ejb-name>
- <home>java.sql.Data</home>
- <remote>java.lang.Integer</remote>
- <local-home>java.lang.String</local-home>
- <local>java.util.HashTable</local>
- <ejb-class>java.util.List</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.List</prim-key-class>
- <reentrant>False</reentrant>
- <env-entry>
- <description>description_5</description>
- <env-entry-name>name_5</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_5</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_6</description>
- <env-entry-name>name_6</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_6</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_7</description>
- <env-entry-name>name_7</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_7</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_8</description>
- <env-entry-name>name_8</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_8</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_9</description>
- <env-entry-name>name_9</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_9</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_5</description>
- <ejb-ref-name>name_5</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_5</home>
- <remote>remote_5</remote>
- <ejb-link>link_5</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_6</description>
- <ejb-ref-name>name_6</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_6</home>
- <remote>remote_6</remote>
- <ejb-link>link_6</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_7</description>
- <ejb-ref-name>name_7</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_7</home>
- <remote>remote_7</remote>
- <ejb-link>link_7</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_8</description>
- <ejb-ref-name>name_8</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_8</home>
- <remote>remote_8</remote>
- <ejb-link>link_8</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_9</description>
- <ejb-ref-name>name_9</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_9</home>
- <remote>remote_9</remote>
- <ejb-link>link_9</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_5</description>
- <ejb-ref-name>name_5</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_11</local-home>
- <local>remote_11</local>
- <ejb-link>link_5</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_6</description>
- <ejb-ref-name>name_6</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_13</local-home>
- <local>remote_13</local>
- <ejb-link>link_6</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_7</description>
- <ejb-ref-name>name_7</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_15</local-home>
- <local>remote_15</local>
- <ejb-link>link_7</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_8</description>
- <ejb-ref-name>name_8</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_17</local-home>
- <local>remote_17</local>
- <ejb-link>link_8</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_9</description>
- <ejb-ref-name>name_9</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_19</local-home>
- <local>remote_19</local>
- <ejb-link>link_9</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_5</description>
- <role-name>name_5</role-name>
- <role-link>link_5</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_6</description>
- <role-name>name_6</role-name>
- <role-link>link_6</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_7</description>
- <role-name>name_7</role-name>
- <role-link>link_7</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_8</description>
- <role-name>name_8</role-name>
- <role-link>link_8</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_9</description>
- <role-name>name_9</role-name>
- <role-link>link_9</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_0</description>
- <use-caller-identity></use-caller-identity>
- </security-identity>
- <resource-ref>
- <description>description_5</description>
- <res-ref-name>name_5</res-ref-name>
- <res-type>type_5</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_6</description>
- <res-ref-name>name_6</res-ref-name>
- <res-type>type_6</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_7</description>
- <res-ref-name>name_7</res-ref-name>
- <res-type>type_7</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_8</description>
- <res-ref-name>name_8</res-ref-name>
- <res-type>type_8</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_9</description>
- <res-ref-name>name_9</res-ref-name>
- <res-type>type_9</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_5</description>
- <resource-env-ref-name>name_5</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_6</description>
- <resource-env-ref-name>name_6</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_7</description>
- <resource-env-ref-name>name_7</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_8</description>
- <resource-env-ref-name>name_8</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_9</description>
- <resource-env-ref-name>name_9</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <ejb-name>name_0</ejb-name>
- <home>java.lang.Integer</home>
- <remote>java.lang.String</remote>
- <local-home>java.util.HashTable</local-home>
- <local>java.util.List</local>
- <ejb-class>java.sql.Data</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>java.sql.Data</prim-key-class>
- <reentrant>True</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>abstractSchemaName_0</abstract-schema-name>
- <cmp-field>
- <description>description_1</description>
- <field-name>name_1</field-name>
- </cmp-field>
- <cmp-field>
- <description>description_3</description>
- <field-name>name_3</field-name>
- </cmp-field>
- <cmp-field>
- <description>description_4</description>
- <field-name>name_4</field-name>
- </cmp-field>
- <env-entry>
- <description>description_10</description>
- <env-entry-name>name_10</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_10</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_11</description>
- <env-entry-name>name_11</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_11</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_12</description>
- <env-entry-name>name_12</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_12</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_13</description>
- <env-entry-name>name_13</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_13</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_14</description>
- <env-entry-name>name_14</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_14</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_10</description>
- <ejb-ref-name>name_10</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_10</home>
- <remote>remote_10</remote>
- <ejb-link>link_10</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_11</description>
- <ejb-ref-name>name_11</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_11</home>
- <remote>remote_11</remote>
- <ejb-link>link_11</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_12</description>
- <ejb-ref-name>name_12</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_12</home>
- <remote>remote_12</remote>
- <ejb-link>link_12</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_13</description>
- <ejb-ref-name>name_13</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_13</home>
- <remote>remote_13</remote>
- <ejb-link>link_13</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_14</description>
- <ejb-ref-name>name_14</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_14</home>
- <remote>remote_14</remote>
- <ejb-link>link_14</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_10</description>
- <ejb-ref-name>name_10</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_21</local-home>
- <local>remote_21</local>
- <ejb-link>link_10</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_11</description>
- <ejb-ref-name>name_11</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_23</local-home>
- <local>remote_23</local>
- <ejb-link>link_11</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_12</description>
- <ejb-ref-name>name_12</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_25</local-home>
- <local>remote_25</local>
- <ejb-link>link_12</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_13</description>
- <ejb-ref-name>name_13</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_27</local-home>
- <local>remote_27</local>
- <ejb-link>link_13</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_14</description>
- <ejb-ref-name>name_14</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_29</local-home>
- <local>remote_29</local>
- <ejb-link>link_14</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_10</description>
- <role-name>name_10</role-name>
- <role-link>link_10</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_11</description>
- <role-name>name_11</role-name>
- <role-link>link_11</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_12</description>
- <role-name>name_12</role-name>
- <role-link>link_12</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_13</description>
- <role-name>name_13</role-name>
- <role-link>link_13</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_14</description>
- <role-name>name_14</role-name>
- <role-link>link_14</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_1</description>
- <run-as>
- <description>description_1</description>
- <role-name>roleName_1</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_10</description>
- <res-ref-name>name_10</res-ref-name>
- <res-type>type_10</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_11</description>
- <res-ref-name>name_11</res-ref-name>
- <res-type>type_11</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_12</description>
- <res-ref-name>name_12</res-ref-name>
- <res-type>type_12</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_13</description>
- <res-ref-name>name_13</res-ref-name>
- <res-type>type_13</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_14</description>
- <res-ref-name>name_14</res-ref-name>
- <res-type>type_14</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_10</description>
- <resource-env-ref-name>name_10</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_11</description>
- <resource-env-ref-name>name_11</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_12</description>
- <resource-env-ref-name>name_12</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_13</description>
- <resource-env-ref-name>name_13</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_14</description>
- <resource-env-ref-name>name_14</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <query>
- <description>description_0</description>
- <query-method>
- <method-name>name_0</method-name>
- </query-method>
- <result-type-mapping>Local</result-type-mapping>
- <ejb-ql>ejbQL_0</ejb-ql>
- </query>
- <query>
- <description>description_1</description>
- <query-method>
- <method-name>name_1</method-name>
- <method-params/>
- </query-method>
- <result-type-mapping>Remote</result-type-mapping>
- <ejb-ql>ejbQL_1</ejb-ql>
- </query>
- <query>
- <description>description_2</description>
- <query-method>
- <method-name>name_2</method-name>
- <method-params>
- <method-param>parms_0</method-param>
- </method-params>
- </query-method>
- <result-type-mapping>Local</result-type-mapping>
- <ejb-ql>ejbQL_2</ejb-ql>
- </query>
- <query>
- <description>description_3</description>
- <query-method>
- <method-name>name_3</method-name>
- <method-params>
- <method-param>parms_1</method-param>
- <method-param>parms_2</method-param>
- </method-params>
- </query-method>
- <result-type-mapping>Remote</result-type-mapping>
- <ejb-ql>ejbQL_3</ejb-ql>
- </query>
- <query>
- <description>description_4</description>
- <query-method>
- <method-name>name_4</method-name>
- <method-params>
- <method-param>parms_3</method-param>
- <method-param>parms_4</method-param>
- <method-param>parms_5</method-param>
- </method-params>
- </query-method>
- <result-type-mapping>Local</result-type-mapping>
- <ejb-ql>ejbQL_4</ejb-ql>
- </query>
- </entity>
- <session>
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <ejb-name>name_0</ejb-name>
- <home>java.lang.String</home>
- <remote>java.util.HashTable</remote>
- <local-home>java.util.List</local-home>
- <local>java.sql.Data</local>
- <ejb-class>java.lang.Integer</ejb-class>
- <session-type>Stateful</session-type>
- <transaction-type>Bean</transaction-type>
- <env-entry>
- <description>description_15</description>
- <env-entry-name>name_15</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_15</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_16</description>
- <env-entry-name>name_16</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_16</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_17</description>
- <env-entry-name>name_17</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_17</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_18</description>
- <env-entry-name>name_18</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_18</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_19</description>
- <env-entry-name>name_19</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_19</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_15</description>
- <ejb-ref-name>name_15</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_15</home>
- <remote>remote_15</remote>
- <ejb-link>link_15</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_16</description>
- <ejb-ref-name>name_16</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_16</home>
- <remote>remote_16</remote>
- <ejb-link>link_16</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_17</description>
- <ejb-ref-name>name_17</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_17</home>
- <remote>remote_17</remote>
- <ejb-link>link_17</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_18</description>
- <ejb-ref-name>name_18</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_18</home>
- <remote>remote_18</remote>
- <ejb-link>link_18</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_19</description>
- <ejb-ref-name>name_19</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_19</home>
- <remote>remote_19</remote>
- <ejb-link>link_19</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_15</description>
- <ejb-ref-name>name_15</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_31</local-home>
- <local>remote_31</local>
- <ejb-link>link_15</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_16</description>
- <ejb-ref-name>name_16</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_33</local-home>
- <local>remote_33</local>
- <ejb-link>link_16</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_17</description>
- <ejb-ref-name>name_17</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_35</local-home>
- <local>remote_35</local>
- <ejb-link>link_17</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_18</description>
- <ejb-ref-name>name_18</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_37</local-home>
- <local>remote_37</local>
- <ejb-link>link_18</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_19</description>
- <ejb-ref-name>name_19</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_39</local-home>
- <local>remote_39</local>
- <ejb-link>link_19</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_15</description>
- <role-name>name_15</role-name>
- <role-link>link_15</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_16</description>
- <role-name>name_16</role-name>
- <role-link>link_16</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_17</description>
- <role-name>name_17</role-name>
- <role-link>link_17</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_18</description>
- <role-name>name_18</role-name>
- <role-link>link_18</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_19</description>
- <role-name>name_19</role-name>
- <role-link>link_19</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_1</description>
- <use-caller-identity></use-caller-identity>
- </security-identity>
- <resource-ref>
- <description>description_15</description>
- <res-ref-name>name_15</res-ref-name>
- <res-type>type_15</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_16</description>
- <res-ref-name>name_16</res-ref-name>
- <res-type>type_16</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_17</description>
- <res-ref-name>name_17</res-ref-name>
- <res-type>type_17</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_18</description>
- <res-ref-name>name_18</res-ref-name>
- <res-type>type_18</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_19</description>
- <res-ref-name>name_19</res-ref-name>
- <res-type>type_19</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_15</description>
- <resource-env-ref-name>name_15</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_16</description>
- <resource-env-ref-name>name_16</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_17</description>
- <resource-env-ref-name>name_17</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_18</description>
- <resource-env-ref-name>name_18</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_19</description>
- <resource-env-ref-name>name_19</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- </session>
- <entity>
- <description>description_2</description>
- <display-name>displayName_2</display-name>
- <small-icon>smallIcon_2</small-icon>
- <large-icon>largeIcon_2</large-icon>
- <ejb-name>name_2</ejb-name>
- <home>java.util.HashTable</home>
- <remote>java.util.List</remote>
- <local-home>java.sql.Data</local-home>
- <local>java.lang.Integer</local>
- <ejb-class>java.lang.String</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.lang.String</prim-key-class>
- <reentrant>True</reentrant>
- <env-entry>
- <description>description_20</description>
- <env-entry-name>name_20</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_20</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_21</description>
- <env-entry-name>name_21</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_21</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_22</description>
- <env-entry-name>name_22</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_22</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_23</description>
- <env-entry-name>name_23</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_23</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_24</description>
- <env-entry-name>name_24</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_24</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_20</description>
- <ejb-ref-name>name_20</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_20</home>
- <remote>remote_20</remote>
- <ejb-link>link_20</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_21</description>
- <ejb-ref-name>name_21</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_21</home>
- <remote>remote_21</remote>
- <ejb-link>link_21</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_22</description>
- <ejb-ref-name>name_22</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_22</home>
- <remote>remote_22</remote>
- <ejb-link>link_22</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_23</description>
- <ejb-ref-name>name_23</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_23</home>
- <remote>remote_23</remote>
- <ejb-link>link_23</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_24</description>
- <ejb-ref-name>name_24</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_24</home>
- <remote>remote_24</remote>
- <ejb-link>link_24</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_20</description>
- <ejb-ref-name>name_20</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_41</local-home>
- <local>remote_41</local>
- <ejb-link>link_20</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_21</description>
- <ejb-ref-name>name_21</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_43</local-home>
- <local>remote_43</local>
- <ejb-link>link_21</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_22</description>
- <ejb-ref-name>name_22</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_45</local-home>
- <local>remote_45</local>
- <ejb-link>link_22</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_23</description>
- <ejb-ref-name>name_23</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_47</local-home>
- <local>remote_47</local>
- <ejb-link>link_23</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_24</description>
- <ejb-ref-name>name_24</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_49</local-home>
- <local>remote_49</local>
- <ejb-link>link_24</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_20</description>
- <role-name>name_20</role-name>
- <role-link>link_20</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_21</description>
- <role-name>name_21</role-name>
- <role-link>link_21</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_22</description>
- <role-name>name_22</role-name>
- <role-link>link_22</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_23</description>
- <role-name>name_23</role-name>
- <role-link>link_23</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_24</description>
- <role-name>name_24</role-name>
- <role-link>link_24</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_2</description>
- <run-as>
- <description>description_2</description>
- <role-name>roleName_2</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_20</description>
- <res-ref-name>name_20</res-ref-name>
- <res-type>type_20</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_21</description>
- <res-ref-name>name_21</res-ref-name>
- <res-type>type_21</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_22</description>
- <res-ref-name>name_22</res-ref-name>
- <res-type>type_22</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_23</description>
- <res-ref-name>name_23</res-ref-name>
- <res-type>type_23</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_24</description>
- <res-ref-name>name_24</res-ref-name>
- <res-type>type_24</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_20</description>
- <resource-env-ref-name>name_20</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_21</description>
- <resource-env-ref-name>name_21</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_22</description>
- <resource-env-ref-name>name_22</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_23</description>
- <resource-env-ref-name>name_23</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_24</description>
- <resource-env-ref-name>name_24</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_3</description>
- <display-name>displayName_3</display-name>
- <small-icon>smallIcon_3</small-icon>
- <large-icon>largeIcon_3</large-icon>
- <ejb-name>name_3</ejb-name>
- <home>java.util.List</home>
- <remote>java.sql.Data</remote>
- <local-home>java.lang.Integer</local-home>
- <local>java.lang.String</local>
- <ejb-class>java.util.HashTable</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.HashTable</prim-key-class>
- <reentrant>False</reentrant>
- <env-entry>
- <description>description_25</description>
- <env-entry-name>name_25</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_25</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_26</description>
- <env-entry-name>name_26</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_26</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_27</description>
- <env-entry-name>name_27</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_27</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_28</description>
- <env-entry-name>name_28</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_28</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_29</description>
- <env-entry-name>name_29</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_29</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_25</description>
- <ejb-ref-name>name_25</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_25</home>
- <remote>remote_25</remote>
- <ejb-link>link_25</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_26</description>
- <ejb-ref-name>name_26</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_26</home>
- <remote>remote_26</remote>
- <ejb-link>link_26</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_27</description>
- <ejb-ref-name>name_27</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_27</home>
- <remote>remote_27</remote>
- <ejb-link>link_27</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_28</description>
- <ejb-ref-name>name_28</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_28</home>
- <remote>remote_28</remote>
- <ejb-link>link_28</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_29</description>
- <ejb-ref-name>name_29</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_29</home>
- <remote>remote_29</remote>
- <ejb-link>link_29</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_25</description>
- <ejb-ref-name>name_25</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_51</local-home>
- <local>remote_51</local>
- <ejb-link>link_25</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_26</description>
- <ejb-ref-name>name_26</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_53</local-home>
- <local>remote_53</local>
- <ejb-link>link_26</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_27</description>
- <ejb-ref-name>name_27</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_55</local-home>
- <local>remote_55</local>
- <ejb-link>link_27</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_28</description>
- <ejb-ref-name>name_28</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_57</local-home>
- <local>remote_57</local>
- <ejb-link>link_28</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_29</description>
- <ejb-ref-name>name_29</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_59</local-home>
- <local>remote_59</local>
- <ejb-link>link_29</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_25</description>
- <role-name>name_25</role-name>
- <role-link>link_25</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_26</description>
- <role-name>name_26</role-name>
- <role-link>link_26</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_27</description>
- <role-name>name_27</role-name>
- <role-link>link_27</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_28</description>
- <role-name>name_28</role-name>
- <role-link>link_28</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_29</description>
- <role-name>name_29</role-name>
- <role-link>link_29</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_2</description>
- <use-caller-identity></use-caller-identity>
- </security-identity>
- <resource-ref>
- <description>description_25</description>
- <res-ref-name>name_25</res-ref-name>
- <res-type>type_25</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_26</description>
- <res-ref-name>name_26</res-ref-name>
- <res-type>type_26</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_27</description>
- <res-ref-name>name_27</res-ref-name>
- <res-type>type_27</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_28</description>
- <res-ref-name>name_28</res-ref-name>
- <res-type>type_28</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_29</description>
- <res-ref-name>name_29</res-ref-name>
- <res-type>type_29</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_25</description>
- <resource-env-ref-name>name_25</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_26</description>
- <resource-env-ref-name>name_26</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_27</description>
- <resource-env-ref-name>name_27</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_28</description>
- <resource-env-ref-name>name_28</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_29</description>
- <resource-env-ref-name>name_29</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <message-driven>
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <ejb-name>name_0</ejb-name>
- <ejb-class>java.util.List</ejb-class>
- <transaction-type>Bean</transaction-type>
- <message-selector>messageSelector_0</message-selector>
- <acknowledge-mode>Auto-acknowledge</acknowledge-mode>
- <message-driven-destination>
- <destination-type>javax.jms.Queue</destination-type>
- <subscription-durability>Durable</subscription-durability>
- </message-driven-destination>
- <env-entry>
- <description>description_30</description>
- <env-entry-name>name_30</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_30</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_31</description>
- <env-entry-name>name_31</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_31</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_32</description>
- <env-entry-name>name_32</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_32</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_33</description>
- <env-entry-name>name_33</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_33</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_34</description>
- <env-entry-name>name_34</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_34</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_30</description>
- <ejb-ref-name>name_30</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_30</home>
- <remote>remote_30</remote>
- <ejb-link>link_30</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_31</description>
- <ejb-ref-name>name_31</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_31</home>
- <remote>remote_31</remote>
- <ejb-link>link_31</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_32</description>
- <ejb-ref-name>name_32</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_32</home>
- <remote>remote_32</remote>
- <ejb-link>link_32</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_33</description>
- <ejb-ref-name>name_33</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_33</home>
- <remote>remote_33</remote>
- <ejb-link>link_33</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_34</description>
- <ejb-ref-name>name_34</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_34</home>
- <remote>remote_34</remote>
- <ejb-link>link_34</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_30</description>
- <ejb-ref-name>name_30</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_61</local-home>
- <local>remote_61</local>
- <ejb-link>link_30</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_31</description>
- <ejb-ref-name>name_31</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_63</local-home>
- <local>remote_63</local>
- <ejb-link>link_31</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_32</description>
- <ejb-ref-name>name_32</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_65</local-home>
- <local>remote_65</local>
- <ejb-link>link_32</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_33</description>
- <ejb-ref-name>name_33</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_67</local-home>
- <local>remote_67</local>
- <ejb-link>link_33</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_34</description>
- <ejb-ref-name>name_34</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_69</local-home>
- <local>remote_69</local>
- <ejb-link>link_34</ejb-link>
- </ejb-local-ref>
- <security-identity>
- <description>description_3</description>
- <run-as>
- <description>description_3</description>
- <role-name>roleName_3</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_30</description>
- <res-ref-name>name_30</res-ref-name>
- <res-type>type_30</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_31</description>
- <res-ref-name>name_31</res-ref-name>
- <res-type>type_31</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_32</description>
- <res-ref-name>name_32</res-ref-name>
- <res-type>type_32</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_33</description>
- <res-ref-name>name_33</res-ref-name>
- <res-type>type_33</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_34</description>
- <res-ref-name>name_34</res-ref-name>
- <res-type>type_34</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_30</description>
- <resource-env-ref-name>name_30</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_31</description>
- <resource-env-ref-name>name_31</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_32</description>
- <resource-env-ref-name>name_32</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_33</description>
- <resource-env-ref-name>name_33</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_34</description>
- <resource-env-ref-name>name_34</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- </message-driven>
- <session>
- <description>description_1</description>
- <display-name>displayName_1</display-name>
- <small-icon>smallIcon_1</small-icon>
- <large-icon>largeIcon_1</large-icon>
- <ejb-name>name_1</ejb-name>
- <home>java.lang.String</home>
- <remote>java.util.HashTable</remote>
- <local-home>java.util.List</local-home>
- <local>java.sql.Data</local>
- <ejb-class>java.lang.Integer</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <env-entry>
- <description>description_35</description>
- <env-entry-name>name_35</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_35</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_36</description>
- <env-entry-name>name_36</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_36</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_37</description>
- <env-entry-name>name_37</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_37</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_38</description>
- <env-entry-name>name_38</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_38</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_39</description>
- <env-entry-name>name_39</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_39</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_35</description>
- <ejb-ref-name>name_35</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_35</home>
- <remote>remote_35</remote>
- <ejb-link>link_35</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_36</description>
- <ejb-ref-name>name_36</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_36</home>
- <remote>remote_36</remote>
- <ejb-link>link_36</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_37</description>
- <ejb-ref-name>name_37</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_37</home>
- <remote>remote_37</remote>
- <ejb-link>link_37</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_38</description>
- <ejb-ref-name>name_38</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_38</home>
- <remote>remote_38</remote>
- <ejb-link>link_38</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_39</description>
- <ejb-ref-name>name_39</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_39</home>
- <remote>remote_39</remote>
- <ejb-link>link_39</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_35</description>
- <ejb-ref-name>name_35</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_71</local-home>
- <local>remote_71</local>
- <ejb-link>link_35</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_36</description>
- <ejb-ref-name>name_36</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_73</local-home>
- <local>remote_73</local>
- <ejb-link>link_36</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_37</description>
- <ejb-ref-name>name_37</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_75</local-home>
- <local>remote_75</local>
- <ejb-link>link_37</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_38</description>
- <ejb-ref-name>name_38</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_77</local-home>
- <local>remote_77</local>
- <ejb-link>link_38</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_39</description>
- <ejb-ref-name>name_39</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_79</local-home>
- <local>remote_79</local>
- <ejb-link>link_39</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_35</description>
- <role-name>name_35</role-name>
- <role-link>link_35</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_36</description>
- <role-name>name_36</role-name>
- <role-link>link_36</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_37</description>
- <role-name>name_37</role-name>
- <role-link>link_37</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_38</description>
- <role-name>name_38</role-name>
- <role-link>link_38</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_39</description>
- <role-name>name_39</role-name>
- <role-link>link_39</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_3</description>
- <use-caller-identity></use-caller-identity>
- </security-identity>
- <resource-ref>
- <description>description_35</description>
- <res-ref-name>name_35</res-ref-name>
- <res-type>type_35</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_36</description>
- <res-ref-name>name_36</res-ref-name>
- <res-type>type_36</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_37</description>
- <res-ref-name>name_37</res-ref-name>
- <res-type>type_37</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_38</description>
- <res-ref-name>name_38</res-ref-name>
- <res-type>type_38</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_39</description>
- <res-ref-name>name_39</res-ref-name>
- <res-type>type_39</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_35</description>
- <resource-env-ref-name>name_35</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_36</description>
- <resource-env-ref-name>name_36</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_37</description>
- <resource-env-ref-name>name_37</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_38</description>
- <resource-env-ref-name>name_38</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_39</description>
- <resource-env-ref-name>name_39</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- </session>
- <entity>
- <description>description_4</description>
- <display-name>displayName_4</display-name>
- <small-icon>smallIcon_4</small-icon>
- <large-icon>largeIcon_4</large-icon>
- <ejb-name>name_4</ejb-name>
- <home>java.util.HashTable</home>
- <remote>java.util.List</remote>
- <local-home>java.sql.Data</local-home>
- <local>java.lang.Integer</local>
- <ejb-class>java.lang.String</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.lang.String</prim-key-class>
- <reentrant>True</reentrant>
- <env-entry>
- <description>description_40</description>
- <env-entry-name>name_40</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_40</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_41</description>
- <env-entry-name>name_41</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_41</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_42</description>
- <env-entry-name>name_42</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_42</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_43</description>
- <env-entry-name>name_43</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_43</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_44</description>
- <env-entry-name>name_44</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_44</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_40</description>
- <ejb-ref-name>name_40</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_40</home>
- <remote>remote_40</remote>
- <ejb-link>link_40</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_41</description>
- <ejb-ref-name>name_41</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_41</home>
- <remote>remote_41</remote>
- <ejb-link>link_41</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_42</description>
- <ejb-ref-name>name_42</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_42</home>
- <remote>remote_42</remote>
- <ejb-link>link_42</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_43</description>
- <ejb-ref-name>name_43</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_43</home>
- <remote>remote_43</remote>
- <ejb-link>link_43</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_44</description>
- <ejb-ref-name>name_44</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_44</home>
- <remote>remote_44</remote>
- <ejb-link>link_44</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_40</description>
- <ejb-ref-name>name_40</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_81</local-home>
- <local>remote_81</local>
- <ejb-link>link_40</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_41</description>
- <ejb-ref-name>name_41</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_83</local-home>
- <local>remote_83</local>
- <ejb-link>link_41</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_42</description>
- <ejb-ref-name>name_42</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_85</local-home>
- <local>remote_85</local>
- <ejb-link>link_42</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_43</description>
- <ejb-ref-name>name_43</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_87</local-home>
- <local>remote_87</local>
- <ejb-link>link_43</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_44</description>
- <ejb-ref-name>name_44</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_89</local-home>
- <local>remote_89</local>
- <ejb-link>link_44</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_40</description>
- <role-name>name_40</role-name>
- <role-link>link_40</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_41</description>
- <role-name>name_41</role-name>
- <role-link>link_41</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_42</description>
- <role-name>name_42</role-name>
- <role-link>link_42</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_43</description>
- <role-name>name_43</role-name>
- <role-link>link_43</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_44</description>
- <role-name>name_44</role-name>
- <role-link>link_44</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_4</description>
- <run-as>
- <description>description_4</description>
- <role-name>roleName_4</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_40</description>
- <res-ref-name>name_40</res-ref-name>
- <res-type>type_40</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_41</description>
- <res-ref-name>name_41</res-ref-name>
- <res-type>type_41</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_42</description>
- <res-ref-name>name_42</res-ref-name>
- <res-type>type_42</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_43</description>
- <res-ref-name>name_43</res-ref-name>
- <res-type>type_43</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_44</description>
- <res-ref-name>name_44</res-ref-name>
- <res-type>type_44</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_40</description>
- <resource-env-ref-name>name_40</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_41</description>
- <resource-env-ref-name>name_41</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_42</description>
- <resource-env-ref-name>name_42</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_43</description>
- <resource-env-ref-name>name_43</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_44</description>
- <resource-env-ref-name>name_44</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_5</description>
- <display-name>displayName_5</display-name>
- <small-icon>smallIcon_5</small-icon>
- <large-icon>largeIcon_5</large-icon>
- <ejb-name>name_5</ejb-name>
- <home>java.util.List</home>
- <remote>java.sql.Data</remote>
- <local-home>java.lang.Integer</local-home>
- <local>java.lang.String</local>
- <ejb-class>java.util.HashTable</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.HashTable</prim-key-class>
- <reentrant>False</reentrant>
- <env-entry>
- <description>description_45</description>
- <env-entry-name>name_45</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_45</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_46</description>
- <env-entry-name>name_46</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_46</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_47</description>
- <env-entry-name>name_47</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_47</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_48</description>
- <env-entry-name>name_48</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_48</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_49</description>
- <env-entry-name>name_49</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_49</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_45</description>
- <ejb-ref-name>name_45</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_45</home>
- <remote>remote_45</remote>
- <ejb-link>link_45</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_46</description>
- <ejb-ref-name>name_46</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_46</home>
- <remote>remote_46</remote>
- <ejb-link>link_46</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_47</description>
- <ejb-ref-name>name_47</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_47</home>
- <remote>remote_47</remote>
- <ejb-link>link_47</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_48</description>
- <ejb-ref-name>name_48</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_48</home>
- <remote>remote_48</remote>
- <ejb-link>link_48</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_49</description>
- <ejb-ref-name>name_49</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_49</home>
- <remote>remote_49</remote>
- <ejb-link>link_49</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_45</description>
- <ejb-ref-name>name_45</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_91</local-home>
- <local>remote_91</local>
- <ejb-link>link_45</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_46</description>
- <ejb-ref-name>name_46</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_93</local-home>
- <local>remote_93</local>
- <ejb-link>link_46</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_47</description>
- <ejb-ref-name>name_47</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_95</local-home>
- <local>remote_95</local>
- <ejb-link>link_47</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_48</description>
- <ejb-ref-name>name_48</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_97</local-home>
- <local>remote_97</local>
- <ejb-link>link_48</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_49</description>
- <ejb-ref-name>name_49</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_99</local-home>
- <local>remote_99</local>
- <ejb-link>link_49</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_45</description>
- <role-name>name_45</role-name>
- <role-link>link_45</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_46</description>
- <role-name>name_46</role-name>
- <role-link>link_46</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_47</description>
- <role-name>name_47</role-name>
- <role-link>link_47</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_48</description>
- <role-name>name_48</role-name>
- <role-link>link_48</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_49</description>
- <role-name>name_49</role-name>
- <role-link>link_49</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_4</description>
- <use-caller-identity></use-caller-identity>
- </security-identity>
- <resource-ref>
- <description>description_45</description>
- <res-ref-name>name_45</res-ref-name>
- <res-type>type_45</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_46</description>
- <res-ref-name>name_46</res-ref-name>
- <res-type>type_46</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_47</description>
- <res-ref-name>name_47</res-ref-name>
- <res-type>type_47</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_48</description>
- <res-ref-name>name_48</res-ref-name>
- <res-type>type_48</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_49</description>
- <res-ref-name>name_49</res-ref-name>
- <res-type>type_49</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_45</description>
- <resource-env-ref-name>name_45</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_46</description>
- <resource-env-ref-name>name_46</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_47</description>
- <resource-env-ref-name>name_47</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_48</description>
- <resource-env-ref-name>name_48</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_49</description>
- <resource-env-ref-name>name_49</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- </enterprise-beans>
- <relationships>
- <description>description_0</description>
- <ejb-relation>
- <description>description_0</description>
- <ejb-relation-name>name_0</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_0</description>
- <ejb-relationship-role-name>roleName_0</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete></cascade-delete>
- <relationship-role-source>
- <description>description_0</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_0</description>
- <cmr-field-name>name_0</cmr-field-name>
- <cmr-field-type>java.util.List</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_1</description>
- <ejb-relationship-role-name>roleName_1</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_1</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_1</description>
- <cmr-field-name>name_1</cmr-field-name>
- <cmr-field-type>java.sql.Data</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <description>description_1</description>
- <ejb-relation-name>name_1</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_2</description>
- <ejb-relationship-role-name>roleName_2</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete></cascade-delete>
- <relationship-role-source>
- <description>description_2</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_2</description>
- <cmr-field-name>name_2</cmr-field-name>
- <cmr-field-type>java.lang.Integer</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_3</description>
- <ejb-relationship-role-name>roleName_3</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_3</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_3</description>
- <cmr-field-name>name_3</cmr-field-name>
- <cmr-field-type>java.lang.String</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <description>description_2</description>
- <ejb-relation-name>name_2</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_4</description>
- <ejb-relationship-role-name>roleName_4</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete></cascade-delete>
- <relationship-role-source>
- <description>description_4</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_4</description>
- <cmr-field-name>name_4</cmr-field-name>
- <cmr-field-type>java.util.HashTable</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_5</description>
- <ejb-relationship-role-name>roleName_5</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_5</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_5</description>
- <cmr-field-name>name_5</cmr-field-name>
- <cmr-field-type>java.util.List</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <description>description_3</description>
- <ejb-relation-name>name_3</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_6</description>
- <ejb-relationship-role-name>roleName_6</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete></cascade-delete>
- <relationship-role-source>
- <description>description_6</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_6</description>
- <cmr-field-name>name_6</cmr-field-name>
- <cmr-field-type>java.sql.Data</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_7</description>
- <ejb-relationship-role-name>roleName_7</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_7</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_7</description>
- <cmr-field-name>name_7</cmr-field-name>
- <cmr-field-type>java.lang.Integer</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <description>description_4</description>
- <ejb-relation-name>name_4</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_8</description>
- <ejb-relationship-role-name>roleName_8</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete></cascade-delete>
- <relationship-role-source>
- <description>description_8</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_8</description>
- <cmr-field-name>name_8</cmr-field-name>
- <cmr-field-type>java.lang.String</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_9</description>
- <ejb-relationship-role-name>roleName_9</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_9</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_9</description>
- <cmr-field-name>name_9</cmr-field-name>
- <cmr-field-type>java.util.HashTable</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- </relationships>
- <assembly-descriptor>
- <security-role>
- <description>description_5</description>
- <role-name>roleName_5</role-name>
- </security-role>
- <security-role>
- <description>description_6</description>
- <role-name>roleName_6</role-name>
- </security-role>
- <security-role>
- <description>description_7</description>
- <role-name>roleName_7</role-name>
- </security-role>
- <security-role>
- <description>description_8</description>
- <role-name>roleName_8</role-name>
- </security-role>
- <security-role>
- <description>description_9</description>
- <role-name>roleName_9</role-name>
- </security-role>
- <method-permission>
- <description>description_0</description>
- <unchecked></unchecked>
- <method>
- <description>description_0</description>
- <method-name>name_0</method-name>
- </method>
- <method>
- <description>description_1</description>
- <method-intf>Remote</method-intf>
- <method-name>name_1</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_2</description>
- <method-intf>Home</method-intf>
- <method-name>name_2</method-name>
- <method-params>
- <method-param>parms_0</method-param>
- </method-params>
- </method>
- <method>
- <description>description_3</description>
- <method-intf>Local</method-intf>
- <method-name>name_3</method-name>
- <method-params>
- <method-param>parms_1</method-param>
- <method-param>parms_2</method-param>
- </method-params>
- </method>
- <method>
- <description>description_4</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_4</method-name>
- <method-params>
- <method-param>parms_3</method-param>
- <method-param>parms_4</method-param>
- <method-param>parms_5</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <description>description_1</description>
- <method>
- <description>description_5</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_5</method-name>
- </method>
- <method>
- <description>description_6</description>
- <method-name>name_6</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_7</description>
- <method-intf>Remote</method-intf>
- <method-name>name_7</method-name>
- <method-params>
- <method-param>parms_6</method-param>
- </method-params>
- </method>
- <method>
- <description>description_8</description>
- <method-intf>Home</method-intf>
- <method-name>name_8</method-name>
- <method-params>
- <method-param>parms_7</method-param>
- <method-param>parms_8</method-param>
- </method-params>
- </method>
- <method>
- <description>description_9</description>
- <method-intf>Local</method-intf>
- <method-name>name_9</method-name>
- <method-params>
- <method-param>parms_9</method-param>
- <method-param>parms_10</method-param>
- <method-param>parms_11</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <description>description_2</description>
- <unchecked></unchecked>
- <method>
- <description>description_10</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_10</method-name>
- </method>
- <method>
- <description>description_11</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_11</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_12</description>
- <method-name>name_12</method-name>
- <method-params>
- <method-param>parms_12</method-param>
- </method-params>
- </method>
- <method>
- <description>description_13</description>
- <method-intf>Remote</method-intf>
- <method-name>name_13</method-name>
- <method-params>
- <method-param>parms_13</method-param>
- <method-param>parms_14</method-param>
- </method-params>
- </method>
- <method>
- <description>description_14</description>
- <method-intf>Home</method-intf>
- <method-name>name_14</method-name>
- <method-params>
- <method-param>parms_15</method-param>
- <method-param>parms_16</method-param>
- <method-param>parms_17</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <description>description_3</description>
- <method>
- <description>description_15</description>
- <method-intf>Local</method-intf>
- <method-name>name_15</method-name>
- </method>
- <method>
- <description>description_16</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_16</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_17</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_17</method-name>
- <method-params>
- <method-param>parms_18</method-param>
- </method-params>
- </method>
- <method>
- <description>description_18</description>
- <method-name>name_18</method-name>
- <method-params>
- <method-param>parms_19</method-param>
- <method-param>parms_20</method-param>
- </method-params>
- </method>
- <method>
- <description>description_19</description>
- <method-intf>Remote</method-intf>
- <method-name>name_19</method-name>
- <method-params>
- <method-param>parms_21</method-param>
- <method-param>parms_22</method-param>
- <method-param>parms_23</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <description>description_4</description>
- <unchecked></unchecked>
- <method>
- <description>description_20</description>
- <method-intf>Home</method-intf>
- <method-name>name_20</method-name>
- </method>
- <method>
- <description>description_21</description>
- <method-intf>Local</method-intf>
- <method-name>name_21</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_22</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_22</method-name>
- <method-params>
- <method-param>parms_24</method-param>
- </method-params>
- </method>
- <method>
- <description>description_23</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_23</method-name>
- <method-params>
- <method-param>parms_25</method-param>
- <method-param>parms_26</method-param>
- </method-params>
- </method>
- <method>
- <description>description_24</description>
- <method-name>name_24</method-name>
- <method-params>
- <method-param>parms_27</method-param>
- <method-param>parms_28</method-param>
- <method-param>parms_29</method-param>
- </method-params>
- </method>
- </method-permission>
- <container-transaction>
- <description>description_0</description>
- <method>
- <description>description_25</description>
- <method-intf>Remote</method-intf>
- <method-name>name_25</method-name>
- </method>
- <method>
- <description>description_26</description>
- <method-intf>Home</method-intf>
- <method-name>name_26</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_27</description>
- <method-intf>Local</method-intf>
- <method-name>name_27</method-name>
- <method-params>
- <method-param>parms_30</method-param>
- </method-params>
- </method>
- <method>
- <description>description_28</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_28</method-name>
- <method-params>
- <method-param>parms_31</method-param>
- <method-param>parms_32</method-param>
- </method-params>
- </method>
- <method>
- <description>description_29</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_29</method-name>
- <method-params>
- <method-param>parms_33</method-param>
- <method-param>parms_34</method-param>
- <method-param>parms_35</method-param>
- </method-params>
- </method>
- <trans-attribute>NotSupported</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>description_1</description>
- <method>
- <description>description_30</description>
- <method-name>name_30</method-name>
- </method>
- <method>
- <description>description_31</description>
- <method-intf>Remote</method-intf>
- <method-name>name_31</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_32</description>
- <method-intf>Home</method-intf>
- <method-name>name_32</method-name>
- <method-params>
- <method-param>parms_36</method-param>
- </method-params>
- </method>
- <method>
- <description>description_33</description>
- <method-intf>Local</method-intf>
- <method-name>name_33</method-name>
- <method-params>
- <method-param>parms_37</method-param>
- <method-param>parms_38</method-param>
- </method-params>
- </method>
- <method>
- <description>description_34</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_34</method-name>
- <method-params>
- <method-param>parms_39</method-param>
- <method-param>parms_40</method-param>
- <method-param>parms_41</method-param>
- </method-params>
- </method>
- <trans-attribute>Supports</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>description_2</description>
- <method>
- <description>description_35</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_35</method-name>
- </method>
- <method>
- <description>description_36</description>
- <method-name>name_36</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_37</description>
- <method-intf>Remote</method-intf>
- <method-name>name_37</method-name>
- <method-params>
- <method-param>parms_42</method-param>
- </method-params>
- </method>
- <method>
- <description>description_38</description>
- <method-intf>Home</method-intf>
- <method-name>name_38</method-name>
- <method-params>
- <method-param>parms_43</method-param>
- <method-param>parms_44</method-param>
- </method-params>
- </method>
- <method>
- <description>description_39</description>
- <method-intf>Local</method-intf>
- <method-name>name_39</method-name>
- <method-params>
- <method-param>parms_45</method-param>
- <method-param>parms_46</method-param>
- <method-param>parms_47</method-param>
- </method-params>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>description_3</description>
- <method>
- <description>description_40</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_40</method-name>
- </method>
- <method>
- <description>description_41</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_41</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_42</description>
- <method-name>name_42</method-name>
- <method-params>
- <method-param>parms_48</method-param>
- </method-params>
- </method>
- <method>
- <description>description_43</description>
- <method-intf>Remote</method-intf>
- <method-name>name_43</method-name>
- <method-params>
- <method-param>parms_49</method-param>
- <method-param>parms_50</method-param>
- </method-params>
- </method>
- <method>
- <description>description_44</description>
- <method-intf>Home</method-intf>
- <method-name>name_44</method-name>
- <method-params>
- <method-param>parms_51</method-param>
- <method-param>parms_52</method-param>
- <method-param>parms_53</method-param>
- </method-params>
- </method>
- <trans-attribute>RequiresNew</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>description_4</description>
- <method>
- <description>description_45</description>
- <method-intf>Local</method-intf>
- <method-name>name_45</method-name>
- </method>
- <method>
- <description>description_46</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_46</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_47</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_47</method-name>
- <method-params>
- <method-param>parms_54</method-param>
- </method-params>
- </method>
- <method>
- <description>description_48</description>
- <method-name>name_48</method-name>
- <method-params>
- <method-param>parms_55</method-param>
- <method-param>parms_56</method-param>
- </method-params>
- </method>
- <method>
- <description>description_49</description>
- <method-intf>Remote</method-intf>
- <method-name>name_49</method-name>
- <method-params>
- <method-param>parms_57</method-param>
- <method-param>parms_58</method-param>
- <method-param>parms_59</method-param>
- </method-params>
- </method>
- <trans-attribute>Mandatory</trans-attribute>
- </container-transaction>
- <exclude-list>
- <description>description_0</description>
- <method>
- <description>description_50</description>
- <method-intf>Home</method-intf>
- <method-name>name_50</method-name>
- </method>
- <method>
- <description>description_51</description>
- <method-intf>Local</method-intf>
- <method-name>name_51</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_52</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_52</method-name>
- <method-params>
- <method-param>parms_60</method-param>
- </method-params>
- </method>
- <method>
- <description>description_53</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_53</method-name>
- <method-params>
- <method-param>parms_61</method-param>
- <method-param>parms_62</method-param>
- </method-params>
- </method>
- <method>
- <description>description_54</description>
- <method-name>name_54</method-name>
- <method-params>
- <method-param>parms_63</method-param>
- <method-param>parms_64</method-param>
- <method-param>parms_65</method-param>
- </method-params>
- </method>
- </exclude-list>
- </assembly-descriptor>
- <ejb-client-jar>ejbClientJar_0</ejb-client-jar>
-</ejb-jar>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ejb-jar2-0sax.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ejb-jar2-0sax.xml
deleted file mode 100644
index f5972422..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ejb-jar2-0sax.xml
+++ /dev/null
@@ -1,2859 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-<ejb-jar id="ejb-jar_ID">
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <enterprise-beans>
- <entity id="CMP1">
- <ejb-name>CMP1</ejb-name>
- <local-home>ejbs.CMP1LocalHome</local-home>
- <local>ejbs.CMP1Local</local>
- <ejb-class>ejbs.CMP1Bean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>ejbs.CMP1Key</prim-key-class>
- <reentrant>False</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>CMP1</abstract-schema-name>
- <cmp-field>
- <field-name>id</field-name>
- </cmp-field>
- </entity>
- <entity id="CMP2">
- <ejb-name>CMP2</ejb-name>
- <local-home>ejbs.CMP2LocalHome</local-home>
- <local>ejbs.CMP2Local</local>
- <ejb-class>ejbs.CMP2Bean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>ejbs.CMP2Key</prim-key-class>
- <reentrant>False</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>CMP2</abstract-schema-name>
- <cmp-field>
- <field-name>id</field-name>
- </cmp-field>
- </entity>
- <entity>
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <ejb-name>name_0</ejb-name>
- <home>java.util.List</home>
- <remote>java.sql.Data</remote>
- <local-home>java.lang.Integer</local-home>
- <local>java.lang.String</local>
- <ejb-class>java.util.HashTable</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.HashTable</prim-key-class>
- <reentrant>True</reentrant>
- <env-entry>
- <description>description_0</description>
- <env-entry-name>name_0</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_0</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_1</description>
- <env-entry-name>name_1</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_1</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_2</description>
- <env-entry-name>name_2</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_2</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_3</description>
- <env-entry-name>name_3</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_3</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_4</description>
- <env-entry-name>name_4</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_4</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_0</description>
- <ejb-ref-name>name_0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_0</home>
- <remote>remote_0</remote>
- <ejb-link>link_0</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_1</description>
- <ejb-ref-name>name_1</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_1</home>
- <remote>remote_1</remote>
- <ejb-link>link_1</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_2</description>
- <ejb-ref-name>name_2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_2</home>
- <remote>remote_2</remote>
- <ejb-link>link_2</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_3</description>
- <ejb-ref-name>name_3</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_3</home>
- <remote>remote_3</remote>
- <ejb-link>link_3</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_4</description>
- <ejb-ref-name>name_4</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_4</home>
- <remote>remote_4</remote>
- <ejb-link>link_4</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_0</description>
- <ejb-ref-name>name_0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_1</local-home>
- <local>remote_1</local>
- <ejb-link>link_0</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_1</description>
- <ejb-ref-name>name_1</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_3</local-home>
- <local>remote_3</local>
- <ejb-link>link_1</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_2</description>
- <ejb-ref-name>name_2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_5</local-home>
- <local>remote_5</local>
- <ejb-link>link_2</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_3</description>
- <ejb-ref-name>name_3</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_7</local-home>
- <local>remote_7</local>
- <ejb-link>link_3</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_4</description>
- <ejb-ref-name>name_4</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_9</local-home>
- <local>remote_9</local>
- <ejb-link>link_4</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_0</description>
- <role-name>name_0</role-name>
- <role-link>link_0</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_1</description>
- <role-name>name_1</role-name>
- <role-link>link_1</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_2</description>
- <role-name>name_2</role-name>
- <role-link>link_2</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_3</description>
- <role-name>name_3</role-name>
- <role-link>link_3</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_4</description>
- <role-name>name_4</role-name>
- <role-link>link_4</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_0</description>
- <run-as>
- <description>description_0</description>
- <role-name>roleName_0</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_0</description>
- <res-ref-name>name_0</res-ref-name>
- <res-type>type_0</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_1</description>
- <res-ref-name>name_1</res-ref-name>
- <res-type>type_1</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_2</description>
- <res-ref-name>name_2</res-ref-name>
- <res-type>type_2</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_3</description>
- <res-ref-name>name_3</res-ref-name>
- <res-type>type_3</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_4</description>
- <res-ref-name>name_4</res-ref-name>
- <res-type>type_4</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_0</description>
- <resource-env-ref-name>name_0</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_1</description>
- <resource-env-ref-name>name_1</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_2</description>
- <resource-env-ref-name>name_2</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_3</description>
- <resource-env-ref-name>name_3</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_4</description>
- <resource-env-ref-name>name_4</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_1</description>
- <display-name>displayName_1</display-name>
- <small-icon>smallIcon_1</small-icon>
- <large-icon>largeIcon_1</large-icon>
- <ejb-name>name_1</ejb-name>
- <home>java.sql.Data</home>
- <remote>java.lang.Integer</remote>
- <local-home>java.lang.String</local-home>
- <local>java.util.HashTable</local>
- <ejb-class>java.util.List</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.List</prim-key-class>
- <reentrant>False</reentrant>
- <env-entry>
- <description>description_5</description>
- <env-entry-name>name_5</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_5</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_6</description>
- <env-entry-name>name_6</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_6</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_7</description>
- <env-entry-name>name_7</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_7</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_8</description>
- <env-entry-name>name_8</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_8</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_9</description>
- <env-entry-name>name_9</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_9</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_5</description>
- <ejb-ref-name>name_5</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_5</home>
- <remote>remote_5</remote>
- <ejb-link>link_5</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_6</description>
- <ejb-ref-name>name_6</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_6</home>
- <remote>remote_6</remote>
- <ejb-link>link_6</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_7</description>
- <ejb-ref-name>name_7</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_7</home>
- <remote>remote_7</remote>
- <ejb-link>link_7</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_8</description>
- <ejb-ref-name>name_8</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_8</home>
- <remote>remote_8</remote>
- <ejb-link>link_8</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_9</description>
- <ejb-ref-name>name_9</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_9</home>
- <remote>remote_9</remote>
- <ejb-link>link_9</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_5</description>
- <ejb-ref-name>name_5</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_11</local-home>
- <local>remote_11</local>
- <ejb-link>link_5</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_6</description>
- <ejb-ref-name>name_6</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_13</local-home>
- <local>remote_13</local>
- <ejb-link>link_6</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_7</description>
- <ejb-ref-name>name_7</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_15</local-home>
- <local>remote_15</local>
- <ejb-link>link_7</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_8</description>
- <ejb-ref-name>name_8</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_17</local-home>
- <local>remote_17</local>
- <ejb-link>link_8</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_9</description>
- <ejb-ref-name>name_9</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_19</local-home>
- <local>remote_19</local>
- <ejb-link>link_9</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_5</description>
- <role-name>name_5</role-name>
- <role-link>link_5</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_6</description>
- <role-name>name_6</role-name>
- <role-link>link_6</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_7</description>
- <role-name>name_7</role-name>
- <role-link>link_7</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_8</description>
- <role-name>name_8</role-name>
- <role-link>link_8</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_9</description>
- <role-name>name_9</role-name>
- <role-link>link_9</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_0</description>
- <use-caller-identity/>
- </security-identity>
- <resource-ref>
- <description>description_5</description>
- <res-ref-name>name_5</res-ref-name>
- <res-type>type_5</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_6</description>
- <res-ref-name>name_6</res-ref-name>
- <res-type>type_6</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_7</description>
- <res-ref-name>name_7</res-ref-name>
- <res-type>type_7</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_8</description>
- <res-ref-name>name_8</res-ref-name>
- <res-type>type_8</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_9</description>
- <res-ref-name>name_9</res-ref-name>
- <res-type>type_9</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_5</description>
- <resource-env-ref-name>name_5</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_6</description>
- <resource-env-ref-name>name_6</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_7</description>
- <resource-env-ref-name>name_7</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_8</description>
- <resource-env-ref-name>name_8</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_9</description>
- <resource-env-ref-name>name_9</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <ejb-name>name_0</ejb-name>
- <home>java.lang.Integer</home>
- <remote>java.lang.String</remote>
- <local-home>java.util.HashTable</local-home>
- <local>java.util.List</local>
- <ejb-class>java.sql.Data</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>java.sql.Data</prim-key-class>
- <reentrant>True</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>abstractSchemaName_0</abstract-schema-name>
- <cmp-field>
- <description>description_1</description>
- <field-name>name_1</field-name>
- </cmp-field>
- <cmp-field>
- <description>description_3</description>
- <field-name>name_3</field-name>
- </cmp-field>
- <env-entry>
- <description>description_10</description>
- <env-entry-name>name_10</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_10</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_11</description>
- <env-entry-name>name_11</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_11</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_12</description>
- <env-entry-name>name_12</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_12</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_13</description>
- <env-entry-name>name_13</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_13</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_14</description>
- <env-entry-name>name_14</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_14</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_10</description>
- <ejb-ref-name>name_10</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_10</home>
- <remote>remote_10</remote>
- <ejb-link>link_10</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_11</description>
- <ejb-ref-name>name_11</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_11</home>
- <remote>remote_11</remote>
- <ejb-link>link_11</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_12</description>
- <ejb-ref-name>name_12</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_12</home>
- <remote>remote_12</remote>
- <ejb-link>link_12</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_13</description>
- <ejb-ref-name>name_13</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_13</home>
- <remote>remote_13</remote>
- <ejb-link>link_13</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_14</description>
- <ejb-ref-name>name_14</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_14</home>
- <remote>remote_14</remote>
- <ejb-link>link_14</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_10</description>
- <ejb-ref-name>name_10</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_21</local-home>
- <local>remote_21</local>
- <ejb-link>link_10</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_11</description>
- <ejb-ref-name>name_11</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_23</local-home>
- <local>remote_23</local>
- <ejb-link>link_11</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_12</description>
- <ejb-ref-name>name_12</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_25</local-home>
- <local>remote_25</local>
- <ejb-link>link_12</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_13</description>
- <ejb-ref-name>name_13</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_27</local-home>
- <local>remote_27</local>
- <ejb-link>link_13</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_14</description>
- <ejb-ref-name>name_14</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_29</local-home>
- <local>remote_29</local>
- <ejb-link>link_14</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_10</description>
- <role-name>name_10</role-name>
- <role-link>link_10</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_11</description>
- <role-name>name_11</role-name>
- <role-link>link_11</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_12</description>
- <role-name>name_12</role-name>
- <role-link>link_12</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_13</description>
- <role-name>name_13</role-name>
- <role-link>link_13</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_14</description>
- <role-name>name_14</role-name>
- <role-link>link_14</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_1</description>
- <run-as>
- <description>description_1</description>
- <role-name>roleName_1</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_10</description>
- <res-ref-name>name_10</res-ref-name>
- <res-type>type_10</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_11</description>
- <res-ref-name>name_11</res-ref-name>
- <res-type>type_11</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_12</description>
- <res-ref-name>name_12</res-ref-name>
- <res-type>type_12</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_13</description>
- <res-ref-name>name_13</res-ref-name>
- <res-type>type_13</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_14</description>
- <res-ref-name>name_14</res-ref-name>
- <res-type>type_14</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_10</description>
- <resource-env-ref-name>name_10</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_11</description>
- <resource-env-ref-name>name_11</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_12</description>
- <resource-env-ref-name>name_12</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_13</description>
- <resource-env-ref-name>name_13</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_14</description>
- <resource-env-ref-name>name_14</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <query>
- <description>description_0</description>
- <query-method>
- <method-name>name_0</method-name>
- </query-method>
- <result-type-mapping>Local</result-type-mapping>
- <ejb-ql>ejbQL_0</ejb-ql>
- </query>
- <query>
- <description>description_1</description>
- <query-method>
- <method-name>name_1</method-name>
- <method-params/>
- </query-method>
- <result-type-mapping>Remote</result-type-mapping>
- <ejb-ql>ejbQL_1</ejb-ql>
- </query>
- <query>
- <description>description_2</description>
- <query-method>
- <method-name>name_2</method-name>
- <method-params>
- <method-param>parms_0</method-param>
- </method-params>
- </query-method>
- <result-type-mapping>Local</result-type-mapping>
- <ejb-ql>ejbQL_2</ejb-ql>
- </query>
- <query>
- <description>description_3</description>
- <query-method>
- <method-name>name_3</method-name>
- <method-params>
- <method-param>parms_1</method-param>
- <method-param>parms_2</method-param>
- </method-params>
- </query-method>
- <result-type-mapping>Remote</result-type-mapping>
- <ejb-ql>ejbQL_3</ejb-ql>
- </query>
- <query>
- <description>description_4</description>
- <query-method>
- <method-name>name_4</method-name>
- <method-params>
- <method-param>parms_3</method-param>
- <method-param>parms_4</method-param>
- <method-param>parms_5</method-param>
- </method-params>
- </query-method>
- <result-type-mapping>Local</result-type-mapping>
- <ejb-ql>ejbQL_4</ejb-ql>
- </query>
- </entity>
- <session>
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <ejb-name>name_0</ejb-name>
- <home>java.lang.String</home>
- <remote>java.util.HashTable</remote>
- <local-home>java.util.List</local-home>
- <local>java.sql.Data</local>
- <ejb-class>java.lang.Integer</ejb-class>
- <session-type>Stateful</session-type>
- <transaction-type>Bean</transaction-type>
- <env-entry>
- <description>description_15</description>
- <env-entry-name>name_15</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_15</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_16</description>
- <env-entry-name>name_16</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_16</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_17</description>
- <env-entry-name>name_17</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_17</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_18</description>
- <env-entry-name>name_18</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_18</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_19</description>
- <env-entry-name>name_19</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_19</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_15</description>
- <ejb-ref-name>name_15</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_15</home>
- <remote>remote_15</remote>
- <ejb-link>link_15</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_16</description>
- <ejb-ref-name>name_16</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_16</home>
- <remote>remote_16</remote>
- <ejb-link>link_16</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_17</description>
- <ejb-ref-name>name_17</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_17</home>
- <remote>remote_17</remote>
- <ejb-link>link_17</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_18</description>
- <ejb-ref-name>name_18</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_18</home>
- <remote>remote_18</remote>
- <ejb-link>link_18</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_19</description>
- <ejb-ref-name>name_19</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_19</home>
- <remote>remote_19</remote>
- <ejb-link>link_19</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_15</description>
- <ejb-ref-name>name_15</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_31</local-home>
- <local>remote_31</local>
- <ejb-link>link_15</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_16</description>
- <ejb-ref-name>name_16</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_33</local-home>
- <local>remote_33</local>
- <ejb-link>link_16</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_17</description>
- <ejb-ref-name>name_17</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_35</local-home>
- <local>remote_35</local>
- <ejb-link>link_17</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_18</description>
- <ejb-ref-name>name_18</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_37</local-home>
- <local>remote_37</local>
- <ejb-link>link_18</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_19</description>
- <ejb-ref-name>name_19</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_39</local-home>
- <local>remote_39</local>
- <ejb-link>link_19</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_15</description>
- <role-name>name_15</role-name>
- <role-link>link_15</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_16</description>
- <role-name>name_16</role-name>
- <role-link>link_16</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_17</description>
- <role-name>name_17</role-name>
- <role-link>link_17</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_18</description>
- <role-name>name_18</role-name>
- <role-link>link_18</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_19</description>
- <role-name>name_19</role-name>
- <role-link>link_19</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_1</description>
- <use-caller-identity/>
- </security-identity>
- <resource-ref>
- <description>description_15</description>
- <res-ref-name>name_15</res-ref-name>
- <res-type>type_15</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_16</description>
- <res-ref-name>name_16</res-ref-name>
- <res-type>type_16</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_17</description>
- <res-ref-name>name_17</res-ref-name>
- <res-type>type_17</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_18</description>
- <res-ref-name>name_18</res-ref-name>
- <res-type>type_18</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_19</description>
- <res-ref-name>name_19</res-ref-name>
- <res-type>type_19</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_15</description>
- <resource-env-ref-name>name_15</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_16</description>
- <resource-env-ref-name>name_16</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_17</description>
- <resource-env-ref-name>name_17</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_18</description>
- <resource-env-ref-name>name_18</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_19</description>
- <resource-env-ref-name>name_19</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- </session>
- <entity>
- <description>description_2</description>
- <display-name>displayName_2</display-name>
- <small-icon>smallIcon_2</small-icon>
- <large-icon>largeIcon_2</large-icon>
- <ejb-name>name_2</ejb-name>
- <home>java.util.HashTable</home>
- <remote>java.util.List</remote>
- <local-home>java.sql.Data</local-home>
- <local>java.lang.Integer</local>
- <ejb-class>java.lang.String</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.lang.String</prim-key-class>
- <reentrant>True</reentrant>
- <env-entry>
- <description>description_20</description>
- <env-entry-name>name_20</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_20</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_21</description>
- <env-entry-name>name_21</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_21</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_22</description>
- <env-entry-name>name_22</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_22</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_23</description>
- <env-entry-name>name_23</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_23</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_24</description>
- <env-entry-name>name_24</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_24</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_20</description>
- <ejb-ref-name>name_20</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_20</home>
- <remote>remote_20</remote>
- <ejb-link>link_20</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_21</description>
- <ejb-ref-name>name_21</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_21</home>
- <remote>remote_21</remote>
- <ejb-link>link_21</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_22</description>
- <ejb-ref-name>name_22</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_22</home>
- <remote>remote_22</remote>
- <ejb-link>link_22</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_23</description>
- <ejb-ref-name>name_23</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_23</home>
- <remote>remote_23</remote>
- <ejb-link>link_23</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_24</description>
- <ejb-ref-name>name_24</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_24</home>
- <remote>remote_24</remote>
- <ejb-link>link_24</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_20</description>
- <ejb-ref-name>name_20</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_41</local-home>
- <local>remote_41</local>
- <ejb-link>link_20</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_21</description>
- <ejb-ref-name>name_21</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_43</local-home>
- <local>remote_43</local>
- <ejb-link>link_21</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_22</description>
- <ejb-ref-name>name_22</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_45</local-home>
- <local>remote_45</local>
- <ejb-link>link_22</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_23</description>
- <ejb-ref-name>name_23</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_47</local-home>
- <local>remote_47</local>
- <ejb-link>link_23</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_24</description>
- <ejb-ref-name>name_24</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_49</local-home>
- <local>remote_49</local>
- <ejb-link>link_24</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_20</description>
- <role-name>name_20</role-name>
- <role-link>link_20</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_21</description>
- <role-name>name_21</role-name>
- <role-link>link_21</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_22</description>
- <role-name>name_22</role-name>
- <role-link>link_22</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_23</description>
- <role-name>name_23</role-name>
- <role-link>link_23</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_24</description>
- <role-name>name_24</role-name>
- <role-link>link_24</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_2</description>
- <run-as>
- <description>description_2</description>
- <role-name>roleName_2</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_20</description>
- <res-ref-name>name_20</res-ref-name>
- <res-type>type_20</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_21</description>
- <res-ref-name>name_21</res-ref-name>
- <res-type>type_21</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_22</description>
- <res-ref-name>name_22</res-ref-name>
- <res-type>type_22</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_23</description>
- <res-ref-name>name_23</res-ref-name>
- <res-type>type_23</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_24</description>
- <res-ref-name>name_24</res-ref-name>
- <res-type>type_24</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_20</description>
- <resource-env-ref-name>name_20</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_21</description>
- <resource-env-ref-name>name_21</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_22</description>
- <resource-env-ref-name>name_22</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_23</description>
- <resource-env-ref-name>name_23</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_24</description>
- <resource-env-ref-name>name_24</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_3</description>
- <display-name>displayName_3</display-name>
- <small-icon>smallIcon_3</small-icon>
- <large-icon>largeIcon_3</large-icon>
- <ejb-name>name_3</ejb-name>
- <home>java.util.List</home>
- <remote>java.sql.Data</remote>
- <local-home>java.lang.Integer</local-home>
- <local>java.lang.String</local>
- <ejb-class>java.util.HashTable</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.HashTable</prim-key-class>
- <reentrant>False</reentrant>
- <env-entry>
- <description>description_25</description>
- <env-entry-name>name_25</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_25</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_26</description>
- <env-entry-name>name_26</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_26</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_27</description>
- <env-entry-name>name_27</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_27</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_28</description>
- <env-entry-name>name_28</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_28</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_29</description>
- <env-entry-name>name_29</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_29</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_25</description>
- <ejb-ref-name>name_25</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_25</home>
- <remote>remote_25</remote>
- <ejb-link>link_25</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_26</description>
- <ejb-ref-name>name_26</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_26</home>
- <remote>remote_26</remote>
- <ejb-link>link_26</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_27</description>
- <ejb-ref-name>name_27</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_27</home>
- <remote>remote_27</remote>
- <ejb-link>link_27</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_28</description>
- <ejb-ref-name>name_28</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_28</home>
- <remote>remote_28</remote>
- <ejb-link>link_28</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_29</description>
- <ejb-ref-name>name_29</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_29</home>
- <remote>remote_29</remote>
- <ejb-link>link_29</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_25</description>
- <ejb-ref-name>name_25</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_51</local-home>
- <local>remote_51</local>
- <ejb-link>link_25</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_26</description>
- <ejb-ref-name>name_26</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_53</local-home>
- <local>remote_53</local>
- <ejb-link>link_26</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_27</description>
- <ejb-ref-name>name_27</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_55</local-home>
- <local>remote_55</local>
- <ejb-link>link_27</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_28</description>
- <ejb-ref-name>name_28</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_57</local-home>
- <local>remote_57</local>
- <ejb-link>link_28</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_29</description>
- <ejb-ref-name>name_29</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_59</local-home>
- <local>remote_59</local>
- <ejb-link>link_29</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_25</description>
- <role-name>name_25</role-name>
- <role-link>link_25</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_26</description>
- <role-name>name_26</role-name>
- <role-link>link_26</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_27</description>
- <role-name>name_27</role-name>
- <role-link>link_27</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_28</description>
- <role-name>name_28</role-name>
- <role-link>link_28</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_29</description>
- <role-name>name_29</role-name>
- <role-link>link_29</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_2</description>
- <use-caller-identity/>
- </security-identity>
- <resource-ref>
- <description>description_25</description>
- <res-ref-name>name_25</res-ref-name>
- <res-type>type_25</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_26</description>
- <res-ref-name>name_26</res-ref-name>
- <res-type>type_26</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_27</description>
- <res-ref-name>name_27</res-ref-name>
- <res-type>type_27</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_28</description>
- <res-ref-name>name_28</res-ref-name>
- <res-type>type_28</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_29</description>
- <res-ref-name>name_29</res-ref-name>
- <res-type>type_29</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_25</description>
- <resource-env-ref-name>name_25</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_26</description>
- <resource-env-ref-name>name_26</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_27</description>
- <resource-env-ref-name>name_27</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_28</description>
- <resource-env-ref-name>name_28</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_29</description>
- <resource-env-ref-name>name_29</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <message-driven>
- <description>description_0</description>
- <display-name>displayName_0</display-name>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- <ejb-name>name_0</ejb-name>
- <ejb-class>java.util.List</ejb-class>
- <transaction-type>Bean</transaction-type>
- <message-selector>messageSelector_0</message-selector>
- <acknowledge-mode>Auto-acknowledge</acknowledge-mode>
- <message-driven-destination>
- <destination-type>javax.jms.Queue</destination-type>
- <subscription-durability>Durable</subscription-durability>
- </message-driven-destination>
- <env-entry>
- <description>description_30</description>
- <env-entry-name>name_30</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_30</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_31</description>
- <env-entry-name>name_31</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_31</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_32</description>
- <env-entry-name>name_32</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_32</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_33</description>
- <env-entry-name>name_33</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_33</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_34</description>
- <env-entry-name>name_34</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_34</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_30</description>
- <ejb-ref-name>name_30</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_30</home>
- <remote>remote_30</remote>
- <ejb-link>link_30</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_31</description>
- <ejb-ref-name>name_31</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_31</home>
- <remote>remote_31</remote>
- <ejb-link>link_31</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_32</description>
- <ejb-ref-name>name_32</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_32</home>
- <remote>remote_32</remote>
- <ejb-link>link_32</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_33</description>
- <ejb-ref-name>name_33</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_33</home>
- <remote>remote_33</remote>
- <ejb-link>link_33</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_34</description>
- <ejb-ref-name>name_34</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_34</home>
- <remote>remote_34</remote>
- <ejb-link>link_34</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_30</description>
- <ejb-ref-name>name_30</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_61</local-home>
- <local>remote_61</local>
- <ejb-link>link_30</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_31</description>
- <ejb-ref-name>name_31</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_63</local-home>
- <local>remote_63</local>
- <ejb-link>link_31</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_32</description>
- <ejb-ref-name>name_32</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_65</local-home>
- <local>remote_65</local>
- <ejb-link>link_32</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_33</description>
- <ejb-ref-name>name_33</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_67</local-home>
- <local>remote_67</local>
- <ejb-link>link_33</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_34</description>
- <ejb-ref-name>name_34</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_69</local-home>
- <local>remote_69</local>
- <ejb-link>link_34</ejb-link>
- </ejb-local-ref>
- <security-identity>
- <description>description_3</description>
- <run-as>
- <description>description_3</description>
- <role-name>roleName_3</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_30</description>
- <res-ref-name>name_30</res-ref-name>
- <res-type>type_30</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_31</description>
- <res-ref-name>name_31</res-ref-name>
- <res-type>type_31</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_32</description>
- <res-ref-name>name_32</res-ref-name>
- <res-type>type_32</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_33</description>
- <res-ref-name>name_33</res-ref-name>
- <res-type>type_33</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_34</description>
- <res-ref-name>name_34</res-ref-name>
- <res-type>type_34</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_30</description>
- <resource-env-ref-name>name_30</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_31</description>
- <resource-env-ref-name>name_31</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_32</description>
- <resource-env-ref-name>name_32</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_33</description>
- <resource-env-ref-name>name_33</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_34</description>
- <resource-env-ref-name>name_34</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- </message-driven>
- <session>
- <description>description_1</description>
- <display-name>displayName_1</display-name>
- <small-icon>smallIcon_1</small-icon>
- <large-icon>largeIcon_1</large-icon>
- <ejb-name>name_1</ejb-name>
- <home>java.lang.String</home>
- <remote>java.util.HashTable</remote>
- <local-home>java.util.List</local-home>
- <local>java.sql.Data</local>
- <ejb-class>java.lang.Integer</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <env-entry>
- <description>description_35</description>
- <env-entry-name>name_35</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_35</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_36</description>
- <env-entry-name>name_36</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_36</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_37</description>
- <env-entry-name>name_37</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_37</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_38</description>
- <env-entry-name>name_38</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_38</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_39</description>
- <env-entry-name>name_39</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_39</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_35</description>
- <ejb-ref-name>name_35</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_35</home>
- <remote>remote_35</remote>
- <ejb-link>link_35</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_36</description>
- <ejb-ref-name>name_36</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_36</home>
- <remote>remote_36</remote>
- <ejb-link>link_36</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_37</description>
- <ejb-ref-name>name_37</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_37</home>
- <remote>remote_37</remote>
- <ejb-link>link_37</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_38</description>
- <ejb-ref-name>name_38</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_38</home>
- <remote>remote_38</remote>
- <ejb-link>link_38</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_39</description>
- <ejb-ref-name>name_39</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_39</home>
- <remote>remote_39</remote>
- <ejb-link>link_39</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_35</description>
- <ejb-ref-name>name_35</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_71</local-home>
- <local>remote_71</local>
- <ejb-link>link_35</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_36</description>
- <ejb-ref-name>name_36</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_73</local-home>
- <local>remote_73</local>
- <ejb-link>link_36</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_37</description>
- <ejb-ref-name>name_37</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_75</local-home>
- <local>remote_75</local>
- <ejb-link>link_37</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_38</description>
- <ejb-ref-name>name_38</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_77</local-home>
- <local>remote_77</local>
- <ejb-link>link_38</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_39</description>
- <ejb-ref-name>name_39</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_79</local-home>
- <local>remote_79</local>
- <ejb-link>link_39</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_35</description>
- <role-name>name_35</role-name>
- <role-link>link_35</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_36</description>
- <role-name>name_36</role-name>
- <role-link>link_36</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_37</description>
- <role-name>name_37</role-name>
- <role-link>link_37</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_38</description>
- <role-name>name_38</role-name>
- <role-link>link_38</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_39</description>
- <role-name>name_39</role-name>
- <role-link>link_39</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_3</description>
- <use-caller-identity/>
- </security-identity>
- <resource-ref>
- <description>description_35</description>
- <res-ref-name>name_35</res-ref-name>
- <res-type>type_35</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_36</description>
- <res-ref-name>name_36</res-ref-name>
- <res-type>type_36</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_37</description>
- <res-ref-name>name_37</res-ref-name>
- <res-type>type_37</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_38</description>
- <res-ref-name>name_38</res-ref-name>
- <res-type>type_38</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_39</description>
- <res-ref-name>name_39</res-ref-name>
- <res-type>type_39</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_35</description>
- <resource-env-ref-name>name_35</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_36</description>
- <resource-env-ref-name>name_36</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_37</description>
- <resource-env-ref-name>name_37</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_38</description>
- <resource-env-ref-name>name_38</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_39</description>
- <resource-env-ref-name>name_39</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- </session>
- <entity>
- <description>description_4</description>
- <display-name>displayName_4</display-name>
- <small-icon>smallIcon_4</small-icon>
- <large-icon>largeIcon_4</large-icon>
- <ejb-name>name_4</ejb-name>
- <home>java.util.HashTable</home>
- <remote>java.util.List</remote>
- <local-home>java.sql.Data</local-home>
- <local>java.lang.Integer</local>
- <ejb-class>java.lang.String</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.lang.String</prim-key-class>
- <reentrant>True</reentrant>
- <env-entry>
- <description>description_40</description>
- <env-entry-name>name_40</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_40</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_41</description>
- <env-entry-name>name_41</env-entry-name>
- <env-entry-type>java.lang.Short</env-entry-type>
- <env-entry-value>value_41</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_42</description>
- <env-entry-name>name_42</env-entry-name>
- <env-entry-type>java.lang.Long</env-entry-type>
- <env-entry-value>value_42</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_43</description>
- <env-entry-name>name_43</env-entry-name>
- <env-entry-type>java.lang.Float</env-entry-type>
- <env-entry-value>value_43</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_44</description>
- <env-entry-name>name_44</env-entry-name>
- <env-entry-type>java.lang.Character</env-entry-type>
- <env-entry-value>value_44</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_40</description>
- <ejb-ref-name>name_40</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_40</home>
- <remote>remote_40</remote>
- <ejb-link>link_40</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_41</description>
- <ejb-ref-name>name_41</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_41</home>
- <remote>remote_41</remote>
- <ejb-link>link_41</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_42</description>
- <ejb-ref-name>name_42</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_42</home>
- <remote>remote_42</remote>
- <ejb-link>link_42</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_43</description>
- <ejb-ref-name>name_43</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_43</home>
- <remote>remote_43</remote>
- <ejb-link>link_43</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_44</description>
- <ejb-ref-name>name_44</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_44</home>
- <remote>remote_44</remote>
- <ejb-link>link_44</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_40</description>
- <ejb-ref-name>name_40</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_81</local-home>
- <local>remote_81</local>
- <ejb-link>link_40</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_41</description>
- <ejb-ref-name>name_41</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_83</local-home>
- <local>remote_83</local>
- <ejb-link>link_41</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_42</description>
- <ejb-ref-name>name_42</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_85</local-home>
- <local>remote_85</local>
- <ejb-link>link_42</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_43</description>
- <ejb-ref-name>name_43</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_87</local-home>
- <local>remote_87</local>
- <ejb-link>link_43</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_44</description>
- <ejb-ref-name>name_44</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_89</local-home>
- <local>remote_89</local>
- <ejb-link>link_44</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_40</description>
- <role-name>name_40</role-name>
- <role-link>link_40</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_41</description>
- <role-name>name_41</role-name>
- <role-link>link_41</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_42</description>
- <role-name>name_42</role-name>
- <role-link>link_42</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_43</description>
- <role-name>name_43</role-name>
- <role-link>link_43</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_44</description>
- <role-name>name_44</role-name>
- <role-link>link_44</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_4</description>
- <run-as>
- <description>description_4</description>
- <role-name>roleName_4</role-name>
- </run-as>
- </security-identity>
- <resource-ref>
- <description>description_40</description>
- <res-ref-name>name_40</res-ref-name>
- <res-type>type_40</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_41</description>
- <res-ref-name>name_41</res-ref-name>
- <res-type>type_41</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_42</description>
- <res-ref-name>name_42</res-ref-name>
- <res-type>type_42</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_43</description>
- <res-ref-name>name_43</res-ref-name>
- <res-type>type_43</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_44</description>
- <res-ref-name>name_44</res-ref-name>
- <res-type>type_44</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_40</description>
- <resource-env-ref-name>name_40</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_41</description>
- <resource-env-ref-name>name_41</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_42</description>
- <resource-env-ref-name>name_42</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_43</description>
- <resource-env-ref-name>name_43</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_44</description>
- <resource-env-ref-name>name_44</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- <entity>
- <description>description_5</description>
- <display-name>displayName_5</display-name>
- <small-icon>smallIcon_5</small-icon>
- <large-icon>largeIcon_5</large-icon>
- <ejb-name>name_5</ejb-name>
- <home>java.util.List</home>
- <remote>java.sql.Data</remote>
- <local-home>java.lang.Integer</local-home>
- <local>java.lang.String</local>
- <ejb-class>java.util.HashTable</ejb-class>
- <persistence-type>Bean</persistence-type>
- <prim-key-class>java.util.HashTable</prim-key-class>
- <reentrant>False</reentrant>
- <env-entry>
- <description>description_45</description>
- <env-entry-name>name_45</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_45</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_46</description>
- <env-entry-name>name_46</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_46</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_47</description>
- <env-entry-name>name_47</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_47</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_48</description>
- <env-entry-name>name_48</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_48</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_49</description>
- <env-entry-name>name_49</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_49</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_45</description>
- <ejb-ref-name>name_45</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_45</home>
- <remote>remote_45</remote>
- <ejb-link>link_45</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_46</description>
- <ejb-ref-name>name_46</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_46</home>
- <remote>remote_46</remote>
- <ejb-link>link_46</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_47</description>
- <ejb-ref-name>name_47</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_47</home>
- <remote>remote_47</remote>
- <ejb-link>link_47</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_48</description>
- <ejb-ref-name>name_48</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_48</home>
- <remote>remote_48</remote>
- <ejb-link>link_48</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_49</description>
- <ejb-ref-name>name_49</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_49</home>
- <remote>remote_49</remote>
- <ejb-link>link_49</ejb-link>
- </ejb-ref>
- <ejb-local-ref>
- <description>description_45</description>
- <ejb-ref-name>name_45</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_91</local-home>
- <local>remote_91</local>
- <ejb-link>link_45</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_46</description>
- <ejb-ref-name>name_46</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_93</local-home>
- <local>remote_93</local>
- <ejb-link>link_46</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_47</description>
- <ejb-ref-name>name_47</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_95</local-home>
- <local>remote_95</local>
- <ejb-link>link_47</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_48</description>
- <ejb-ref-name>name_48</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_97</local-home>
- <local>remote_97</local>
- <ejb-link>link_48</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref>
- <description>description_49</description>
- <ejb-ref-name>name_49</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_99</local-home>
- <local>remote_99</local>
- <ejb-link>link_49</ejb-link>
- </ejb-local-ref>
- <security-role-ref>
- <description>description_45</description>
- <role-name>name_45</role-name>
- <role-link>link_45</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_46</description>
- <role-name>name_46</role-name>
- <role-link>link_46</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_47</description>
- <role-name>name_47</role-name>
- <role-link>link_47</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_48</description>
- <role-name>name_48</role-name>
- <role-link>link_48</role-link>
- </security-role-ref>
- <security-role-ref>
- <description>description_49</description>
- <role-name>name_49</role-name>
- <role-link>link_49</role-link>
- </security-role-ref>
- <security-identity>
- <description>description_4</description>
- <use-caller-identity/>
- </security-identity>
- <resource-ref>
- <description>description_45</description>
- <res-ref-name>name_45</res-ref-name>
- <res-type>type_45</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_46</description>
- <res-ref-name>name_46</res-ref-name>
- <res-type>type_46</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_47</description>
- <res-ref-name>name_47</res-ref-name>
- <res-type>type_47</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_48</description>
- <res-ref-name>name_48</res-ref-name>
- <res-type>type_48</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_49</description>
- <res-ref-name>name_49</res-ref-name>
- <res-type>type_49</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_45</description>
- <resource-env-ref-name>name_45</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_46</description>
- <resource-env-ref-name>name_46</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_47</description>
- <resource-env-ref-name>name_47</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_48</description>
- <resource-env-ref-name>name_48</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_49</description>
- <resource-env-ref-name>name_49</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- </entity>
- </enterprise-beans>
- <relationships>
- <description>description_0</description>
- <ejb-relation>
- <description>description_0</description>
- <ejb-relation-name>name_0</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_0</description>
- <ejb-relationship-role-name>roleName_0</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete/>
- <relationship-role-source>
- <description>description_0</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_0</description>
- <cmr-field-name>name_0</cmr-field-name>
- <cmr-field-type>java.util.List</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_1</description>
- <ejb-relationship-role-name>roleName_1</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_1</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_1</description>
- <cmr-field-name>name_1</cmr-field-name>
- <cmr-field-type>java.sql.Data</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <description>description_1</description>
- <ejb-relation-name>name_1</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_2</description>
- <ejb-relationship-role-name>roleName_2</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete/>
- <relationship-role-source>
- <description>description_2</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_2</description>
- <cmr-field-name>name_2</cmr-field-name>
- <cmr-field-type>java.lang.Integer</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_3</description>
- <ejb-relationship-role-name>roleName_3</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_3</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_3</description>
- <cmr-field-name>name_3</cmr-field-name>
- <cmr-field-type>java.lang.String</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <description>description_2</description>
- <ejb-relation-name>name_2</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_4</description>
- <ejb-relationship-role-name>roleName_4</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete/>
- <relationship-role-source>
- <description>description_4</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_4</description>
- <cmr-field-name>name_4</cmr-field-name>
- <cmr-field-type>java.util.HashTable</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_5</description>
- <ejb-relationship-role-name>roleName_5</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_5</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_5</description>
- <cmr-field-name>name_5</cmr-field-name>
- <cmr-field-type>java.util.List</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <description>description_3</description>
- <ejb-relation-name>name_3</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_6</description>
- <ejb-relationship-role-name>roleName_6</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete/>
- <relationship-role-source>
- <description>description_6</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_6</description>
- <cmr-field-name>name_6</cmr-field-name>
- <cmr-field-type>java.sql.Data</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_7</description>
- <ejb-relationship-role-name>roleName_7</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_7</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_7</description>
- <cmr-field-name>name_7</cmr-field-name>
- <cmr-field-type>java.lang.Integer</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- <ejb-relation>
- <description>description_4</description>
- <ejb-relation-name>name_4</ejb-relation-name>
- <ejb-relationship-role>
- <description>description_8</description>
- <ejb-relationship-role-name>roleName_8</ejb-relationship-role-name>
- <multiplicity>One</multiplicity>
- <cascade-delete/>
- <relationship-role-source>
- <description>description_8</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_8</description>
- <cmr-field-name>name_8</cmr-field-name>
- <cmr-field-type>java.lang.String</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- <ejb-relationship-role>
- <description>description_9</description>
- <ejb-relationship-role-name>roleName_9</ejb-relationship-role-name>
- <multiplicity>Many</multiplicity>
- <relationship-role-source>
- <description>description_9</description>
- </relationship-role-source>
- <cmr-field>
- <description>description_9</description>
- <cmr-field-name>name_9</cmr-field-name>
- <cmr-field-type>java.util.HashTable</cmr-field-type>
- </cmr-field>
- </ejb-relationship-role>
- </ejb-relation>
- </relationships>
- <assembly-descriptor>
- <security-role>
- <description>description_5</description>
- <role-name>roleName_5</role-name>
- </security-role>
- <security-role>
- <description>description_6</description>
- <role-name>roleName_6</role-name>
- </security-role>
- <security-role>
- <description>description_7</description>
- <role-name>roleName_7</role-name>
- </security-role>
- <security-role>
- <description>description_8</description>
- <role-name>roleName_8</role-name>
- </security-role>
- <security-role>
- <description>description_9</description>
- <role-name>roleName_9</role-name>
- </security-role>
- <method-permission>
- <description>description_0</description>
- <unchecked/>
- <method>
- <description>description_0</description>
- <method-name>name_0</method-name>
- </method>
- <method>
- <description>description_1</description>
- <method-intf>Remote</method-intf>
- <method-name>name_1</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_2</description>
- <method-intf>Home</method-intf>
- <method-name>name_2</method-name>
- <method-params>
- <method-param>parms_0</method-param>
- </method-params>
- </method>
- <method>
- <description>description_3</description>
- <method-intf>Local</method-intf>
- <method-name>name_3</method-name>
- <method-params>
- <method-param>parms_1</method-param>
- <method-param>parms_2</method-param>
- </method-params>
- </method>
- <method>
- <description>description_4</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_4</method-name>
- <method-params>
- <method-param>parms_3</method-param>
- <method-param>parms_4</method-param>
- <method-param>parms_5</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <description>description_1</description>
- <method>
- <description>description_5</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_5</method-name>
- </method>
- <method>
- <description>description_6</description>
- <method-name>name_6</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_7</description>
- <method-intf>Remote</method-intf>
- <method-name>name_7</method-name>
- <method-params>
- <method-param>parms_6</method-param>
- </method-params>
- </method>
- <method>
- <description>description_8</description>
- <method-intf>Home</method-intf>
- <method-name>name_8</method-name>
- <method-params>
- <method-param>parms_7</method-param>
- <method-param>parms_8</method-param>
- </method-params>
- </method>
- <method>
- <description>description_9</description>
- <method-intf>Local</method-intf>
- <method-name>name_9</method-name>
- <method-params>
- <method-param>parms_9</method-param>
- <method-param>parms_10</method-param>
- <method-param>parms_11</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <description>description_2</description>
- <unchecked/>
- <method>
- <description>description_10</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_10</method-name>
- </method>
- <method>
- <description>description_11</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_11</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_12</description>
- <method-name>name_12</method-name>
- <method-params>
- <method-param>parms_12</method-param>
- </method-params>
- </method>
- <method>
- <description>description_13</description>
- <method-intf>Remote</method-intf>
- <method-name>name_13</method-name>
- <method-params>
- <method-param>parms_13</method-param>
- <method-param>parms_14</method-param>
- </method-params>
- </method>
- <method>
- <description>description_14</description>
- <method-intf>Home</method-intf>
- <method-name>name_14</method-name>
- <method-params>
- <method-param>parms_15</method-param>
- <method-param>parms_16</method-param>
- <method-param>parms_17</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <description>description_3</description>
- <method>
- <description>description_15</description>
- <method-intf>Local</method-intf>
- <method-name>name_15</method-name>
- </method>
- <method>
- <description>description_16</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_16</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_17</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_17</method-name>
- <method-params>
- <method-param>parms_18</method-param>
- </method-params>
- </method>
- <method>
- <description>description_18</description>
- <method-name>name_18</method-name>
- <method-params>
- <method-param>parms_19</method-param>
- <method-param>parms_20</method-param>
- </method-params>
- </method>
- <method>
- <description>description_19</description>
- <method-intf>Remote</method-intf>
- <method-name>name_19</method-name>
- <method-params>
- <method-param>parms_21</method-param>
- <method-param>parms_22</method-param>
- <method-param>parms_23</method-param>
- </method-params>
- </method>
- </method-permission>
- <method-permission>
- <description>description_4</description>
- <unchecked/>
- <method>
- <description>description_20</description>
- <method-intf>Home</method-intf>
- <method-name>name_20</method-name>
- </method>
- <method>
- <description>description_21</description>
- <method-intf>Local</method-intf>
- <method-name>name_21</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_22</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_22</method-name>
- <method-params>
- <method-param>parms_24</method-param>
- </method-params>
- </method>
- <method>
- <description>description_23</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_23</method-name>
- <method-params>
- <method-param>parms_25</method-param>
- <method-param>parms_26</method-param>
- </method-params>
- </method>
- <method>
- <description>description_24</description>
- <method-name>name_24</method-name>
- <method-params>
- <method-param>parms_27</method-param>
- <method-param>parms_28</method-param>
- <method-param>parms_29</method-param>
- </method-params>
- </method>
- </method-permission>
- <container-transaction>
- <description>description_0</description>
- <method>
- <description>description_25</description>
- <method-intf>Remote</method-intf>
- <method-name>name_25</method-name>
- </method>
- <method>
- <description>description_26</description>
- <method-intf>Home</method-intf>
- <method-name>name_26</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_27</description>
- <method-intf>Local</method-intf>
- <method-name>name_27</method-name>
- <method-params>
- <method-param>parms_30</method-param>
- </method-params>
- </method>
- <method>
- <description>description_28</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_28</method-name>
- <method-params>
- <method-param>parms_31</method-param>
- <method-param>parms_32</method-param>
- </method-params>
- </method>
- <method>
- <description>description_29</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_29</method-name>
- <method-params>
- <method-param>parms_33</method-param>
- <method-param>parms_34</method-param>
- <method-param>parms_35</method-param>
- </method-params>
- </method>
- <trans-attribute>NotSupported</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>description_1</description>
- <method>
- <description>description_30</description>
- <method-name>name_30</method-name>
- </method>
- <method>
- <description>description_31</description>
- <method-intf>Remote</method-intf>
- <method-name>name_31</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_32</description>
- <method-intf>Home</method-intf>
- <method-name>name_32</method-name>
- <method-params>
- <method-param>parms_36</method-param>
- </method-params>
- </method>
- <method>
- <description>description_33</description>
- <method-intf>Local</method-intf>
- <method-name>name_33</method-name>
- <method-params>
- <method-param>parms_37</method-param>
- <method-param>parms_38</method-param>
- </method-params>
- </method>
- <method>
- <description>description_34</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_34</method-name>
- <method-params>
- <method-param>parms_39</method-param>
- <method-param>parms_40</method-param>
- <method-param>parms_41</method-param>
- </method-params>
- </method>
- <trans-attribute>Supports</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>description_2</description>
- <method>
- <description>description_35</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_35</method-name>
- </method>
- <method>
- <description>description_36</description>
- <method-name>name_36</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_37</description>
- <method-intf>Remote</method-intf>
- <method-name>name_37</method-name>
- <method-params>
- <method-param>parms_42</method-param>
- </method-params>
- </method>
- <method>
- <description>description_38</description>
- <method-intf>Home</method-intf>
- <method-name>name_38</method-name>
- <method-params>
- <method-param>parms_43</method-param>
- <method-param>parms_44</method-param>
- </method-params>
- </method>
- <method>
- <description>description_39</description>
- <method-intf>Local</method-intf>
- <method-name>name_39</method-name>
- <method-params>
- <method-param>parms_45</method-param>
- <method-param>parms_46</method-param>
- <method-param>parms_47</method-param>
- </method-params>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>description_3</description>
- <method>
- <description>description_40</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_40</method-name>
- </method>
- <method>
- <description>description_41</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_41</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_42</description>
- <method-name>name_42</method-name>
- <method-params>
- <method-param>parms_48</method-param>
- </method-params>
- </method>
- <method>
- <description>description_43</description>
- <method-intf>Remote</method-intf>
- <method-name>name_43</method-name>
- <method-params>
- <method-param>parms_49</method-param>
- <method-param>parms_50</method-param>
- </method-params>
- </method>
- <method>
- <description>description_44</description>
- <method-intf>Home</method-intf>
- <method-name>name_44</method-name>
- <method-params>
- <method-param>parms_51</method-param>
- <method-param>parms_52</method-param>
- <method-param>parms_53</method-param>
- </method-params>
- </method>
- <trans-attribute>RequiresNew</trans-attribute>
- </container-transaction>
- <container-transaction>
- <description>description_4</description>
- <method>
- <description>description_45</description>
- <method-intf>Local</method-intf>
- <method-name>name_45</method-name>
- </method>
- <method>
- <description>description_46</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_46</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_47</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_47</method-name>
- <method-params>
- <method-param>parms_54</method-param>
- </method-params>
- </method>
- <method>
- <description>description_48</description>
- <method-name>name_48</method-name>
- <method-params>
- <method-param>parms_55</method-param>
- <method-param>parms_56</method-param>
- </method-params>
- </method>
- <method>
- <description>description_49</description>
- <method-intf>Remote</method-intf>
- <method-name>name_49</method-name>
- <method-params>
- <method-param>parms_57</method-param>
- <method-param>parms_58</method-param>
- <method-param>parms_59</method-param>
- </method-params>
- </method>
- <trans-attribute>Mandatory</trans-attribute>
- </container-transaction>
- <exclude-list>
- <description>description_0</description>
- <method>
- <description>description_50</description>
- <method-intf>Home</method-intf>
- <method-name>name_50</method-name>
- </method>
- <method>
- <description>description_51</description>
- <method-intf>Local</method-intf>
- <method-name>name_51</method-name>
- <method-params/>
- </method>
- <method>
- <description>description_52</description>
- <method-intf>LocalHome</method-intf>
- <method-name>name_52</method-name>
- <method-params>
- <method-param>parms_60</method-param>
- </method-params>
- </method>
- <method>
- <description>description_53</description>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>name_53</method-name>
- <method-params>
- <method-param>parms_61</method-param>
- <method-param>parms_62</method-param>
- </method-params>
- </method>
- <method>
- <description>description_54</description>
- <method-name>name_54</method-name>
- <method-params>
- <method-param>parms_63</method-param>
- <method-param>parms_64</method-param>
- <method-param>parms_65</method-param>
- </method-params>
- </method>
- </exclude-list>
- </assembly-descriptor>
- <ejb-client-jar>ejbClientJar_0</ejb-client-jar>
-</ejb-jar>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ra.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ra.xml
deleted file mode 100644
index e0816aec..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/ra.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE connector PUBLIC "-//Sun Microsystems, Inc.//DTD Connector 1.0//EN" "http://java.sun.com/dtd/connector_1_0.dtd">
-
- <connector id="Connector_ID">
- <display-name>displayName_0</display-name>
- <description>description_0</description>
- <icon>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- </icon>
- <vendor-name>vendorName_0</vendor-name>
- <spec-version>1.0</spec-version>
- <eis-type>eisType_0</eis-type>
- <version>1.0</version>
- <license>
- <description>description_0</description>
- <license-required>true</license-required>
- </license>
- <resourceadapter id="ResourceAdapter_1051639769087">
- <managedconnectionfactory-class>managedConnectionFactoryClass_0</managedconnectionfactory-class>
- <connectionfactory-interface>connectionFactoryInterface_0</connectionfactory-interface>
- <connectionfactory-impl-class>connectionFactoryImplClass_0</connectionfactory-impl-class>
- <connection-interface>connectionInterface_0</connection-interface>
- <connection-impl-class>connectionImplClass_0</connection-impl-class>
- <transaction-support>NoTransaction</transaction-support>
- <config-property id="ConfigProperty_1051639769127">
- <description>description_0</description>
- <config-property-name>name_0</config-property-name>
- <config-property-type>type_0</config-property-type>
- <config-property-value>value_0</config-property-value>
- </config-property>
- <config-property id="ConfigProperty_1051639769128">
- <description>description_1</description>
- <config-property-name>name_1</config-property-name>
- <config-property-type>type_1</config-property-type>
- <config-property-value>value_1</config-property-value>
- </config-property>
- <config-property id="ConfigProperty_1051639769129">
- <description>description_2</description>
- <config-property-name>name_2</config-property-name>
- <config-property-type>type_2</config-property-type>
- <config-property-value>value_2</config-property-value>
- </config-property>
- <config-property id="ConfigProperty_1051639769130">
- <description>description_3</description>
- <config-property-name>name_3</config-property-name>
- <config-property-type>type_3</config-property-type>
- <config-property-value>value_3</config-property-value>
- </config-property>
- <config-property id="ConfigProperty_1051639769131">
- <description>description_4</description>
- <config-property-name>name_4</config-property-name>
- <config-property-type>type_4</config-property-type>
- <config-property-value>value_4</config-property-value>
- </config-property>
- <authentication-mechanism id="AuthenticationMechanism_1051639769147">
- <description>description_0</description>
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
- <credential-interface>credentialInterface_0</credential-interface>
- </authentication-mechanism>
- <authentication-mechanism id="AuthenticationMechanism_1051639769148">
- <description>description_1</description>
- <authentication-mechanism-type>Kerbv5</authentication-mechanism-type>
- <credential-interface>credentialInterface_1</credential-interface>
- </authentication-mechanism>
- <authentication-mechanism id="AuthenticationMechanism_1051639769149">
- <description>description_2</description>
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
- <credential-interface>credentialInterface_2</credential-interface>
- </authentication-mechanism>
- <authentication-mechanism id="AuthenticationMechanism_1051639769150">
- <description>description_3</description>
- <authentication-mechanism-type>Kerbv5</authentication-mechanism-type>
- <credential-interface>credentialInterface_3</credential-interface>
- </authentication-mechanism>
- <authentication-mechanism id="AuthenticationMechanism_1051639769151">
- <description>description_4</description>
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
- <credential-interface>credentialInterface_4</credential-interface>
- </authentication-mechanism>
- <reauthentication-support>true</reauthentication-support>
- <security-permission id="SecurityPermission_1051639769167">
- <description>description_0</description>
- <security-permission-spec>specification_0</security-permission-spec>
- </security-permission>
- <security-permission id="SecurityPermission_1051639769177">
- <description>description_1</description>
- <security-permission-spec>specification_1</security-permission-spec>
- </security-permission>
- <security-permission id="SecurityPermission_1051639769178">
- <description>description_2</description>
- <security-permission-spec>specification_2</security-permission-spec>
- </security-permission>
- <security-permission id="SecurityPermission_1051639769179">
- <description>description_3</description>
- <security-permission-spec>specification_3</security-permission-spec>
- </security-permission>
- <security-permission id="SecurityPermission_1051639769180">
- <description>description_4</description>
- <security-permission-spec>specification_4</security-permission-spec>
- </security-permission>
- </resourceadapter>
- </connector>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/web.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/web.xml
deleted file mode 100644
index 27831b04..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/EMFTests/web.xml
+++ /dev/null
@@ -1,1285 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-
- <web-app id="WebApp_ID">
- <icon>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- </icon>
- <display-name>displayName_0</display-name>
- <description>description_0</description>
- <distributable></distributable>
- <context-param id="ContextParam_1051643499852">
- <param-name>paramName_0</param-name>
- <param-value>paramValue_0</param-value>
- <description>description_0</description>
- </context-param>
- <context-param id="ContextParam_1051643499853">
- <param-name>paramName_1</param-name>
- <param-value>paramValue_1</param-value>
- <description>description_1</description>
- </context-param>
- <context-param id="ContextParam_1051643499862">
- <param-name>paramName_2</param-name>
- <param-value>paramValue_2</param-value>
- <description>description_2</description>
- </context-param>
- <context-param id="ContextParam_1051643499863">
- <param-name>paramName_3</param-name>
- <param-value>paramValue_3</param-value>
- <description>description_3</description>
- </context-param>
- <context-param id="ContextParam_1051643499872">
- <param-name>paramName_4</param-name>
- <param-value>paramValue_4</param-value>
- <description>description_4</description>
- </context-param>
- <filter id="Filter_1051643499902">
- <icon>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- </icon>
- <filter-name>name_0</filter-name>
- <display-name>displayName_0</display-name>
- <description>description_0</description>
- <filter-class>java.lang.Integer</filter-class>
- <init-param id="InitParam_1051643500002">
- <param-name>paramName_25</param-name>
- <param-value>paramValue_25</param-value>
- <description>description_25</description>
- </init-param>
- <init-param id="InitParam_1051643500003">
- <param-name>paramName_26</param-name>
- <param-value>paramValue_26</param-value>
- <description>description_26</description>
- </init-param>
- <init-param id="InitParam_1051643500004">
- <param-name>paramName_27</param-name>
- <param-value>paramValue_27</param-value>
- <description>description_27</description>
- </init-param>
- <init-param id="InitParam_1051643500005">
- <param-name>paramName_28</param-name>
- <param-value>paramValue_28</param-value>
- <description>description_28</description>
- </init-param>
- <init-param id="InitParam_1051643500006">
- <param-name>paramName_29</param-name>
- <param-value>paramValue_29</param-value>
- <description>description_29</description>
- </init-param>
- </filter>
- <filter id="Filter_1051643500002">
- <icon>
- <small-icon>smallIcon_1</small-icon>
- <large-icon>largeIcon_1</large-icon>
- </icon>
- <filter-name>name_1</filter-name>
- <display-name>displayName_1</display-name>
- <description>description_1</description>
- <filter-class>java.lang.String</filter-class>
- <init-param id="InitParam_1051643500007">
- <param-name>paramName_30</param-name>
- <param-value>paramValue_30</param-value>
- <description>description_30</description>
- </init-param>
- <init-param id="InitParam_1051643500012">
- <param-name>paramName_31</param-name>
- <param-value>paramValue_31</param-value>
- <description>description_31</description>
- </init-param>
- <init-param id="InitParam_1051643500013">
- <param-name>paramName_32</param-name>
- <param-value>paramValue_32</param-value>
- <description>description_32</description>
- </init-param>
- <init-param id="InitParam_1051643500014">
- <param-name>paramName_33</param-name>
- <param-value>paramValue_33</param-value>
- <description>description_33</description>
- </init-param>
- <init-param id="InitParam_1051643500015">
- <param-name>paramName_34</param-name>
- <param-value>paramValue_34</param-value>
- <description>description_34</description>
- </init-param>
- </filter>
- <filter id="Filter_1051643500012">
- <icon>
- <small-icon>smallIcon_2</small-icon>
- <large-icon>largeIcon_2</large-icon>
- </icon>
- <filter-name>name_2</filter-name>
- <display-name>displayName_2</display-name>
- <description>description_2</description>
- <filter-class>java.util.HashTable</filter-class>
- <init-param id="InitParam_1051643500016">
- <param-name>paramName_35</param-name>
- <param-value>paramValue_35</param-value>
- <description>description_35</description>
- </init-param>
- <init-param id="InitParam_1051643500017">
- <param-name>paramName_36</param-name>
- <param-value>paramValue_36</param-value>
- <description>description_36</description>
- </init-param>
- <init-param id="InitParam_1051643500018">
- <param-name>paramName_37</param-name>
- <param-value>paramValue_37</param-value>
- <description>description_37</description>
- </init-param>
- <init-param id="InitParam_1051643500019">
- <param-name>paramName_38</param-name>
- <param-value>paramValue_38</param-value>
- <description>description_38</description>
- </init-param>
- <init-param id="InitParam_1051643500020">
- <param-name>paramName_39</param-name>
- <param-value>paramValue_39</param-value>
- <description>description_39</description>
- </init-param>
- </filter>
- <filter id="Filter_1051643500013">
- <icon>
- <small-icon>smallIcon_3</small-icon>
- <large-icon>largeIcon_3</large-icon>
- </icon>
- <filter-name>name_3</filter-name>
- <display-name>displayName_3</display-name>
- <description>description_3</description>
- <filter-class>java.util.List</filter-class>
- <init-param id="InitParam_1051643500021">
- <param-name>paramName_40</param-name>
- <param-value>paramValue_40</param-value>
- <description>description_40</description>
- </init-param>
- <init-param id="InitParam_1051643500022">
- <param-name>paramName_41</param-name>
- <param-value>paramValue_41</param-value>
- <description>description_41</description>
- </init-param>
- <init-param id="InitParam_1051643500032">
- <param-name>paramName_42</param-name>
- <param-value>paramValue_42</param-value>
- <description>description_42</description>
- </init-param>
- <init-param id="InitParam_1051643500033">
- <param-name>paramName_43</param-name>
- <param-value>paramValue_43</param-value>
- <description>description_43</description>
- </init-param>
- <init-param id="InitParam_1051643500034">
- <param-name>paramName_44</param-name>
- <param-value>paramValue_44</param-value>
- <description>description_44</description>
- </init-param>
- </filter>
- <filter id="Filter_1051643500032">
- <icon>
- <small-icon>smallIcon_4</small-icon>
- <large-icon>largeIcon_4</large-icon>
- </icon>
- <filter-name>name_4</filter-name>
- <display-name>displayName_4</display-name>
- <description>description_4</description>
- <filter-class>java.sql.Data</filter-class>
- <init-param id="InitParam_1051643500035">
- <param-name>paramName_45</param-name>
- <param-value>paramValue_45</param-value>
- <description>description_45</description>
- </init-param>
- <init-param id="InitParam_1051643500036">
- <param-name>paramName_46</param-name>
- <param-value>paramValue_46</param-value>
- <description>description_46</description>
- </init-param>
- <init-param id="InitParam_1051643500037">
- <param-name>paramName_47</param-name>
- <param-value>paramValue_47</param-value>
- <description>description_47</description>
- </init-param>
- <init-param id="InitParam_1051643500038">
- <param-name>paramName_48</param-name>
- <param-value>paramValue_48</param-value>
- <description>description_48</description>
- </init-param>
- <init-param id="InitParam_1051643500042">
- <param-name>paramName_49</param-name>
- <param-value>paramValue_49</param-value>
- <description>description_49</description>
- </init-param>
- </filter>
- <filter-mapping id="FilterMapping_1051643500082">
- <filter-name>name_0</filter-name>
- <url-pattern>urlPattern_0</url-pattern>
- </filter-mapping>
- <filter-mapping id="FilterMapping_1051643500083">
- <filter-name>name_1</filter-name>
- <url-pattern>urlPattern_1</url-pattern>
- </filter-mapping>
- <filter-mapping id="FilterMapping_1051643500084">
- <filter-name>name_2</filter-name>
- <url-pattern>urlPattern_2</url-pattern>
- </filter-mapping>
- <filter-mapping id="FilterMapping_1051643500085">
- <filter-name>name_3</filter-name>
- <url-pattern>urlPattern_3</url-pattern>
- </filter-mapping>
- <filter-mapping id="FilterMapping_1051643500086">
- <filter-name>name_4</filter-name>
- <url-pattern>urlPattern_4</url-pattern>
- </filter-mapping>
- <listener id="Listener_1051643500112">
- <listener-class>java.lang.Integer</listener-class>
- </listener>
- <listener id="Listener_1051643500113">
- <listener-class>java.lang.String</listener-class>
- </listener>
- <listener id="Listener_1051643500114">
- <listener-class>java.util.HashTable</listener-class>
- </listener>
- <listener id="Listener_1051643500115">
- <listener-class>java.util.List</listener-class>
- </listener>
- <listener id="Listener_1051643500116">
- <listener-class>java.sql.Data</listener-class>
- </listener>
- <servlet id="Servlet_1051643500212">
- <icon>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- </icon>
- <servlet-name>servletName_0</servlet-name>
- <display-name>displayName_0</display-name>
- <description>description_0</description>
- <jsp-file>jspFile_0</jsp-file>
- <init-param id="InitParam_1051643500232">
- <param-name>paramName_0</param-name>
- <param-value>paramValue_0</param-value>
- <description>description_0</description>
- </init-param>
- <init-param id="InitParam_1051643500233">
- <param-name>paramName_1</param-name>
- <param-value>paramValue_1</param-value>
- <description>description_1</description>
- </init-param>
- <init-param id="InitParam_1051643500234">
- <param-name>paramName_2</param-name>
- <param-value>paramValue_2</param-value>
- <description>description_2</description>
- </init-param>
- <init-param id="InitParam_1051643500235">
- <param-name>paramName_3</param-name>
- <param-value>paramValue_3</param-value>
- <description>description_3</description>
- </init-param>
- <init-param id="InitParam_1051643500236">
- <param-name>paramName_4</param-name>
- <param-value>paramValue_4</param-value>
- <description>description_4</description>
- </init-param>
- <load-on-startup>0</load-on-startup>
- <run-as id="RunAsSpecifiedIdentity_1051643500232">
- <description>description_0</description>
- <role-name>roleName_0</role-name>
- </run-as>
- <security-role-ref id="SecurityRoleRef_1051643500272">
- <description>description_0</description>
- <role-name>name_0</role-name>
- <role-link>link_0</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500273">
- <description>description_1</description>
- <role-name>name_1</role-name>
- <role-link>link_1</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500274">
- <description>description_2</description>
- <role-name>name_2</role-name>
- <role-link>link_2</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500275">
- <description>description_3</description>
- <role-name>name_3</role-name>
- <role-link>link_3</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500276">
- <description>description_4</description>
- <role-name>name_4</role-name>
- <role-link>link_4</role-link>
- </security-role-ref>
- </servlet>
- <servlet id="Servlet_1051643500272">
- <icon>
- <small-icon>smallIcon_1</small-icon>
- <large-icon>largeIcon_1</large-icon>
- </icon>
- <servlet-name>servletName_1</servlet-name>
- <display-name>displayName_1</display-name>
- <description>description_1</description>
- <servlet-class>className_0</servlet-class>
- <init-param id="InitParam_1051643500272">
- <param-name>paramName_5</param-name>
- <param-value>paramValue_5</param-value>
- <description>description_5</description>
- </init-param>
- <init-param id="InitParam_1051643500273">
- <param-name>paramName_6</param-name>
- <param-value>paramValue_6</param-value>
- <description>description_6</description>
- </init-param>
- <init-param id="InitParam_1051643500274">
- <param-name>paramName_7</param-name>
- <param-value>paramValue_7</param-value>
- <description>description_7</description>
- </init-param>
- <init-param id="InitParam_1051643500275">
- <param-name>paramName_8</param-name>
- <param-value>paramValue_8</param-value>
- <description>description_8</description>
- </init-param>
- <init-param id="InitParam_1051643500276">
- <param-name>paramName_9</param-name>
- <param-value>paramValue_9</param-value>
- <description>description_9</description>
- </init-param>
- <load-on-startup>1</load-on-startup>
- <run-as id="RunAsSpecifiedIdentity_1051643500272">
- <description>description_1</description>
- <role-name>roleName_1</role-name>
- </run-as>
- <security-role-ref id="SecurityRoleRef_1051643500277">
- <description>description_5</description>
- <role-name>name_5</role-name>
- <role-link>link_5</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500278">
- <description>description_6</description>
- <role-name>name_6</role-name>
- <role-link>link_6</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500282">
- <description>description_7</description>
- <role-name>name_7</role-name>
- <role-link>link_7</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500283">
- <description>description_8</description>
- <role-name>name_8</role-name>
- <role-link>link_8</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500284">
- <description>description_9</description>
- <role-name>name_9</role-name>
- <role-link>link_9</role-link>
- </security-role-ref>
- </servlet>
- <servlet id="Servlet_1051643500282">
- <icon>
- <small-icon>smallIcon_2</small-icon>
- <large-icon>largeIcon_2</large-icon>
- </icon>
- <servlet-name>servletName_2</servlet-name>
- <display-name>displayName_2</display-name>
- <description>description_2</description>
- <jsp-file>jspFile_1</jsp-file>
- <init-param id="InitParam_1051643500282">
- <param-name>paramName_10</param-name>
- <param-value>paramValue_10</param-value>
- <description>description_10</description>
- </init-param>
- <init-param id="InitParam_1051643500283">
- <param-name>paramName_11</param-name>
- <param-value>paramValue_11</param-value>
- <description>description_11</description>
- </init-param>
- <init-param id="InitParam_1051643500284">
- <param-name>paramName_12</param-name>
- <param-value>paramValue_12</param-value>
- <description>description_12</description>
- </init-param>
- <init-param id="InitParam_1051643500285">
- <param-name>paramName_13</param-name>
- <param-value>paramValue_13</param-value>
- <description>description_13</description>
- </init-param>
- <init-param id="InitParam_1051643500286">
- <param-name>paramName_14</param-name>
- <param-value>paramValue_14</param-value>
- <description>description_14</description>
- </init-param>
- <load-on-startup>2</load-on-startup>
- <run-as id="RunAsSpecifiedIdentity_1051643500282">
- <description>description_2</description>
- <role-name>roleName_2</role-name>
- </run-as>
- <security-role-ref id="SecurityRoleRef_1051643500285">
- <description>description_10</description>
- <role-name>name_10</role-name>
- <role-link>link_10</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500286">
- <description>description_11</description>
- <role-name>name_11</role-name>
- <role-link>link_11</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500287">
- <description>description_12</description>
- <role-name>name_12</role-name>
- <role-link>link_12</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500288">
- <description>description_13</description>
- <role-name>name_13</role-name>
- <role-link>link_13</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500289">
- <description>description_14</description>
- <role-name>name_14</role-name>
- <role-link>link_14</role-link>
- </security-role-ref>
- </servlet>
- <servlet id="Servlet_1051643500283">
- <icon>
- <small-icon>smallIcon_3</small-icon>
- <large-icon>largeIcon_3</large-icon>
- </icon>
- <servlet-name>servletName_3</servlet-name>
- <display-name>displayName_3</display-name>
- <description>description_3</description>
- <servlet-class>className_1</servlet-class>
- <init-param id="InitParam_1051643500287">
- <param-name>paramName_15</param-name>
- <param-value>paramValue_15</param-value>
- <description>description_15</description>
- </init-param>
- <init-param id="InitParam_1051643500288">
- <param-name>paramName_16</param-name>
- <param-value>paramValue_16</param-value>
- <description>description_16</description>
- </init-param>
- <init-param id="InitParam_1051643500292">
- <param-name>paramName_17</param-name>
- <param-value>paramValue_17</param-value>
- <description>description_17</description>
- </init-param>
- <init-param id="InitParam_1051643500293">
- <param-name>paramName_18</param-name>
- <param-value>paramValue_18</param-value>
- <description>description_18</description>
- </init-param>
- <init-param id="InitParam_1051643500294">
- <param-name>paramName_19</param-name>
- <param-value>paramValue_19</param-value>
- <description>description_19</description>
- </init-param>
- <load-on-startup>3</load-on-startup>
- <run-as id="RunAsSpecifiedIdentity_1051643500292">
- <description>description_3</description>
- <role-name>roleName_3</role-name>
- </run-as>
- <security-role-ref id="SecurityRoleRef_1051643500292">
- <description>description_15</description>
- <role-name>name_15</role-name>
- <role-link>link_15</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500293">
- <description>description_16</description>
- <role-name>name_16</role-name>
- <role-link>link_16</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500294">
- <description>description_17</description>
- <role-name>name_17</role-name>
- <role-link>link_17</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500295">
- <description>description_18</description>
- <role-name>name_18</role-name>
- <role-link>link_18</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500296">
- <description>description_19</description>
- <role-name>name_19</role-name>
- <role-link>link_19</role-link>
- </security-role-ref>
- </servlet>
- <servlet id="Servlet_1051643500292">
- <icon>
- <small-icon>smallIcon_4</small-icon>
- <large-icon>largeIcon_4</large-icon>
- </icon>
- <servlet-name>servletName_4</servlet-name>
- <display-name>displayName_4</display-name>
- <description>description_4</description>
- <jsp-file>jspFile_2</jsp-file>
- <init-param id="InitParam_1051643500295">
- <param-name>paramName_20</param-name>
- <param-value>paramValue_20</param-value>
- <description>description_20</description>
- </init-param>
- <init-param id="InitParam_1051643500296">
- <param-name>paramName_21</param-name>
- <param-value>paramValue_21</param-value>
- <description>description_21</description>
- </init-param>
- <init-param id="InitParam_1051643500297">
- <param-name>paramName_22</param-name>
- <param-value>paramValue_22</param-value>
- <description>description_22</description>
- </init-param>
- <init-param id="InitParam_1051643500298">
- <param-name>paramName_23</param-name>
- <param-value>paramValue_23</param-value>
- <description>description_23</description>
- </init-param>
- <init-param id="InitParam_1051643500299">
- <param-name>paramName_24</param-name>
- <param-value>paramValue_24</param-value>
- <description>description_24</description>
- </init-param>
- <load-on-startup>4</load-on-startup>
- <run-as id="RunAsSpecifiedIdentity_1051643500293">
- <description>description_4</description>
- <role-name>roleName_4</role-name>
- </run-as>
- <security-role-ref id="SecurityRoleRef_1051643500297">
- <description>description_20</description>
- <role-name>name_20</role-name>
- <role-link>link_20</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500298">
- <description>description_21</description>
- <role-name>name_21</role-name>
- <role-link>link_21</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500299">
- <description>description_22</description>
- <role-name>name_22</role-name>
- <role-link>link_22</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500300">
- <description>description_23</description>
- <role-name>name_23</role-name>
- <role-link>link_23</role-link>
- </security-role-ref>
- <security-role-ref id="SecurityRoleRef_1051643500301">
- <description>description_24</description>
- <role-name>name_24</role-name>
- <role-link>link_24</role-link>
- </security-role-ref>
- </servlet>
- <servlet-mapping id="ServletMapping_1051643500312">
- <servlet-name>servletName_0</servlet-name>
- <url-pattern>urlPattern_0</url-pattern>
- </servlet-mapping>
- <servlet-mapping id="ServletMapping_1051643500313">
- <servlet-name>servletName_1</servlet-name>
- <url-pattern>urlPattern_1</url-pattern>
- </servlet-mapping>
- <servlet-mapping id="ServletMapping_1051643500314">
- <servlet-name>servletName_2</servlet-name>
- <url-pattern>urlPattern_2</url-pattern>
- </servlet-mapping>
- <servlet-mapping id="ServletMapping_1051643500315">
- <servlet-name>servletName_3</servlet-name>
- <url-pattern>urlPattern_3</url-pattern>
- </servlet-mapping>
- <servlet-mapping id="ServletMapping_1051643500316">
- <servlet-name>servletName_4</servlet-name>
- <url-pattern>urlPattern_4</url-pattern>
- </servlet-mapping>
- <session-config id="SessionConfig_1051643500312">
- <session-timeout>0</session-timeout>
- </session-config>
- <mime-mapping id="MimeMapping_1051643500332">
- <extension>extension_0</extension>
- <mime-type>mimeType_0</mime-type>
- </mime-mapping>
- <mime-mapping id="MimeMapping_1051643500333">
- <extension>extension_1</extension>
- <mime-type>mimeType_1</mime-type>
- </mime-mapping>
- <mime-mapping id="MimeMapping_1051643500334">
- <extension>extension_2</extension>
- <mime-type>mimeType_2</mime-type>
- </mime-mapping>
- <mime-mapping id="MimeMapping_1051643500335">
- <extension>extension_3</extension>
- <mime-type>mimeType_3</mime-type>
- </mime-mapping>
- <mime-mapping id="MimeMapping_1051643500336">
- <extension>extension_4</extension>
- <mime-type>mimeType_4</mime-type>
- </mime-mapping>
- <welcome-file-list id="WelcomeFileList_1051643500332">
- <welcome-file>welcomeFile_0</welcome-file>
- <welcome-file>welcomeFile_1</welcome-file>
- <welcome-file>welcomeFile_2</welcome-file>
- <welcome-file>welcomeFile_3</welcome-file>
- <welcome-file>welcomeFile_4</welcome-file>
- </welcome-file-list>
- <error-page id="ExceptionTypeErrorPage_1051643500342">
- <exception-type>java.util.HashTable</exception-type>
- <location>location_0</location>
- </error-page>
- <error-page id="ErrorCodeErrorPage_1051643500342">
- <error-code>errorCode_0</error-code>
- <location>location_1</location>
- </error-page>
- <error-page id="ExceptionTypeErrorPage_1051643500343">
- <exception-type>java.util.List</exception-type>
- <location>location_2</location>
- </error-page>
- <error-page id="ErrorCodeErrorPage_1051643500343">
- <error-code>errorCode_1</error-code>
- <location>location_3</location>
- </error-page>
- <error-page id="ExceptionTypeErrorPage_1051643500352">
- <exception-type>java.sql.Data</exception-type>
- <location>location_4</location>
- </error-page>
- <taglib id="TagLibRef_1051643500362">
- <taglib-uri>taglibURI_0</taglib-uri>
- <taglib-location>taglibLocation_0</taglib-location>
- </taglib>
- <taglib id="TagLibRef_1051643500363">
- <taglib-uri>taglibURI_1</taglib-uri>
- <taglib-location>taglibLocation_1</taglib-location>
- </taglib>
- <taglib id="TagLibRef_1051643500364">
- <taglib-uri>taglibURI_2</taglib-uri>
- <taglib-location>taglibLocation_2</taglib-location>
- </taglib>
- <taglib id="TagLibRef_1051643500365">
- <taglib-uri>taglibURI_3</taglib-uri>
- <taglib-location>taglibLocation_3</taglib-location>
- </taglib>
- <taglib id="TagLibRef_1051643500366">
- <taglib-uri>taglibURI_4</taglib-uri>
- <taglib-location>taglibLocation_4</taglib-location>
- </taglib>
- <resource-env-ref id="ResourceEnvRef_1051643500382">
- <description>description_0</description>
- <resource-env-ref-name>name_0</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051643500383">
- <description>description_1</description>
- <resource-env-ref-name>name_1</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051643500384">
- <description>description_2</description>
- <resource-env-ref-name>name_2</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051643500385">
- <description>description_3</description>
- <resource-env-ref-name>name_3</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref id="ResourceEnvRef_1051643500386">
- <description>description_4</description>
- <resource-env-ref-name>name_4</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-ref id="ResourceRef_1051643500402">
- <description>description_0</description>
- <res-ref-name>name_0</res-ref-name>
- <res-type>type_0</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051643500403">
- <description>description_1</description>
- <res-ref-name>name_1</res-ref-name>
- <res-type>type_1</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051643500404">
- <description>description_2</description>
- <res-ref-name>name_2</res-ref-name>
- <res-type>type_2</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051643500405">
- <description>description_3</description>
- <res-ref-name>name_3</res-ref-name>
- <res-type>type_3</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref id="ResourceRef_1051643500406">
- <description>description_4</description>
- <res-ref-name>name_4</res-ref-name>
- <res-type>type_4</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <security-constraint id="SecurityConstraint_1051643500432">
- <display-name>displayName_0</display-name>
- <web-resource-collection id="WebResourceCollection_1051643500452">
- <web-resource-name>webResourceName_0</web-resource-name>
- <description>description_0</description>
- <url-pattern>urlPattern_0</url-pattern>
- <url-pattern>urlPattern_1</url-pattern>
- <url-pattern>urlPattern_2</url-pattern>
- <url-pattern>urlPattern_3</url-pattern>
- <url-pattern>urlPattern_4</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500453">
- <web-resource-name>webResourceName_1</web-resource-name>
- <description>description_1</description>
- <url-pattern>urlPattern_5</url-pattern>
- <url-pattern>urlPattern_6</url-pattern>
- <url-pattern>urlPattern_7</url-pattern>
- <url-pattern>urlPattern_8</url-pattern>
- <url-pattern>urlPattern_9</url-pattern>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500454">
- <web-resource-name>webResourceName_2</web-resource-name>
- <description>description_2</description>
- <url-pattern>urlPattern_10</url-pattern>
- <url-pattern>urlPattern_11</url-pattern>
- <url-pattern>urlPattern_12</url-pattern>
- <url-pattern>urlPattern_13</url-pattern>
- <url-pattern>urlPattern_14</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- <http-method>GET</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500455">
- <web-resource-name>webResourceName_3</web-resource-name>
- <description>description_3</description>
- <url-pattern>urlPattern_15</url-pattern>
- <url-pattern>urlPattern_16</url-pattern>
- <url-pattern>urlPattern_17</url-pattern>
- <url-pattern>urlPattern_18</url-pattern>
- <url-pattern>urlPattern_19</url-pattern>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- <http-method>OPTIONS</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500462">
- <web-resource-name>webResourceName_4</web-resource-name>
- <description>description_4</description>
- <url-pattern>urlPattern_20</url-pattern>
- <url-pattern>urlPattern_21</url-pattern>
- <url-pattern>urlPattern_22</url-pattern>
- <url-pattern>urlPattern_23</url-pattern>
- <url-pattern>urlPattern_24</url-pattern>
- <http-method>TRACE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- </web-resource-collection>
- <auth-constraint id="AuthConstraint_1051643500462">
- <description>description_0</description>
- <role-name>roles_0</role-name>
- <role-name>roles_1</role-name>
- <role-name>roles_2</role-name>
- <role-name>roles_3</role-name>
- <role-name>roles_4</role-name>
- </auth-constraint>
- <user-data-constraint id="UserDataConstraint_1051643500462">
- <description>description_0</description>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <security-constraint id="SecurityConstraint_1051643500462">
- <display-name>displayName_1</display-name>
- <web-resource-collection id="WebResourceCollection_1051643500463">
- <web-resource-name>webResourceName_5</web-resource-name>
- <description>description_5</description>
- <url-pattern>urlPattern_25</url-pattern>
- <url-pattern>urlPattern_26</url-pattern>
- <url-pattern>urlPattern_27</url-pattern>
- <url-pattern>urlPattern_28</url-pattern>
- <url-pattern>urlPattern_29</url-pattern>
- <http-method>HEAD</http-method>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500464">
- <web-resource-name>webResourceName_6</web-resource-name>
- <description>description_6</description>
- <url-pattern>urlPattern_30</url-pattern>
- <url-pattern>urlPattern_31</url-pattern>
- <url-pattern>urlPattern_32</url-pattern>
- <url-pattern>urlPattern_33</url-pattern>
- <url-pattern>urlPattern_34</url-pattern>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500465">
- <web-resource-name>webResourceName_7</web-resource-name>
- <description>description_7</description>
- <url-pattern>urlPattern_35</url-pattern>
- <url-pattern>urlPattern_36</url-pattern>
- <url-pattern>urlPattern_37</url-pattern>
- <url-pattern>urlPattern_38</url-pattern>
- <url-pattern>urlPattern_39</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500466">
- <web-resource-name>webResourceName_8</web-resource-name>
- <description>description_8</description>
- <url-pattern>urlPattern_40</url-pattern>
- <url-pattern>urlPattern_41</url-pattern>
- <url-pattern>urlPattern_42</url-pattern>
- <url-pattern>urlPattern_43</url-pattern>
- <url-pattern>urlPattern_44</url-pattern>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500467">
- <web-resource-name>webResourceName_9</web-resource-name>
- <description>description_9</description>
- <url-pattern>urlPattern_45</url-pattern>
- <url-pattern>urlPattern_46</url-pattern>
- <url-pattern>urlPattern_47</url-pattern>
- <url-pattern>urlPattern_48</url-pattern>
- <url-pattern>urlPattern_49</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- <http-method>GET</http-method>
- </web-resource-collection>
- <auth-constraint id="AuthConstraint_1051643500463">
- <description>description_1</description>
- <role-name>roles_5</role-name>
- <role-name>roles_6</role-name>
- <role-name>roles_7</role-name>
- <role-name>roles_8</role-name>
- <role-name>roles_9</role-name>
- </auth-constraint>
- <user-data-constraint id="UserDataConstraint_1051643500463">
- <description>description_1</description>
- <transport-guarantee>INTEGRAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <security-constraint id="SecurityConstraint_1051643500463">
- <display-name>displayName_2</display-name>
- <web-resource-collection id="WebResourceCollection_1051643500468">
- <web-resource-name>webResourceName_10</web-resource-name>
- <description>description_10</description>
- <url-pattern>urlPattern_50</url-pattern>
- <url-pattern>urlPattern_51</url-pattern>
- <url-pattern>urlPattern_52</url-pattern>
- <url-pattern>urlPattern_53</url-pattern>
- <url-pattern>urlPattern_54</url-pattern>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- <http-method>OPTIONS</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500469">
- <web-resource-name>webResourceName_11</web-resource-name>
- <description>description_11</description>
- <url-pattern>urlPattern_55</url-pattern>
- <url-pattern>urlPattern_56</url-pattern>
- <url-pattern>urlPattern_57</url-pattern>
- <url-pattern>urlPattern_58</url-pattern>
- <url-pattern>urlPattern_59</url-pattern>
- <http-method>TRACE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500470">
- <web-resource-name>webResourceName_12</web-resource-name>
- <description>description_12</description>
- <url-pattern>urlPattern_60</url-pattern>
- <url-pattern>urlPattern_61</url-pattern>
- <url-pattern>urlPattern_62</url-pattern>
- <url-pattern>urlPattern_63</url-pattern>
- <url-pattern>urlPattern_64</url-pattern>
- <http-method>HEAD</http-method>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500471">
- <web-resource-name>webResourceName_13</web-resource-name>
- <description>description_13</description>
- <url-pattern>urlPattern_65</url-pattern>
- <url-pattern>urlPattern_66</url-pattern>
- <url-pattern>urlPattern_67</url-pattern>
- <url-pattern>urlPattern_68</url-pattern>
- <url-pattern>urlPattern_69</url-pattern>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500472">
- <web-resource-name>webResourceName_14</web-resource-name>
- <description>description_14</description>
- <url-pattern>urlPattern_70</url-pattern>
- <url-pattern>urlPattern_71</url-pattern>
- <url-pattern>urlPattern_72</url-pattern>
- <url-pattern>urlPattern_73</url-pattern>
- <url-pattern>urlPattern_74</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- </web-resource-collection>
- <auth-constraint id="AuthConstraint_1051643500464">
- <description>description_2</description>
- <role-name>roles_10</role-name>
- <role-name>roles_11</role-name>
- <role-name>roles_12</role-name>
- <role-name>roles_13</role-name>
- <role-name>roles_14</role-name>
- </auth-constraint>
- <user-data-constraint id="UserDataConstraint_1051643500464">
- <description>description_2</description>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <security-constraint id="SecurityConstraint_1051643500464">
- <display-name>displayName_3</display-name>
- <web-resource-collection id="WebResourceCollection_1051643500473">
- <web-resource-name>webResourceName_15</web-resource-name>
- <description>description_15</description>
- <url-pattern>urlPattern_75</url-pattern>
- <url-pattern>urlPattern_76</url-pattern>
- <url-pattern>urlPattern_77</url-pattern>
- <url-pattern>urlPattern_78</url-pattern>
- <url-pattern>urlPattern_79</url-pattern>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500474">
- <web-resource-name>webResourceName_16</web-resource-name>
- <description>description_16</description>
- <url-pattern>urlPattern_80</url-pattern>
- <url-pattern>urlPattern_81</url-pattern>
- <url-pattern>urlPattern_82</url-pattern>
- <url-pattern>urlPattern_83</url-pattern>
- <url-pattern>urlPattern_84</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- <http-method>GET</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500475">
- <web-resource-name>webResourceName_17</web-resource-name>
- <description>description_17</description>
- <url-pattern>urlPattern_85</url-pattern>
- <url-pattern>urlPattern_86</url-pattern>
- <url-pattern>urlPattern_87</url-pattern>
- <url-pattern>urlPattern_88</url-pattern>
- <url-pattern>urlPattern_89</url-pattern>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- <http-method>OPTIONS</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500476">
- <web-resource-name>webResourceName_18</web-resource-name>
- <description>description_18</description>
- <url-pattern>urlPattern_90</url-pattern>
- <url-pattern>urlPattern_91</url-pattern>
- <url-pattern>urlPattern_92</url-pattern>
- <url-pattern>urlPattern_93</url-pattern>
- <url-pattern>urlPattern_94</url-pattern>
- <http-method>TRACE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500477">
- <web-resource-name>webResourceName_19</web-resource-name>
- <description>description_19</description>
- <url-pattern>urlPattern_95</url-pattern>
- <url-pattern>urlPattern_96</url-pattern>
- <url-pattern>urlPattern_97</url-pattern>
- <url-pattern>urlPattern_98</url-pattern>
- <url-pattern>urlPattern_99</url-pattern>
- <http-method>HEAD</http-method>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- </web-resource-collection>
- <auth-constraint id="AuthConstraint_1051643500472">
- <description>description_3</description>
- <role-name>roles_15</role-name>
- <role-name>roles_16</role-name>
- <role-name>roles_17</role-name>
- <role-name>roles_18</role-name>
- <role-name>roles_19</role-name>
- </auth-constraint>
- <user-data-constraint id="UserDataConstraint_1051643500472">
- <description>description_3</description>
- <transport-guarantee>NONE</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <security-constraint id="SecurityConstraint_1051643500472">
- <display-name>displayName_4</display-name>
- <web-resource-collection id="WebResourceCollection_1051643500478">
- <web-resource-name>webResourceName_20</web-resource-name>
- <description>description_20</description>
- <url-pattern>urlPattern_100</url-pattern>
- <url-pattern>urlPattern_101</url-pattern>
- <url-pattern>urlPattern_102</url-pattern>
- <url-pattern>urlPattern_103</url-pattern>
- <url-pattern>urlPattern_104</url-pattern>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500479">
- <web-resource-name>webResourceName_21</web-resource-name>
- <description>description_21</description>
- <url-pattern>urlPattern_105</url-pattern>
- <url-pattern>urlPattern_106</url-pattern>
- <url-pattern>urlPattern_107</url-pattern>
- <url-pattern>urlPattern_108</url-pattern>
- <url-pattern>urlPattern_109</url-pattern>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500480">
- <web-resource-name>webResourceName_22</web-resource-name>
- <description>description_22</description>
- <url-pattern>urlPattern_110</url-pattern>
- <url-pattern>urlPattern_111</url-pattern>
- <url-pattern>urlPattern_112</url-pattern>
- <url-pattern>urlPattern_113</url-pattern>
- <url-pattern>urlPattern_114</url-pattern>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500481">
- <web-resource-name>webResourceName_23</web-resource-name>
- <description>description_23</description>
- <url-pattern>urlPattern_115</url-pattern>
- <url-pattern>urlPattern_116</url-pattern>
- <url-pattern>urlPattern_117</url-pattern>
- <url-pattern>urlPattern_118</url-pattern>
- <url-pattern>urlPattern_119</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- <http-method>OPTIONS</http-method>
- <http-method>TRACE</http-method>
- <http-method>GET</http-method>
- </web-resource-collection>
- <web-resource-collection id="WebResourceCollection_1051643500482">
- <web-resource-name>webResourceName_24</web-resource-name>
- <description>description_24</description>
- <url-pattern>urlPattern_120</url-pattern>
- <url-pattern>urlPattern_121</url-pattern>
- <url-pattern>urlPattern_122</url-pattern>
- <url-pattern>urlPattern_123</url-pattern>
- <url-pattern>urlPattern_124</url-pattern>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
- <http-method>DELETE</http-method>
- <http-method>HEAD</http-method>
- <http-method>OPTIONS</http-method>
- </web-resource-collection>
- <auth-constraint id="AuthConstraint_1051643500473">
- <description>description_4</description>
- <role-name>roles_20</role-name>
- <role-name>roles_21</role-name>
- <role-name>roles_22</role-name>
- <role-name>roles_23</role-name>
- <role-name>roles_24</role-name>
- </auth-constraint>
- <user-data-constraint id="UserDataConstraint_1051643500473">
- <description>description_4</description>
- <transport-guarantee>INTEGRAL</transport-guarantee>
- </user-data-constraint>
- </security-constraint>
- <login-config id="LoginConfig_1051643500482">
- <auth-method>BASIC</auth-method>
- <realm-name>realmName_0</realm-name>
- <form-login-config id="FormLoginConfig_1051643500482">
- <form-login-page>formLoginPage_0</form-login-page>
- <form-error-page>formErrorPage_0</form-error-page>
- </form-login-config>
- </login-config>
- <security-role id="SecurityRole_1051643500492">
- <description>description_0</description>
- <role-name>roleName_0</role-name>
- </security-role>
- <security-role id="SecurityRole_1051643500493">
- <description>description_1</description>
- <role-name>roleName_1</role-name>
- </security-role>
- <security-role id="SecurityRole_1051643500494">
- <description>description_2</description>
- <role-name>roleName_2</role-name>
- </security-role>
- <security-role id="SecurityRole_1051643500495">
- <description>description_3</description>
- <role-name>roleName_3</role-name>
- </security-role>
- <security-role id="SecurityRole_1051643500496">
- <description>description_4</description>
- <role-name>roleName_4</role-name>
- </security-role>
- <env-entry id="EnvEntry_1051643500513">
- <description>description_0</description>
- <env-entry-name>name_0</env-entry-name>
- <env-entry-value>value_0</env-entry-value>
- <env-entry-type>java.lang.String</env-entry-type>
- </env-entry>
- <env-entry id="EnvEntry_1051643500514">
- <description>description_1</description>
- <env-entry-name>name_1</env-entry-name>
- <env-entry-value>value_1</env-entry-value>
- <env-entry-type>java.lang.Integer</env-entry-type>
- </env-entry>
- <env-entry id="EnvEntry_1051643500515">
- <description>description_2</description>
- <env-entry-name>name_2</env-entry-name>
- <env-entry-value>value_2</env-entry-value>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- </env-entry>
- <env-entry id="EnvEntry_1051643500516">
- <description>description_3</description>
- <env-entry-name>name_3</env-entry-name>
- <env-entry-value>value_3</env-entry-value>
- <env-entry-type>java.lang.Double</env-entry-type>
- </env-entry>
- <env-entry id="EnvEntry_1051643500517">
- <description>description_4</description>
- <env-entry-name>name_4</env-entry-name>
- <env-entry-value>value_4</env-entry-value>
- <env-entry-type>java.lang.Byte</env-entry-type>
- </env-entry>
- <ejb-ref id="EjbRef_1051643500533">
- <description>description_0</description>
- <ejb-ref-name>name_0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_0</home>
- <remote>remote_0</remote>
- <ejb-link>link_0</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051643500534">
- <description>description_1</description>
- <ejb-ref-name>name_1</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_1</home>
- <remote>remote_1</remote>
- <ejb-link>link_1</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051643500535">
- <description>description_2</description>
- <ejb-ref-name>name_2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_2</home>
- <remote>remote_2</remote>
- <ejb-link>link_2</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051643500536">
- <description>description_3</description>
- <ejb-ref-name>name_3</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_3</home>
- <remote>remote_3</remote>
- <ejb-link>link_3</ejb-link>
- </ejb-ref>
- <ejb-ref id="EjbRef_1051643500537">
- <description>description_4</description>
- <ejb-ref-name>name_4</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_4</home>
- <remote>remote_4</remote>
- <ejb-link>link_4</ejb-link>
- </ejb-ref>
- <ejb-local-ref id="EJBLocalRef_1051643500553">
- <description>description_5</description>
- <ejb-ref-name>name_5</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_5</local-home>
- <local>remote_5</local>
- <ejb-link>link_5</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051643500554">
- <description>description_6</description>
- <ejb-ref-name>name_6</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_6</local-home>
- <local>remote_6</local>
- <ejb-link>link_6</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051643500555">
- <description>description_7</description>
- <ejb-ref-name>name_7</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_7</local-home>
- <local>remote_7</local>
- <ejb-link>link_7</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051643500556">
- <description>description_8</description>
- <ejb-ref-name>name_8</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <local-home>home_8</local-home>
- <local>remote_8</local>
- <ejb-link>link_8</ejb-link>
- </ejb-local-ref>
- <ejb-local-ref id="EJBLocalRef_1051643500557">
- <description>description_9</description>
- <ejb-ref-name>name_9</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>home_9</local-home>
- <local>remote_9</local>
- <ejb-link>link_9</ejb-link>
- </ejb-local-ref>
- </web-app>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/.metadata/.plugins/com.ibm.etools.j2ee/looseApp.xmi b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/.metadata/.plugins/com.ibm.etools.j2ee/looseApp.xmi
deleted file mode 100644
index 1e3ae0b9..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/.metadata/.plugins/com.ibm.etools.j2ee/looseApp.xmi
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<org.eclipse.jst.j2ee.internal.commonarchivecore.looseconfig:LooseApplication xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.jst.j2ee.internal.commonarchivecore.looseconfig="commonarchive.looseconfig.xmi" uri="\d:\work\WTP\org.eclipse.jst.j2ee.core.tests\commonArchiveResources\loose_module_workspace\LooseEAR" binariesPath="\d:\work\WTP\org.eclipse.jst.j2ee.core.tests\commonArchiveResources\loose_module_workspace\LooseEAR" resourcesPath="\d:\work\WTP\org.eclipse.jst.j2ee.core.tests\commonArchiveResources\loose_module_workspace\LooseEAR">
- <looseArchives xsi:type="org.eclipse.jst.j2ee.internal.commonarchivecore.looseconfig:LooseModule" uri="LooseEAREjb.jar" binariesPath="/d:/work/WTP/org.eclipse.jst.j2ee.core.tests/commonArchiveResources\loose_module_workspace\LooseEAREjb\bin" resourcesPath="/d:/work/WTP/org.eclipse.jst.j2ee.core.tests/commonArchiveResources\loose_module_workspace\LooseEAREjb\bin"/>
- <looseArchives xsi:type="org.eclipse.jst.j2ee.internal.commonarchivecore.looseconfig:LooseWARFile" uri="LooseEARWeb.war" binariesPath="/d:/work/WTP/org.eclipse.jst.j2ee.core.tests/commonArchiveResources\loose_module_workspace\LooseEARWeb\webApplication" resourcesPath="/d:/work/WTP/org.eclipse.jst.j2ee.core.tests/commonArchiveResources\loose_module_workspace\LooseEARWeb\webApplication">
- <looseLibs uri="WEB-INF/lib/library.jar" binariesPath="/d:/work/WTP/org.eclipse.jst.j2ee.core.tests/commonArchiveResources\loose_module_workspace\LooseJavaWebLib\bin" resourcesPath="/d:/work/WTP/org.eclipse.jst.j2ee.core.tests/commonArchiveResources\loose_module_workspace\LooseJavaWebLib\bin"/>
- </looseArchives>
- <looseArchives xsi:type="org.eclipse.jst.j2ee.internal.commonarchivecore.looseconfig:LooseLibrary" uri="util.jar" binariesPath="/d:/work/WTP/org.eclipse.jst.j2ee.core.tests/commonArchiveResources\loose_module_workspace\LooseJavaUtil\bin" resourcesPath="/d:/work/WTP/org.eclipse.jst.j2ee.core.tests/commonArchiveResources\loose_module_workspace\LooseJavaUtil\bin"/>
-</org.eclipse.jst.j2ee.internal.commonarchivecore.looseconfig:LooseApplication>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/.metadata/.plugins/com.ibm.etools.j2ee/looseConfig.xmi b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/.metadata/.plugins/com.ibm.etools.j2ee/looseConfig.xmi
deleted file mode 100644
index 64ffaf72..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/.metadata/.plugins/com.ibm.etools.j2ee/looseConfig.xmi
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<org.eclipse.jst.j2ee.internal.commonarchivecore.looseconfig:LooseConfiguration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.jst.j2ee.internal.commonarchivecore.looseconfig="commonarchive.looseconfig.xmi">
- <applications uri="\d:\work\WTP\org.eclipse.jst.j2ee.core.tests\commonArchiveResources\loose_module_workspace\LooseEAR" binariesPath="\d:\work\WTP\org.eclipse.jst.j2ee.core.tests\commonArchiveResources\loose_module_workspace\LooseEAR" resourcesPath="\d:\work\WTP\org.eclipse.jst.j2ee.core.tests\commonArchiveResources\loose_module_workspace\LooseEAR">
- <looseArchives xsi:type="org.eclipse.jst.j2ee.internal.commonarchivecore.looseconfig:LooseModule" uri="LooseEAREjb.jar" binariesPath="/d:/work/WTP/org.eclipse.jst.j2ee.core.tests/commonArchiveResources\loose_module_workspace\LooseEAREjb\bin" resourcesPath="/d:/work/WTP/org.eclipse.jst.j2ee.core.tests/commonArchiveResources\loose_module_workspace\LooseEAREjb\bin"/>
- <looseArchives xsi:type="org.eclipse.jst.j2ee.internal.commonarchivecore.looseconfig:LooseWARFile" uri="LooseEARWeb.war" binariesPath="/d:/work/WTP/org.eclipse.jst.j2ee.core.tests/commonArchiveResources\loose_module_workspace\LooseEARWeb\webApplication" resourcesPath="/d:/work/WTP/org.eclipse.jst.j2ee.core.tests/commonArchiveResources\loose_module_workspace\LooseEARWeb\webApplication">
- <looseLibs uri="WEB-INF/lib/library.jar" binariesPath="/d:/work/WTP/org.eclipse.jst.j2ee.core.tests/commonArchiveResources\loose_module_workspace\LooseJavaWebLib\bin" resourcesPath="/d:/work/WTP/org.eclipse.jst.j2ee.core.tests/commonArchiveResources\loose_module_workspace\LooseJavaWebLib\bin"/>
- </looseArchives>
- <looseArchives xsi:type="org.eclipse.jst.j2ee.internal.commonarchivecore.looseconfig:LooseLibrary" uri="util.jar" binariesPath="/d:/work/WTP/org.eclipse.jst.j2ee.core.tests/commonArchiveResources\loose_module_workspace\LooseJavaUtil\bin" resourcesPath="/d:/work/WTP/org.eclipse.jst.j2ee.core.tests/commonArchiveResources\loose_module_workspace\LooseJavaUtil\bin"/>
- </applications>
-</org.eclipse.jst.j2ee.internal.commonarchivecore.looseconfig:LooseConfiguration>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseConnector/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseConnector/META-INF/MANIFEST.MF
deleted file mode 100644
index 59499bce..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseConnector/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseConnector/META-INF/application.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseConnector/META-INF/application.xml
deleted file mode 100644
index 6a1cd6f5..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseConnector/META-INF/application.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application id="Application_ID"
- 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">
- <module>
- <connector>fooRAR</connector>
- </module>
-</application>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseConnector/fooRAR/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseConnector/fooRAR/META-INF/MANIFEST.MF
deleted file mode 100644
index 59499bce..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseConnector/fooRAR/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseConnector/fooRAR/META-INF/ra.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseConnector/fooRAR/META-INF/ra.xml
deleted file mode 100644
index b341c53e..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseConnector/fooRAR/META-INF/ra.xml
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE connector PUBLIC "-//Sun Microsystems, Inc.//DTD Connector 1.0//EN"
- "http://java.sun.com/dtd/connector_1_0.dtd">
-<connector>
- <display-name>displayName_0</display-name>
- <description>description_0</description>
- <icon>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- </icon>
- <vendor-name>vendorName_0</vendor-name>
- <spec-version>1.0</spec-version>
- <eis-type>eisType_0</eis-type>
- <version>1.0</version>
- <license>
- <description>description_0</description>
- <license-required>true</license-required>
- </license>
- <resourceadapter>
- <managedconnectionfactory-class>managedConnectionFactoryClass_0</managedconnectionfactory-class>
- <connectionfactory-interface>connectionFactoryInterface_0</connectionfactory-interface>
- <connectionfactory-impl-class>connectionFactoryImplClass_0</connectionfactory-impl-class>
- <connection-interface>connectionInterface_0</connection-interface>
- <connection-impl-class>connectionImplClass_0</connection-impl-class>
- <transaction-support>NoTransaction</transaction-support>
- <config-property>
- <description>description_0</description>
- <config-property-name>name_0</config-property-name>
- <config-property-type>type_0</config-property-type>
- <config-property-value>value_0</config-property-value>
- </config-property>
- <config-property>
- <description>description_1</description>
- <config-property-name>name_1</config-property-name>
- <config-property-type>type_1</config-property-type>
- <config-property-value>value_1</config-property-value>
- </config-property>
- <config-property>
- <description>description_2</description>
- <config-property-name>name_2</config-property-name>
- <config-property-type>type_2</config-property-type>
- <config-property-value>value_2</config-property-value>
- </config-property>
- <config-property>
- <description>description_3</description>
- <config-property-name>name_3</config-property-name>
- <config-property-type>type_3</config-property-type>
- <config-property-value>value_3</config-property-value>
- </config-property>
- <config-property>
- <description>description_4</description>
- <config-property-name>name_4</config-property-name>
- <config-property-type>type_4</config-property-type>
- <config-property-value>value_4</config-property-value>
- </config-property>
- <authentication-mechanism>
- <description>description_0</description>
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
- <credential-interface>credentialInterface_0</credential-interface>
- </authentication-mechanism>
- <authentication-mechanism>
- <description>description_1</description>
- <authentication-mechanism-type>Kerbv5</authentication-mechanism-type>
- <credential-interface>credentialInterface_1</credential-interface>
- </authentication-mechanism>
- <authentication-mechanism>
- <description>description_2</description>
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
- <credential-interface>credentialInterface_2</credential-interface>
- </authentication-mechanism>
- <authentication-mechanism>
- <description>description_3</description>
- <authentication-mechanism-type>Kerbv5</authentication-mechanism-type>
- <credential-interface>credentialInterface_3</credential-interface>
- </authentication-mechanism>
- <authentication-mechanism>
- <description>description_4</description>
- <authentication-mechanism-type>BasicPassword</authentication-mechanism-type>
- <credential-interface>credentialInterface_4</credential-interface>
- </authentication-mechanism>
- <reauthentication-support>true</reauthentication-support>
- <security-permission>
- <description>description_0</description>
- <security-permission-spec>specification_0</security-permission-spec>
- </security-permission>
- <security-permission>
- <description>description_1</description>
- <security-permission-spec>specification_1</security-permission-spec>
- </security-permission>
- <security-permission>
- <description>description_2</description>
- <security-permission-spec>specification_2</security-permission-spec>
- </security-permission>
- <security-permission>
- <description>description_3</description>
- <security-permission-spec>specification_3</security-permission-spec>
- </security-permission>
- <security-permission>
- <description>description_4</description>
- <security-permission-spec>specification_4</security-permission-spec>
- </security-permission>
- </resourceadapter>
-</connector>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAR/META-INF/application.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAR/META-INF/application.xml
deleted file mode 100644
index 56067f6c..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAR/META-INF/application.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN" "http://java.sun.com/j2ee/dtds/application_1_2.dtd">
-<application id="Application_ID">
- <display-name>LooseEAR</display-name>
- <module id="EjbModule_1">
- <ejb>LooseEAREjb.jar</ejb>
- </module>
- <module id="WebModule_1">
- <web>
- <web-uri>LooseEARWeb.war</web-uri>
- <context-root>LooseEARWeb</context-root></web>
- </module>
-</application>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAR/META-INF/ibm-application-ext.xmi b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAR/META-INF/ibm-application-ext.xmi
deleted file mode 100644
index f3fbd0db..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAR/META-INF/ibm-application-ext.xmi
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<applicationext:ApplicationExtension xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:applicationext="applicationext.xmi" xmlns:application="application.xmi" xmi:id="Application_ID_Ext">
- <moduleExtensions xmi:type="applicationext:EjbModuleExtension" xmi:id="EjbModule_1_Ext" absolutePath="D:\WSAD_DEV\eclipse\workspace\LooseEAREjb\bin">
- <module xmi:type="application:EjbModule" href="META-INF/application.xml#EjbModule_1"/>
- </moduleExtensions>
- <moduleExtensions xmi:type="applicationext:WebModuleExtension" xmi:id="WebModule_1_Ext" absolutePath="D:\WSAD_DEV\eclipse\workspace\LooseEARWeb\webApplication">
- <module xmi:type="application:WebModule" href="META-INF/application.xml#WebModule_1"/>
- </moduleExtensions>
- <application href="META-INF/application.xml#Application_ID"/>
-</applicationext:ApplicationExtension>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARApp/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARApp/META-INF/MANIFEST.MF
deleted file mode 100644
index 59499bce..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARApp/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARApp/META-INF/application.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARApp/META-INF/application.xml
deleted file mode 100644
index b44d91e6..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARApp/META-INF/application.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application id="Application_ID"
- 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">
- <module>
- <java>fooAPP</java>
- </module>
-</application>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARApp/fooAPP/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARApp/fooAPP/META-INF/MANIFEST.MF
deleted file mode 100644
index 59499bce..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARApp/fooAPP/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARApp/fooAPP/META-INF/application-client.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARApp/fooAPP/META-INF/application-client.xml
deleted file mode 100644
index c8bed768..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARApp/fooAPP/META-INF/application-client.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application-client PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN"
- "http://java.sun.com/dtd/application-client_1_3.dtd">
-<application-client id="Application-client_ID">
- <icon>
- <small-icon>smallIcon_0</small-icon>
- <large-icon>largeIcon_0</large-icon>
- </icon>
- <display-name>displayName_0</display-name>
- <description>description_0</description>
- <env-entry>
- <description>description_0</description>
- <env-entry-name>name_0</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_0</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_1</description>
- <env-entry-name>name_1</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_1</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_2</description>
- <env-entry-name>name_2</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_2</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_3</description>
- <env-entry-name>name_3</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_3</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_4</description>
- <env-entry-name>name_4</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_4</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_0</description>
- <env-entry-name>name_0</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>value_0</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_1</description>
- <env-entry-name>name_1</env-entry-name>
- <env-entry-type>java.lang.Integer</env-entry-type>
- <env-entry-value>value_1</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_2</description>
- <env-entry-name>name_2</env-entry-name>
- <env-entry-type>java.lang.Boolean</env-entry-type>
- <env-entry-value>value_2</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_3</description>
- <env-entry-name>name_3</env-entry-name>
- <env-entry-type>java.lang.Double</env-entry-type>
- <env-entry-value>value_3</env-entry-value>
- </env-entry>
- <env-entry>
- <description>description_4</description>
- <env-entry-name>name_4</env-entry-name>
- <env-entry-type>java.lang.Byte</env-entry-type>
- <env-entry-value>value_4</env-entry-value>
- </env-entry>
- <ejb-ref>
- <description>description_0</description>
- <ejb-ref-name>name_0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_0</home>
- <remote>remote_0</remote>
- <ejb-link>link_0</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_1</description>
- <ejb-ref-name>name_1</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_1</home>
- <remote>remote_1</remote>
- <ejb-link>link_1</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_2</description>
- <ejb-ref-name>name_2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_2</home>
- <remote>remote_2</remote>
- <ejb-link>link_2</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_3</description>
- <ejb-ref-name>name_3</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_3</home>
- <remote>remote_3</remote>
- <ejb-link>link_3</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_4</description>
- <ejb-ref-name>name_4</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_4</home>
- <remote>remote_4</remote>
- <ejb-link>link_4</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_0</description>
- <ejb-ref-name>name_0</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_0</home>
- <remote>remote_0</remote>
- <ejb-link>link_0</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_1</description>
- <ejb-ref-name>name_1</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_1</home>
- <remote>remote_1</remote>
- <ejb-link>link_1</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_2</description>
- <ejb-ref-name>name_2</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_2</home>
- <remote>remote_2</remote>
- <ejb-link>link_2</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_3</description>
- <ejb-ref-name>name_3</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <home>home_3</home>
- <remote>remote_3</remote>
- <ejb-link>link_3</ejb-link>
- </ejb-ref>
- <ejb-ref>
- <description>description_4</description>
- <ejb-ref-name>name_4</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>home_4</home>
- <remote>remote_4</remote>
- <ejb-link>link_4</ejb-link>
- </ejb-ref>
- <resource-ref>
- <description>description_0</description>
- <res-ref-name>name_0</res-ref-name>
- <res-type>type_0</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_1</description>
- <res-ref-name>name_1</res-ref-name>
- <res-type>type_1</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_2</description>
- <res-ref-name>name_2</res-ref-name>
- <res-type>type_2</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_3</description>
- <res-ref-name>name_3</res-ref-name>
- <res-type>type_3</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_4</description>
- <res-ref-name>name_4</res-ref-name>
- <res-type>type_4</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_0</description>
- <res-ref-name>name_0</res-ref-name>
- <res-type>type_0</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_1</description>
- <res-ref-name>name_1</res-ref-name>
- <res-type>type_1</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_2</description>
- <res-ref-name>name_2</res-ref-name>
- <res-type>type_2</res-type>
- <res-auth>SERVLET</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_3</description>
- <res-ref-name>name_3</res-ref-name>
- <res-type>type_3</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Unshareable</res-sharing-scope>
- </resource-ref>
- <resource-ref>
- <description>description_4</description>
- <res-ref-name>name_4</res-ref-name>
- <res-type>type_4</res-type>
- <res-auth>Application</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- <resource-env-ref>
- <description>description_0</description>
- <resource-env-ref-name>name_0</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_1</description>
- <resource-env-ref-name>name_1</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_2</description>
- <resource-env-ref-name>name_2</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_3</description>
- <resource-env-ref-name>name_3</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_4</description>
- <resource-env-ref-name>name_4</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_0</description>
- <resource-env-ref-name>name_0</resource-env-ref-name>
- <resource-env-ref-type>java.util.HashTable</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_1</description>
- <resource-env-ref-name>name_1</resource-env-ref-name>
- <resource-env-ref-type>java.util.List</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_2</description>
- <resource-env-ref-name>name_2</resource-env-ref-name>
- <resource-env-ref-type>java.sql.Data</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_3</description>
- <resource-env-ref-name>name_3</resource-env-ref-name>
- <resource-env-ref-type>java.lang.Integer</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>description_4</description>
- <resource-env-ref-name>name_4</resource-env-ref-name>
- <resource-env-ref-type>java.lang.String</resource-env-ref-type>
- </resource-env-ref>
- <callback-handler>java.util.HashTable</callback-handler>
-</application-client>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/.classpath b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/.classpath
deleted file mode 100644
index b25cae25..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="ejbModule"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/WebSphere Application Server v6.0 JRE"/>
- <classpathentry kind="con" path="com.ibm.wtp.server.java.core.container/com.ibm.ws.ast.st.runtime.core.runtimeTarget.v60/WebSphere Application Server v6.0"/>
- <classpathentry kind="output" path="ejbModule"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/.j2ee b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/.j2ee
deleted file mode 100644
index 659969d6..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/.j2ee
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<j2eesettings version="600">
-<moduleversion>20</moduleversion>
-</j2eesettings>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/.project b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/.project
deleted file mode 100644
index a84f7514..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/.project
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>LooseEAREjb</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>com.ibm.wtp.migration.MigrationBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.ibm.etools.validation.validationbuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.ibm.wtp.j2ee.LibCopyBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>com.ibm.etools.j2ee.LibCopyBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
- <nature>com.ibm.etools.j2ee.EJB2_0Nature</nature>
- <nature>com.ibm.wtp.ejb.EJBNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- <nature>org.eclipse.jem.beaninfo.BeanInfoNature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/.runtime b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/.runtime
deleted file mode 100644
index ddc5d41c..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/.runtime
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<runtime runtime-id="WebSphere Application Server v6.0"/>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/META-INF/MANIFEST.MF
deleted file mode 100644
index 7ebad27f..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: util.jar ../boo.jar
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/META-INF/ejb-jar.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/META-INF/ejb-jar.xml
deleted file mode 100644
index bdce1e42..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN" "http://java.sun.com/j2ee/dtds/ejb-jar_1_1.dtd">
-<ejb-jar id="ejb-jar_ID">
- <display-name>LooseEAREjb</display-name>
- <enterprise-beans>
- <entity id="MyCMP">
- <ejb-name>MyCMP</ejb-name>
- <home>com.ibm.test.ejb.MyCMPHome</home>
- <remote>com.ibm.test.ejb.MyCMP</remote>
- <ejb-class>com.ibm.test.ejb.MyCMPBean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>com.ibm.test.ejb.MyCMPKey</prim-key-class>
- <reentrant>False</reentrant>
- <cmp-field>
- <field-name>k1</field-name>
- </cmp-field>
- </entity>
- </enterprise-beans>
-</ejb-jar>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/META-INF/ibm-ejb-jar-bnd.xmi b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/META-INF/ibm-ejb-jar-bnd.xmi
deleted file mode 100644
index 573af4e6..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/META-INF/ibm-ejb-jar-bnd.xmi
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejbbnd:EJBJarBinding xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ejbbnd="ejbbnd.xmi" xmlns:ejb="ejb.xmi" xmi:id="ejb-jar_ID_Bnd">
- <ejbJar href="META-INF/ejb-jar.xml#ejb-jar_ID"/>
- <ejbBindings xmi:id="MyCMP_Bnd" jndiName="ejb/com/ibm/test/ejb/MyCMPHome">
- <enterpriseBean xmi:type="ejb:ContainerManagedEntity" href="META-INF/ejb-jar.xml#MyCMP"/>
- </ejbBindings>
-</ejbbnd:EJBJarBinding>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/META-INF/ibm-ejb-jar-ext.xmi b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/META-INF/ibm-ejb-jar-ext.xmi
deleted file mode 100644
index 46e70a8e..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/META-INF/ibm-ejb-jar-ext.xmi
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejbext:EJBJarExtension xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ejbext="ejbext.xmi" xmlns:ejb="ejb.xmi" xmi:id="ejb-jar_ID">
- <ejbJar href="META-INF/ejb-jar.xml#ejb-jar_ID"/>
-</ejbext:EJBJarExtension>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/com/ibm/test/ejb/MyCMP.class b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/com/ibm/test/ejb/MyCMP.class
deleted file mode 100644
index 51f72770..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/com/ibm/test/ejb/MyCMP.class
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/com/ibm/test/ejb/MyCMPBean.class b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/com/ibm/test/ejb/MyCMPBean.class
deleted file mode 100644
index 78ced2f0..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/com/ibm/test/ejb/MyCMPBean.class
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/com/ibm/test/ejb/MyCMPHome.class b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/com/ibm/test/ejb/MyCMPHome.class
deleted file mode 100644
index 04925904..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/com/ibm/test/ejb/MyCMPHome.class
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/com/ibm/test/ejb/MyCMPKey.class b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/com/ibm/test/ejb/MyCMPKey.class
deleted file mode 100644
index 91b67027..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/bin/com/ibm/test/ejb/MyCMPKey.class
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/META-INF/MANIFEST.MF
deleted file mode 100644
index 59499bce..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/META-INF/ejb-jar.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/META-INF/ejb-jar.xml
deleted file mode 100644
index 46bae90a..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-<ejb-jar id="ejb-jar_ID">
- <display-name>LooseEAREjb</display-name>
- <enterprise-beans>
- <entity id="CMP1">
- <ejb-name>CMP1</ejb-name>
- <local-home>ejbs.CMP1LocalHome</local-home>
- <local>ejbs.CMP1Local</local>
- <ejb-class>ejbs.CMP1Bean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>ejbs.CMP1Key</prim-key-class>
- <reentrant>False</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>CMP1</abstract-schema-name>
- <cmp-field>
- <field-name>id</field-name>
- </cmp-field>
- </entity>
- <entity id="CMP2">
- <ejb-name>CMP2</ejb-name>
- <local-home>ejbs.CMP2LocalHome</local-home>
- <local>ejbs.CMP2Local</local>
- <ejb-class>ejbs.CMP2Bean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>ejbs.CMP2Key</prim-key-class>
- <reentrant>False</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>CMP2</abstract-schema-name>
- <cmp-field>
- <field-name>id</field-name>
- </cmp-field>
- </entity>
- </enterprise-beans>
-</ejb-jar>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/META-INF/ibm-ejb-jar-bnd.xmi b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/META-INF/ibm-ejb-jar-bnd.xmi
deleted file mode 100644
index a08df997..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/META-INF/ibm-ejb-jar-bnd.xmi
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejbbnd:EJBJarBinding xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ejb="ejb.xmi" xmlns:ejbbnd="ejbbnd.xmi" xmi:id="EJBJarBinding_1099076698481">
- <ejbJar href="META-INF/ejb-jar.xml#ejb-jar_ID"/>
- <ejbBindings xmi:id="EnterpriseBeanBinding_1099076698491" jndiName="ejb/ejbs/CMP1LocalHome">
- <enterpriseBean xmi:type="ejb:ContainerManagedEntity" href="META-INF/ejb-jar.xml#CMP1"/>
- </ejbBindings>
- <ejbBindings xmi:id="EnterpriseBeanBinding_1099076729295" jndiName="ejb/ejbs/CMP2LocalHome">
- <enterpriseBean xmi:type="ejb:ContainerManagedEntity" href="META-INF/ejb-jar.xml#CMP2"/>
- </ejbBindings>
- <defaultCMPConnectionFactory xmi:id="CMPConnectionFactoryBinding_1099076698491" jndiName="jdbc/Default" resAuth="Per_Connection_Factory"/>
-</ejbbnd:EJBJarBinding>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/META-INF/ibm-ejb-jar-ext.xmi b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/META-INF/ibm-ejb-jar-ext.xmi
deleted file mode 100644
index 46e70a8e..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/META-INF/ibm-ejb-jar-ext.xmi
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejbext:EJBJarExtension xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ejbext="ejbext.xmi" xmlns:ejb="ejb.xmi" xmi:id="ejb-jar_ID">
- <ejbJar href="META-INF/ejb-jar.xml#ejb-jar_ID"/>
-</ejbext:EJBJarExtension>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/com/ibm/test/ejb/MyCMP.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/com/ibm/test/ejb/MyCMP.java
deleted file mode 100644
index 12b8b7ce..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/com/ibm/test/ejb/MyCMP.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.ibm.test.ejb;
-/**
- * Remote interface for Enterprise Bean: MyCMP
- */
-public interface MyCMP extends javax.ejb.EJBObject {
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/com/ibm/test/ejb/MyCMPBean.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/com/ibm/test/ejb/MyCMPBean.java
deleted file mode 100644
index bcdb0444..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/com/ibm/test/ejb/MyCMPBean.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package com.ibm.test.ejb;
-/**
- * Bean implementation class for Enterprise Bean: MyCMP
- */
-public class MyCMPBean extends com.ibm.test.A implements javax.ejb.EntityBean {
- private javax.ejb.EntityContext myEntityCtx;
- /**
- * Implemetation field for persistent attribute: k1
- */
- public java.lang.String k1;
- /**
- * getEntityContext
- */
- public javax.ejb.EntityContext getEntityContext() {
- return myEntityCtx;
- }
- /**
- * setEntityContext
- */
- public void setEntityContext(javax.ejb.EntityContext ctx) {
- myEntityCtx = ctx;
- }
- /**
- * unsetEntityContext
- */
- public void unsetEntityContext() {
- myEntityCtx = null;
- }
- /**
- * ejbActivate
- */
- public void ejbActivate() {
- _initLinks();
- }
- /**
- * ejbCreate method for a CMP entity bean.
- */
- public com.ibm.test.ejb.MyCMPKey ejbCreate(java.lang.String k1) throws javax.ejb.CreateException {
- _initLinks();
- this.k1 = k1;
- return null;
- }
- /**
- * ejbLoad
- */
- public void ejbLoad() {
- _initLinks();
- }
- /**
- * ejbPassivate
- */
- public void ejbPassivate() {
- }
- /**
- * ejbPostCreate
- */
- public void ejbPostCreate(java.lang.String k1) throws javax.ejb.CreateException {
- }
- /**
- * ejbRemove
- */
- public void ejbRemove() throws javax.ejb.RemoveException {
- try {
- _removeLinks();
- } catch (java.rmi.RemoteException e) {
- throw new javax.ejb.RemoveException(e.getMessage());
- }
- }
- /**
- * ejbStore
- */
- public void ejbStore() {
- }
- /**
- * This method was generated for supporting the associations.
- */
- protected void _initLinks() {
- }
- /**
- * This method was generated for supporting the associations.
- */
- protected java.util.Vector _getLinks() {
- java.util.Vector links = new java.util.Vector();
- return links;
- }
- /**
- * This method was generated for supporting the associations.
- */
- protected void _removeLinks() throws java.rmi.RemoteException, javax.ejb.RemoveException {
- java.util.List links = _getLinks();
- for (int i = 0; i < links.size() ; i++) {
- try {
- ((com.ibm.ivj.ejb.associations.interfaces.Link) links.get(i)).remove();
- } catch (javax.ejb.FinderException e) {} //Consume Finder error since I am going away
- }
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/com/ibm/test/ejb/MyCMPHome.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/com/ibm/test/ejb/MyCMPHome.java
deleted file mode 100644
index 7c09f21b..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/com/ibm/test/ejb/MyCMPHome.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.ibm.test.ejb;
-/**
- * Home interface for Enterprise Bean: MyCMP
- */
-public interface MyCMPHome extends javax.ejb.EJBHome {
- /**
- * Creates an instance from a key for Entity Bean: MyCMP
- */
- public com.ibm.test.ejb.MyCMP create(java.lang.String k1) throws javax.ejb.CreateException, java.rmi.RemoteException;
- /**
- * Finds an instance using a key for Entity Bean: MyCMP
- */
- public com.ibm.test.ejb.MyCMP findByPrimaryKey(com.ibm.test.ejb.MyCMPKey primaryKey) throws javax.ejb.FinderException, java.rmi.RemoteException;
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/com/ibm/test/ejb/MyCMPKey.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/com/ibm/test/ejb/MyCMPKey.java
deleted file mode 100644
index 7aa6f79a..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/com/ibm/test/ejb/MyCMPKey.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.ibm.test.ejb;
-/**
- * Key class for Entity Bean: MyCMP
- */
-public class MyCMPKey extends com.ibm.test.A implements java.io.Serializable {
-
- static final long serialVersionUID = 3206093459760846163L;
- /**
- * Implemetation field for persistent attribute: k1
- */
- public java.lang.String k1;
- /**
- * Creates an empty key for Entity Bean: MyCMP
- */
- public MyCMPKey() {
- }
- /**
- * Returns true if both keys are equal.
- */
- public boolean equals(java.lang.Object otherKey) {
- if (otherKey instanceof com.ibm.test.ejb.MyCMPKey) {
- com.ibm.test.ejb.MyCMPKey o = (com.ibm.test.ejb.MyCMPKey)otherKey;
- return ((this.k1.equals(o.k1)));
- }
- return false;
- }
- /**
- * Returns the hash code for the key.
- */
- public int hashCode() {
- return (k1.hashCode());
- }
- /**
- * Creates a key for Entity Bean: MyCMP
- */
- public MyCMPKey(java.lang.String k1) {
- this.k1 = k1;
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP1Bean.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP1Bean.java
deleted file mode 100644
index 79727476..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP1Bean.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package ejbs;
-/**
- * Bean implementation class for Enterprise Bean: CMP1
- */
-public abstract class CMP1Bean implements javax.ejb.EntityBean {
- private javax.ejb.EntityContext myEntityCtx;
- /**
- * setEntityContext
- */
- public void setEntityContext(javax.ejb.EntityContext ctx) {
- myEntityCtx = ctx;
- }
- /**
- * getEntityContext
- */
- public javax.ejb.EntityContext getEntityContext() {
- return myEntityCtx;
- }
- /**
- * unsetEntityContext
- */
- public void unsetEntityContext() {
- myEntityCtx = null;
- }
- /**
- * ejbCreate
- */
- public ejbs.CMP1Key ejbCreate(java.lang.Integer id)
- throws javax.ejb.CreateException {
- setId(id);
- return null;
- }
- /**
- * ejbPostCreate
- */
- public void ejbPostCreate(java.lang.Integer id)
- throws javax.ejb.CreateException {
- }
- /**
- * ejbActivate
- */
- public void ejbActivate() {
- }
- /**
- * ejbLoad
- */
- public void ejbLoad() {
- }
- /**
- * ejbPassivate
- */
- public void ejbPassivate() {
- }
- /**
- * ejbRemove
- */
- public void ejbRemove() throws javax.ejb.RemoveException {
- }
- /**
- * ejbStore
- */
- public void ejbStore() {
- }
- /**
- * Get accessor for persistent attribute: id
- */
- public abstract java.lang.Integer getId();
- /**
- * Set accessor for persistent attribute: id
- */
- public abstract void setId(java.lang.Integer newId);
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP1Key.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP1Key.java
deleted file mode 100644
index 69240162..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP1Key.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package ejbs;
-/**
- * Key class for Entity Bean: CMP1
- */
-public class CMP1Key implements java.io.Serializable {
- static final long serialVersionUID = 3206093459760846163L;
- /**
- * Implementation field for persistent attribute: id
- */
- public java.lang.Integer id;
- /**
- * Creates an empty key for Entity Bean: CMP1
- */
- public CMP1Key() {
- }
- /**
- * Creates a key for Entity Bean: CMP1
- */
- public CMP1Key(java.lang.Integer id) {
- this.id = id;
- }
- /**
- * Returns true if both keys are equal.
- */
- public boolean equals(java.lang.Object otherKey) {
- if (otherKey instanceof ejbs.CMP1Key) {
- ejbs.CMP1Key o = (ejbs.CMP1Key) otherKey;
- return ((this.id.equals(o.id)));
- }
- return false;
- }
- /**
- * Returns the hash code for the key.
- */
- public int hashCode() {
- return (id.hashCode());
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP1Local.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP1Local.java
deleted file mode 100644
index bdfdb592..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP1Local.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package ejbs;
-/**
- * Local interface for Enterprise Bean: CMP1
- */
-public interface CMP1Local extends javax.ejb.EJBLocalObject {
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP1LocalHome.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP1LocalHome.java
deleted file mode 100644
index d856a30b..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP1LocalHome.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package ejbs;
-/**
- * Local Home interface for Enterprise Bean: CMP1
- */
-public interface CMP1LocalHome extends javax.ejb.EJBLocalHome {
- /**
- * Creates an instance from a key for Entity Bean: CMP1
- */
- public ejbs.CMP1Local create(java.lang.Integer id)
- throws javax.ejb.CreateException;
- /**
- * Finds an instance using a key for Entity Bean: CMP1
- */
- public ejbs.CMP1Local findByPrimaryKey(ejbs.CMP1Key primaryKey)
- throws javax.ejb.FinderException;
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP2Bean.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP2Bean.java
deleted file mode 100644
index b69abe14..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP2Bean.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package ejbs;
-/**
- * Bean implementation class for Enterprise Bean: CMP2
- */
-public abstract class CMP2Bean implements javax.ejb.EntityBean {
- private javax.ejb.EntityContext myEntityCtx;
- /**
- * setEntityContext
- */
- public void setEntityContext(javax.ejb.EntityContext ctx) {
- myEntityCtx = ctx;
- }
- /**
- * getEntityContext
- */
- public javax.ejb.EntityContext getEntityContext() {
- return myEntityCtx;
- }
- /**
- * unsetEntityContext
- */
- public void unsetEntityContext() {
- myEntityCtx = null;
- }
- /**
- * ejbCreate
- */
- public ejbs.CMP2Key ejbCreate(java.lang.Integer id)
- throws javax.ejb.CreateException {
- setId(id);
- return null;
- }
- /**
- * ejbPostCreate
- */
- public void ejbPostCreate(java.lang.Integer id)
- throws javax.ejb.CreateException {
- }
- /**
- * ejbActivate
- */
- public void ejbActivate() {
- }
- /**
- * ejbLoad
- */
- public void ejbLoad() {
- }
- /**
- * ejbPassivate
- */
- public void ejbPassivate() {
- }
- /**
- * ejbRemove
- */
- public void ejbRemove() throws javax.ejb.RemoveException {
- }
- /**
- * ejbStore
- */
- public void ejbStore() {
- }
- /**
- * Get accessor for persistent attribute: id
- */
- public abstract java.lang.Integer getId();
- /**
- * Set accessor for persistent attribute: id
- */
- public abstract void setId(java.lang.Integer newId);
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP2Key.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP2Key.java
deleted file mode 100644
index 38e9bc7f..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP2Key.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package ejbs;
-/**
- * Key class for Entity Bean: CMP2
- */
-public class CMP2Key implements java.io.Serializable {
- static final long serialVersionUID = 3206093459760846163L;
- /**
- * Implementation field for persistent attribute: id
- */
- public java.lang.Integer id;
- /**
- * Creates an empty key for Entity Bean: CMP2
- */
- public CMP2Key() {
- }
- /**
- * Creates a key for Entity Bean: CMP2
- */
- public CMP2Key(java.lang.Integer id) {
- this.id = id;
- }
- /**
- * Returns true if both keys are equal.
- */
- public boolean equals(java.lang.Object otherKey) {
- if (otherKey instanceof ejbs.CMP2Key) {
- ejbs.CMP2Key o = (ejbs.CMP2Key) otherKey;
- return ((this.id.equals(o.id)));
- }
- return false;
- }
- /**
- * Returns the hash code for the key.
- */
- public int hashCode() {
- return (id.hashCode());
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP2Local.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP2Local.java
deleted file mode 100644
index f6ac7303..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP2Local.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package ejbs;
-/**
- * Local interface for Enterprise Bean: CMP2
- */
-public interface CMP2Local extends javax.ejb.EJBLocalObject {
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP2LocalHome.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP2LocalHome.java
deleted file mode 100644
index 8a1bdf93..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEAREjb/ejbModule/ejbs/CMP2LocalHome.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package ejbs;
-/**
- * Local Home interface for Enterprise Bean: CMP2
- */
-public interface CMP2LocalHome extends javax.ejb.EJBLocalHome {
- /**
- * Creates an instance from a key for Entity Bean: CMP2
- */
- public ejbs.CMP2Local create(java.lang.Integer id)
- throws javax.ejb.CreateException;
- /**
- * Finds an instance using a key for Entity Bean: CMP2
- */
- public ejbs.CMP2Local findByPrimaryKey(ejbs.CMP2Key primaryKey)
- throws javax.ejb.FinderException;
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/.classpath b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/.classpath
deleted file mode 100644
index 71bb38bc..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="var" path="SERVERJDK_PLUGINDIR/jre/lib/rt.jar"
- rootpath="src" sourcepath="SERVERJDK_PLUGINDIR/src.jar"/>
- <classpathentry kind="src" path="source"/>
- <classpathentry kind="var" path="WAS_PLUGINDIR/lib/j2ee.jar"/>
- <classpathentry kind="var" path="WAS_PLUGINDIR/lib/webcontainer.jar"/>
- <classpathentry kind="var" path="WAS_PLUGINDIR/lib/ivjejb35.jar"/>
- <classpathentry kind="var" path="WAS_PLUGINDIR/lib/websphere.jar"/>
- <classpathentry kind="output" path="webApplication\WEB-INF\classes"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/.websettings b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/.websettings
deleted file mode 100644
index 0e5b9a8e..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/.websettings
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<websettings>
- <context-root>LooseEARWeb</context-root>
-</websettings>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/source/com/ibm/test/web/C.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/source/com/ibm/test/web/C.java
deleted file mode 100644
index b71b3947..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/source/com/ibm/test/web/C.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.ibm.test.web;
-public class C {
-
- /**
- * Constructor for C
- */
- public C() {
- super();
- }
-
- public static void main(String[] args) {
- }
-}
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/META-INF/MANIFEST.MF
deleted file mode 100644
index 735160aa..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: LooseEAREjb.jar
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/WEB-INF/classes/com/ibm/test/web/C.class b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/WEB-INF/classes/com/ibm/test/web/C.class
deleted file mode 100644
index 40511314..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/WEB-INF/classes/com/ibm/test/web/C.class
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/WEB-INF/ibm-web-bnd.xmi b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/WEB-INF/ibm-web-bnd.xmi
deleted file mode 100644
index d74844b9..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/WEB-INF/ibm-web-bnd.xmi
+++ /dev/null
@@ -1,3 +0,0 @@
-<webappbnd:WebAppBinding xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:webappbnd="webappbnd.xmi" xmlns:webapplication="webapplication.xmi" xmi:id="WebAppBinding_1" virtualHostName="default_host">
- <webapp href="WEB-INF/web.xml#WebApp"/>
-</webappbnd:WebAppBinding> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/WEB-INF/ibm-web-ext.xmi b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/WEB-INF/ibm-web-ext.xmi
deleted file mode 100644
index 82ec262a..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/WEB-INF/ibm-web-ext.xmi
+++ /dev/null
@@ -1,10 +0,0 @@
-<webappext:WebAppExtension xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:webappext="webappext.xmi" xmlns:webapplication="webapplication.xmi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmi:id="WebAppExtension_1"
- reloadInterval="3"
- reloadingEnabled="true"
- defaultErrorPage="error.jsp"
- additionalClassPath=""
- fileServingEnabled="true"
- directoryBrowsingEnabled="false"
- serveServletsByClassnameEnabled="true">
- <webApp href="WEB-INF/web.xml#WebApp"/>
-</webappext:WebAppExtension> \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/WEB-INF/web.xml b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/WEB-INF/web.xml
deleted file mode 100644
index 1412efd2..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseEARWeb/webApplication/WEB-INF/web.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
-<web-app id="WebApp">
- <display-name>LooseEARWeb</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/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaUtil/.classpath b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaUtil/.classpath
deleted file mode 100644
index d8b3fa0d..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaUtil/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaUtil/bin/com/ibm/test/A.class b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaUtil/bin/com/ibm/test/A.class
deleted file mode 100644
index bfcfff08..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaUtil/bin/com/ibm/test/A.class
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaUtil/src/com/ibm/test/A.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaUtil/src/com/ibm/test/A.java
deleted file mode 100644
index 07f09c15..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaUtil/src/com/ibm/test/A.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.ibm.test;
-public class A {
-
- /**
- * Constructor for A
- */
- public A() {
- super();
- }
-
- public static void main(String[] args) {
- }
-}
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaWebLib/.classpath b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaWebLib/.classpath
deleted file mode 100644
index d8b3fa0d..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaWebLib/.classpath
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaWebLib/bin/com/ibm/web/test/B.class b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaWebLib/bin/com/ibm/web/test/B.class
deleted file mode 100644
index e3ee5640..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaWebLib/bin/com/ibm/web/test/B.class
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaWebLib/src/com/ibm/web/test/B.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaWebLib/src/com/ibm/web/test/B.java
deleted file mode 100644
index ab185337..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/LooseJavaWebLib/src/com/ibm/web/test/B.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package com.ibm.web.test;
-public class B {
-
- /**
- * Constructor for B
- */
- public B() {
- super();
- }
-
- public static void main(String[] args) {
- }
-}
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/boo.jar/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/boo.jar/META-INF/MANIFEST.MF
deleted file mode 100644
index 1743e3da..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/boo.jar/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,4 +0,0 @@
-Manifest-Version: 1.0
-Class-Path: util.jar LooseEAREjb/bin foobar.jar
-
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/foobar.jar b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/foobar.jar
deleted file mode 100644
index 4a76798b..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/foobar.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/readme.txt b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/readme.txt
deleted file mode 100644
index fdd5d187..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveResources/loose_module_workspace/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-This is not a full workspace; it is just the files necessary to emulate one, for unit testing the runtime \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AllDOMTests.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AllDOMTests.java
deleted file mode 100644
index 49b7420c..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AllDOMTests.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Created on Sep 5, 2003
- *
- */
-package org.eclipse.jst.j2ee.archive.emftests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.common.internal.emf.resource.EMF2DOMRendererFactory;
-
-/**
- * @author Administrator
- */
-public class AllDOMTests extends TestSuite {
-
-// private RendererFactory defaultRendererFactory;
-
-// public AllDOMTests(String name) {
-// super(name);
-// }
-
-// public AllDOMTests(String name, RendererFactory rf) {
-// super(name);
-// this.defaultRendererFactory = rf;
-// }
-
- public static Test suite() {
- TestSuite suite = new TestSuite("All DOM Tests for com.ibm.etools.archive.emftest");
- //$JUnit-BEGIN$
- suite.addTest(AppClientEMFEditTest.suite(EMF2DOMRendererFactory.INSTANCE));
- suite.addTest(AppClientEMFTest.suite(EMF2DOMRendererFactory.INSTANCE));
- suite.addTest(EarEMFEditTest.suite(EMF2DOMRendererFactory.INSTANCE));
- suite.addTest(EarEMFTest.suite(EMF2DOMRendererFactory.INSTANCE)); //
- suite.addTest(EjbEMFEditTest.suite(EMF2DOMRendererFactory.INSTANCE));
- suite.addTest(EjbEMFTest.suite(EMF2DOMRendererFactory.INSTANCE));
- suite.addTest(RarEMFEditTest.suite(EMF2DOMRendererFactory.INSTANCE));
- suite.addTest(RarEMFTest.suite(EMF2DOMRendererFactory.INSTANCE));
- suite.addTest(WarEMFEditTest.suite(EMF2DOMRendererFactory.INSTANCE));
- suite.addTest(WarEMFTest.suite(EMF2DOMRendererFactory.INSTANCE));
- suite.addTest(WebServicesEMFTest.suite(EMF2DOMRendererFactory.INSTANCE));
- //$JUnit-END$
- return suite;
- }
-
- public static void main(java.lang.String[] args) {
- junit.textui.TestRunner.main(new String[] { AllDOMTests.class.getName() });
- }
-
-// public void testSwitchRenderer() {
-// RendererFactory.setDefaultRendererFactory(EMF2DOMRendererFactory.INSTANCE);
-//
-// }
-//
-// public void testSwitchRendererBack() {
-// RendererFactory.setDefaultRendererFactory(defaultRendererFactory);
-// }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AllSAXTests.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AllSAXTests.java
deleted file mode 100644
index a59f66fd..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AllSAXTests.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Created on Sep 5, 2003
- *
- */
-package org.eclipse.jst.j2ee.archive.emftests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.common.internal.emf.resource.EMF2SAXRendererFactory;
-
-/**
- * @author Administrator
- */
-public class AllSAXTests extends TestSuite{
-
-// private RendererFactory defaultRendererFactory;
-//
-// AllTests tests = new AllTests(); // force the class to load if this test is loaded
-//
-// public AllSAXTests(String name) {
-// super(name);
-// }
-//
-// public AllSAXTests(String name, RendererFactory rf) {
-// super(name);
-// this.defaultRendererFactory = rf;
-// }
-
- public static Test suite() {
- TestSuite suite = new TestSuite("All SAX Tests for com.ibm.etools.archive.emftest");
- //$JUnit-BEGIN$
- suite.addTest(AppClientEMFEditTest.suite(EMF2SAXRendererFactory.INSTANCE));
- suite.addTest(AppClientEMFTest.suite(EMF2SAXRendererFactory.INSTANCE));
- suite.addTest(EarEMFEditTest.suite(EMF2SAXRendererFactory.INSTANCE));
- suite.addTest(EarEMFTest.suite(EMF2SAXRendererFactory.INSTANCE)); //
- suite.addTest(EjbEMFEditTest.suite(EMF2SAXRendererFactory.INSTANCE));
- suite.addTest(EjbEMFTest.suite(EMF2SAXRendererFactory.INSTANCE));
- suite.addTest(RarEMFEditTest.suite(EMF2SAXRendererFactory.INSTANCE));
- suite.addTest(RarEMFTest.suite(EMF2SAXRendererFactory.INSTANCE));
- suite.addTest(WarEMFEditTest.suite(EMF2SAXRendererFactory.INSTANCE));
- suite.addTest(WarEMFTest.suite(EMF2SAXRendererFactory.INSTANCE));
- suite.addTest(WebServicesEMFTest.suite(EMF2SAXRendererFactory.INSTANCE));
- //$JUnit-END$
- return suite;
- }
-
- public static void main(java.lang.String[] args) {
- junit.textui.TestRunner.main(new String[] { AllSAXTests.class.getName() });
- }
-
-// public void testSwitchRenderer() {
-// RendererFactory.setDefaultRendererFactory(EMF2SAXRendererFactory.INSTANCE);
-// }
-//
-// public void testSwitchRendererBack() {
-// RendererFactory.setDefaultRendererFactory(defaultRendererFactory);
-// }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AllTests.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AllTests.java
deleted file mode 100644
index 7e3008bf..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AllTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Created on Apr 1, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.archive.emftests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class AllTests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for Common Archive and EMF Tests");
- //$JUnit-BEGIN$
-
- suite.addTest(AllDOMTests.suite());
- suite.addTest(AllSAXTests.suite());
-
- //$JUnit-END$
- return suite;
- }
-
- public static void main(java.lang.String[] args) {
- junit.textui.TestRunner.main(new String[] { AllTests.class.getName() });
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AppClientEMFEditTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AppClientEMFEditTest.java
deleted file mode 100644
index 419c3afc..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AppClientEMFEditTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.eclipse.jst.j2ee.archive.emftests;
-
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.client.ApplicationClientResource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-
-public class AppClientEMFEditTest extends GeneralEMFEditingTest {
- EARFile earFile;
- ApplicationClientFile appClientFile;
-
- public AppClientEMFEditTest(String name) {
- super(name);
- }
-
- public AppClientEMFEditTest(String name, RendererFactory factory) {
- super(name, factory);
- }
-
- public static void main(java.lang.String[] args) {
- String[] className = { "com.ibm.etools.archive.test.AppClientEMFEditTest", "-noloading" };
- TestRunner.main(className);
- }
-
- public static junit.framework.Test suite(RendererFactory factory) {
- TestSuite suite = new TestSuite(AppClientEMFEditTest.class.getName());
- suite.addTest(new AppClientEMFEditTest("testApplicationClientEdit", factory));
- return suite;
- }
-
- public void testApplicationClientEdit() throws Exception {
- getAppClient();
- assertEquals("1.3", appClientFile.getDeploymentDescriptor().getVersion());
-
- ApplicationClientResource DD = (ApplicationClientResource) appClientFile.getDeploymentDescriptorResource();
- setVersion(VERSION_1_3);
- setModuleType(APP_CLIENT);
- editRoot(DD.getRootObject());
- String curDir = AutomatedBVT.baseDirectory;
- String out = curDir + "testOutput/EMFModelCreationTests/EditAppEAR";
- appClientFile.extractTo(out, Archive.EXPAND_ALL);
- appClientFile.close();
-
- //Compare
-
- String exampleDeploymentDesURI = curDir + "EMFTests/application-client.xml";
- String curDeploymentDesURI = curDir + out + "/AppClientfoo/META-INF/application-client.xml";
- setIgnoreAtt(ignorableAttributes());
- //compareContents(curDeploymentDesURI, exampleDeploymentDesURI);
- }
-
- public void getAppClient() throws DuplicateObjectException, OpenFailureException {
- String in = AutomatedBVT.baseDirectory + "loose_module_workspace/LooseEARApp/fooAPP/";
- appClientFile = getArchiveFactory().openApplicationClientFile(in);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AppClientEMFTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AppClientEMFTest.java
deleted file mode 100644
index 5e2596e4..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/AppClientEMFTest.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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.archive.emftests;
-
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.archive.testutilities.EMFAttributeFeatureGenerator;
-import org.eclipse.jst.j2ee.client.ApplicationClientResource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-
-public class AppClientEMFTest extends GeneralEMFPopulationTest {
- EARFile earFile;
- protected ApplicationClientFile appClientFile;
- EARFile earFile14;
- ApplicationClientFile appClientFile14;
-
- public AppClientEMFTest(String name) {
- super(name);
- }
-
- public AppClientEMFTest(String name, RendererFactory factory) {
- super(name, factory);
- }
-
- public static void main(java.lang.String[] args) {
- String[] className = { "com.ibm.etools.archive.test.AppClientEMFTest", "-noloading" };
- TestRunner.main(className);
- }
-
- public static junit.framework.Test suite(RendererFactory factory) {
- TestSuite suite = new TestSuite(AppClientEMFTest.class.getName());
- //[248158] suite.addTest(new AppClientEMFTest("testApplicationClientPopulation", factory));
- suite.addTest(new AppClientEMFTest("test14ApplicationClientPopulation", factory));
- return suite;
- }
-
- public void testApplicationClientPopulation() throws Exception {
- EMFAttributeFeatureGenerator.reset();
- createEAR();
- createAppClient();
-
- ApplicationClientResource DD = (ApplicationClientResource) appClientFile.getDeploymentDescriptorResource();
- DD.setVersionID(J2EEVersionConstants.J2EE_1_3_ID);
- setVersion(VERSION_1_3);
- setModuleType(APP_CLIENT);
- populateRoot(DD.getRootObject());
-
- String out = AutomatedBVT.baseDirectory +"testOutput/TestAppEAR";
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
-
- //Compare
- String curDir = AutomatedBVT.baseDirectory;
- String exampleDeploymentDesURI = curDir + "EMFTestNoID/application-client.xml";
- String curDeploymentDesURI = curDir + "testOutput/TestAppEAR/fooAPP/META-INF/application-client.xml";
- setIgnoreAtt(ignorableAttributes());
- compareContentsIgnoreWhitespace(curDeploymentDesURI, exampleDeploymentDesURI, null);
- }
-
- public void test14ApplicationClientPopulation() throws Exception {
- EMFAttributeFeatureGenerator.reset();
- createEAR();
- createAppClient();
-
- ApplicationClientResource DD = (ApplicationClientResource) appClientFile.getDeploymentDescriptorResource();
- DD.setVersionID(J2EEVersionConstants.J2EE_1_4_ID);
- setVersion(VERSION_1_4);
- setModuleType(APP_CLIENT);
- populateRoot(DD.getRootObject());
-
- String out = AutomatedBVT.baseDirectory +"testOutput/TestAppEAR14";
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
-
- getApp14Client();
- assertEquals("1.4", appClientFile14.getDeploymentDescriptor().getVersion());
- out = AutomatedBVT.baseDirectory +"testOutput/TestAppEAR14_2";
- appClientFile14.extractTo(out, Archive.EXPAND_ALL);
- appClientFile14.close();
-
- //Compare
- String curDir = AutomatedBVT.baseDirectory;
- String curDeploymentDesURI = curDir + "testOutput/TestAppEAR14/fooAPP/META-INF/application-client.xml";
- String secondDeploymentDesURI = out + "/META-INF/application-client.xml";
- setIgnoreAtt(ignorableAttributes());
- compareContentsIgnoreWhitespace(curDeploymentDesURI, secondDeploymentDesURI, null);
- }
-
- public void createAppClient() throws DuplicateObjectException {
- appClientFile = getArchiveFactory().createApplicationClientFileInitialized("fooAPP");
- appClientFile = (ApplicationClientFile) earFile.addCopy(appClientFile);
- appClientFile.getDeploymentDescriptor().setDisplayName("fooAPP");
- assertTrue(appClientFile.getDeploymentDescriptor() != null);
- }
-
- public void createEAR() {
- String earName = "Test.ear";
- earFile = getArchiveFactory().createEARFileInitialized(earName);
- assertTrue(earFile.getDeploymentDescriptor() != null);
- }
-
-
- public void getApp14Client() throws DuplicateObjectException, OpenFailureException {
- String in = AutomatedBVT.baseDirectory + "testOutput/TestAppEAR14/fooAPP";
- appClientFile14 = getArchiveFactory().openApplicationClientFile(in);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EarEMFEditTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EarEMFEditTest.java
deleted file mode 100644
index e5f40f62..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EarEMFEditTest.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package org.eclipse.jst.j2ee.archive.emftests;
-
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.ApplicationResource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-
-public class EarEMFEditTest extends GeneralEMFEditingTest {
- EARFile earFile;
- int createdModules = 0;
-
- private int NUM_MODULES = 4;
-
- public EarEMFEditTest(String name) {
- super(name);
- }
-
- public EarEMFEditTest(String name, RendererFactory factory) {
- super(name, factory);
- }
-
- public static void main(java.lang.String[] args) {
- String[] className = { "com.ibm.etools.archive.test.EarEMFEditTest", "-noloading" };
- TestRunner.main(className);
- }
-
- public static junit.framework.Test suite(RendererFactory factory) {
- TestSuite suite = new TestSuite(EarEMFEditTest.class.getName());
- suite.addTest(new EarEMFEditTest("testEAREdit", factory));
- return suite;
- }
-
- public void testEAREdit() throws Exception {
- getEAR();
-
- assertEquals("1.2", earFile.getDeploymentDescriptor().getVersion());
-
- ApplicationResource DD = (ApplicationResource) earFile.getDeploymentDescriptorResource();
- setVersion(VERSION_1_3);
- setModuleType(APPICATION);
- editRoot(DD.getRootObject());
- String curDir = AutomatedBVT.baseDirectory;
-
- String out = curDir +"testOutput/EditOutput/EMFModelCreationTests/EditEAR";
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
-
- //Compare work in progress
-
- String exampleDeploymentDesURI = curDir + "EMFTests/application.xml";
- String curDeploymentDesURI = curDir + out + "/META-INF/application.xml";
- //compareContents(curDeploymentDesURI, exampleDeploymentDesURI);
- }
-
- public void getEAR() throws OpenFailureException {
- String in = AutomatedBVT.baseDirectory + "loose_module_workspace/LooseEAR/";
- earFile = getArchiveFactory().openEARFile(in);
- assertTrue(earFile.getDeploymentDescriptor() != null);
- }
-
- public EObject createInstance(EClass eClassifier) {
- if (eClassifier.getName().equals("Module")) {
- createdModules++;
- switch (createdModules) {
- case (1) :
- return createJavaModuleInstance(eClassifier);
- case (2) :
- return createEJBModuleInstance(eClassifier);
- case (3) :
- return createWebModuleInstance(eClassifier);
- case (4) :
- return createConnetorModuleInstance(eClassifier);
- default :
- return createJavaModuleInstance(eClassifier);
- }
- }
- return super.createInstance(eClassifier);
- }
-
- private EObject createConnetorModuleInstance(EClass eClassifier) {
- return ((ApplicationFactory) eClassifier.getEPackage().getEFactoryInstance()).createConnectorModule();
- }
-
- private EObject createWebModuleInstance(EClass eClassifier) {
- return ((ApplicationFactory) eClassifier.getEPackage().getEFactoryInstance()).createWebModule();
- }
-
- private EObject createEJBModuleInstance(EClass eClassifier) {
- return ((ApplicationFactory) eClassifier.getEPackage().getEFactoryInstance()).createEjbModule();
- }
-
- private EObject createJavaModuleInstance(EClass eClassifier) {
- return ((ApplicationFactory) eClassifier.getEPackage().getEFactoryInstance()).createJavaClientModule();
- }
-
- public Object getSharedObjectByType(EObject owner, EReference ref) {
- if (ref.getName().equals("module"))
- return createJavaModuleInstance((EClass) ref.getEType());
- return super.getSharedObjectByType(owner, ref);
- }
-
- public int getDepthForAttribute(EReference ref) {
- if (ref.getName().equals("modules"))
- return NUM_MODULES;
- return super.getDepthForAttribute(ref);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EarEMFTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EarEMFTest.java
deleted file mode 100644
index 89233fac..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EarEMFTest.java
+++ /dev/null
@@ -1,170 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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.archive.emftests;
-
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.ApplicationResource;
-import org.eclipse.jst.j2ee.archive.testutilities.EMFAttributeFeatureGenerator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-
-public class EarEMFTest extends GeneralEMFPopulationTest {
- protected EARFile earFile;
- int createdModules = 0;
-
- private int NUM_MODULES = 5;
-
- public EarEMFTest(String name) {
- super(name);
- }
-
- public EarEMFTest(String name, RendererFactory factory) {
- super(name, factory);
- }
-
- public static void main(java.lang.String[] args) {
- String[] className = { "com.ibm.etools.archive.test.EarEMFTest", "-noloading" };
- TestRunner.main(className);
- }
-
- public static junit.framework.Test suite(RendererFactory factory) {
- TestSuite suite = new TestSuite(EarEMFTest.class.getName());
- //[248158] suite.addTest(new EarEMFTest("testEARPopulation", factory));
- suite.addTest(new EarEMFTest("test14EARPopulation", factory));
- return suite;
- }
-
- public void testEARPopulation() throws Exception {
- EMFAttributeFeatureGenerator.reset();
- createEAR();
- //createAppClient();
-
- ApplicationResource DD = (ApplicationResource) earFile.getDeploymentDescriptorResource();
- //TODO: individual test for each version
- DD.setVersionID(J2EEVersionConstants.J2EE_1_3_ID);
- setVersion(VERSION_1_3);
- setModuleType(APPLICATION);
- populateRoot(DD.getRootObject());
-
- String out = AutomatedBVT.baseDirectory +"testOutput/TestEAR";
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
-
- //Compare work in progress
- String curDir = AutomatedBVT.baseDirectory;
- String exampleDeploymentDesURI = curDir + "EMFTestNoID/application.xml";
- String curDeploymentDesURI = curDir + "testOutput/TestEAR/META-INF/application.xml";
- setIgnoreAtt(ignorableAttributes());
- compareContentsIgnoreWhitespace(curDeploymentDesURI, exampleDeploymentDesURI, null);
- }
-
- public void test14EARPopulation() throws Exception {
- EMFAttributeFeatureGenerator.reset();
- createEAR();
- //createAppClient();
-
- ApplicationResource DD = (ApplicationResource) earFile.getDeploymentDescriptorResource();
- //TODO: individual test for each version
- DD.setVersionID(J2EEVersionConstants.J2EE_1_4_ID);
- setVersion(VERSION_1_4);
- setModuleType(APPLICATION);
- populateRoot(DD.getRootObject());
-
- String out = AutomatedBVT.baseDirectory +"testOutput/TestEAR14";
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
-
- getEAR();
- assertEquals("1.4", earFile.getDeploymentDescriptor().getVersion());
- out = AutomatedBVT.baseDirectory +"testOutput/TestEAR14_2";
- earFile.extractTo(out, Archive.EXPAND_ALL);
-
- earFile.close();
-
- //Compare work in progress
- String curDir = AutomatedBVT.baseDirectory;
- String exampleDeploymentDesURI = out + "/META-INF/application.xml";
- String curDeploymentDesURI = curDir + "testOutput/TestEAR14/META-INF/application.xml";
- setIgnoreAtt(ignorableAttributes());
- compareContentsIgnoreWhitespace(curDeploymentDesURI, exampleDeploymentDesURI, null);
- }
- public void createEAR() {
- String earName = "Test.ear";
- earFile = getArchiveFactory().createEARFileInitialized(earName);
- assertTrue(earFile.getDeploymentDescriptor() != null);
- }
-
- public void getEAR() throws OpenFailureException {
- String in =AutomatedBVT.baseDirectory +"testOutput/TestEAR14";
- earFile = getArchiveFactory().openEARFile(in);
- assertTrue(earFile.getDeploymentDescriptor() != null);
- }
-
- public EObject createInstance(EReference ref, EObject eObject) {
- EClass eClassifier = (EClass)ref.getEType();
- if (eClassifier.getName().equals("Module")) {
- createdModules++;
- switch (createdModules) {
- case (1) :
- return createJavaModuleInstance(eClassifier);
- case (2) :
- return createEJBModuleInstance(eClassifier);
- case (3) :
- return createWebModuleInstance(eClassifier);
- case (4) :
- return createConnetorModuleInstance(eClassifier);
- default :
- return createJavaModuleInstance(eClassifier);
- }
- }
- return super.createInstance(ref,eObject);
- }
-
- private EObject createConnetorModuleInstance(EClass eClassifier) {
- return ((ApplicationFactory) eClassifier.getEPackage().getEFactoryInstance()).createConnectorModule();
- }
-
- private EObject createWebModuleInstance(EClass eClassifier) {
- return ((ApplicationFactory) eClassifier.getEPackage().getEFactoryInstance()).createWebModule();
- }
-
- private EObject createEJBModuleInstance(EClass eClassifier) {
- return ((ApplicationFactory) eClassifier.getEPackage().getEFactoryInstance()).createEjbModule();
- }
-
- private EObject createJavaModuleInstance(EClass eClassifier) {
- return ((ApplicationFactory) eClassifier.getEPackage().getEFactoryInstance()).createJavaClientModule();
- }
-
- public Object getSharedObjectByType(EObject owner, EReference ref) {
- if (ref.getName().equals("module"))
- return createJavaModuleInstance((EClass) ref.getEType());
- return super.getSharedObjectByType(owner, ref);
- }
-
- public int getDepthForAttribute(EStructuralFeature ref) {
- if (ref.getName().equals("modules"))
- return NUM_MODULES;
- return super.getDepthForAttribute(ref);
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EjbEMFEditTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EjbEMFEditTest.java
deleted file mode 100644
index a00cf1b0..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EjbEMFEditTest.java
+++ /dev/null
@@ -1,321 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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.archive.emftests;
-
-import java.util.List;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.jst.j2ee.archive.testutilities.EMFAttributeFeatureGenerator;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.ejb.internal.impl.MethodPermissionImpl;
-import org.eclipse.jst.j2ee.ejb.internal.impl.QueryMethodImpl;
-import org.eclipse.wst.common.internal.emf.resource.EMF2SAXRendererFactory;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-
-public class EjbEMFEditTest extends GeneralEMFEditingTest {
-
- protected static final EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
- EARFile earFile;
- EJBJarFile ejbFile;
- EObject mesBean, entityBean;
- SecurityIdentity secID;
- RoleSource roleSource;
- int NUM_BEANS = 10;
- final int NUM_RELATION_ROLES = 2;
- int createdBeans = 0;
- int createdSecRoles = 0;
- protected int createdSecurityIdentities = 0;
- boolean mpFlag = false;
-
- public EjbEMFEditTest(String name) {
- super(name);
- }
-
- public EjbEMFEditTest(String name, RendererFactory factory) {
- super(name, factory);
- }
-
- public static void main(java.lang.String[] args) {
- junit.textui.TestRunner.main(new String[] { EjbEMFEditTest.class.getName() });
- }
-
- public static junit.framework.Test suite(RendererFactory factory) {
- TestSuite suite = new TestSuite(EjbEMFEditTest.class.getName());
- suite.addTest(new EjbEMFEditTest("testEJBJarEdit",factory));
- suite.addTest(new EjbEMFEditTest("testWCCMJar",factory));
- return suite;
- }
-
- public void testEJBJarEdit() throws Exception {
- getEJB();
-
- assertEquals("2.0", ejbFile.getDeploymentDescriptor().getVersion());
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
- setVersion(VERSION_1_3);
- setModuleType(EJB);
- editRoot(DD.getRootObject());
- String curDir = AutomatedBVT.baseDirectory;
- String out = curDir + "testOutput/EMFModelCreationTests/EditEjbEAR";
- ejbFile.extractTo(out, Archive.EXPAND_ALL);
- ejbFile.close();
-
-
- //Compare work in progress
-
- String exampleDeploymentDesURI = null;
- //System.out.println(RendererFactory.getDefaultRendererFactory());
- if (RendererFactory.getDefaultRendererFactory() instanceof EMF2SAXRendererFactory){
- exampleDeploymentDesURI = curDir + "EMFTests/ejb-jar2-0sax.xml";
- }
- else
- exampleDeploymentDesURI = curDir + "EMFTests/ejb-jar2-0.xml";
- //System.out.println("File: " + exampleDeploymentDesURI);
- String curDeploymentDesURI = out + "/META-INF/ejb-jar.xml";
- //TODO Remove after webservices xsd is restored
- //compareContentsIgnoreWhitespace(curDeploymentDesURI, exampleDeploymentDesURI, "");
- }
-
- public void testWCCMJar() throws Exception {
- String in = AutomatedBVT.baseDirectory + "../testData/ejb";
- ArchiveOptions options = new ArchiveOptions();
- options.setIsReadOnly(true);
- ejbFile = getArchiveFactory().openEJBJarFile(options, in);
-
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
- DD.getRootObject();
-
- String out = AutomatedBVT.baseDirectory + "../testData/testOutput";
- ejbFile.extractTo(out, Archive.EXPAND_ALL);
- ejbFile.close();
-
- /*DD.save(System.out, null); */
-
- //Compare work in progress
- String curDir = AutomatedBVT.baseDirectory;
- String exampleDeploymentDesURI = in + "/META-INF/ejb-jar.xml";
- String curDeploymentDesURI = out + "/META-INF/ejb-jar.xml";
-
- compareContents(curDeploymentDesURI, exampleDeploymentDesURI);
- }
-
- /**
- * Requires j2ee.core.ws.ext to be on the classpath
- * @throws DuplicateObjectException
- * @throws OpenFailureException
- */
-/* public void testWCCMProvidedCase() throws Exception {
-
- String in = AutomatedBVT.baseDirectory + "../wccm/ear";
- EARFile earFile = null;
- try {
-
- CommonarchiveFactory factory =
- CommonarchiveFactoryImpl.getActiveFactory();
- ArchiveOptions opt = new ArchiveOptions();
- opt.setIsReadOnly (true);
- opt.setUseJavaReflection (false);
-
- earFile = factory.openEARFile (opt, in);
- System.out.println ("uri: " + earFile.getURI());
- System.out.println ("origuri: " + earFile.getOriginalURI());
-
- Application application = earFile.getDeploymentDescriptor();
- ApplicationBinding appBindings = earFile.getBindings();
- ApplicationExtension appExtensions = earFile.getExtensions();
-
-
- Iterator rs = earFile.getLoadedMofResources().iterator();
- while (rs.hasNext())
- {
- Resource r = (Resource) rs.next();
-
- FileOutputStream fo = new FileOutputStream (r.getURI().toString().replace('/', '-'));
- r.save (fo, new HashMap());
- fo.flush();
- fo.close();
- }
-
- System.out.println("==========<Done App DD>==========");
- System.out.println ("");
-
-
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- finally {
- if(earFile != null)
- earFile.close();
- }
-
- }*/
-
- public void getEJB() throws DuplicateObjectException, OpenFailureException {
- String in = AutomatedBVT.baseDirectory + "loose_module_workspace/LooseEAREjb/ejbModule/";
- ejbFile = getArchiveFactory().openEJBJarFile(in);
- assertTrue(ejbFile.getDeploymentDescriptor() != null);
- }
-
- public EObject createInstance(EClass eClassifier) {
- if (eClassifier.getName().equals("EnterpriseBean")) {
- createdBeans++;
- switch (createdBeans) {
- case (3) :
- return createContainerManagedEntityInstance(eClassifier);
- case (7) :
- return createMessageBeanInstance(eClassifier);
- case (4) :
- case (8) :
- return createSessionBeanInstance(eClassifier);
- default :
- return createEntityBeanInstance(eClassifier);
- }
- } else if (eClassifier.getName().equals("SecurityIdentity"))
- return createSecurityIdentitiyInstance(eClassifier);
- else if (eClassifier.getName().equals("RoleSource"))
- return createRoleSourceInstance(eClassifier);
- else if (eClassifier == EcorePackage.eINSTANCE.getEAttribute())
- return getEjbFactory().createCMPAttribute();
- return super.createInstance(eClassifier);
- }
-
- private EObject createSecurityIdentitiyInstance(EClass eClassifier) {
- /* Alternate types */
- createdSecRoles++;
- if ((createdSecRoles & 1) == 0)
- return CommonFactory.eINSTANCE.createUseCallerIdentity();
- else
- return CommonFactory.eINSTANCE.createRunAsSpecifiedIdentity();
- }
-
- private EObject createRoleSourceInstance(EClass eClassifier) {
- return ((EjbFactory) eClassifier.getEPackage().getEFactoryInstance()).createRoleSource();
- }
-
- private EObject createMessageBeanInstance(EClass eClassifier) {
- return ((EjbFactory) eClassifier.getEPackage().getEFactoryInstance()).createMessageDriven();
- }
-
- private EObject createSessionBeanInstance(EClass eClassifier) {
- return ((EjbFactory) eClassifier.getEPackage().getEFactoryInstance()).createSession();
- }
-
- private EObject createEntityBeanInstance(EClass eClassifier) {
- return ((EjbFactory) eClassifier.getEPackage().getEFactoryInstance()).createEntity();
- }
-
- private EObject createContainerManagedEntityInstance(EClass eClassifier) {
- return EjbFactory.eINSTANCE.createContainerManagedEntity();
- }
-
- /**
- * @see org.eclipse.jst.j2ee.archive.test.GeneralEMFTest#getDepthForAttribute(EReference)
- */
- public int getDepthForAttribute(EReference ref) {
- if (ref.getName().equals("enterpriseBeans"))
- return NUM_BEANS;
- else if (ref.getName().equals("entityBeans"))
- return NUM_BEANS;
- else if (ref.getName().equals("relationshipRoles"))
- return NUM_RELATION_ROLES;
- return super.getDepthForAttribute(ref);
- }
-
- /* (non-Javadoc)
- * @see com.ibm.etools.archive.emftest.GeneralEMFPopulationTest#populateFeatures(org.eclipse.emf.ecore.EObject)
- */
- public void populateFeatures(EObject eObject) {
- if (eObject.eClass() == EJB_PKG.getCMPAttribute()) {
- ((CMPAttribute) eObject).setName((String) EMFAttributeFeatureGenerator.createAttribute(EcorePackage.eINSTANCE.getENamedElement_Name(),eObject));
- ((CMPAttribute) eObject).setEType((EClassifier) createJavaClassProxy(null));
- } else
- super.editFeatures(eObject);
- }
-
- /* (non-Javadoc)
- * @see com.ibm.etools.archive.emftest.GeneralEMFPopulationTest#populateAttributes(org.eclipse.emf.ecore.EObject)
- */
- protected void populateAttributes(EObject eObject) {
- if (eObject instanceof QueryMethodImpl) {
- List attributes = eObject.eClass().getEAllAttributes();
- for (int i = 0; i < attributes.size(); i++) {
- EAttribute att = (EAttribute) attributes.get(i);
- Object value = createAttributeValue(att, eObject);
- if (att.getName().equals("parms") && value == null){
- value = createAttributeValue(att, eObject);
- }
- if (att.isChangeable())
- eObject.eSet(att, value);
- }
- } else if (eObject instanceof MethodPermissionImpl) {
- List attributes = eObject.eClass().getEAllAttributes();
- for (int i = 0; i < attributes.size(); i++) {
- EAttribute att = (EAttribute) attributes.get(i);
- if(att.getName().equals("unchecked") && mpFlag){
- continue;
- }
-
- Object value = createAttributeValue(att, eObject);
- if (att.isChangeable())
- eObject.eSet(att, value);
- }
- mpFlag = !mpFlag;
- } else
- super.editAttributes(eObject);
- }
-
-
- protected void populateSharedReference(EObject eObject, EReference ref) {
- if(eObject instanceof MethodPermissionImpl && ref.getName().equals("roles")){
- mpFlag = !mpFlag;
- //if method permission unchecked ignore roles
- if(!mpFlag){
- return;
- }
- }
- super.populateSharedReference(eObject, ref);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- earFile = null;
- ejbFile = null;
- mesBean = null;
- entityBean = null;
- secID = null;
- roleSource = null;
-
- super.tearDown();
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EjbEMFTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EjbEMFTest.java
deleted file mode 100644
index c153b41d..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/EjbEMFTest.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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.archive.emftests;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.jem.java.internal.impl.JavaClassImpl;
-import org.eclipse.jst.j2ee.archive.testutilities.EMFAttributeFeatureGenerator;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.ejb.internal.impl.EJBRelationshipRoleImpl;
-import org.eclipse.jst.j2ee.ejb.internal.impl.MethodPermissionImpl;
-import org.eclipse.jst.j2ee.ejb.internal.impl.QueryMethodImpl;
-import org.eclipse.jst.j2ee.internal.J2EEInit;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-
-public class EjbEMFTest extends GeneralEMFPopulationTest {
- static {
- //Temporary workaround to keep packages from being registered twice
- J2EEInit.init();
- }
- protected static final EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
- EARFile earFile;
- protected EJBJarFile ejbFile;
- EObject mesBean, entityBean;
- SecurityIdentity secID;
- RoleSource roleSource;
- int NUM_BEANS = 10;
- final int NUM_RELATION_ROLES = 2;
- int createdBeans = 0;
- int createdSecRoles = 0;
- protected int createdSecurityIdentities = 0;
- boolean mpFlag = false;
- boolean firstReturnTypeMapping = true;
-
- public EjbEMFTest(String name) {
- super(name);
- }
-
- public EjbEMFTest(String name, RendererFactory factory) {
- super(name, factory);
- }
-
- public static void main(java.lang.String[] args) {
- junit.textui.TestRunner.main(new String[] { EjbEMFTest.class.getName()});
- }
-
- public static junit.framework.Test suite(RendererFactory factory) {
- TestSuite suite = new TestSuite(EjbEMFTest.class.getName());
- //[248158] suite.addTest(new EjbEMFTest("testEJBJarPopulation",factory));
- suite.addTest(new EjbEMFTest("test14EJBJarPopulation",factory));
- return suite;
- }
-
- public void testEJBJarPopulation() throws Exception {
- EMFAttributeFeatureGenerator.reset();
- createEAR();
- createEJB();
-
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
- //TODO: individual test for each version
- DD.setVersionID(J2EEVersionConstants.J2EE_1_3_ID);
- setVersion(VERSION_1_3);
- setModuleType(EJB);
- populateRoot(DD.getRootObject());
-
- String out = AutomatedBVT.baseDirectory +"testOutput/TestEJBEAR";
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
- setEquivalentLines(getEquivalentLinesMap());
- //Compare work in progress
- String curDir = AutomatedBVT.baseDirectory;
- String exampleDeploymentDesURI = curDir + "/EMFTestNoID/ejb-jar.xml";
- String curDeploymentDesURI = curDir + "testOutput/TestEJBEAR/fooEJB/META-INF/ejb-jar.xml";
- setIgnoreAtt(ignorableAttributes());
- compareContentsIgnoreWhitespace(curDeploymentDesURI, exampleDeploymentDesURI, null);
-// DD.unload();
-// DD.load(new HashMap());
- }
-
- public void test14EJBJarPopulation() throws Exception {
- EMFAttributeFeatureGenerator.reset();
- createEAR();
- createEJB();
-
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
- //TODO: individual test for each version
- DD.setVersionID(J2EEVersionConstants.J2EE_1_4_ID);
- setVersion(VERSION_1_4);
- setModuleType(EJB);
- //setGeneralDepth(2);
- populateRoot(DD.getRootObject());
- String out = AutomatedBVT.baseDirectory +"testOutput/TestEJBEAR14";
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
-
- setEquivalentLines(getEquivalentLinesMap());
- getEJB();
- assertEquals("2.1", ejbFile.getDeploymentDescriptor().getVersion());
- out = AutomatedBVT.baseDirectory +"testOutput/TestEJBEAR14_2";
- ejbFile.extractTo(out, Archive.EXPAND_ALL);
- ejbFile.close();
-
- //Compare work in progress
- String curDir = AutomatedBVT.baseDirectory;
- String exampleDeploymentDesURI = out + "/META-INF/ejb-jar.xml";
- String curDeploymentDesURI = curDir + "testOutput/TestEJBEAR14/fooEJB/META-INF/ejb-jar.xml";
- setIgnoreAtt(ignorableAttributes());
- compareContentsIgnoreWhitespace(curDeploymentDesURI, exampleDeploymentDesURI, null);
- }
-
- /**
- * @return
- */
- private Map getEquivalentLinesMap() {
- Map lines = new HashMap();
- lines.put("<cascade-delete></cascade-delete>", "<cascade-delete/>");
- lines.put("<method-params></method-params>","<method-params/>");
- lines.put("<unchecked></unchecked>","<unchecked/>");
- lines.put("<use-caller-identity></use-caller-identity>","<use-caller-identity/>");
- return lines;
- }
-
- public void getEJB() throws DuplicateObjectException, OpenFailureException {
- String in = AutomatedBVT.baseDirectory +"testOutput/TestEJBEAR14/fooEJB";
- ejbFile = getArchiveFactory().openEJBJarFile(in);
- assertTrue(ejbFile.getDeploymentDescriptor() != null);
- }
-
- public void createEJB() throws DuplicateObjectException {
- ejbFile = getArchiveFactory().createEJBJarFileInitialized("fooEJB");
- ejbFile = (EJBJarFile) earFile.addCopy(ejbFile);
- ejbFile.getDeploymentDescriptor().setDisplayName("fooEJB");
- assertTrue(ejbFile.getDeploymentDescriptor() != null);
- }
-
- public void createEAR() {
- String earName = "Test.ear";
- earFile = getArchiveFactory().createEARFileInitialized(earName);
- assertTrue(earFile.getDeploymentDescriptor() != null);
- }
-
- public EObject createInstance(EReference ref, EObject eObject) {
- EClass eClassifier = (EClass)ref.getEType();
- if (eClassifier.getName().equals("EnterpriseBean")) {
- createdBeans++;
- switch (createdBeans) {
- case (3) :
- return createContainerManagedEntityInstance(eClassifier);
- case (7) :
- return createMessageBeanInstance(eClassifier);
- case (4) :
- case (8) :
- return createSessionBeanInstance(eClassifier);
- default :
- return createEntityBeanInstance(eClassifier);
- }
- } else if (eClassifier.getName().equals("SecurityIdentity"))
- return createSecurityIdentitiyInstance(eClassifier);
- else if (eClassifier.getName().equals("RoleSource"))
- return createRoleSourceInstance(eClassifier);
- else if (eClassifier == EcorePackage.eINSTANCE.getEAttribute())
- return getEjbFactory().createCMPAttribute();
- return super.createInstance(ref,eObject);
- }
-
- private EObject createSecurityIdentitiyInstance(EClass eClassifier) {
- /* Alternate types */
- createdSecRoles++;
- if ((createdSecRoles & 1) == 0)
- return CommonFactory.eINSTANCE.createUseCallerIdentity();
- else
- return CommonFactory.eINSTANCE.createRunAsSpecifiedIdentity();
- }
-
- private EObject createRoleSourceInstance(EClass eClassifier) {
- return ((EjbFactory) eClassifier.getEPackage().getEFactoryInstance()).createRoleSource();
- }
-
- private EObject createMessageBeanInstance(EClass eClassifier) {
- return ((EjbFactory) eClassifier.getEPackage().getEFactoryInstance()).createMessageDriven();
- }
-
- private EObject createSessionBeanInstance(EClass eClassifier) {
- return ((EjbFactory) eClassifier.getEPackage().getEFactoryInstance()).createSession();
- }
-
- private EObject createEntityBeanInstance(EClass eClassifier) {
- return ((EjbFactory) eClassifier.getEPackage().getEFactoryInstance()).createEntity();
- }
-
- private EObject createContainerManagedEntityInstance(EClass eClassifier) {
- return EjbFactory.eINSTANCE.createContainerManagedEntity();
- }
-
- /**
- * @see org.eclipse.jst.j2ee.archive.test.GeneralEMFTest#getDepthForAttribute(EReference)
- */
- public int getDepthForAttribute(EStructuralFeature ref) {
- if (ref.getName().equals("enterpriseBeans"))
- return NUM_BEANS;
- else if (ref.getName().equals("entityBeans"))
- return NUM_BEANS;
- else if (ref.getName().equals("relationshipRoles"))
- return NUM_RELATION_ROLES;
- return super.getDepthForAttribute(ref);
- }
-
- /* (non-Javadoc)
- * @see com.ibm.etools.archive.emftest.GeneralEMFPopulationTest#populateFeatures(org.eclipse.emf.ecore.EObject)
- */
- public void populateFeatures(EObject eObject) {
- if (eObject.eClass() == EJB_PKG.getCMPAttribute()) {
- ((CMPAttribute) eObject).setName((String) EMFAttributeFeatureGenerator.createAttribute(EcorePackage.eINSTANCE.getENamedElement_Name(),eObject));
- ((CMPAttribute) eObject).setEType((EClassifier) EMFAttributeFeatureGenerator.createJavaClassProxy(EcorePackage.eINSTANCE.getETypedElement_EType(),eObject));
- } else if (eObject.eClass() == EJB_PKG.getCMRField()) {
- ((CMRField) eObject).setName((String) EMFAttributeFeatureGenerator.createAttribute(EcorePackage.eINSTANCE.getENamedElement_Name(),eObject));
- populateSharedReference(eObject, EJB_PKG.getCMRField_CollectionType());
- populateSharedReference(eObject, EJB_PKG.getCMRField_Role());
- } else
- super.populateFeatures(eObject);
- }
-
- /* (non-Javadoc)
- * @see com.ibm.etools.archive.emftest.GeneralEMFPopulationTest#populateAttributes(org.eclipse.emf.ecore.EObject)
- */
- protected void populateAttributes(EObject eObject) {
- if (eObject instanceof QueryMethodImpl) {
- List attributes = eObject.eClass().getEAllAttributes();
- for (int i = 0; i < attributes.size(); i++) {
- EAttribute att = (EAttribute) attributes.get(i);
- if (att.equals(EJB_PKG.getMethodElement_Description()) || att.equals(EJB_PKG.getMethodElement_EnterpriseBean()) || att.equals(EJB_PKG.getMethodElement_Type()) )
- continue;
- Object value = createAttributeValue(att, eObject);
- if (att.getName().equals("parms") && value == null){
- value = createAttributeValue(att, eObject);
- }
- if (att.isChangeable())
- eObject.eSet(att, value);
- }
- } else if (eObject instanceof MethodPermissionImpl) {
- List attributes = eObject.eClass().getEAllAttributes();
- for (int i = 0; i < attributes.size(); i++) {
- EAttribute att = (EAttribute) attributes.get(i);
- if(att.getName().equals("unchecked") && mpFlag){
- continue;
- }
-
- Object value = createAttributeValue(att, eObject);
- if (att.isChangeable())
- eObject.eSet(att, value);
- }
- mpFlag = !mpFlag;
- } else if (eObject instanceof EJBRelationshipRoleImpl) {
- List attributes = eObject.eClass().getEAllAttributes();
- EAttribute lastAttr = null;
- Object value = null;
- for (int i = 0; i < attributes.size(); i++) {
- EAttribute att = (EAttribute) attributes.get(i);
- if (att.getName().equals("cascadeDelete") && (lastAttr.getName().equals("multiplicity") && !value.toString().equals("Many")))
- continue;
-
- value = createAttributeValue(att, eObject);
- if (att.isChangeable())
- eObject.eSet(att, value);
- lastAttr = att;
- }
- mpFlag = !mpFlag;
- } else
- super.populateAttributes(eObject);
- }
-
-
- protected void populateSharedReference(EObject eObject, EReference ref) {
- if (ref == EJB_PKG.getCMRField_CollectionType()) {
- setReferenceValue(eObject, ref, JavaClassImpl.createClassRef("java.util.Collection"));
- return;
- } else if(eObject instanceof MethodPermission && ref.getName().equals("roles")){
- //if method permission unchecked ignore roles
- if(mpFlag){
- return;
- }
- mpFlag = !mpFlag;
- }
- super.populateSharedReference(eObject, ref);
- }
-
- /* (non-Javadoc)
- * @see com.ibm.etools.archive.emftest.GeneralEMFPopulationTest#createAttributeValue(org.eclipse.emf.ecore.EAttribute, org.eclipse.emf.ecore.EObject)
- */
- protected Object createAttributeValue(EAttribute att, EObject eObject) {
- //eat the first return type mapping because the order was changed.
- if (firstReturnTypeMapping && att.equals(EJB_PKG.getQuery_ReturnTypeMapping())){
- super.createAttributeValue(att,eObject);
- firstReturnTypeMapping = false;
- } else if (att.equals(EJB_PKG.getEnterpriseBean_Name()))
- return EMFAttributeFeatureGenerator.createAttribute(att,EJB_PKG.getEntity());
- return super.createAttributeValue(att, eObject);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- super.tearDown();
- earFile = null;
- ejbFile = null;
- mesBean = null;
- entityBean = null;
- secID = null;
- roleSource = null;
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/GeneralEMFEditingTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/GeneralEMFEditingTest.java
deleted file mode 100644
index 36a22dbf..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/GeneralEMFEditingTest.java
+++ /dev/null
@@ -1,479 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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.archive.emftests;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jem.java.internal.impl.JavaClassImpl;
-import org.eclipse.jst.j2ee.archive.testutilities.EMFAttributeFeatureGenerator;
-import org.eclipse.jst.j2ee.archive.testutilities.J2EEVersionCheck;
-import org.eclipse.jst.j2ee.archive.testutilities.TestUtilities;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-
-public class GeneralEMFEditingTest extends GeneralEMFTest {
- //inner class to handle deffered shared references
- protected class DeferredSharedReferenceAction {
- EObject owner;
- EReference ref;
-
- public DeferredSharedReferenceAction(EObject owner, EReference ref) {
- this.owner = owner;
- this.ref = ref;
- }
-
- public void performAction() {
- Object value = getSharedObjectByType(owner, ref);
- setReferenceValue(owner, ref, value);
- }
- }
-
- protected Map equivalentLines;
- public List deferedReferences;
- public static int genDepth = 5;
- public static Object sharedValue;
- public int classIndex = 0;
- public static String avClass[];
- public static HashSet ignoreAtt;
-
- public int version;
- public int moduleType;
- //static versions
- public static final int VERSION_1_2 = 0;
- public static final int VERSION_1_3 = 1;
- public static final int VERSION_1_4 = 2;
-
- public static final int APPICATION = 0;
- public static final int APP_CLIENT = 1;
- public static final int CONNECTOR = 2;
- public static final int EJB = 3;
- public static final int WEB = 4;
-
- public GeneralEMFEditingTest(String name) {
- super(name);
- }
-
- public GeneralEMFEditingTest(String name, RendererFactory factory) {
- super(name, factory);
- }
-
- public void editRoot(EObject eObject) {
- editFeatures(eObject);
- //if (deferedReferences != null) {
- // for (int i = 0; i < deferedReferences.size(); i++) {
- // ((DeferredSharedReferenceAction) deferedReferences.get(i)).performAction();
- // }
- //}
- }
-
- public void editFeatures(EObject eObject) {
- if (eObject == null)
- return;
- else {
- editAttributes(eObject);
- editReferences(eObject);
- }
- }
-
- protected void editReferences(EObject eObject) {
- List references = eObject.eClass().getEAllReferences();
- for (int i = 0; i < references.size(); i++) {
- EReference ref = (EReference) references.get(i);
- if (!ref.isMany() && eObject.eGet(ref) != null)
- continue;
- if (ref.isContainment())
- populateContainmentReference(eObject, ref);
- else
- populateSharedReference(eObject, ref);
- }
- }
-
- protected void populateSharedReference(EObject eObject, EReference ref) {
- if (ref.getEType() == JavaRefPackage.eINSTANCE.getJavaClass())
- setReferenceValue(eObject, ref, createJavaClassProxy((EClass) ref.getEType()));
- else {
- EPackage pkg = ref.getEType().getEPackage();
- if (pkg == eObject.eClass().getEPackage() || pkg == CommonPackage.eINSTANCE) {
- if (eObject.eClass().getName().equals("EAnnotation") || eObject.eClass().getName().equals("EAnnotationImpl") || !J2EEVersionCheck.checkReferenceVersion(ref, version, moduleType))
- return;
- if (deferedReferences == null)
- deferedReferences = new ArrayList();
- deferedReferences.add(new DeferredSharedReferenceAction(eObject, ref));
- }
- }
- }
-
- protected void populateContainmentReference(EObject eObject, EReference ref) {
- for (int i = 0; i < getDepthForAttribute(ref); i++) {
- EObject instance = createInstance((EClass) ref.getEType());
- if (instance == null)
- return;
- if (!J2EEVersionCheck.checkReferenceVersion(ref, version, moduleType))
- continue;
- setReferenceValue(eObject, ref, instance);
- if (((InternalEObject) instance).eIsProxy())
- return;
- if (ref.getEType() == eObject.eClass())
- editAttributes(instance);
- else
- editFeatures(instance);
- }
- }
-
- protected void setReferenceValue(EObject eObject, EReference ref, Object value) {
- if (ref.getName().equals("EAnnotation") || ref.getName().equals("EAnnotationImpl") || !J2EEVersionCheck.checkReferenceVersion(ref, version, moduleType))
- return;
- if (ref.isMany()) {
- List list = (List) eObject.eGet(ref);
- if (value instanceof Collection)
- list.addAll((Collection) value);
- else
- list.add(value);
- } else {
- eObject.eSet(ref, value);
- }
- }
-
- public EObject createInstance(EClass eClassifier) {
- if (eClassifier == JavaRefPackage.eINSTANCE.getJavaClass())
- return createJavaClassProxy(eClassifier);
- return eClassifier.getEPackage().getEFactoryInstance().create(eClassifier);
- }
-
- protected void editAttributes(EObject eObject) {
- List attributes = eObject.eClass().getEAllAttributes();
- for (int i = 0; i < attributes.size(); i++) {
- EAttribute att = (EAttribute) attributes.get(i);
- if (att.isChangeable() && J2EEVersionCheck.checkAttributeVersion(att, version, moduleType)) {
- Object value = createAttributeValue(att, eObject);
- eObject.eSet(att, value);
- }
- }
- }
-
- protected Object createAttributeValue(EAttribute att, EObject eObject) {
- if (att.getEType() == JavaRefPackage.eINSTANCE.getJavaClass()) {
- return createJavaClassProxy(att.eClass()).getClass();
- }
- // if (moduleType == WEB)
- return EMFAttributeFeatureGenerator.createAttribute(att, eObject, true, version, moduleType);
- //return EMFAttributeFeatureGenerator.createAttribute(att);
- }
-
- protected EObject createJavaClassProxy(EClass metaClass) {
- if (avClass == null) {
- avClass = new String[] { "java.util.HashTable", "java.util.List", "java.sql.Data", "java.lang.Integer", "java.lang.String" };
- }
- String name = avClass[classIndex];
- classIndex++;
- if (classIndex == 5)
- classIndex = 0;
- return JavaClassImpl.createClassRef(name);
- }
-
- // Old Compare method....now using DOMComparator...remove once stable
- public void compareContents(String file1, String file2) throws Exception {
- BufferedReader reader1 = null;
- BufferedReader reader2 = null;
- try {
- int lineno = 1;
- reader1 = new BufferedReader(new InputStreamReader(getFileInputStream(file1)));
- reader2 = new BufferedReader(new InputStreamReader(getFileInputStream(file2)));
- String line1 = "", line2 = "";
- while (reader1.ready() && reader2.ready()) {
- line1 = readLineTrimComments(reader1);
- line2 = readLineTrimComments(reader2);
- if (line1 == null && line2 == null && lineno != 0)
- return;
-
- if (!line1.trim().equals(line2.trim())) {
- String message = "Error at line #: " + lineno + '\n' + line1 + '\n' + line2 + '\n';
- System.out.println(message);
- //assertTrue(message, false);
- }
- lineno++;
- }
- assertTrue("The files have a different number of lines:" + lineno + '\n' + line1 + '\n' + line2 + '\n', (!reader1.ready() && !reader2.ready()));
- } catch (IOException ex) {
- ex.printStackTrace();
- assertTrue("IO failed", false);
- } finally {
- if(reader1 != null)
- reader1.close();
- if(reader2 != null)
- reader2.close();
- }
- }
-
- /**
- * @param string
- * @return
- */
- private String readLineTrimComments(BufferedReader reader) throws IOException {
- String result = reader.readLine();
- if(result.indexOf("<!--") < 0)
- return result;
- else {
- int endCommentIndx = 0;
- while(reader.ready()) {
- if( (endCommentIndx = result.indexOf("-->")) >= 0)
- result = reader.readLine();
- else
- return result;
- }
- }
- return result;
- }
-
- public void compareContentsIgnoreWhitespace(String file1, String file2, String identifier) throws Exception {
-
- LineNumberReader reader1 = new LineNumberReader(new InputStreamReader(getFileInputStream(file1)));
- LineNumberReader reader2 = new LineNumberReader(new InputStreamReader(getFileInputStream(file2)));
- compareContentsIgnoreWhitespace(reader1, reader2, identifier);
-
- }
-
- public void compareContentsIgnoreWhitespace(LineNumberReader reader1, LineNumberReader reader2, String identifier) throws Exception {
-
- while (reader1.ready() || reader2.ready()) {
- String line1 = "", line2 = "";
- while (reader1.ready() && line1.equals("")) {
- line1 = reader1.readLine().trim();
- }
- while (reader2.ready() && line2.equals("")) {
- line2 = reader2.readLine().trim();
- }
- if (!isEquivalentLines(line1, line2)) {
- StringBuffer buff = new StringBuffer();
- buff.append("Difference found in test ");
-
- buff.append(identifier);
- buff.append("\nSource line #: ");
- buff.append(reader1.getLineNumber());
- buff.append('\n');
- buff.append(line1);
- buff.append("\nDestination line #: ");
- buff.append(reader2.getLineNumber());
- buff.append('\n');
- buff.append(line2);
- assertTrue(buff.toString(), false);
- }
- }
-
- }
-
- public boolean lineEquals(String line1, String line2) {
- return line1.equals(line2);
- }
-
- public boolean isEquivalentLines(String line1, String line2) {
- if (lineEquals(line1, line2))
- return true;
- if (equalTags(line1, line2))
- return true;
- String equiv = (String) getEquivalentLines().get(line1);
- return equiv != null && equiv.equals(line2);
- }
-
- public boolean equalTags(String line1, String line2){
- //data check, there should be no data for this test to return true
- int shortEndIndex1 = line1.indexOf("/>");
- int shortEndIndex2 = line2.indexOf("/>");
- if (shortEndIndex1 == -1 && shortEndIndex2 == -1)
- return false;
- else if (shortEndIndex1 != -1){
- String tagName1 = line1.substring(1,shortEndIndex1);
- String tagName2 = extractTagName(line2);
- if (checkNoData(line2) && tagName1.equals(tagName2)){
- return true;
- }
- }
- else if (shortEndIndex2 != -1){
- String tagName1 = extractTagName(line1);
- String tagName2 = line2.substring(1,shortEndIndex2);
- if (checkNoData(line1) && tagName1.equals(tagName2)){
- return true;
- }
- }
- return false;
- }
- /**
- * @param line2
- * @return
- */
- private String extractTagName(String line) {
- int endOpenTag = line.indexOf(">");
- return line.substring(1,endOpenTag);
- }
-
- /**
- * @param line2
- * @return
- */
- private boolean checkNoData(String line) {
- int endOpenTag = line.indexOf(">");
- int startEndTag = line.lastIndexOf("<");
- if (endOpenTag == line.length())
- return true;
- else if (endOpenTag+1 == startEndTag)
- return true;
- return false;
- }
-
- public Map getEquivalentLines() {
- if (equivalentLines == null)
- equivalentLines = new HashMap();
- return equivalentLines;
- }
-
- public void setEquivalentLines(Map equivalentLines) {
- this.equivalentLines = equivalentLines;
- }
- /*
- public void compareContents(String file1, String file2) throws Exception {
- InputStream is1, is2;
- is1 = getFileInputStream(file1);
- is2 = getFileInputStream(file2);
- InputSource input1 = new InputSource(is1);
- InputSource input2 = new InputSource(is2);
- try {
- String results;
- if(ignoreAtt == null)
- results = DomComparitor.compareDoms(input1, input2);
- else
- results = DomComparitor.compareDoms(input1, input2, ignoreAtt);
- if (results != null) {
- assertTrue("Unequal doms compared as equal " + file1 + " " + file2 + "Details: " + results, false);
- }
- } finally {
- try {
- is1.close();
- } catch (Exception e) {
- Assert.fail(e.getMessage());
- }
- try {
- is2.close();
- } catch (Exception e) {
- Assert.fail(e.getMessage());
- }
- }
- }
- */
- public InputStream getFileInputStream(String path) throws FileNotFoundException {
- return new FileInputStream(path);
- }
-
- public InputStream getResourceAsStream(String fileName) {
- InputStream in = null;
- ClassLoader loader = getClass().getClassLoader();
- if (loader == null) {
- in = ClassLoader.getSystemResourceAsStream(fileName);
- } else {
- in = loader.getResourceAsStream(fileName);
- }
- assertTrue("Unable to find resource: " + fileName, in != null);
- return in;
- }
-
- public void setGeneralDepth(int depth) {
- GeneralEMFPopulationTest.genDepth = depth;
- }
-
- public void setModuleType(int type) {
- moduleType = type;
- }
-
- public void setVersion(int version) {
- this.version = version;
- }
-
- public int getDepthForAttribute(EReference ref) {
- if (ref.isMany())
- return genDepth;
- else
- return 1;
- }
-
- public Object getSharedObjectByType(EObject owner, EReference ref) {
- sharedValue = TestUtilities.getObjectByType(owner.eResource(), ref.getEType(), ref.isMany());
- return sharedValue;
- }
-
- /**
- * @param set
- */
- public static void setIgnoreAtt(HashSet set) {
- ignoreAtt = set;
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- try {
- String out = AutomatedBVT.baseDirectory + "testOutput/";
- File del = new File(out);
- deleteDirectory(del);
- del.delete();
- out = AutomatedBVT.baseDirectory + "../testData/testOutput/";
- del = new File(out);
- deleteDirectory(del);
- del.delete();
- }
- catch (Exception e){
- e.printStackTrace();
- }
- super.tearDown();
- }
-
- protected void deleteDirectory(File directory)
- throws IOException
- {
- if (directory.exists()){
- File[] delFiles = directory.listFiles();
-
- for(int i=0; i<delFiles.length; ++i)
- {
- if(delFiles[i].isDirectory())
- deleteDirectory(delFiles[i]);
- delFiles[i].delete();
- }
- }
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- //TODO: Remove this line after ws xsd's are restored.
- RendererFactory.getDefaultRendererFactory().setValidating(false);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/GeneralEMFPopulationTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/GeneralEMFPopulationTest.java
deleted file mode 100644
index 41fce296..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/GeneralEMFPopulationTest.java
+++ /dev/null
@@ -1,491 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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.archive.emftests;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.LineNumberReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.InternalEObject;
-import org.eclipse.emf.ecore.util.BasicFeatureMap;
-import org.eclipse.emf.ecore.util.FeatureMapUtil;
-import org.eclipse.jem.java.JavaRefPackage;
-import org.eclipse.jst.j2ee.archive.testutilities.EAttributeDescriptor;
-import org.eclipse.jst.j2ee.archive.testutilities.EMFAttributeFeatureGenerator;
-import org.eclipse.jst.j2ee.archive.testutilities.J2EEVersionCheck;
-import org.eclipse.jst.j2ee.archive.testutilities.TestUtilities;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.common.ResAuthTypeBase;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.MethodElementKind;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-
-public class GeneralEMFPopulationTest extends GeneralEMFTest {
- //inner class to handle deffered shared references
- protected class DeferredSharedReferenceAction {
- EObject owner;
- EReference ref;
-
- public DeferredSharedReferenceAction(EObject owner, EReference ref) {
- this.owner = owner;
- this.ref = ref;
- }
-
- public void performAction() {
- Object value = getSharedObjectByType(owner, ref);
- setReferenceValue(owner, ref, value);
- }
- }
-
- protected Map equivalentLines;
- public List deferedReferences;
- public static int genDepth = 5;
- public static Object sharedValue;
- public static HashSet ignoreAtt;
-
- public int version;
- public int moduleType;
- //static versions
- public static final int VERSION_1_2 = 0;
- public static final int VERSION_1_3 = 1;
- public static final int VERSION_1_4 = 2;
- public static final int VERSION_5_0 = 3;
- public static final int VERSION_6_0 = 3;
-
- public static final int APPLICATION = 0;
- public static final int APP_CLIENT = 1;
- public static final int CONNECTOR = 2;
- public static final int EJB = 3;
- public static final int WEB = 4;
-
- public GeneralEMFPopulationTest(String name) {
- super(name);
- }
-
- public GeneralEMFPopulationTest(String name, RendererFactory factory) {
- super(name, factory);
- }
-
- public void populateRoot(EObject eObject) {
- populateFeatures(eObject);
- if (deferedReferences != null) {
- for (int i = 0; i < deferedReferences.size(); i++) {
- ((DeferredSharedReferenceAction) deferedReferences.get(i)).performAction();
- }
- }
- }
-
- public void populateFeatures(EObject eObject) {
- if (eObject == null)
- return;
- else {
- populateAttributes(eObject);
- populateReferences(eObject);
- }
- }
-
- protected void populateReferences(EObject eObject) {
- List references = eObject.eClass().getEAllReferences();
- for (int i = 0; i < references.size(); i++) {
- EReference ref = (EReference) references.get(i);
- if (!ref.isMany() && eObject.eGet(ref) != null)
- continue;
- if (eObject instanceof MessageDriven && (ref.equals(EjbPackage.eINSTANCE.getEnterpriseBean_HomeInterface()) || ref.equals(EjbPackage.eINSTANCE.getEnterpriseBean_RemoteInterface()) || ref.equals(EjbPackage.eINSTANCE.getEnterpriseBean_LocalInterface()) || ref.equals(EjbPackage.eINSTANCE.getEnterpriseBean_LocalHomeInterface()) || ref.equals(EjbPackage.eINSTANCE.getEnterpriseBean_SecurityRoleRefs())))
- continue;
- if (ref.isContainment())
- populateContainmentReference(eObject, ref);
- else
- populateSharedReference(eObject, ref);
- }
- }
-
- protected void populateSharedReference(EObject eObject, EReference ref) {
- if (ref.getEType() == JavaRefPackage.eINSTANCE.getJavaClass())
- setReferenceValue(eObject, ref, EMFAttributeFeatureGenerator.createJavaClassProxy(ref,eObject));
- else {
- EPackage pkg = ref.getEType().getEPackage();
- //if (pkg == eObject.eClass().getEPackage() || pkg == CommonPackage.eINSTANCE) {
- if (eObject.eClass().getName().equals("EAnnotation") || eObject.eClass().getName().equals("EAnnotationImpl") || !J2EEVersionCheck.checkReferenceVersion(ref, version, moduleType))
- return;
- if (deferedReferences == null)
- deferedReferences = new ArrayList();
- deferedReferences.add(new DeferredSharedReferenceAction(eObject, ref));
- //}
- }
- }
-
- protected void populateContainmentReference(EObject eObject, EReference ref) {
- for (int i = 0; i < getDepthForAttribute(ref); i++) {
- EObject instance = createInstance(ref,eObject);
- if (instance == null)
- return;
- if (!J2EEVersionCheck.checkReferenceVersion(ref, version, moduleType))
- continue;
- setReferenceValue(eObject, ref, instance);
- if (((InternalEObject) instance).eIsProxy())
- return;
- if (ref.getEType() == eObject.eClass())
- populateAttributes(instance);
- else
- populateFeatures(instance);
- }
- }
-
- protected void setReferenceValue(EObject eObject, EStructuralFeature ref, Object value) {
- if (ref.getName().equals("EAnnotation") || ref.getName().equals("EAnnotationImpl") || !J2EEVersionCheck.checkReferenceVersion(ref, version, moduleType))
- return;
- if (ref.isMany()) {
- List list = (List) eObject.eGet(ref);
- if (list instanceof BasicFeatureMap) {
- BasicFeatureMap aMap = (BasicFeatureMap)list;
- if (value instanceof Collection) {
- for (Iterator iterator = ((Collection)value).iterator(); iterator.hasNext();) {
- Object obj = iterator.next();
- aMap.add(FeatureMapUtil.createEntry(ref, obj));
- }
- } else aMap.add(FeatureMapUtil.createEntry(ref, value));
-
- } else {
- if (value instanceof Collection)
- list.addAll((Collection) value);
-
- else
- list.add(value);
- }
- } else {
- eObject.eSet(ref, value);
- }
- }
-
- public EObject createInstance(EReference ref, EObject eObject) {
- if (ref.getEType() == JavaRefPackage.eINSTANCE.getJavaClass())
- return EMFAttributeFeatureGenerator.createJavaClassProxy(ref, eObject);
- return ref.getEType().getEPackage().getEFactoryInstance().create((EClass)ref.getEType());
- }
-
- protected void populateAttributes(EObject eObject) {
- if (eObject.eClass() == CommonPackage.eINSTANCE.getQName()) {
- populateAttributesQName(eObject);
- return;
- }
- List attributes = eObject.eClass().getEAllAttributes();
- for (int i = 0; i < attributes.size(); i++) {
- EAttribute att = (EAttribute) attributes.get(i);
- if (eObject instanceof EJBLocalRef && (att.equals(CommonPackage.eINSTANCE.getEjbRef_Home()) || att.equals(CommonPackage.eINSTANCE.getEjbRef_Remote())))
- continue;
- EAttributeDescriptor desc = new EAttributeDescriptor(att,eObject.eClass());
- if (desc.getFeature().getName().equals("group")) continue;
- primPopulateAttrbute(eObject, att);
- }
- }
-
- protected void primPopulateAttrbute(EObject eObject, EAttribute att) {
- if (att.isChangeable() && J2EEVersionCheck.checkAttributeVersion(att, version, moduleType)) {
- for (int j = 0 ; j < getDepthForAttribute(att);j++){
- Object value = createAttributeValue(att, eObject);
- setReferenceValue(eObject,att,value);
- }
- }
- }
-
-
-
- /**
- * @param eObject
- */
- protected void populateAttributesQName(EObject eObject) {
- String prefix = (String)createAttributeValue(CommonPackage.eINSTANCE.getQName_InternalPrefixOrNsURI(), eObject);
- String localPart = (String)createAttributeValue(CommonPackage.eINSTANCE.getQName_LocalPart(), eObject);
- ((QName)eObject).setValues(prefix, "http://www.ibm.com", localPart);
- }
-
- protected Object createAttributeValue(EAttribute att, EObject eObject) {
- if (att.getEType() == JavaRefPackage.eINSTANCE.getJavaClass()) {
- return EMFAttributeFeatureGenerator.createJavaClassProxy(att,eObject).getClass();
- } else if (att == CommonPackage.eINSTANCE.getResourceRef_Auth())
- return createResAuth(att, eObject);
- else if (att == EjbPackage.eINSTANCE.getMethodElement_Type())
- return createMethodElementType(att, eObject);
- else
- return primCreateAttributeValue(att, eObject);
- //return EMFAttributeFeatureGenerator.createAttribute(att);
- }
-
- protected Object primCreateAttributeValue(EAttribute att, EObject eObject) {
- return EMFAttributeFeatureGenerator.createAttribute(att, eObject, true, version, moduleType);
- }
-
- // Old Compare method....now using DOMComparator...remove once stable
- public void compareContents(String file1, String file2) throws Exception {
- try {
- int lineno = 1;
- BufferedReader reader1 = new BufferedReader(new InputStreamReader(getFileInputStream(file1)));
- BufferedReader reader2 = new BufferedReader(new InputStreamReader(getFileInputStream(file2)));
- String line1 = "", line2 = "";
- while (reader1.ready() && reader2.ready()) {
- line1 = reader1.readLine();
- line2 = reader2.readLine();
- if (line1 == null && line2 == null && lineno != 0)
- return;
- if (!line1.equals(line2)) {
- String message = "Error at line #: " + lineno + '\n' + line1 + '\n' + line2 + '\n';
- assertTrue(message, false);
- break; // added to escape compare
- }
- lineno++;
- }
- assertTrue("The files have a different number of lines:" + lineno + '\n' + line1 + '\n' + line2 + '\n', (!reader1.ready() && !reader2.ready()));
- } catch (IOException ex) {
- assertTrue("IO failed", false);
- }
- }
- public void compareContentsIgnoreWhitespace(String file1, String file2, String identifier) throws Exception {
-
- LineNumberReader reader1 = new LineNumberReader(new InputStreamReader(getFileInputStream(file1)));
- LineNumberReader reader2 = new LineNumberReader(new InputStreamReader(getFileInputStream(file2)));
- compareContentsIgnoreWhitespace(reader1, reader2, identifier);
-
- }
-
- public void compareContentsIgnoreWhitespace(LineNumberReader reader1, LineNumberReader reader2, String identifier) throws Exception {
- List errors = new ArrayList();
- String msg = null;
- while (reader1.ready() || reader2.ready()) {
- String line1 = "", line2 = "";
- while (reader1.ready() && line1 != null && line1.equals("")) {
- line1 = reader1.readLine();
- if (line1 != null)
- line1 = line1.trim();
- }
- while (reader2.ready() && line2 != null && line2.equals("")) {
- line2 = reader2.readLine();
- if (line2 != null)
- line2 = line2.trim();
- }
- if (line1 != null && line2 != null && !isEquivalentLines(line1, line2)) {
- StringBuffer buff = new StringBuffer();
- buff.append("------------------------------ ");
- buff.append("\nSource line #: ");
- buff.append(reader1.getLineNumber());
- buff.append('\n');
- buff.append(line1);
- buff.append("\nDestination line #: ");
- buff.append(reader2.getLineNumber());
- buff.append('\n');
- buff.append(line2);
- System.out.println(buff.toString());
- errors.add(buff);
- break;
- }
- }
- if (!errors.isEmpty())
- assertTrue("Errors Found, Check Console.", false);
- }
-
- public boolean lineEquals(String line1, String line2) {
- return line1 != null && line1.equals(line2);
- }
-
- public boolean isEquivalentLines(String line1, String line2) {
- if (lineEquals(line1, line2))
- return true;
-
- String equiv = (String) getEquivalentLines().get(line1);
- if (equiv == null){
- equiv = (String)getEquivalentLines().get(line2);
- if (equiv != null)
- return equiv.equals(line1);
- }
- return equiv != null && equiv.equals(line2);
- }
- public Map getEquivalentLines() {
- if (equivalentLines == null)
- equivalentLines = new HashMap();
- return equivalentLines;
- }
-
- public void setEquivalentLines(Map equivalentLines) {
- this.equivalentLines = equivalentLines;
- }
- /*
- public void compareContents(String file1, String file2) throws Exception {
- InputStream is1, is2;
- is1 = getFileInputStream(file1);
- is2 = getFileInputStream(file2);
- InputSource input1 = new InputSource(is1);
- InputSource input2 = new InputSource(is2);
- try {
- String results;
- if(ignoreAtt == null)
- results = DomComparitor.compareDoms(input1, input2);
- else
- results = DomComparitor.compareDoms(input1, input2, ignoreAtt);
- if (results != null) {
- assertTrue("Unequal doms compared as equal " + file1 + " " + file2 + "Details: " + results, false);
- }
- } finally {
- try {
- is1.close();
- } catch (Exception e) {
- Assert.fail(e.getMessage());
- }
- try {
- is2.close();
- } catch (Exception e) {
- Assert.fail(e.getMessage());
- }
- }
- }
- */
- public InputStream getFileInputStream(String path) throws FileNotFoundException {
- return new FileInputStream(path);
- }
-
- public InputStream getResourceAsStream(String fileName) {
- InputStream in = null;
- ClassLoader loader = getClass().getClassLoader();
- if (loader == null) {
- in = ClassLoader.getSystemResourceAsStream(fileName);
- } else {
- in = loader.getResourceAsStream(fileName);
- }
- assertTrue("Unable to find resource: " + fileName, in != null);
- return in;
- }
-
- public void setGeneralDepth(int depth) {
- GeneralEMFPopulationTest.genDepth = depth;
- }
-
- public void setModuleType(int type) {
- moduleType = type;
- }
-
- public void setVersion(int version) {
- this.version = version;
- }
-
- public int getDepthForAttribute(EStructuralFeature feature) {
- if (feature.isMany())
- return genDepth;
- else
- return 1;
- }
-
- public Object getSharedObjectByType(EObject owner, EReference ref) {
- sharedValue = TestUtilities.getObjectByType(owner.eResource(), ref.getEType(), ref.isMany());
- return sharedValue;
- }
-
- /**
- * @param set
- */
- public static void setIgnoreAtt(HashSet set) {
- ignoreAtt = set;
- }
-
-
-
- protected Object createResAuth(EAttribute att, EObject eObject) {
- Object auth = null;
- do {
- auth = primCreateAttributeValue(att, eObject);
- } while (!isValidAuth((ResAuthTypeBase)auth));
- return auth;
- }
-
- /**
- * Web will need to override for J2EE 1.2/1/3
- * @param auth
- * @return
- */
- protected boolean isValidAuth(ResAuthTypeBase auth) {
- return auth == ResAuthTypeBase.APPLICATION_LITERAL || auth == ResAuthTypeBase.CONTAINER_LITERAL;
- }
-
- protected Object createMethodElementType(EAttribute att, EObject eObject) {
- Object type = null;
- do {
- type = primCreateAttributeValue(att, eObject);
- } while (!isValidMethodElementType((MethodElementKind)type));
- return type;
- }
-
- /**
- * Web will need to override for J2EE 1.2/1/3
- * @param auth
- * @return
- */
- protected boolean isValidMethodElementType(MethodElementKind type) {
- if (version == VERSION_1_4)
- return true;
- return version != VERSION_1_4 && type != MethodElementKind.SERVICE_ENDPOINT_LITERAL;
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- try {
- String out = AutomatedBVT.baseDirectory + "testOutput/";
- File del = new File(out);
- deleteDirectory(del);
- del.delete();
- out = AutomatedBVT.baseDirectory + "../testData/testOutput/";
- del = new File(out);
- deleteDirectory(del);
- del.delete();
- }
- catch (Exception e){
- e.printStackTrace();
- }
- super.tearDown();
- }
-
- protected void deleteDirectory(File directory)
- throws IOException
- {
- if (directory.exists()){
- File[] delFiles = directory.listFiles();
-
- for(int i=0; i<delFiles.length; ++i)
- {
- if(delFiles[i].isDirectory())
- deleteDirectory(delFiles[i]);
- delFiles[i].delete();
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/GeneralEMFTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/GeneralEMFTest.java
deleted file mode 100644
index c3511c0e..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/GeneralEMFTest.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- *
- */
-package org.eclipse.jst.j2ee.archive.emftests;
-
-import java.util.HashSet;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-import org.eclipse.wst.common.tests.BaseTestCase;
-import org.eclipse.wst.common.tests.ProjectUtility;
-import org.eclipse.wst.validation.internal.operations.ValidationBuilder;
-
-/**
- * @author itewk
- *
- */
-public abstract class GeneralEMFTest extends BaseTestCase {
- private RendererFactory testingFactory;
- private RendererFactory defaultFactory;
- public static final String VALIDATOR_JOB_FAMILY = "validators";
-
- public GeneralEMFTest(String name) {
- super(name);
-
- defaultFactory = RendererFactory.getDefaultRendererFactory();
- testingFactory = RendererFactory.getDefaultRendererFactory();
- }
-
- public GeneralEMFTest(String name, RendererFactory factory) {
- super(name);
-
- defaultFactory = RendererFactory.getDefaultRendererFactory();
- testingFactory = factory;
- }
-
- protected void setUp() throws Exception {
- //set the default factory to the factory needed for this test run
- RendererFactory.setDefaultRendererFactory(testingFactory);
-
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- //set the default factory back to the orginal default
- RendererFactory.setDefaultRendererFactory(defaultFactory);
- // Wait for all validation jobs to end before ending test....
- waitOnJobs();
- super.tearDown();
- }
-
- protected CommonarchiveFactory getArchiveFactory() {
- return CommonarchivePackage.eINSTANCE.getCommonarchiveFactory();
- }
-
- protected EjbFactory getEjbFactory() {
- return EjbPackage.eINSTANCE.getEjbFactory();
- }
-
- protected ApplicationFactory getApplicationFactory() {
- return ApplicationPackage.eINSTANCE.getApplicationFactory();
- }
-
- protected WebapplicationFactory getWebAppFactory() {
- return WebapplicationPackage.eINSTANCE.getWebapplicationFactory();
- }
-
- protected HashSet ignorableAttributes(){
- HashSet set = new HashSet();
- set.add("id");
- return set;
- }
- public static void waitOnJobs() throws InterruptedException {
- IProject[] projects = ProjectUtility.getAllProjects();
- for (int i = 0; i < projects.length; i++) {
- IProject project = projects[i];
- Job.getJobManager().join(project.getName() + VALIDATOR_JOB_FAMILY,null);
- }
- Job.getJobManager().join(ResourcesPlugin.FAMILY_MANUAL_BUILD,null);
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,null);
- Job.getJobManager().join(ValidationBuilder.FAMILY_VALIDATION_JOB,null);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/RarEMFEditTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/RarEMFEditTest.java
deleted file mode 100644
index 9779bfce..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/RarEMFEditTest.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package org.eclipse.jst.j2ee.archive.emftests;
-
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.jca.ConnectorResource;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-
-public class RarEMFEditTest extends GeneralEMFEditingTest {
- RARFile rarFile;
-
- public RarEMFEditTest(String name) {
- super(name);
- }
-
- public RarEMFEditTest(String name, RendererFactory factory) {
- super(name, factory);
- }
-
- public static void main(java.lang.String[] args) {
- String[] className = { "com.ibm.etools.archive.test.RarEMFEditTest", "-noloading" };
- TestRunner.main(className);
- }
-
- public static junit.framework.Test suite(RendererFactory factory) {
- TestSuite suite = new TestSuite(RarEMFEditTest.class.getName());
- suite.addTest(new RarEMFEditTest("testRAREdit",factory));
- return suite;
- }
-
- public void testRAREdit() throws Exception {
- getRar();
- assertEquals("1.0", rarFile.getDeploymentDescriptor().getSpecVersion());
-
- ConnectorResource DD = (ConnectorResource) rarFile.getDeploymentDescriptorResource();
- setVersion(VERSION_1_3);
- setModuleType(CONNECTOR);
- editRoot(DD.getRootObject());
- String curDir = AutomatedBVT.baseDirectory;
-
- String out = curDir + "testOutput/EMFModelCreationTests/EditRarEAR";
- rarFile.extractTo(out, Archive.EXPAND_ALL);
- rarFile.close();
-
- //Compare work in progress
-
- String exampleDeploymentDesURI = curDir + "EMFTests/ra.xml";
- String curDeploymentDesURI = curDir + out + "/fooRAR/META-INF/ra.xml";
- //compareContents(curDeploymentDesURI, exampleDeploymentDesURI);
- }
-
- public void getRar() throws DuplicateObjectException, OpenFailureException {
- String in = AutomatedBVT.baseDirectory + "loose_module_workspace/LooseConnector/fooRAR/";
- rarFile = getArchiveFactory().openRARFile(in);
- assertTrue(rarFile.getDeploymentDescriptor() != null);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/RarEMFTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/RarEMFTest.java
deleted file mode 100644
index 2f5bcaa4..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/RarEMFTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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.archive.emftests;
-
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.archive.testutilities.EMFAttributeFeatureGenerator;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.jca.ConnectorResource;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-
-public class RarEMFTest extends GeneralEMFPopulationTest {
- EARFile earFile;
- protected RARFile rarFile;
-
- public RarEMFTest(String name) {
- super(name);
- }
-
- public RarEMFTest(String name, RendererFactory factory) {
- super(name, factory);
- }
-
- public static void main(java.lang.String[] args) {
- String[] className = { "com.ibm.etools.archive.test.RarEMFTest", "-noloading" };
- TestRunner.main(className);
- }
-
- public static junit.framework.Test suite(RendererFactory factory) {
- TestSuite suite = new TestSuite(RarEMFTest.class.getName());
- //[248158] suite.addTest(new RarEMFTest("testRARPopulation",factory));
- suite.addTest(new RarEMFTest("test14RARPopulation",factory));
- return suite;
- }
-
- public void testRARPopulation() throws Exception {
- EMFAttributeFeatureGenerator.reset();
- createEAR();
- createRAR();
-
- ConnectorResource DD = (ConnectorResource) rarFile.getDeploymentDescriptorResource();
- //TODO: individual test for each version
- DD.setVersionID(J2EEVersionConstants.J2EE_1_3_ID);
- setVersion(VERSION_1_3);
- setModuleType(CONNECTOR);
- populateRoot(DD.getRootObject());
-
- String out = AutomatedBVT.baseDirectory + "testOutput/TestRarEAR";
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
-
- //Compare work in progress
- String curDir = AutomatedBVT.baseDirectory;
- String exampleDeploymentDesURI = curDir + "EMFTestNoID/ra.xml";
- String curDeploymentDesURI = curDir + "testOutput/TestRarEAR/fooRAR/META-INF/ra.xml";
- setIgnoreAtt(ignorableAttributes());
- compareContentsIgnoreWhitespace(curDeploymentDesURI, exampleDeploymentDesURI, null);
- }
- public void test14RARPopulation() throws Exception {
- EMFAttributeFeatureGenerator.reset();
- createEAR();
- createRAR();
-
- ConnectorResource DD = (ConnectorResource) rarFile.getDeploymentDescriptorResource();
- //TODO: individual test for each version
- DD.setVersionID(J2EEVersionConstants.J2EE_1_4_ID);
- setVersion(VERSION_1_4);
- setModuleType(CONNECTOR);
- populateRoot(DD.getRootObject());
-
- String out = AutomatedBVT.baseDirectory + "testOutput/Test14RarEAR";
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
-
- getRar();
- assertTrue("1.5".equals(rarFile.getDeploymentDescriptor().getSpecVersion()));
- out = AutomatedBVT.baseDirectory + "testOutput/Test14RarEAR2";
- rarFile.extractTo(out, Archive.EXPAND_ALL);
- rarFile.close();
-
- //Compare work in progress
- String curDir = AutomatedBVT.baseDirectory;
- String exampleDeploymentDesURI = curDir + "testOutput/Test14RarEAR2/META-INF/ra.xml";
- String curDeploymentDesURI = curDir + "testOutput/Test14RarEAR/fooRAR/META-INF/ra.xml";
- setIgnoreAtt(ignorableAttributes());
- compareContentsIgnoreWhitespace(curDeploymentDesURI, exampleDeploymentDesURI, null);
- }
-
- public void getRar() throws DuplicateObjectException, OpenFailureException {
- String in = AutomatedBVT.baseDirectory + "testOutput/Test14RarEAR/fooRAR";
- rarFile = getArchiveFactory().openRARFile(in);
- assertTrue(rarFile.getDeploymentDescriptor() != null);
- }
-
- public void createRAR() throws DuplicateObjectException {
- rarFile = getArchiveFactory().createRARFileInitialized("fooRAR");
- rarFile = (RARFile) earFile.addCopy(rarFile);
- rarFile.getDeploymentDescriptor().setDisplayName("fooRAR");
- assertTrue(rarFile.getDeploymentDescriptor() != null);
- }
-
- public void createEAR() {
- String earName = "Test.ear";
- earFile = getArchiveFactory().createEARFileInitialized(earName);
- assertTrue(earFile.getDeploymentDescriptor() != null);
- }
-
- /* (non-Javadoc)
- * @see com.ibm.etools.archive.emftest.GeneralEMFPopulationTest#createAttributeValue(org.eclipse.emf.ecore.EAttribute)
- */
- protected Object createAttributeValue(EAttribute att, EObject eObject) {
- //TODO: delete this after the model is fixed
- if (att == JcaPackage.eINSTANCE.getConfigProperty_Type())
- return "java.lang.String";
- else if (att == JcaPackage.eINSTANCE.getAuthenticationMechanism_CredentialInterface())
- return "javax.resource.spi.security.PasswordCredential";
- else if (att == JcaPackage.eINSTANCE.getConnector_SpecVersion() && version == VERSION_1_3)
- return "1.0";
- else
- return super.createAttributeValue(att, eObject);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/ResolverTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/ResolverTest.java
deleted file mode 100644
index 87b059ed..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/ResolverTest.java
+++ /dev/null
@@ -1,264 +0,0 @@
-package org.eclipse.jst.j2ee.archive.emftests;
-
-import java.util.List;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.jst.j2ee.archive.testutilities.EMFAttributeFeatureGenerator;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.ejb.internal.impl.MethodPermissionImpl;
-import org.eclipse.jst.j2ee.ejb.internal.impl.QueryMethodImpl;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-
-public class ResolverTest extends GeneralEMFEditingTest {
-
- protected static final String _META_INF_EJB_JAR_XML = "/META-INF/ejb-jar.xml";
-
- protected static final EjbPackage EJB_PKG = EjbPackage.eINSTANCE;
-
- EARFile earFile;
-
- EJBJarFile ejbFile;
-
- EObject mesBean, entityBean;
-
- SecurityIdentity secID;
-
- RoleSource roleSource;
-
- int NUM_BEANS = 10;
-
- final int NUM_RELATION_ROLES = 2;
-
- int createdBeans = 0;
-
- int createdSecRoles = 0;
-
- protected int createdSecurityIdentities = 0;
-
- boolean mpFlag = false;
-
- public ResolverTest(String name) {
- super(name);
- }
-
- public ResolverTest(String name, RendererFactory factory) {
- super(name, factory);
- }
-
- public static void main(java.lang.String[] args) {
- junit.textui.TestRunner.main(new String[] { ResolverTest.class.getName()});
- }
-
- public static junit.framework.Test suite(RendererFactory factory) {
- TestSuite suite = new TestSuite(ResolverTest.class.getName());
- suite.addTest(new ResolverTest("testResolver",factory));
- suite.addTest(new ResolverTest("testResolverNoSchemaLocation",factory));
- return suite;
- }
-
- public void testResolver() throws Exception {
- String in = AutomatedBVT.baseDirectory + "../testData/sl";
- getEJB(in);
-
- assertEquals("2.1", ejbFile.getDeploymentDescriptor().getVersion());
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
- setVersion(VERSION_1_4);
- setModuleType(EJB);
-
- String out = AutomatedBVT.baseDirectory + "../testData/testOutput/sl";
- ejbFile.extractTo(out, Archive.EXPAND_ALL);
- ejbFile.close();
-
- String exampleDeploymentDesURI = in + _META_INF_EJB_JAR_XML;
- String curDeploymentDesURI = out + _META_INF_EJB_JAR_XML;
- compareContents(curDeploymentDesURI, exampleDeploymentDesURI);
- }
-
- public void testResolverNoSchemaLocation() throws Exception {
-
- boolean validating = RendererFactory.getDefaultRendererFactory().isValidating();
- try {
- RendererFactory.getDefaultRendererFactory().setValidating(false);
-
- String in = AutomatedBVT.baseDirectory + "../testData/no-sl";
- getEJB(in);
-
- assertEquals("2.1", ejbFile.getDeploymentDescriptor().getVersion());
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
- setVersion(VERSION_1_4);
- setModuleType(EJB);
-
- String out = AutomatedBVT.baseDirectory + "../testData/testOutput/no-sl";
- ejbFile.extractTo(out, Archive.EXPAND_ALL);
- ejbFile.close();
-
- String exampleDeploymentDesURI = in + _META_INF_EJB_JAR_XML;
- String curDeploymentDesURI = out + _META_INF_EJB_JAR_XML;
- compareContents(curDeploymentDesURI, exampleDeploymentDesURI);
- } catch (RuntimeException re) {
- re.printStackTrace();
- } finally {
- RendererFactory.getDefaultRendererFactory().setValidating(validating);
- }
- }
-
- public void getEJB(String in) throws DuplicateObjectException, OpenFailureException {
- ejbFile = getArchiveFactory().openEJBJarFile(in);
- assertTrue(ejbFile.getDeploymentDescriptor() != null);
- }
-
- public EObject createInstance(EClass eClassifier) {
- if (eClassifier.getName().equals("EnterpriseBean")) {
- createdBeans++;
- switch (createdBeans) {
- case (3):
- return createContainerManagedEntityInstance(eClassifier);
- case (7):
- return createMessageBeanInstance(eClassifier);
- case (4):
- case (8):
- return createSessionBeanInstance(eClassifier);
- default:
- return createEntityBeanInstance(eClassifier);
- }
- } else if (eClassifier.getName().equals("SecurityIdentity"))
- return createSecurityIdentitiyInstance(eClassifier);
- else if (eClassifier.getName().equals("RoleSource"))
- return createRoleSourceInstance(eClassifier);
- else if (eClassifier == EcorePackage.eINSTANCE.getEAttribute()) return getEjbFactory().createCMPAttribute();
- return super.createInstance(eClassifier);
- }
-
- private EObject createSecurityIdentitiyInstance(EClass eClassifier) {
- /* Alternate types */
- createdSecRoles++;
- if ((createdSecRoles & 1) == 0)
- return CommonFactory.eINSTANCE.createUseCallerIdentity();
- else
- return CommonFactory.eINSTANCE.createRunAsSpecifiedIdentity();
- }
-
- private EObject createRoleSourceInstance(EClass eClassifier) {
- return ((EjbFactory) eClassifier.getEPackage().getEFactoryInstance()).createRoleSource();
- }
-
- private EObject createMessageBeanInstance(EClass eClassifier) {
- return ((EjbFactory) eClassifier.getEPackage().getEFactoryInstance()).createMessageDriven();
- }
-
- private EObject createSessionBeanInstance(EClass eClassifier) {
- return ((EjbFactory) eClassifier.getEPackage().getEFactoryInstance()).createSession();
- }
-
- private EObject createEntityBeanInstance(EClass eClassifier) {
- return ((EjbFactory) eClassifier.getEPackage().getEFactoryInstance()).createEntity();
- }
-
- private EObject createContainerManagedEntityInstance(EClass eClassifier) {
- return EjbFactory.eINSTANCE.createContainerManagedEntity();
- }
-
- /**
- * @see org.eclipse.jst.j2ee.archive.test.GeneralEMFTest#getDepthForAttribute(EReference)
- */
- public int getDepthForAttribute(EReference ref) {
- if (ref.getName().equals("enterpriseBeans"))
- return NUM_BEANS;
- else if (ref.getName().equals("entityBeans"))
- return NUM_BEANS;
- else if (ref.getName().equals("relationshipRoles")) return NUM_RELATION_ROLES;
- return super.getDepthForAttribute(ref);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.archive.emftest.GeneralEMFPopulationTest#populateFeatures(org.eclipse.emf.ecore.EObject)
- */
- public void populateFeatures(EObject eObject) {
- if (eObject.eClass() == EJB_PKG.getCMPAttribute()) {
- ((CMPAttribute) eObject).setName((String) EMFAttributeFeatureGenerator.createAttribute(
- EcorePackage.eINSTANCE.getENamedElement_Name(), eObject));
- ((CMPAttribute) eObject).setEType((EClassifier) createJavaClassProxy(null));
- } else
- super.editFeatures(eObject);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.archive.emftest.GeneralEMFPopulationTest#populateAttributes(org.eclipse.emf.ecore.EObject)
- */
- protected void populateAttributes(EObject eObject) {
- if (eObject instanceof QueryMethodImpl) {
- List attributes = eObject.eClass().getEAllAttributes();
- for (int i = 0; i < attributes.size(); i++) {
- EAttribute att = (EAttribute) attributes.get(i);
- Object value = createAttributeValue(att, eObject);
- if (att.getName().equals("parms") && value == null) {
- value = createAttributeValue(att, eObject);
- }
- if (att.isChangeable()) eObject.eSet(att, value);
- }
- } else if (eObject instanceof MethodPermissionImpl) {
- List attributes = eObject.eClass().getEAllAttributes();
- for (int i = 0; i < attributes.size(); i++) {
- EAttribute att = (EAttribute) attributes.get(i);
- if (att.getName().equals("unchecked") && mpFlag) {
- continue;
- }
-
- Object value = createAttributeValue(att, eObject);
- if (att.isChangeable()) eObject.eSet(att, value);
- }
- mpFlag = !mpFlag;
- } else
- super.editAttributes(eObject);
- }
-
- protected void populateSharedReference(EObject eObject, EReference ref) {
- if (eObject instanceof MethodPermissionImpl && ref.getName().equals("roles")) {
- mpFlag = !mpFlag;
- //if method permission unchecked ignore roles
- if (!mpFlag) { return; }
- }
- super.populateSharedReference(eObject, ref);
- }
-
- /*
- * (non-Javadoc)
- *
- * @see junit.framework.TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- earFile = null;
- ejbFile = null;
- mesBean = null;
- entityBean = null;
- secID = null;
- roleSource = null;
-
- super.tearDown();
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WarEMFEditTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WarEMFEditTest.java
deleted file mode 100644
index f89e9f53..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WarEMFEditTest.java
+++ /dev/null
@@ -1,139 +0,0 @@
-package org.eclipse.jst.j2ee.archive.emftests;
-
-import java.util.List;
-
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebAppResource;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.FilterMappingImpl;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-
-public class WarEMFEditTest extends GeneralEMFEditingTest {
- protected EARFile earFile;
- protected WARFile warFile;
- protected int createdWebTypes = 0;
- protected int createdErrorPages = 0;
- protected boolean fmFlag = false;
-
- public WarEMFEditTest(String name) {
- super(name);
- }
-
- public WarEMFEditTest(String name, RendererFactory factory) {
- super(name, factory);
- }
-
- public static void main(java.lang.String[] args) {
- String[] className = { "com.ibm.etools.archive.test.WarEMFTest", "-noloading" };
- TestRunner.main(className);
- }
- public static junit.framework.Test suite(RendererFactory factory) {
- TestSuite suite = new TestSuite(WarEMFEditTest.class.getName());
- suite.addTest(new WarEMFEditTest("testWAREdit",factory));
- return suite;
- }
-
- public void testWAREdit() throws Exception {
- getWARClient();
-
- WebAppResource DD = (WebAppResource) warFile.getDeploymentDescriptorResource();
- setVersion(VERSION_1_3);
- setModuleType(WEB);
- editRoot(DD.getRootObject());
- String curDir = AutomatedBVT.baseDirectory;
- String out = curDir + "testOutput/EMFModelCreationTests/EditWarEAR";
- warFile.extractTo(out, Archive.EXPAND_ALL);
- warFile.close();
-
- //Compare work in progress
-
- String exampleDeploymentDesURI = curDir + "EMFTests/web.xml";
- String curDeploymentDesURI = curDir + out + "/fooWAR/WEB-INF/web.xml";
- //compareContents(curDeploymentDesURI, exampleDeploymentDesURI);
- }
-
- public void getWARClient() throws DuplicateObjectException, OpenFailureException {
- String in = AutomatedBVT.baseDirectory + "loose_module_workspace/LooseEARWeb/webApplication/";
- warFile = getArchiveFactory().openWARFile(in);
- assertTrue(warFile.getDeploymentDescriptor() != null);
- }
- public EObject createInstance(EClass eClassifier) {
-
- if (WebapplicationPackage.eINSTANCE.getWebType().equals(eClassifier))
- return createWebType();
- else if (WebapplicationPackage.eINSTANCE.getErrorPage().equals(eClassifier))
- return createErrorPage();
-
- return super.createInstance(eClassifier);
- }
- /* The web type is abstract. Alternate between servlet-class
- * and jsp-file
- */
- public WebType createWebType() {
- createdWebTypes++;
- if ((createdWebTypes & 1) == 0)
- return WebapplicationFactory.eINSTANCE.createServletType();
- else
- return WebapplicationFactory.eINSTANCE.createJSPType();
-
- }
- /* The error page is abstract. Alternate between exceptiontype
- * and error code
- */
- public ErrorPage createErrorPage() {
- createdErrorPages++;
- if ((createdErrorPages & 1) == 0)
- return WebapplicationFactory.eINSTANCE.createErrorCodeErrorPage();
- else
- return WebapplicationFactory.eINSTANCE.createExceptionTypeErrorPage();
- }
- /* (non-Javadoc)
- * @see com.ibm.etools.archive.emftest.GeneralEMFPopulationTest#populateAttributes(org.eclipse.emf.ecore.EObject)
- */
- protected void populateAttributes(EObject eObject) {
- if (eObject instanceof FilterMappingImpl){
- List attributes = eObject.eClass().getEAllAttributes();
- for (int i = 0; i < attributes.size(); i++) {
- EAttribute att = (EAttribute) attributes.get(i);
- if(att.getName().equals("urlPattern") && fmFlag){
- continue;
- }
-
- Object value = createAttributeValue(att, eObject);
- if (att.isChangeable())
- eObject.eSet(att, value);
- }
- fmFlag = !fmFlag;
- }
- else
- super.editAttributes(eObject);
- }
-
-
- protected void populateSharedReference(EObject eObject, EReference ref) {
- if(eObject instanceof FilterMappingImpl && ref.getName().equals("servlet")){
- fmFlag = !fmFlag;
- //if method permission unchecked ignore roles
- if(!fmFlag){
- return;
- }
- }
- super.populateSharedReference(eObject, ref);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WarEMFTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WarEMFTest.java
deleted file mode 100644
index d036e704..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WarEMFTest.java
+++ /dev/null
@@ -1,224 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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.archive.emftests;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.jst.j2ee.archive.testutilities.EMFAttributeFeatureGenerator;
-import org.eclipse.jst.j2ee.common.ResAuthTypeBase;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.WebAppResource;
-import org.eclipse.jst.j2ee.webapplication.WebType;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.FilterMappingImpl;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-
-public class WarEMFTest extends GeneralEMFPopulationTest {
- protected EARFile earFile;
- protected WARFile warFile;
- protected int createdWebTypes = 0;
- protected int createdErrorPages = 0;
- protected boolean fmFlag = false;
-
- public WarEMFTest(String name) {
- super(name);
- }
-
- public WarEMFTest(String name, RendererFactory factory) {
- super(name, factory);
- }
-
- public static void main(java.lang.String[] args) {
- junit.textui.TestRunner.main(new String[]{ WarEMFTest.class.getName() });
- }
-
- public static junit.framework.Test suite(RendererFactory factory) {
- TestSuite suite = new TestSuite(WarEMFTest.class.getName());
- //[248158] suite.addTest(new WarEMFTest("testWARPopulation",factory));
- suite.addTest(new WarEMFTest("test14WARPopulation",factory));
- return suite;
- }
-
- public void testWARPopulation() throws Exception {
- EMFAttributeFeatureGenerator.reset();
- createEAR();
- createWARClient();
-
- WebAppResource DD = (WebAppResource) warFile.getDeploymentDescriptorResource();
- DD.setVersionID(J2EEVersionConstants.J2EE_1_3_ID);
- //TODO: individual test for each version
- setVersion(VERSION_1_3);
- setModuleType(WEB);
- populateRoot(DD.getRootObject());
-
- String out = AutomatedBVT.baseDirectory +"testOutput/TestWarEAR";
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
-
- //Compare work in progress
- String curDir = AutomatedBVT.baseDirectory;
- String exampleDeploymentDesURI = curDir + "EMFTestNoID/web.xml";
- String curDeploymentDesURI = curDir + "testOutput/TestWarEAR/fooWAR/WEB-INF/web.xml";
- setIgnoreAtt(ignorableAttributes());
- setEquivalentLines(getEquivalentLinesMap());
- compareContentsIgnoreWhitespace(curDeploymentDesURI, exampleDeploymentDesURI, null);
- }
-
- public void test14WARPopulation() throws Exception {
- EMFAttributeFeatureGenerator.reset();
- createEAR();
- createWARClient();
-
- WebAppResource DD = (WebAppResource) warFile.getDeploymentDescriptorResource();
- DD.setVersionID(J2EEVersionConstants.J2EE_1_4_ID);
- //TODO: individual test for each version
- setVersion(VERSION_1_4);
- setModuleType(WEB);
- //setGeneralDepth(2);
- populateRoot(DD.getRootObject());
-
- String out = AutomatedBVT.baseDirectory +"testOutput/TestWarEAR14";
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
-
- getWARClient();
- assertEquals("2.4", warFile.getDeploymentDescriptor().getVersion());
- out = AutomatedBVT.baseDirectory +"testOutput/TestWarEAR14_2";
- warFile.extractTo(out, Archive.EXPAND_ALL);
- warFile.close();
-
- //Compare work in progress
- String curDir = AutomatedBVT.baseDirectory;
- String exampleDeploymentDesURI = out + "/WEB-INF/web.xml";
- String curDeploymentDesURI = curDir + "testOutput/TestWarEAR14/fooWAR/WEB-INF/web.xml";
- setIgnoreAtt(ignorableAttributes());
- compareContentsIgnoreWhitespace(curDeploymentDesURI, exampleDeploymentDesURI, null);
- }
-
- /**
- * @return
- */
- private Map getEquivalentLinesMap() {
- Map lines = new HashMap();
- lines.put("<distributable></distributable>", "<distributable/>");
- return lines;
- }
-
- public void createWARClient() throws DuplicateObjectException {
- warFile = getArchiveFactory().createWARFileInitialized("fooWAR");
- warFile = (WARFile) earFile.addCopy(warFile);
- warFile.getDeploymentDescriptor().setDisplayName("fooWAR");
- assertTrue(warFile.getDeploymentDescriptor() != null);
- }
-
- public void createEAR() {
- String earName = "Test.ear";
- earFile = getArchiveFactory().createEARFileInitialized(earName);
- assertTrue(earFile.getDeploymentDescriptor() != null);
- }
-
- public void getWARClient() throws DuplicateObjectException, OpenFailureException {
- String in = AutomatedBVT.baseDirectory + "testOutput/TestWarEAR14/fooWAR";
- ArchiveOptions options = new ArchiveOptions();
- options.setRendererType(options.SAX);
- warFile = getArchiveFactory().openWARFile(options, in);
- assertTrue(warFile.getDeploymentDescriptor() != null);
- }
-
- public EObject createInstance(EReference ref,EObject eObject) {
-
- if (WebapplicationPackage.eINSTANCE.getWebType().equals(ref.getEType()))
- return createWebType();
- else if (WebapplicationPackage.eINSTANCE.getErrorPage().equals(ref.getEType()))
- return createErrorPage();
-
- return super.createInstance(ref, eObject);
- }
- /* The web type is abstract. Alternate between servlet-class
- * and jsp-file
- */
- public WebType createWebType() {
- createdWebTypes++;
- if ((createdWebTypes & 1) == 0)
- return WebapplicationFactory.eINSTANCE.createServletType();
- else
- return WebapplicationFactory.eINSTANCE.createJSPType();
-
- }
- /* The error page is abstract. Alternate between exceptiontype
- * and error code
- */
- public ErrorPage createErrorPage() {
- createdErrorPages++;
- if ((createdErrorPages & 1) == 0)
- return WebapplicationFactory.eINSTANCE.createErrorCodeErrorPage();
- else
- return WebapplicationFactory.eINSTANCE.createExceptionTypeErrorPage();
- }
- /* (non-Javadoc)
- * @see com.ibm.etools.archive.emftest.GeneralEMFPopulationTest#populateAttributes(org.eclipse.emf.ecore.EObject)
- */
- protected void populateAttributes(EObject eObject) {
- if (eObject instanceof FilterMappingImpl){
- List attributes = eObject.eClass().getEAllAttributes();
- for (int i = 0; i < attributes.size(); i++) {
- EAttribute att = (EAttribute) attributes.get(i);
- if(att.getName().equals("urlPattern") && fmFlag){
- continue;
- }
-
- Object value = createAttributeValue(att, eObject);
- if (att.isChangeable())
- eObject.eSet(att, value);
- }
- fmFlag = !fmFlag;
- }
- else
- super.populateAttributes(eObject);
- }
-
-
- protected void populateSharedReference(EObject eObject, EReference ref) {
- if(eObject instanceof FilterMappingImpl && ref.getName().equals("servlet")){
- fmFlag = !fmFlag;
- //if method permission unchecked ignore roles
- if(!fmFlag){
- return;
- }
- }
- super.populateSharedReference(eObject, ref);
- }
-
- protected boolean isValidAuth(ResAuthTypeBase auth) {
- if (version == VERSION_1_2)
- return auth == ResAuthTypeBase.SERVLET_LITERAL || auth == ResAuthTypeBase.CONTAINER_LITERAL;
- else
- return super.isValidAuth(auth);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WebServicesEMFTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WebServicesEMFTest.java
deleted file mode 100644
index 0f40ee5a..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/emftests/WebServicesEMFTest.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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
- *******************************************************************************/
-/*
- * Created on Aug 6, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.archive.emftests;
-
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.jst.j2ee.archive.testutilities.EMFAttributeFeatureGenerator;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.OpenFailureException;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.InterfaceMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JavaWSDLMapping;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapFactory;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapPackage;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResource;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResourceFactory;
-import org.eclipse.jst.j2ee.webservice.wsclient.WebServicesResource;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddResource;
-import org.eclipse.wst.common.internal.emf.resource.RendererFactory;
-
-
-/**
- * @author dfholttp
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class WebServicesEMFTest extends GeneralEMFPopulationTest {
- public EARFile earFile;
- public EJBJarFile ejbFile;
- int currentVersion = J2EEVersionConstants.J2EE_1_3_ID;
- private int createdInterfaceMaps = 0;
-
- public WebServicesEMFTest(String name) {
- super(name);
- }
-
- public WebServicesEMFTest(String name, RendererFactory factory) {
- super(name, factory);
- }
-
- public static void main(java.lang.String[] args) {
- String[] className = { "com.ibm.etools.archive.test.WebServicesEMFTest", "-noloading" };
- TestRunner.main(className);
- }
- public static junit.framework.Test suite(RendererFactory factory) {
- TestSuite suite = new TestSuite(WebServicesEMFTest.class.getName());
- suite.addTest(new WebServicesEMFTest("test13WebServicesClientPopulation",factory));
- suite.addTest(new WebServicesEMFTest("test13WebServicesDDPopulation",factory));
- suite.addTest(new WebServicesEMFTest("test14WebServicesDDPopulation",factory));
- suite.addTest(new WebServicesEMFTest("test50WebServicesDDPopulation",factory));
- suite.addTest(new WebServicesEMFTest("testJaxRPCMapPopulation",factory));
- return suite;
- }
-
- public void test13WebServicesClientPopulation() throws Exception {
- currentVersion = J2EEVersionConstants.J2EE_1_3_ID;
- EMFAttributeFeatureGenerator.reset();
- createEAR();
- createEJB();
-
-
- WebServicesResource webserDD = (WebServicesResource)ejbFile.getResourceSet().createResource(URI.createURI("META-INF/webservicesclient.xml"));
- //TODO: individual test for each version
- webserDD.setVersionID(currentVersion);
- setVersion(VERSION_1_3);
- populateRoot(webserDD.getRootObject());
-
- String out = AutomatedBVT.baseDirectory +getProjectLocation();
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
-
- }
-
- public void testJaxRPCMapPopulation() throws Exception {
- currentVersion = J2EEVersionConstants.J2EE_1_3_ID;
- EMFAttributeFeatureGenerator.reset();
- createEAR();
- createEJB();
- String mappingFilePathURI = "META-INF/testmap.xml";
- URI uri = URI.createURI(mappingFilePathURI);
- ResourceSet resSet = ejbFile.getResourceSet();
- J2EEResourceFactoryRegistry registry = (J2EEResourceFactoryRegistry) resSet.getResourceFactoryRegistry();
- registry.registerLastFileSegment(uri.lastSegment(), new JaxrpcmapResourceFactory(RendererFactory.getDefaultRendererFactory()));
- resSet = earFile.getResourceSet();
- registry = (J2EEResourceFactoryRegistry) resSet.getResourceFactoryRegistry();
- registry.registerLastFileSegment(uri.lastSegment(), new JaxrpcmapResourceFactory(RendererFactory.getDefaultRendererFactory()));
-
- JaxrpcmapResource jaxrpcmapRes = (JaxrpcmapResource) resSet.createResource(uri);
-
- jaxrpcmapRes.setVersionID(currentVersion);
- setVersion(VERSION_1_3);
-
- JavaWSDLMapping map = JaxrpcmapFactory.eINSTANCE.createJavaWSDLMapping();
- jaxrpcmapRes.getContents().add(map);
- populateRoot(jaxrpcmapRes.getRootObject());
-
- String out = AutomatedBVT.baseDirectory +getProjectLocation();
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
-
- }
-
- public void test13WebServicesDDPopulation() throws Exception {
- EMFAttributeFeatureGenerator.reset();
- currentVersion = J2EEVersionConstants.J2EE_1_3_ID;
- createEAR();
- createEJB();
-
- WsddResource webserDD = (WsddResource)ejbFile.getResourceSet().createResource(URI.createURI("META-INF/webservices.xml"));
- //TODO: individual test for each version
- webserDD.setVersionID(currentVersion);
- setVersion(VERSION_1_3);
- populateRoot(webserDD.getRootObject());
-
- String out = AutomatedBVT.baseDirectory +getProjectLocation();
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
-
- }
- public void test14WebServicesDDPopulation() throws Exception {
- EMFAttributeFeatureGenerator.reset();
- currentVersion = J2EEVersionConstants.J2EE_1_4_ID;
- createEAR();
- createEJB();
-
- WsddResource webserDD = (WsddResource)ejbFile.getResourceSet().createResource(URI.createURI("META-INF/webservices.xml"));
- webserDD.getContents().add(WsddFactory.eINSTANCE.createWebServices());
- //TODO: individual test for each version
- webserDD.setVersionID(currentVersion);
- setVersion(VERSION_1_4);
- populateRoot(webserDD.getRootObject());
-
- String out = AutomatedBVT.baseDirectory +getProjectLocation();
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
-
- }
- public void test50WebServicesDDPopulation() throws Exception {
- EMFAttributeFeatureGenerator.reset();
- currentVersion = J2EEVersionConstants.JEE_5_0_ID;
- createEAR();
- createEJB();
-
- WsddResource webserDD = (WsddResource)ejbFile.getResourceSet().createResource(URI.createURI("META-INF/webservices.xml"));
- webserDD.getContents().add(WsddFactory.eINSTANCE.createWebServices());
- //TODO: individual test for each version
- webserDD.setVersionID(currentVersion);
- setVersion(VERSION_5_0);
- populateRoot(webserDD.getRootObject());
-
- String out = AutomatedBVT.baseDirectory +getProjectLocation();
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
-
- }
-
- public void test60WebServicesDDPopulation() throws Exception {
- EMFAttributeFeatureGenerator.reset();
- currentVersion = J2EEVersionConstants.JEE_6_0_ID;
- createEAR();
- createEJB();
-
- WsddResource webserDD = (WsddResource)ejbFile.getResourceSet().createResource(URI.createURI("META-INF/webservices.xml"));
- webserDD.getContents().add(WsddFactory.eINSTANCE.createWebServices());
- //TODO: individual test for each version
- webserDD.setVersionID(currentVersion);
- setVersion(VERSION_6_0);
- populateRoot(webserDD.getRootObject());
-
- String out = AutomatedBVT.baseDirectory +getProjectLocation();
- earFile.extractTo(out, Archive.EXPAND_ALL);
- earFile.close();
-
- }
-
- public EObject createInstance(EReference ref,EObject eObject) {
-
- if (JaxrpcmapPackage.eINSTANCE.getInterfaceMapping().equals(ref.getEType()))
- return createInterfaceMap();
-
- return super.createInstance(ref, eObject);
- }
-
- /* The web type is abstract. Alternate between servlet-class
- * and jsp-file
- */
- public InterfaceMapping createInterfaceMap() {
- createdInterfaceMaps++;
- if ((createdInterfaceMaps & 1) == 0)
- return JaxrpcmapFactory.eINSTANCE.createServiceEndpointInterfaceMapping();
- else
- return JaxrpcmapFactory.eINSTANCE.createServiceEndpointInterfaceMapping();
-
- }
-
- public String getProjectLocation() {
- if (currentVersion == J2EEVersionConstants.J2EE_1_3_ID)
- return "testOutput/TestWebServices";
- if (currentVersion == J2EEVersionConstants.J2EE_1_4_ID)
- return "testOutput/TestWebServices14";
- else
- return "testOutput/TestWebServices50";
- }
- public void getEJB() throws DuplicateObjectException, OpenFailureException {
- String in = AutomatedBVT.baseDirectory +getProjectLocation() +"/fooWebServices";
- ejbFile = getArchiveFactory().openEJBJarFile(in);
- assertTrue(ejbFile.getDeploymentDescriptor() != null);
- }
- public void createEJB() throws DuplicateObjectException {
- ejbFile = getArchiveFactory().createEJBJarFileInitialized("fooWebServices");
- ejbFile = (EJBJarFile) earFile.addCopy(ejbFile);
- ejbFile.getDeploymentDescriptor().setDisplayName("fooWebServices");
- assertTrue(ejbFile.getDeploymentDescriptor() != null);
- }
- public void createEAR() {
- String earName = "Test.ear";
- earFile = getArchiveFactory().createEARFileInitialized(earName);
- assertTrue(earFile.getDeploymentDescriptor() != null);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/AbstractArchiveTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/AbstractArchiveTest.java
deleted file mode 100644
index 491a319d..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/AbstractArchiveTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-package org.eclipse.jst.j2ee.archive.test;
-
- /*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EReference;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-/**
- * Insert the type's description here.
- * Creation date: (02/07/01 1:48:18 PM)
- * @author: Administrator
- */
-public class AbstractArchiveTest extends junit.framework.TestCase {
- private final static String copyright = "(c) Copyright IBM Corporation 2001.";//$NON-NLS-1$
-/**
- * AbstractArchiveTest constructor comment.
- * @param name java.lang.String
- */
-public AbstractArchiveTest(String name) {
- super(name);
-}
-public Set getAllUnresolvedProxies(EObject root) {
- Set visited = new HashSet();
- Set proxies = new HashSet();
- getAllUnresolvedProxies(root, proxies, visited, root.eResource());
- return proxies;
-}
-public void getAllUnresolvedProxies(EObject object, Set proxies, Set visitedObjects, Resource originalResource) {
-
- if (visitedObjects.contains(object))
- return;
- else
- visitedObjects.add(object);
-
- if (object.eResource() != originalResource) {
- if (((org.eclipse.emf.ecore.InternalEObject )object).eIsProxy()) {
- proxies.add(object);
- }
- return;
- }
-
- List refs = object.eClass().getEAllReferences();
- if (refs != null) {
- Iterator ir = refs.iterator();
- while (ir.hasNext()) {
- EReference r = (EReference) ir.next();
- Object value = object.eGet(r);
- if (value == null)
- continue;
-
- if (r.isMany()) {
- Collection c = (Collection) value;
- Iterator ir2 = c.iterator();
- while (ir2.hasNext()) {
- EObject refObj = (EObject) ir2.next();
- getAllUnresolvedProxies(refObj, proxies, visitedObjects, originalResource);
- }
- } else
- getAllUnresolvedProxies((EObject) value, proxies, visitedObjects, originalResource);
- }
- }
-}
-public static CommonarchiveFactory getArchiveFactory() {
- return CommonarchivePackage.eINSTANCE.getCommonarchiveFactory();
-}
-public void verifyProxies(EObject root) {
-
- Set proxies = getAllUnresolvedProxies(root);
- assertTrue("Some proxies could not be resolved", proxies.isEmpty());
-}
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/AllArchiveTestsEclipse.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/AllArchiveTestsEclipse.java
deleted file mode 100644
index 449fc6e1..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/AllArchiveTestsEclipse.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Created on Apr 18, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.archive.test;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class AllArchiveTestsEclipse extends AllArchiveTestsJava {
-
- public AllArchiveTestsEclipse(String name) {
- super(name);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/AllArchiveTestsJava.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/AllArchiveTestsJava.java
deleted file mode 100644
index a3f4efcb..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/AllArchiveTestsJava.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.eclipse.jst.j2ee.archive.test;
-
- /*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-/**
- * Insert the type's description here.
- * Creation date: (12/19/00 4:44:04 PM)
- * @author: Administrator
- */
-public class AllArchiveTestsJava extends TestCase {
- private final static String copyright = "(c) Copyright IBM Corporation 2001.";//$NON-NLS-1$
-/**
- * AllTests constructor comment.
- * @param name java.lang.String
- */
-public AllArchiveTestsJava(String name) {
- super(name);
-}
-/**
- * Starts the application.
- * @param args an array of command-line arguments
- */
-public static void main(java.lang.String[] args) {
- String[] className = {"com.ibm.etools.archive.test.AllTests", "-noloading"};
- TestRunner.main(className);
-}
-public static junit.framework.Test suite() {
- TestSuite suite = new TestSuite("Test for com.ibm.etools.archive.test");
- suite.addTest(DiscriminatorTest.suite());
- suite.addTest(LooseArchiveTests.suite());
- suite.addTest(InitializationTests.suite());
- suite.addTest(SimpleTests.suite());
- suite.addTest(CopyTests.suite());
-// suite.addTest(EJBJarConversionTests.suite());
- suite.addTest(WARFileTests.suite());
- suite.addTest(SaveTests.suite());
- suite.addTest(JavaTests.suite());
-// suite.addTest(IDTests.suite());
- //suite.addTest(AltDDTests.suite());
- suite.addTest(SecurityRoleTests.suite());
- suite.addTest(RarFileTests.suite());
- suite.addTest(ResourceTests.suite());
- suite.addTest(ClientContainerResourceLoadTest.suite());
- suite.addTest(TestModuleClassLoading.suite());
- suite.addTest(TestInvalidXmlMultiplicity.suite());
- suite.addTest(DefectVerificationTests.suite());
-
- return suite;
-}
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/ClientContainerResourceLoadTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/ClientContainerResourceLoadTest.java
deleted file mode 100644
index 7466acc0..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/ClientContainerResourceLoadTest.java
+++ /dev/null
@@ -1,104 +0,0 @@
-package org.eclipse.jst.j2ee.archive.test;
-
-import java.io.FileNotFoundException;
-import java.util.List;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveInit;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-
-
-
-public class ClientContainerResourceLoadTest extends TestCase{
- public static EARFile earFile = null;
-
- private final static String copyright = "(c) Copyright IBM Corporation 2001."; //$NON-NLS-1$
- /**
- * SimpleTests constructor comment.
- * @param name java.lang.String
- */
- public ClientContainerResourceLoadTest(String name) {
- super(name);
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- ArchiveInit.init();
- }
-
-
- public static junit.framework.Test suite() {
- return new TestSuite(ClientContainerResourceLoadTest.class);
- }
- /**
- * Starts the application.
- * @param args an array of command-line arguments
- */
- public static void main(java.lang.String[] args) {
- String[] className = { "com.ibm.etools.archive.test.ClientContainerResourceLoadTest", "-noloading" };
- TestRunner.main(className);
- }
-
- public void testClientContainerLoad () throws Exception {
-
- try {
-
- CommonarchiveFactory factory = CommonarchiveFactory.eINSTANCE;
- String in = AutomatedBVT.baseDirectory + "mtapp2.ear";
- String out = AutomatedBVT.baseDirectory + "mtapp2Finished.ear";
- earFile = factory.openEARFile (in);
- System.out.println ("uri: " + earFile.getURI());
-
- List appClients = earFile.getApplicationClientFiles();
- boolean exFound1 = false;
- boolean exFound2 = false;
-
- for(int i = 0; i<appClients.size(); i++){
- ApplicationClientFile file = (ApplicationClientFile)appClients.get(0);
- Resource res;
-
- try{
- res = file.getMofResource("META-INF/FOOclient-resource.xmi");
- } catch(Exception e){
- exFound1 = true;
- if(!(e instanceof FileNotFoundException)){
- assertTrue("Expected FileNotFoundException", false);
- }
- }
-
- try {
- res = file.getMofResource("META-INF/client-resource.xmi");
- } catch (Exception e) {
- exFound2 = true;
- if(!(e instanceof ResourceLoadException)){
- assertTrue("Expected ResourceLoadException", false);
- }
- }
- }
- assertTrue("No exception logged for non-existing file", exFound1);
- assertTrue("No exception logged for existing", exFound2);
-
-
- earFile.saveAs(out);
- earFile.close();
- }
- catch (Exception e) {
- e.printStackTrace();
- }
- }
- /* (non-Javadoc)
- * @see junit.framework.TestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/CopyTests.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/CopyTests.java
deleted file mode 100644
index f4d08f45..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/CopyTests.java
+++ /dev/null
@@ -1,234 +0,0 @@
-package org.eclipse.jst.j2ee.archive.test;
-
-/*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2001 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
-
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ReadOnlyDirectory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * Insert the type's description here.
- * Creation date: (12/14/00 12:10:36 PM)
- * @author: Administrator
- */
-public class CopyTests extends TestCase {
- private final static String copyright = "(c) Copyright IBM Corporation 2001."; //$NON-NLS-1$
- /**
- * CopyTests constructor comment.
- * @param name java.lang.String
- */
- public CopyTests(String name) {
- super(name);
- }
- public CommonarchiveFactory getArchiveFactory() {
- return CommonarchivePackage.eINSTANCE.getCommonarchiveFactory();
- }
- public EjbFactory getEJBFactory() {
- return EjbPackage.eINSTANCE.getEjbFactory();
- }
-
- public EjbPackage getEJBPackage() {
- return EjbPackage.eINSTANCE;
- }
- public WebapplicationFactory getWebFactory() {
- return WebapplicationPackage.eINSTANCE.getWebapplicationFactory();
- }
- /**
- * Starts the application.
- * @param args an array of command-line arguments
- */
- public static void main(java.lang.String[] args) {
- String[] className = { "com.ibm.etools.archive.test.CopyTests", "-noloading" };
- TestRunner.main(className);
- }
- public static junit.framework.Test suite() {
- return new TestSuite(CopyTests.class);
- }
- /**
- * Tests the addCopy(ReadOnlyDirectory) api on archive
- */
- public void testAddCopyDirectory() throws Exception {
-
- WARFile aWarFile = (WARFile) getArchiveFactory().openArchive(AutomatedBVT.baseDirectory + "example2.war");
-
- ReadOnlyDirectory sampleDirectory = getArchiveFactory().openReadOnlyDirectory(AutomatedBVT.baseDirectory + "WarTestClasses");
-
- int initialSize = aWarFile.getFiles().size();
-
- aWarFile.addCopy(sampleDirectory);
- Iterator iter = aWarFile.getFiles().iterator();
- //For running inside eclipse
- while (iter.hasNext()) {
- String uri = ((File)iter.next()).getURI();
- if (uri.indexOf("CVS") >= 0)
- iter.remove();
- }
- assertTrue("Wrong number of files ", aWarFile.getFiles().size() == initialSize + 7);
- aWarFile.saveAsNoReopen(AutomatedBVT.baseDirectory + "testOutput/CopyTests/addCopyDir.war");
-
- }
-
- public void testAddCopyModule() throws Exception {
-
- String in = AutomatedBVT.baseDirectory + "sample.ear";
- EARFile earFile = (EARFile) getArchiveFactory().openArchive(in);
- List modules = earFile.getDeploymentDescriptor().getModules();
- EJBJarFile ejbJarFile = null;
-
- for (int i = 0; i < modules.size(); i++) {
- Module aModule = (Module) modules.get(i);
- if (aModule.isEjbModule()) {
- ejbJarFile = (EJBJarFile) earFile.getFile(aModule.getUri());
- break;
- }
- }
-
- assertTrue("EJBJarFile should not be null", ejbJarFile != null);
- ejbJarFile.getDeploymentDescriptor();
-
- EARFile newEarFile = getArchiveFactory().createEARFileInitialized(AutomatedBVT.baseDirectory + "testOutput/CopyTests/newEarWithCopiedModule.ear");
- newEarFile.addCopy(ejbJarFile);
- EJBJarFile copied = (EJBJarFile) newEarFile.getModuleFiles().get(0);
- assertTrue(copied.isDeploymentDescriptorSet());
- assertTrue(copied.getDeploymentDescriptor() == copied.getDeploymentDescriptorResource().getContents().get(0));
- assertTrue(copied.getDeploymentDescriptor() != ejbJarFile.getDeploymentDescriptor());
- assertTrue(ejbJarFile.getFiles().size() == copied.getFiles().size());
-
- newEarFile.saveNoReopen();
- }
-
- /**
- * Test per CMVC defect report 96197
- * Create a new application, open ejb jar file, use addcopy to add the module, and save
- * using original ear, get the ejb jar, and modify bindings
- * save again
- * Result: bindings not updated
- */
- public void testAddCopyModuleFilesToEAR() throws Exception {
- String uri = AutomatedBVT.baseDirectory + "testOutput/CopyTests/testAddCopyModuleFilesToEAR.ear";
- //Create a new ear file, add a standalone ejb jar file and standalone war file, and save
- EARFile earFile = getArchiveFactory().createEARFileInitialized(uri);
- earFile.setJ2EEVersion(J2EEVersionConstants.J2EE_1_3_ID);
- earFile.getDeploymentDescriptor().setDisplayName(uri);
- EJBJarFile ejbJarFile = getArchiveFactory().openEJBJarFile(AutomatedBVT.baseDirectory + "bankejbs.jar");
- earFile.addCopy(ejbJarFile);
- WARFile warFile = getArchiveFactory().openWARFile(AutomatedBVT.baseDirectory + "example2.war");
- earFile.addCopy(warFile);
- ((WebModule) earFile.getDeploymentDescriptor().getFirstModule(warFile.getURI())).setContextRoot("/");
- earFile.save();
-
- ejbJarFile = (EJBJarFile) earFile.getEJBJarFiles().get(0);
- assertTrue("ejb dd resource not right", ejbJarFile.getDeploymentDescriptor().eResource() == ejbJarFile.getDeploymentDescriptorResource());
-
-
-
- warFile = (WARFile) earFile.getWARFiles().get(0);
- assertTrue("war dd resource not right", warFile.getDeploymentDescriptor().eResource() == warFile.getDeploymentDescriptorResource());
-
-
- earFile.saveNoReopen();
-
-
- earFile.close();
-
- }
- /**
- * Tests opening a standalone module with an absolute path, and adding that to a new ear file, per defect report
- */
- public void testAddCopyStandaloneModule() throws Exception {
- String fileName = AutomatedBVT.baseDirectory + "bankejbs.jar";
-
- EJBJarFile ejbJarFile = (EJBJarFile) getArchiveFactory().openArchive(fileName);
- ejbJarFile.getDeploymentDescriptor();
-
- EARFile newEarFile = getArchiveFactory().createEARFileInitialized(AutomatedBVT.baseDirectory + "testOutput/CopyTests/newEarWithStandAloneModule-out.ear");
- newEarFile.addCopy(ejbJarFile);
- EJBJarFile copied = (EJBJarFile) newEarFile.getModuleFiles().get(0);
- assertTrue(copied.isDeploymentDescriptorSet());
- assertTrue(copied.getDeploymentDescriptor() == copied.getDeploymentDescriptorResource().getContents().get(0));
- assertTrue(copied.getDeploymentDescriptor() != ejbJarFile.getDeploymentDescriptor());
- assertTrue(ejbJarFile.getFiles().size() == copied.getFiles().size());
-
- newEarFile.saveNoReopen();
- }
-
- public void testAddRenameAndDelete() throws Exception {
-
- String in = AutomatedBVT.baseDirectory + "sample.ear";
- EARFile earFile = (EARFile) getArchiveFactory().openArchive(in);
- List modules = earFile.getDeploymentDescriptor().getModules();
- EJBJarFile ejbJarFile = null;
-
- for (int i = 0; i < modules.size(); i++) {
- Module aModule = (Module) modules.get(i);
- if (aModule.isEjbModule()) {
- ejbJarFile = (EJBJarFile) earFile.getFile(aModule.getUri());
- break;
- }
- }
-
- assertTrue("EJBJarFile should not be null", ejbJarFile != null);
- ejbJarFile.getDeploymentDescriptor();
-
- EARFile newEarFile = getArchiveFactory().createEARFileInitialized(AutomatedBVT.baseDirectory + "testOutput/CopyTests/newEarWithCopiedModule.ear");
- EJBModuleRef addedCopy = (EJBModuleRef) newEarFile.addCopyRef(ejbJarFile);
- assertTrue("Module files should not be empty", !newEarFile.getModuleFiles().isEmpty());
- assertTrue("Modules should not be empty", !newEarFile.getDeploymentDescriptor().getModules().isEmpty());
- assertTrue("Module should be accessible and have the same uri as file", addedCopy.getModule().getUri().equals(addedCopy.getModuleFile().getURI()));
-
- String newURI = "temp/foobar.jar";
- addedCopy.setURI(newURI);
- assertTrue("Module should be accessible and have the new renamed uri as well as the file", addedCopy.getModule().getUri().equals(addedCopy.getModuleFile().getURI()) && addedCopy.getModule().getUri().equals(newURI));
- newEarFile.remove(addedCopy);
- assertTrue("Module files should be empty", newEarFile.getModuleFiles().isEmpty());
- assertTrue("Modules should be empty", newEarFile.getDeploymentDescriptor().getModules().isEmpty());
-
- }
-
- public void testAddRenameAndDeleteStandalone() throws Exception {
-
- String fileName = AutomatedBVT.baseDirectory + "bankejbs.jar";
-
- EJBJarFile ejbJarFile = (EJBJarFile) getArchiveFactory().openArchive(fileName);
-
- EARFile newEarFile = getArchiveFactory().createEARFileInitialized(AutomatedBVT.baseDirectory + "testOutput/CopyTests/newEarWithCopiedModule.ear");
- EJBModuleRef addedCopy = (EJBModuleRef) newEarFile.addCopyRef(ejbJarFile);
- assertTrue("Module files should not be empty", !newEarFile.getModuleFiles().isEmpty());
- assertTrue("Modules should not be empty", !newEarFile.getDeploymentDescriptor().getModules().isEmpty());
- assertTrue("Module should be accessible and have the same uri as file", addedCopy.getModule().getUri().equals(addedCopy.getModuleFile().getURI()));
-
- String newURI = "temp/foobar.jar";
- addedCopy.setURI(newURI);
- assertTrue("Module should be accessible and have the new renamed uri as well as the file", addedCopy.getModule().getUri().equals(addedCopy.getModuleFile().getURI()) && addedCopy.getModule().getUri().equals(newURI));
- newEarFile.remove(addedCopy);
- assertTrue("Module files should be empty", newEarFile.getModuleFiles().isEmpty());
- assertTrue("Modules should be empty", newEarFile.getDeploymentDescriptor().getModules().isEmpty());
-
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/DefectVerificationTests.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/DefectVerificationTests.java
deleted file mode 100644
index 205165b3..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/DefectVerificationTests.java
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * Created on May 20, 2004
- */
-package org.eclipse.jst.j2ee.archive.test;
-
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Iterator;
-import java.util.List;
-import java.util.zip.ZipInputStream;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Container;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WebModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.internal.WrappedException;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-
-/**
- * @author mdelder
- */
-public class DefectVerificationTests extends TestCase {
-
- /**
- *
- */
- public DefectVerificationTests() {
- super();
- }
-
- /**
- * @param name
- */
- public DefectVerificationTests(String name) {
- super(name);
- }
-
- public static junit.framework.Test suite() {
- /*TestSuite suite = new TestSuite();
- suite.addTest(new DefectVerificationTests("testFilterMappingTranslator"));
- return suite;*/
- return new TestSuite(DefectVerificationTests.class);
- }
-
-
- public void testFilterMappingTranslator() throws Exception {
-/* ArchiveOptions options = new ArchiveOptions();
- options.setRendererType(ArchiveOptions.DOM);
- final String earPath = AutomatedBVT.baseDirectory + "sample.ear";
- CommonarchivePackage pkg = CommonarchivePackage.eINSTANCE;
- EARFile earFile = pkg.getCommonarchiveFactory().openEARFile(options,
- earPath);
- // open the ear
- System.out.println("opening " + archive + " ... ");*/
-
- String archive = AutomatedBVT.baseDirectory + "QIDefectsNew.ear";
- String name = "QIDefects.war";
- /*
- * crack open the ear file using the common archive:
- */
- CommonarchiveFactory archiveFactory = (CommonarchiveFactory) CommonarchivePackage.eINSTANCE.getEFactoryInstance();
- ArchiveOptions options = new ArchiveOptions();
- options.setRendererType(ArchiveOptions.SAX);
- options.setUseJavaReflection(false);
- // options.setDiscriminateNestedArchives(extraProcessing);
-
- EARFile earFile = archiveFactory.openEARFile(options, archive);
- WebModuleRef warFile = null;
- for (Iterator i = earFile.getModuleRefs().iterator(); i.hasNext();) {
- ModuleRef mref = (ModuleRef) i.next();
- if (name.equals(mref.getUri())) {
- warFile = (WebModuleRef) mref;
- }
- }
-
- WebApp dd = (WebApp)warFile.getDeploymentDescriptor();
-
- EList filterMappings = dd.getFilterMappings();
- assertTrue("The test requires two filter mappings.", filterMappings.size() == 2);
- FilterMapping filterMapping1 = (FilterMapping)filterMappings.get(0);
- assertNotNull("A URL Pattern was not found for filter with name " + filterMapping1.getFilter().getName(),filterMapping1.getUrlPattern());
- FilterMapping filterMapping2 = (FilterMapping)filterMappings.get(1);
- assertNotNull("A Servlet name was not found for filter with name " + filterMapping2.getFilter().getName(),filterMapping2.getServletName());
- assertNotNull("A Servlet was not found for filter with name " + filterMapping2.getFilter().getName(),filterMapping2.getServlet());
-
- }
-
- public void testFormerDefect297() throws Exception {
- ArchiveOptions options = new ArchiveOptions();
- options.setRendererType(ArchiveOptions.DOM);
- final String earPath = AutomatedBVT.baseDirectory + "sample.ear";
- CommonarchivePackage pkg = CommonarchivePackage.eINSTANCE;
- EARFile earFile = pkg.getCommonarchiveFactory().openEARFile(options,
- earPath);
- earFile.extractNoReopen(Archive.EXPAND_ALL);
- }
-
- public void testFormerDefect1459() throws Exception {
- ArchiveOptions options = new ArchiveOptions();
- options.setRendererType(ArchiveOptions.DOM);
- CommonarchivePackage pkg = CommonarchivePackage.eINSTANCE;
- CommonarchiveFactory factory = pkg.getCommonarchiveFactory();
-
- EARFile earFile = factory.createEARFileInitialized(options, "Test.ear");
- earFile.saveAs("C:\\Test.ear");
- }
-
- /*
- * public void testCorruptedEAR() throws Exception { ArchiveOptions options =
- * new ArchiveOptions(); options.setRendererType(ArchiveOptions.DOM); final
- * String earPath = AutomatedBVT.baseDirectory + "occam.ear";
- * CommonarchivePackage pkg = CommonarchivePackage.eINSTANCE;
- * CommonarchiveFactory factory = pkg.getCommonarchiveFactory();
- *
- * EARFile earFile = factory.openEARFile(options, earPath);
- *
- * List files = earFile.getFiles();
- *
- * for(int i=0; i <files.size(); i++) { System.err.println(files.get(i));
- * readFile( (File) files.get(i)); if(files.get(i) instanceof WARFile) {
- * WARFile war = (WARFile) files.get(i); List warFiles = war.getFiles();
- * for(int j=0; j <warFiles.size(); j++) {
- * System.err.println(warFiles.get(j)); readFile((File)warFiles.get(j)); } } }
- * System.out.println("Done"); }
- */
-
- /**
- * @param file
- * @throws FileNotFoundException
- * @throws IOException
- */
- private void readFile(File file) throws FileNotFoundException, IOException {
- InputStream is = file.getInputStream();
- ZipInputStream zis = new ZipInputStream(is);
- try {
- while (zis.getNextEntry() != null);
-
- } finally {
- if (is != null)
- is.close();
- if (zis != null)
- zis.close();
- is = null;
- zis = null;
- }
- }
-
- public void testSavingEARWhileDeploying() throws Exception {
- try {
- ArchiveOptions options = new ArchiveOptions();
- options.setRendererType(ArchiveOptions.SAX);
- options.setUseJavaReflection(true);
- final String earPath = AutomatedBVT.baseDirectory
- + "AuctionApp.ear";
- CommonarchivePackage pkg = CommonarchivePackage.eINSTANCE;
- EARFile earFile = pkg.getCommonarchiveFactory().openEARFile(
- options, earPath);
- printFiles(earFile);
- earFile.save();
-
- earFile.reopen();
- } catch (WrappedException we) {
- Logger.getLogger().logError(we);
- Logger.getLogger().logError(we.getMessage());
- if (we.getCause() != null)
- Logger.getLogger().logError(we.getCause());
- if (we.getNestedException() != null)
- Logger.getLogger().logError(we.getNestedException());
- if (we.getNestedException() != null)
- Logger.getLogger().logError(we.getConcatenatedMessages());
- throw we;
- }
- }
-
- public void testCreatingEARFile() throws Exception {
-
- CommonarchivePackage pkg = CommonarchivePackage.eINSTANCE;
- CommonarchiveFactory factory = pkg.getCommonarchiveFactory();
- final String earPath = AutomatedBVT.baseDirectory
- + "InitializedEAR.ear";
-
- ArchiveOptions options = new ArchiveOptions();
- options.setIsReadOnly(true);
- options.setRendererType(ArchiveOptions.DOM);
-
- // new ear file
- EARFile earFile = factory.createEARFileInitialized(options, earPath);
-
- Application appl = earFile.getDeploymentDescriptor();
-
- }
-
- public void testServiceQNameTranslator() throws Exception {
- try {
- ArchiveOptions options = new ArchiveOptions();
- options.setRendererType(ArchiveOptions.SAX);
- final String earPath = AutomatedBVT.baseDirectory + "WSSecured_InsuranceServices_EJB_WS.ear";
- CommonarchivePackage pkg = CommonarchivePackage.eINSTANCE;
- CommonarchiveFactory factory = pkg.getCommonarchiveFactory();
- EARFile earFile = factory.openEARFile(options, earPath);
- printFiles(earFile);
- String tmp = "C:\\temp\\"+System.currentTimeMillis();
- earFile.extractTo(tmp, 0);
-
- List ejbModuleRefs = earFile.getEJBModuleRefs();
-
- for(int i=0; i<ejbModuleRefs.size(); i++) {
- EJBModuleRef ejbmodref = (EJBModuleRef) ejbModuleRefs.get(i);
- if(ejbmodref.getUri().equals("WSInsSession20EJB.jar")) {
- Resource res = ejbmodref.getMofResource("META-INF/webservicesclient.xml");
- System.err.println(res.getURI());
-
- }
- }
- /*
- * Application app = earFile.getDeploymentDescriptor(); List modules =
- * app.getModules(); for(int i=0; i <modules.size(); i++) {
- * System.err.println(modules.get(i)); Module
- * mod=(Module)modules.get(i); if( mod.isEjbModule() ) { EjbModule
- * ejbModule = (EjbModule) mod; EJBJarFile ejbJarFile =
- * factory.openEJBJarFile(options, "WSInsSession20EJB.jar"); EJBJar
- * ejbjar = ejbJarFile.getDeploymentDescriptor(); }
- * }
- */
- } catch (WrappedException we) {
- Logger.getLogger().logError(we);
- Logger.getLogger().logError(we.getMessage());
- if(we.getCause() != null)
- Logger.getLogger().logError(we.getCause());
- if(we.getNestedException() != null)
- Logger.getLogger().logError(we.getNestedException());
- if(we.getNestedException() != null)
- Logger.getLogger().logError(we.getConcatenatedMessages());
- throw we;
- }
- }
-
- public void testReadCrimsonCase() throws Exception {
- try {
- ArchiveOptions options = new ArchiveOptions();
- options.setRendererType(ArchiveOptions.DOM);
- final String earPath = AutomatedBVT.baseDirectory
- + "ejb_sam_Hello.ear";
- CommonarchivePackage pkg = CommonarchivePackage.eINSTANCE;
- EARFile earFile = pkg.getCommonarchiveFactory().openEARFile(
- options, earPath);
- Application app = earFile.getDeploymentDescriptor();
- assertNotNull("Could not read deployment descriptor.", app);
- System.err.println("\n\n******************Printing files from " + app.getDisplayName());
- assertNotNull("Could not read display name from deployment descriptor.", app.getDisplayName());
- printFiles(earFile);
- earFile.extractTo(AutomatedBVT.baseDirectory + "testOutput/temp", 0);
- earFile.reopen();
- } catch (WrappedException we) {
- Logger.getLogger().logError(we);
- Logger.getLogger().logError(we.getMessage());
- if (we.getCause() != null)
- Logger.getLogger().logError(we.getCause());
- if (we.getNestedException() != null)
- Logger.getLogger().logError(we.getNestedException());
- if (we.getNestedException() != null)
- Logger.getLogger().logError(we.getConcatenatedMessages());
- throw we;
- }
- }
-
- /*public void testReadInitParms13() throws Exception {
- readInitParms(true);
- }
- public void testReadInitParms14() throws Exception{
- readInitParms(false);
- } */
-
- /*public void readInitParms(boolean is13) throws Exception {
- try {
- System.out.println("Using J2EE " + (is13?"1.3" :"1.4") );
- ArchiveOptions options = new ArchiveOptions();
- options.setRendererType(ArchiveOptions.DOM);
- final String earPath = AutomatedBVT.baseDirectory
- + ((is13) ? "filter13war.ear" : "servlet_js_filter.ear");
- CommonarchivePackage pkg = CommonarchivePackage.eINSTANCE;
- EARFile earFile = pkg.getCommonarchiveFactory().openEARFile(
- options, earPath);
- WARFile warFile = (WARFile) (is13 ? earFile.getFile("FilterWar.war") :earFile.getFile("servlet_js_filter_web.war"));
- WebApp webapp = warFile.getDeploymentDescriptor();
- assertNotNull("The web app DD could not be located", webapp);
- EList filters = webapp.getFilters();
- Filter f = null;
- EList parms, paramValues;
- for(int i=0; i<filters.size(); i++) {
- f = (Filter) filters.get(i);
- System.out.println(f);
- EList parms = f.getInitParams();
- System.out.println("There are " + parms.size() + " InitParams");
- for(int j=0; j<parms.size(); j++) {
- InitParam p = (InitParam) parms.get(j);
- System.out.println(p);
- }
- EList paramValues = f.getInitParamValues();
- System.out.println("There are " + paramValues.size() + " InitParamValues");
- for(int j=0; j<paramValues.size(); j++) {
- ParamValue p = (ParamValue) paramValues.get(j);
- System.out.println(p);
- }
-
- System.out.println("Demo version case");
-
-
- WebApp container = (WebApp) f.eContainer();
- switch(container.getJ2EEVersionID()) {
- case J2EEVersionConstants.J2EE_1_2_ID:
- case J2EEVersionConstants.J2EE_1_3_ID:
-
- parms = f.getInitParams();
- System.out.println("There are " + parms.size() + " InitParams");
- assertEquals("There must be 2 Filter Init Params", parms.size(), 2);
- for(int j=0; j<parms.size(); j++) {
- InitParam ip = (InitParam) parms.get(j);
- System.out.println(p);
- assertTrue("The param names much match", ("param"+j+"name").equals(ip.getParamName()));
- assertTrue("The param values much match", ("param"+j+"value").equals(ip.getParamValue()));
- }
- break;
- case J2EEVersionConstants.J2EE_1_4_ID: default: {
-
- paramValues = f.getInitParamValues();
- assertEquals("There must be 1 Filter Init Param Values", paramValues.size(), 1);
- System.out.println("There are " + paramValues.size() + " InitParamValues");
-
- ParamValue pv = (ParamValue) paramValues.get(0);
- System.out.println(pv);
- assertTrue("The param names much match", ("attribute").equals(pv.getName()));
- String expectedValue = (i == 0) ? "com.sun.ts.tests.servlet.api.javax_servlet.filter.DoFilter_Filter.SERVLET_MAPPED" : "com.sun.ts.tests.servlet.api.javax_servlet.filter.InitFilter_Filter.SERVLET_MAPPED";
- assertEquals("The param values much match", expectedValue , pv.getValue());
- }
- break;
- }
- }
-
-
- } catch (WrappedException we) {
- Logger.getLogger().logError(we);
- Logger.getLogger().logError(we.getMessage());
- if (we.getCause() != null)
- Logger.getLogger().logError(we.getCause());
- if (we.getNestedException() != null)
- Logger.getLogger().logError(we.getNestedException());
- if (we.getNestedException() != null)
- Logger.getLogger().logError(we.getConcatenatedMessages());
- throw we;
- }
- }*/
-
-
- private void printFiles(Container ar) {
- List files = ar.getFiles();
-
- for (int i = 0; i < files.size(); i++) {
- System.err.println(files.get(i));
- if (files.get(i) instanceof Container) {
- Container tainer = (Container) files.get(i);
- printFiles(tainer);
- }
- }
- }
-
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/DiscriminatorTest.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/DiscriminatorTest.java
deleted file mode 100644
index 734786d7..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/DiscriminatorTest.java
+++ /dev/null
@@ -1,107 +0,0 @@
-package org.eclipse.jst.j2ee.archive.test;
-
-import java.io.File;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ArchiveTypeDiscriminatorRegistry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.GenericArchiveTypeDiscriminator;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-
-
-/*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001, 2002 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-/**
- * @author mdelder
- *
- */
-public class DiscriminatorTest
- extends TestCase {
-
- public boolean assertBarFile = false;
-
- public DiscriminatorTest(String name) {
- super(name);
- }
-
- public static Test suite() {
- TestSuite suite = new TestSuite("DiscriminatorTest");
- suite.addTest(new DiscriminatorTest("testDiscriminator"));
- return suite;
- }
-
- // TODO Implement unit test for discriminator framework
- public void testDiscriminator() throws Exception {
- assertBarFile = true;
- try {
- ArchiveTypeDiscriminatorRegistry.registorDiscriminator(new BeverageArchiveDiscriminator());
- Archive archive = CommonarchiveFactory.eINSTANCE.openArchive( AutomatedBVT.baseDirectory + File.separator + "my.bar");
- assertNotNull("The archive was not found!", archive);
-
- assertTrue("The archive extension (.bar) was not recognized as a custom extension!", archive.isNestedArchive("my.bar"));
-
- boolean typeContributedSuccessfully = false;
- EList types = archive.getTypes();
- for (int i = 0; i < types.size(); i++) {
- if (types.get(i).equals(BeverageArchiveDiscriminator.BEVERAGE_ARCHIVE_TYPE_KEY)) {
- typeContributedSuccessfully = true;
- break;
- }
- }
- assertTrue("The BEVERAGE_ARCHIVE_TYPE_KEY was not found in the list of types of the archive!", typeContributedSuccessfully);
- } finally {
- assertBarFile = false;
- }
- }
-
- public class BeverageArchiveDiscriminator
- extends TestCase implements GenericArchiveTypeDiscriminator {
-
- public static final String BEVERAGE_ARCHIVE_TYPE_KEY = "com.ibm.beverage.archive";
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.j2ee.commonarchivecore.GenericArchiveTypeDiscriminator#discriminate(com.ibm.etools.j2ee.commonarchivecore.Archive)
- */
- public boolean discriminate(Archive anArchive) {
- boolean result = anArchive.containsFile("META-INF/adult-beverage-imbibement-options.xml");
- if (assertBarFile)
- assertTrue(
- "The BeverageArchiveDiscriminator did not recogniZe the file! (Ensure it contains a file named META-INF/adult-beverage-imbibement-venues.xml)",
- result);
- return result;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.j2ee.commonarchivecore.GenericArchiveTypeDiscriminator#getCustomFileExtensions()
- */
- public String[] getCustomFileExtensions() {
-
- return new String[] { "bar"};
-
- }
-
- /*
- * (non-Javadoc)
- *
- * @see com.ibm.etools.j2ee.commonarchivecore.GenericArchiveTypeDiscriminator#getTypeKey()
- */
- public String getTypeKey() {
-
- return BEVERAGE_ARCHIVE_TYPE_KEY;
- }
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/DomComparitor.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/DomComparitor.java
deleted file mode 100644
index 454c1e30..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/DomComparitor.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*
- * Created on Mar 17, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.archive.test;
-
-import java.util.HashSet;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.CharacterData;
-import org.w3c.dom.Document;
-import org.w3c.dom.DocumentFragment;
-import org.w3c.dom.DocumentType;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.dom.ProcessingInstruction;
-import org.xml.sax.EntityResolver;
-
-/**
- * THE MASTER COPY of this class is in com.ibm.etools.commontests
- * Please update the copy in commontests and then copy this class to
- * where you need it if you are looking at a different copy
- *
- * @author jsholl
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class DomComparitor {
- private static EntityResolver entityResolver;
- private static HashSet attributeList;
-// TODO replace this with non xerces
-// public static String compareDoms(InputSource source1, InputSource source2, HashSet ignorableAtts) throws Exception {
-// attributeList = ignorableAtts;
-// DOMParser parser = new DOMParser();
-// if (entityResolver == null) {
-// parser.setEntityResolver(new EntityResolver() {
-// public InputSource resolveEntity(String arg0, String arg1) throws SAXException, IOException {
-// return null;
-// }
-//
-// });
-// } else {
-// parser.setEntityResolver(entityResolver);
-// }
-// parser.parse(source1);
-// Document doc1 = parser.getDocument();
-// parser.parse(source2);
-// Document doc2 = parser.getDocument();
-// return compareNodes(doc1, doc2);
-// }
-
-// public static String compareDoms(InputSource source1, InputSource source2) throws Exception {
-// return compareDoms(source1, source2, null);
-// }
-
-
- public static String compareNodes(Node node1, Node node2) throws Exception {
- // System.out.println("checking A:" + node1);
- // System.out.println("checking B:" + node2);
- // System.out.println("nodeType=" + node1.getNodeType());
- // System.out.println("getNodeName=" + node1.getNodeName());
- // System.out.println("getNodeValue=" + node1.getNodeValue());
-
- //Generic Node Testing
- if (node1 == null && node2 == null)
- return null;
- else if ((node1 != null && node2 == null) || node1 == null && node2 != null)
- return nullNodeEncountered(node1, node2);
- else if (node1.getNodeType() != node2.getNodeType()) {
- return mismatch("Node.getNodeType() " + node1.getNodeType() + " " + node2.getNodeType(), node1, node2);
- } else if (node1.getNodeName() != node2.getNodeName()) {
- return mismatch("Node.getNodeName() <" + node1.getNodeName() + "> <" + node2.getNodeName() + ">", node1, node2);
- } else if (!(node1.getNodeValue() == null && node2.getNodeValue() == null)) {
- if (node1.getNodeValue() == null) {
- return mismatch("Node.getNodeValue() node A is null", node1, node2);
- } else if (node2.getNodeValue() == null) {
- return mismatch("Node.getNodeValue() node B is null", node1, node2);
- } else if (!node1.getNodeValue().equals(node2.getNodeValue())) {
- return mismatch("Node.getNodeValue() <" + node1.getNodeValue() + "> <" + node2.getNodeValue() + ">", node1, node2);
- }
- } else if (node1.hasAttributes() != node2.hasAttributes()) {
- return mismatch("Node.hasAttributes() " + node1.hasAttributes() + " " + node2.hasAttributes(), node1, node2);
- } else if (node1.hasChildNodes() != node2.hasChildNodes()) {
- return mismatch("Node.hasChildNodes() " + node1.hasChildNodes() + " " + node2.hasChildNodes(), node1, node2);
- }
- //TODO strengthen node comparisons as necessary
- //Specialized Node Testing
- switch (node1.getNodeType()) {
- case Node.TEXT_NODE :
- case Node.CDATA_SECTION_NODE :
- CharacterData cdata1 = (CharacterData) node1;
- CharacterData cdata2 = (CharacterData) node2;
- if (!cdata1.getData().equals(cdata2.getData())) {
- return mismatch("CharacterData.getData() " + cdata1.getData() + " " + cdata2.getData(), node1, node2);
- }
- break;
- case Node.ATTRIBUTE_NODE :
- Attr attr1 = (Attr) node1;
- Attr attr2 = (Attr) node2;
- if (!attr1.getName().equals(attr2.getName())) {
- return mismatch("Attr.getName() " + attr1.getName() + " " + attr2.getName(), node1, node2);
- }
- else if( attributeList != null && !attributeList.contains(attr1.getName()) && !attributeList.contains(attr2.getName())) {
- if (!attr1.getValue().equals(attr2.getValue())) {
- return mismatch("Attr.getValue() " + attr1.getValue() + " " + attr2.getValue(), node1, node2);
- } else if (attr1.getSpecified() != attr2.getSpecified()) {
- return mismatch("Attr.getSpecified() " + attr1.getSpecified() + " " + attr2.getSpecified(), node1, node2);
- }
- }
- break;
- case Node.DOCUMENT_NODE :
- Document doc1 = (Document)node1;
- Document doc2 = (Document)node2;
- String result = compareNodes(doc1.getDoctype(), doc2.getDoctype());
- if(result != null){
- return result;
- }
- break;
- case Node.DOCUMENT_TYPE_NODE:
- DocumentType docType1 = (DocumentType)node1;
- DocumentType docType2 = (DocumentType)node2;
- if(!docType1.getPublicId().equals(docType2.getPublicId())){
- return mismatch("DocumentType.getPublicId() "+docType1.getPublicId()+ " "+docType2.getPublicId(), node1, node2);
- }
- break;
- case Node.PROCESSING_INSTRUCTION_NODE :
- ProcessingInstruction pInst1 = (ProcessingInstruction)node1;
- ProcessingInstruction pInst2 = (ProcessingInstruction)node2;
- //System.out.println("ProcessingInstruction todo");
- break;
- case Node.DOCUMENT_FRAGMENT_NODE :
- DocumentFragment frag1 = (DocumentFragment)node1;
- DocumentFragment frag2 = (DocumentFragment)node2;
- //System.out.println("DocumentFragment todo");
- break;
-
- case Node.ELEMENT_NODE :
- case Node.COMMENT_NODE :
- case Node.ENTITY_NODE :
- case Node.NOTATION_NODE :
- break;
-
- }
-
- //Recursion
- NamedNodeMap attributes1 = node1.getAttributes();
- NamedNodeMap attributes2 = node2.getAttributes();
-
- if (attributes1 != null && attributes2 != null) {
- if (attributes1.getLength() != attributes2.getLength()) {
- return mismatch("getAttributes().getLength() " + attributes1.getLength() + " " + attributes2.getLength(), node1, node2);
- }
- for (int i = 0; i < attributes1.getLength(); i++) {
- Attr attr1 = (Attr) attributes1.item(i);
- Attr attr2 = (Attr) attributes2.item(i);
- if(!attr1.getName().equals(attr2.getName())){
- return mismatch("Attr.getName() " + attr1.getName() + " " + attr2.getName(), attr1, attr2);
- }
- if(attributeList != null && !attributeList.contains(attr1.getName()) && !attributeList.contains(attr2.getName())) {
- String results = compareNodes(attr1, attr2);
- if (null != results) {
- return results;
- }
- }
- }
-
- } else if (attributes1 != null || attributes2 != null) {
- return mismatch("getAttributes() null", node1, node2);
- }
-
- NodeList children1 = node1.getChildNodes();
- NodeList children2 = node2.getChildNodes();
-
- // if (children1.getLength() != children2.getLength()) {
- // return mismatch("getChildNodes().getLength() "+children1.getLength()+" "+children2.getLength(), node1, node2);
- // }
-
- int count1 = 0;
- int count2 = 0;
-
- //compare all children, skipping empty text nodes
- while (count1 < children1.getLength() && count2 < children2.getLength()) {
- Node child1 = children1.item(count1);
- Node child2 = children2.item(count2);
- if (child1.getNodeType() != child2.getNodeType()) {
- if (child1.getNodeType() == Node.TEXT_NODE && (child1.getNodeValue() == null || child1.getNodeValue().trim().equals(""))) {
- count1++;
- continue;
- } else if (child2.getNodeType() == Node.TEXT_NODE && (child2.getNodeValue() != null || child2.getNodeValue().trim().equals(""))) {
- count2++;
- continue;
- }
- }
- count1++;
- count2++;
- String results = compareNodes(child1, child2);
- if (null != results) {
- return results;
- }
- }
- //TODO there must be a way to tell the parser to ignore whitespace.
- //be sure skip any empty text nodes at the end
- while (count1 < children1.getLength()) {
- Node child1 = children1.item(count1);
- if (child1.getNodeType() == Node.TEXT_NODE && child1.getNodeValue() == null || child1.getNodeValue().trim().equals("")) {
- count1++;
- continue;
- }
- return nodeNotCompared(child1);
- }
-
- while (count2 < children2.getLength()) {
- Node child2 = children2.item(count2);
- if (child2.getNodeType() == Node.TEXT_NODE && child2.getNodeValue() == null || child2.getNodeValue().trim().equals("")) {
- count2++;
- continue;
- }
- return nodeNotCompared(child2);
- }
-
- // for (int i = 0; i < children1.getLength(); i++) {
- // Node child1 = children1.item(i);
- // Node child2 = children2.item(i);
- // }
-
- return null;
- }
-
-
- public static String nullNodeEncountered(Node node1, Node node2) {
- String message = "Null node encountered";
- Node nonNullNode = node1 == null ? node2 : node1;
- char source = node1 == null ? 'B' : 'A';
- while (nonNullNode != null) {
- message += source + nonNullNode.getNodeName() + "\n";
- nonNullNode = nonNullNode.getParentNode();
- }
- return message;
-
-
- }
-
- public static String nodeNotCompared(Node node) {
- String message = "Node node compared:";
- while (node != null) {
- message += node.getNodeName() + "\n";
- node = node.getParentNode();
- }
-
- return message;
- }
-
- public static String mismatch(String mismatchtype, Node node1, Node node2) throws Exception {
- String message = "Nodes A and B do not match because of node." + mismatchtype + "\n";
- while (node1 != null && node2 != null) {
- message += "A:" + node1.getNodeName() + "\n";
- message += "B:" + node2.getNodeName() + "\n";
- node1 = node1.getParentNode();
- node2 = node2.getParentNode();
- }
-
- return message;
- }
-
- public static void main(String[] args) {
- }
- /**
- * @return
- */
- public static EntityResolver getEntityResolver() {
- return entityResolver;
- }
-
- /**
- * @param resolver
- */
- public static void setEntityResolver(EntityResolver resolver) {
- entityResolver = resolver;
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/InitializationTests.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/InitializationTests.java
deleted file mode 100644
index 5c66ea4f..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/InitializationTests.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.eclipse.jst.j2ee.archive.test;
-
- /*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WebModuleRef;
-/**
- * Insert the type's description here.
- * Creation date: (12/18/00 7:41:39 PM)
- * @author: Administrator
- */
-public class InitializationTests extends TestCase {
- private final static String copyright = "(c) Copyright IBM Corporation 2001.";//$NON-NLS-1$
-/**
- * InitializationTests constructor comment.
- * @param name java.lang.String
- */
-public InitializationTests(String name) {
- super(name);
-}
-public CommonarchiveFactory getArchiveFactory() {
- return CommonarchivePackage.eINSTANCE.getCommonarchiveFactory();
-}
-/**
- * Starts the application.
- * @param args an array of command-line arguments
- */
-public static void main(java.lang.String[] args) {
- String[] className = {"com.ibm.etools.archive.test.InitializationTests", "-noloading"};
- TestRunner.main(className);
-}
-public static junit.framework.Test suite() {
- return new TestSuite(InitializationTests.class);
-}
-public void testNewArchives() throws Exception {
-
-// Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("*", new XMIResourceFactoryImpl());
- ApplicationClientFile clientFile = getArchiveFactory().createApplicationClientFileInitialized("foo");
- assertTrue(clientFile.getDeploymentDescriptor() != null);
-
-
- clientFile = getArchiveFactory().createApplicationClientFileInitialized("foo");
-
- EJBJarFile ejbJarFile = getArchiveFactory().createEJBJarFileInitialized("foo");
- assertTrue(ejbJarFile.getDeploymentDescriptor() != null);
-
- //The next piece is to verify no exceptions occur
- ejbJarFile = getArchiveFactory().createEJBJarFileInitialized("foo");
- EJBModuleRef ejbModuleRef = getArchiveFactory().createEJBModuleRef();
- ejbModuleRef.setModuleFile(ejbJarFile);
-
-
- EARFile earFile = getArchiveFactory().createEARFileInitialized("foo");
-
- assertTrue(earFile.getDeploymentDescriptor() != null);
-
-
- WARFile warFile = getArchiveFactory().createWARFileInitialized("foo");
-
- assertTrue(warFile.getDeploymentDescriptor() != null);
-
-
- warFile = getArchiveFactory().createWARFileInitialized("foo");
- WebModuleRef webModuleRef = getArchiveFactory().createWebModuleRef();
- webModuleRef.setModuleFile(warFile);
-
-
-}
-
-
-
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/JavaTests.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/JavaTests.java
deleted file mode 100644
index c18fd597..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/JavaTests.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package org.eclipse.jst.j2ee.archive.test;
-
- /*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-/**
- * Insert the type's description here.
- * Creation date: (1/17/2001 10:17:29 AM)
- * @author: Administrator
- */
-public class JavaTests extends TestCase {
- private final static String copyright = "(c) Copyright IBM Corporation 2001.";//$NON-NLS-1$
-/**
- * JavaTests constructor comment.
- * @param name java.lang.String
- */
-public JavaTests(String name) {
- super(name);
-}
-public CommonarchiveFactory getArchiveFactory() {
- return CommonarchivePackage.eINSTANCE.getCommonarchiveFactory();
-}
-/**
- * Starts the application.
- * @param args an array of command-line arguments
- */
-public static void main(java.lang.String[] args) {
- String[] className = {"com.ibm.etools.archive.test.JavaTests", "-noloading"};
- TestRunner.main(className);
-}
-public static junit.framework.Test suite() {
- return new TestSuite(JavaTests.class);
-}
-/**
- * This method verifies that java reflection works on archives, and that
- * class loading and java reflection is dynamic with changes to the class
- * path of the archive
- */
-public void testJavaReflection() throws Exception {
-/*
- Archive anArchive = getArchiveFactory().primOpenArchive("bank35deployed.jar");
- JavaClass cls = (JavaClass)org.eclipse.jem.internal.java.impl.JavaClassImpl.reflect("com.ibm.ejb.bank.VapAccountBean", anArchive.getContext());
- //Ignore the constructor
- assertTrue("Should not have been able to reflect methods" ,cls.getMethods().size() == 1 && ((Method)cls.getMethods().get(0)).getName().equals(cls.getName()));
-
- anArchive.setExtraClasspath("ivjejb35.jar");
-
- assertTrue("Methods should have been reflected", cls.getMethods().size() > 1);
-*/
-}
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/LooseArchiveTests.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/LooseArchiveTests.java
deleted file mode 100644
index 59ebe9e7..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/LooseArchiveTests.java
+++ /dev/null
@@ -1,282 +0,0 @@
-package org.eclipse.jst.j2ee.archive.test;
-
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveInit;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.RuntimeClasspathEntry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseApplication;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfigRegister;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseConfiguration;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseLibrary;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseModule;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseWARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.looseconfig.internal.LooseconfigPackage;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-
-
-public class LooseArchiveTests extends AbstractArchiveTest {
-
- /** The current working directory */
- protected String cwd;
- protected URI looseConfigLoc;
- protected URI looseAppLoc;
- protected String looseModuleWorkspace;
- protected String looseEARUri;
-
- protected static final String EJB_JAR_URI = "LooseEAREjb.jar";
- protected static final String WAR_URI = "LooseEARWeb.war";
- protected static final String UTIL_JAR_URI = "util.jar";
- protected static final String WEBLIB_URI = "WEB-INF/lib/library.jar";
- protected static final String WEBLIB_FULL_URI = "WEB-INF/lib/library.jar";
- protected static final String OUTPUT_EAR_FILE_URI = AutomatedBVT.baseDirectory +"testOutput/LooseArchiveTests/LooseApp.ear";
- protected static char sep = java.io.File.separatorChar;
- /**
- * Constructor for LooseArchiveTests.
- * @param name
- */
- public LooseArchiveTests(String name) {
- super(name);
- }
-
- public void testLooseConfigCreation() throws Exception {
- Resource resource = Resource.Factory.Registry.INSTANCE.getFactory(looseConfigLoc).createResource(looseConfigLoc);
- resource.getContents().add(createLooseConfig());
- resource.save(new java.util.HashMap());
- }
-
- public void testLooseAppCreation() throws Exception {
- Resource resource = Resource.Factory.Registry.INSTANCE.getFactory(looseAppLoc).createResource(looseAppLoc);
- resource.getContents().add(createLooseApplication());
- resource.save(new java.util.HashMap());
- }
-
- public void testLooseConfigOpenAndSave() throws Exception {
- System.setProperty(LooseConfigRegister.LOOSE_CONFIG_PROPERTY, looseConfigLoc.toString());
- EARFile ear = getArchiveFactory().openEARFile(looseEARUri);
- verify(ear);
- //printClasspaths(ear);
- ear.saveAs(OUTPUT_EAR_FILE_URI);
- ear.close();
- ear = getArchiveFactory().openEARFile(OUTPUT_EAR_FILE_URI);
- verify(ear);
- ear.close();
-
- }
-
-
-
- public void testLooseConfigUnimodeOpenAndSave() throws Exception {
- System.setProperty(LooseConfigRegister.LOOSE_CONFIG_PROPERTY, "");
-
- LooseConfigRegister.singleton().addLooseMapping(looseEARUri, looseAppLoc.toString());
- EARFile ear = getArchiveFactory().openEARFile(looseEARUri);
- verify(ear);
- //printClasspaths(ear);
- ear.saveAs(OUTPUT_EAR_FILE_URI);
- ear.close();
-
- ear = getArchiveFactory().openEARFile(OUTPUT_EAR_FILE_URI);
- verify(ear);
- ear.close();
-
- }
-
- public void testLooseConfigOpenAndReOpen() throws Exception {
- System.setProperty(LooseConfigRegister.LOOSE_CONFIG_PROPERTY, looseConfigLoc.toString());
- EARFile ear = getArchiveFactory().openEARFile(looseEARUri);
- ear.close();
- ear.reopen();
- List jars = ear.getArchiveFiles();
- for (int i = 0; i < jars.size(); i++) {
- Archive archive = (Archive) jars.get(i);
- archive.close();
- archive.reopen(ear);
- }
- ear.close();
-
- }
-
- protected void verify(EARFile ear) throws Exception {
- verifyModules(ear);
- verifyModuleRefs(ear);
- verifyUtilAndLib(ear);
- }
-
- /**
- * Another level of verification that for each module, the module files exists
- * and the deployment descriptor can be read
- */
- protected void verifyModuleRefs(EARFile ear) throws Exception {
- List moduleRefs = ear.getModuleRefs();
- int size = moduleRefs.size();
- assertEquals("Wrong number of modules", 2, size);
- for (int i = 0; i < size; i++) {
- ModuleRef ref = (ModuleRef) moduleRefs.get(i);
- assertNotNull("ModuleRef should have a module file:"+ref.getModule().getUri(), ref.getModuleFile());
- assertNotNull("Deployment descriptor should not be null", ref.getDeploymentDescriptor());
- }
- }
-
- /**
- * Verify that the util jar in the ear and the library in the war exist and are not empty
- */
- protected void verifyUtilAndLib(EARFile ear) throws Exception {
- verifyJAR(ear, UTIL_JAR_URI);
- verifyJAR((Archive)ear.getFile(WAR_URI), WEBLIB_FULL_URI);
-
- }
-
- protected void verifyJAR(Archive parent, String uri) throws Exception {
- assertTrue("Should contain JAR: "+uri, parent.containsFile(uri));
- Archive jar = (Archive)parent.getFile(uri);
- //at lease one file plus the manifest
- assertTrue("JAR should contain a class file: "+uri, containsClassFile(jar));
- }
-
- protected boolean containsClassFile(Archive jar) {
- List files = jar.getFiles();
- for (int i = 0; i < files.size(); i++) {
- File aFile = (File) files.get(i);
- if (aFile.getURI().endsWith(".class"));
- return true;
- }
- return false;
- }
-
- /**
- * Make sure {@link Container#containsFile(String) works for loose modules
- */
- public void verifyModules(EARFile ear) throws Exception {
- List modules = ear.getDeploymentDescriptor().getModules();
- int size = modules.size();
- for (int i = 0; i < modules.size(); i++) {
- Module m = (Module) modules.get(i);
- assertTrue("EAR file should contain module file: "+m.getUri(), ear.containsFile(m.getUri()));
- }
- assertEquals("Wrong number of modules", 2, size);
- for (int i = 0; i < modules.size(); i++) {
- Module m = (Module) modules.get(i);
- assertTrue("EAR file should contain module file: "+m.getUri(), ear.containsFile(m.getUri()));
- }
- }
-
- protected LooseConfiguration createLooseConfig() {
- LooseConfiguration config = looseConfigFactory().createLooseConfiguration();
- config.getApplications().add(createLooseApplication());
- return config;
- }
-
- protected LooseApplication createLooseApplication() {
- LooseApplication app = looseConfigFactory().createLooseApplication();
- app.setUri(looseEARUri);
- app.setResourcesPath(looseEARUri);
- app.setBinariesPath(looseEARUri);
- List looseArchives = app.getLooseArchives();
- looseArchives.add(createLooseEJB());
- looseArchives.add(createLooseWEB());
- looseArchives.add(createLooseUtil());
- return app;
- }
-
- protected LooseModule createLooseEJB() {
- LooseModule mod = looseConfigFactory().createLooseModule();
- mod.setUri(EJB_JAR_URI);
- String absPath = looseModuleWorkspace+sep+"LooseEAREjb"+sep+"bin";
- mod.setBinariesPath(absPath);
- mod.setResourcesPath(absPath);
- return mod;
- }
-
- protected LooseModule createLooseWEB() {
- LooseWARFile mod = looseConfigFactory().createLooseWARFile();
- mod.setUri(WAR_URI);
- String absPath = looseModuleWorkspace+sep+"LooseEARWeb"+sep+"webApplication";
- mod.setBinariesPath(absPath);
- mod.setResourcesPath(absPath);
- mod.getLooseLibs().add(createLooseWebLib());
- return mod;
- }
-
- protected LooseLibrary createLooseUtil() {
- LooseLibrary lib = looseConfigFactory().createLooseLibrary();
- lib.setUri(UTIL_JAR_URI);
- String absPath = looseModuleWorkspace+sep+"LooseJavaUtil"+sep+"bin";
- lib.setBinariesPath(absPath);
- lib.setResourcesPath(absPath);
- return lib;
- }
-
- protected LooseLibrary createLooseWebLib() {
- LooseLibrary lib = looseConfigFactory().createLooseLibrary();
- lib.setUri(WEBLIB_URI);
- String absPath = looseModuleWorkspace+sep+"LooseJavaWebLib"+sep+"bin";
- lib.setBinariesPath(absPath);
- lib.setResourcesPath(absPath);
- return lib;
- }
-
- protected LooseconfigFactory looseConfigFactory() {
- return LooseconfigPackage.eINSTANCE.getLooseconfigFactory();
- }
-
- protected void printClasspaths(EARFile ear) {
- List archives = ear.getArchiveFiles();
- for (int i = 0; i < archives.size(); i++) {
- Archive archive = (Archive) archives.get(i);
- System.out.println("Local runtime classpath for: "+archive.getURI());
- RuntimeClasspathEntry[] entries = archive.getLocalRuntimeClassPath();
- for (int j = 0; j < entries.length; j++) {
- System.out.println(entries[j]);
- }
- System.out.println("Full runtime classpath for: "+archive.getURI());
- entries = archive.getFullRuntimeClassPath();
- for (int j = 0; j < entries.length; j++) {
- System.out.println(entries[j]);
- }
- }
- }
-
-
- public static void main(String[] args) {
- String[] className = { "com.ibm.etools.archive.test.LooseArchiveTests", "-noloading" };
- TestRunner.main(className);
- }
-
- public static Test suite() {
- TestSuite suite = new TestSuite("LooseArchiveTests");
- suite.addTest(new LooseArchiveTests("testLooseConfigCreation"));
- suite.addTest(new LooseArchiveTests("testLooseAppCreation"));
- suite.addTest(new LooseArchiveTests("testLooseConfigOpenAndSave"));
- suite.addTest(new LooseArchiveTests("testLooseConfigOpenAndReOpen"));
- suite.addTest(new LooseArchiveTests("testLooseConfigUnimodeOpenAndSave"));
- return suite;
- }
- /*
- * @see TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- ArchiveInit.init();
- LooseConfigRegister.singleton().flush();
- cwd = AutomatedBVT.baseDirectory;
- looseModuleWorkspace = cwd+"loose_module_workspace";
- looseConfigLoc = URI.createFileURI(looseModuleWorkspace+sep+".metadata"+sep+".plugins"+sep+"com.ibm.etools.j2ee"+sep+"looseConfig.xmi");
- looseAppLoc = URI.createFileURI(looseModuleWorkspace+sep+".metadata"+sep+".plugins"+sep+"com.ibm.etools.j2ee"+sep+"looseApp.xmi");
- looseEARUri = ArchiveUtil.getOSUri(looseModuleWorkspace+sep+"LooseEAR");
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/RarFileTests.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/RarFileTests.java
deleted file mode 100644
index b11e969b..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/RarFileTests.java
+++ /dev/null
@@ -1,207 +0,0 @@
-package org.eclipse.jst.j2ee.archive.test;
-
-/*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2001 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
-
-import java.util.List;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.RARFile;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-
-/**
- * Tests for verfication that RAR support works correctly in WCCM.
- * Creation date: (12/11/00 10:26:11 AM)
- * @author: Jared Jurkiewicz, et al.
- */
-public class RarFileTests extends TestCase {
- private final static String copyright = "(c) Copyright IBM Corporation 2001."; //$NON-NLS-1$
- /**
- * SimpleTests constructor comment.
- * @param name java.lang.String
- */
- public RarFileTests(String name) {
- super(name);
- }
- public CommonarchiveFactory getArchiveFactory() {
- return CommonarchivePackage.eINSTANCE.getCommonarchiveFactory();
- }
- /**
- * Starts the application.
- * @param args an array of command-line arguments
- */
- public static void main(java.lang.String[] args) {
- String[] className = { "com.ibm.etools.archive.test.RarFileTests", "-noloading" };
- TestRunner.main(className);
- }
- public void printRARToConsole(Connector connector) {
- ResourceAdapter ra = connector.getResourceAdapter();
-
- System.out.println("ResourceAdapter from XML Deployment Descriptor");
- System.out.println("-------------------------------------------------");
- System.out.println(connector.getDisplayName() + ": " + connector.getDescription());
- System.out.println("Vendor : " + connector.getVendorName());
- System.out.println("Version : " + connector.getVersion());
- System.out.println("Spec Version : " + connector.getSpecVersion());
- System.out.println("EIS Type : " + connector.getEisType());
- System.out.println("Reauthentication Support : " + ra.isReauthenticationSupport());
- System.out.println("Transaction Support : " + ra.getTransactionSupport().getName().toLowerCase());
-
- if (connector.getLicense() != null) {
- System.out.println("License Required : " + connector.getLicense().isRequired());
- System.out.println("License Description : " + connector.getLicense().getDescription());
- }
-
- System.out.println("Small Icon : " + connector.getSmallIcon());
- System.out.println("Large Icon : " + connector.getLargeIcon());
-
- List authMechs = ra.getAuthenticationMechanisms();
- for (int i = 0; i < authMechs.size(); i++) {
- AuthenticationMechanism auth = (AuthenticationMechanism) authMechs.get(i);
- System.out.println("\nAuthentication Mechanism:");
- System.out.println("Description : " + auth.getDescription());
- System.out.println("Type : " + auth.getAuthenticationMechanismType().getName().toLowerCase());
- System.out.println("Credential Interface : " + auth.getCredentialInterface());
- }
- System.out.println("\nRegistered classes:");
- System.out.println("\t" + ra.getConnectionFactoryImplClass() + " implements ");
- System.out.println("\t\t" + ra.getConnectionFactoryInterface());
- System.out.println("\t" + ra.getConnectionImplClass() + " implements ");
- System.out.println("\t\t" + ra.getConnectionInterface());
- System.out.println("\tManagedConnectionFactory: " + ra.getManagedConnectionFactoryClass());
-
- List configs = ra.getConfigProperties();
- System.out.println("\nConfig-properties:");
- for (int i = 0; i < configs.size(); i++) {
- ConfigProperty prop = (ConfigProperty) configs.get(i);
- System.out.println("\tConfig-property : " + prop.getName());
- System.out.println("\tType : " + prop.getType() + " / Value : " + prop.getValue());
- System.out.println("\tDescription : " + prop.getDescription() + "\n");
- }
-
- List secs = ra.getSecurityPermissions();
- System.out.println("\nSecurity-Permissions:");
- for (int i = 0; i < secs.size(); i++) {
- SecurityPermission prop = (SecurityPermission) secs.get(i);
- System.out.println("\tConfig-Description : " + prop.getDescription());
- System.out.println("\tSpecification : " + prop.getSpecification() + "\n");
- }
-
- }
- public static junit.framework.Test suite() {
- return new TestSuite(RarFileTests.class);
- }
- public void testaddCopyModule() throws Exception {
-
- String in = AutomatedBVT.baseDirectory + "sample.rar";
- RARFile rarFile = (RARFile) getArchiveFactory().openArchive(in);
-
- rarFile.getDeploymentDescriptor();
-
- EARFile newEarFile = getArchiveFactory().createEARFileInitialized(AutomatedBVT.baseDirectory + "testOutput/CopyTests/newEarWithRarCopiedModule.ear");
-
- newEarFile.addCopy(rarFile);
- RARFile copied = (RARFile) newEarFile.getModuleFiles().get(0);
- assertTrue(copied.isDeploymentDescriptorSet());
- assertTrue(copied.getDeploymentDescriptor() == copied.getDeploymentDescriptorResource().getContents().get(0));
- assertTrue(copied.getDeploymentDescriptor() != rarFile.getDeploymentDescriptor());
- assertTrue(rarFile.getFiles().size() == copied.getFiles().size());
-
- newEarFile.saveNoReopen();
- }
- public void testexpandRarModule() throws Exception {
-
- String in = AutomatedBVT.baseDirectory + "sample.rar";
- RARFile rarFile = (RARFile) getArchiveFactory().openArchive(in);
- rarFile.setURI("sample.rar");
-
- rarFile.getDeploymentDescriptor();
-
- EARFile newEarFile = getArchiveFactory().createEARFileInitialized(AutomatedBVT.baseDirectory + "testOutput/RarTests/newEarWithRarModule.ear");
- newEarFile.addCopy(rarFile);
-
- newEarFile.saveNoReopen();
-
- String out = AutomatedBVT.baseDirectory + "testOutput/RarTests/Rar-containing-ear-out.ear";
- newEarFile.extractTo(out, Archive.EXPAND_RAR_FILES);
- }
-
- /**
- * Very basic method to open an archive and save it as a directory to a new destination. Requires visual inspection
- * for verification. Nested wars and ejb jars will be exploded but other nested jars will not
- */
- public void testOpenAndExtract() throws Exception {
-
- String in = AutomatedBVT.baseDirectory + "sample.rar";
- RARFile rarFile = (RARFile) getArchiveFactory().openArchive(in);
- String out = AutomatedBVT.baseDirectory + "testOutput/Exploded_RAR_Dir/";
- rarFile.extractToConnectorDirectory(out, Archive.EXPAND_ALL);
- }
- /**
- * Opens an ear file, and for each module, writes it's dd components to the console. Requires visual inspection
- * for verification
- */
-
- public void testOpenAndRead() throws Exception {
-
- String in = AutomatedBVT.baseDirectory + "sample.rar";
- RARFile rarFile = (RARFile) getArchiveFactory().openArchive(in);
-
- Connector dd = rarFile.getDeploymentDescriptor();
- //printRARToConsole(dd);
- }
-
- public void testopenRarEar() throws Exception {
- EARFile earFile = (EARFile) getArchiveFactory().openArchive(AutomatedBVT.baseDirectory + "testrar.ear");
- assertTrue(earFile.getDeploymentDescriptor().getFirstModule("sample.rar") != null);
- }
-
- public void testSaveRarEar() throws Exception {
- String in = AutomatedBVT.baseDirectory + "sample.rar";
- RARFile rarFile = (RARFile) getArchiveFactory().openArchive(in);
- rarFile.setURI("sample.rar");
-
- rarFile.getDeploymentDescriptor();
-
- EARFile newEarFile = getArchiveFactory().createEARFileInitialized(AutomatedBVT.baseDirectory + "testOutput/RarTests/newEarWithRarModule_saved.ear");
- newEarFile.addCopy(rarFile);
-
- assertNotNull("Module wasn't found!", newEarFile.getDeploymentDescriptor().getFirstModule("sample.rar"));
-
- newEarFile.save();
- }
-
- public void testJ2Cauth() throws Exception {
- String in = AutomatedBVT.baseDirectory + "sample.rar";
- RARFile rarFile = (RARFile) getArchiveFactory().openArchive(in);
-
- Connector dd = rarFile.getDeploymentDescriptor();
-
- ResourceAdapter rd = dd.getResourceAdapter();
-
- EList myAuthList = rd.getAuthenticationMechanisms();
-// System.out.println("Number of auth mechanisms is: " + myAuthList.size());
-// for (int i = 0; i < myAuthList.size(); i++) {
-// System.out.println("Auth type is: " + ((AuthenticationMechanism) myAuthList.get(i)).getAuthenticationMechanismType());
-// System.out.println("Auth type is: " + ((AuthenticationMechanism) myAuthList.get(i)).getAuthenticationMechanismType().getName());
-// }
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/ResourceTests.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/ResourceTests.java
deleted file mode 100644
index 0e7557b9..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/ResourceTests.java
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Created on Mar 13, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.archive.test;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ApplicationClientFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveInit;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-
-
-/**
- * @author schacher
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class ResourceTests extends AbstractArchiveTest {
-
- /**
- * @param name
- */
- public ResourceTests(String name) {
- super(name);
- }
-
- /**
- * Starts the application.
- * @param args an array of command-line arguments
- */
- public static void main(java.lang.String[] args) {
- String[] className = {"com.ibm.etools.archive.test.ResourceTests", "-noloading"};
- TestRunner.main(className);
- }
- public static junit.framework.Test suite() {
- return new TestSuite(ResourceTests.class);
- }
-
- protected List findOccurrences(List resources, String uri) {
- List result = new ArrayList(1);
- for (int i = 0; i < resources.size(); i++) {
- Resource aResource = (Resource) resources.get(i);
- if (uri.equals(aResource.getURI().toString()))
- result.add(aResource);
- }
- return result;
- }
-
- public void testResourceCreation() throws Exception {
- String uri = "META-INF/client-resource.xmi";
- ApplicationClientFile appClientFile = getArchiveFactory().createApplicationClientFileInitialized("test.jar");
- Resource res = null;
- boolean exceptionCaught = false;
- try {
- res = appClientFile.getMofResource(uri);
- } catch (java.io.FileNotFoundException e) {
- exceptionCaught = true;
- List foundResources = findOccurrences(appClientFile.getResourceSet().getResources(), uri);
- assertTrue("There should exist exactly one resource", foundResources.size() == 1);
- Resource foundResource = (Resource)foundResources.get(0);
- assertFalse("The resource should be unloaded", foundResource.isLoaded());
- res = appClientFile.makeMofResource(uri);
- assertTrue("Resource should not be null", res != null);
- foundResources = findOccurrences(appClientFile.getResourceSet().getResources(), uri);
- assertTrue("There should exist exactly one resource", foundResources.size() == 1);
- foundResource = (Resource)foundResources.get(0);
- assertTrue("The resource should exist", foundResource != null);
- assertFalse("The resource should be unloaded", foundResource.isLoaded());
- }
- assertTrue("Exception should have been caught", exceptionCaught);
- Collection loadedResources = appClientFile.getLoadedMofResources();
- assertTrue("Loaded resources should be size 1", loadedResources.size() == 1);
- EjbRef aRef = CommonPackage.eINSTANCE.getCommonFactory().createEjbRef();
- res.getContents().add(aRef);
- loadedResources = appClientFile.getLoadedMofResources();
- assertTrue("Loaded resources should be size 2", loadedResources.size() == 2);
- }
-
- public void testResourceDirty() throws Exception {
- EJBJarFile jar = getArchiveFactory().openEJB11JarFile(AutomatedBVT.baseDirectory + "bankejbs.jar");
- EnterpriseBean bean = (EnterpriseBean)jar.getDeploymentDescriptor().getEnterpriseBeans().get(0);
-
- EARFile newEar = getArchiveFactory().createEARFileInitialized("test");
- EJBJarFile copyJar = (EJBJarFile) newEar.addCopy(jar);
-
- assertFalse("dd should not be dirty", copyJar.getDeploymentDescriptorResource().isModified());
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- ArchiveInit.init();
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/SaveTests.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/SaveTests.java
deleted file mode 100644
index 41e1be06..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/SaveTests.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package org.eclipse.jst.j2ee.archive.test;
-
-/*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2001 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ReadOnlyDirectory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-
-/**
- * Insert the type's description here.
- * Creation date: (12/21/00 3:04:36 PM)
- * @author: Administrator
- */
-public class SaveTests extends TestCase {
- private final static String copyright = "(c) Copyright IBM Corporation 2001."; //$NON-NLS-1$
- /**
- * SaveTests constructor comment.
- * @param name java.lang.String
- */
- public SaveTests(String name) {
- super(name);
- }
- public CommonarchiveFactory getArchiveFactory() {
- return CommonarchivePackage.eINSTANCE.getCommonarchiveFactory();
- }
- /**
- * Starts the application.
- * @param args an array of command-line arguments
- */
- public static void main(java.lang.String[] args) {
- String[] className = { "com.ibm.etools.archive.test.SaveTests", "-noloading" };
- TestRunner.main(className);
- }
- public static junit.framework.Test suite() {
- return new TestSuite(SaveTests.class);
- }
- /**
- * This scenario tests the case of opening an archive, modifying it's contents, and saving to the same uri from which it was
- * loaded. The problem is that the reading of input streams of individual entries in an archive is deferred until requested through
- * the api or save time; therefore, an open file exists on the source file. To get around this, the implementation saves the archive
- * to a temp file, then deletes (or renames, based on setting, to be implemented) the old file, renames the temp file, and does some
- * housekeeping on the saved archive, with it's load strategy and contained files
- */
- public void testSave() throws Exception {
-
- //First make a copy of our reference file
- Archive anArchive = getArchiveFactory().openArchive(AutomatedBVT.baseDirectory + "example2.war");
- anArchive.saveAsNoReopen(AutomatedBVT.baseDirectory + "testOutput/SaveTests/copy.war");
- anArchive = null;
-
- WARFile aWarFile = (WARFile) getArchiveFactory().openArchive(AutomatedBVT.baseDirectory + "testOutput/SaveTests/copy.war");
- ReadOnlyDirectory sampleDirectory = getArchiveFactory().openReadOnlyDirectory(AutomatedBVT.baseDirectory + "WarTestClasses");
- int initialSize = aWarFile.getClasses().size();
- File aFile = sampleDirectory.getFileInSelfOrSubdirectory("com/ibm/etools/archive/test/WARFileTests.class");
- aWarFile.addCopyClass(aFile);
- assertTrue(aWarFile.getClasses().size() == initialSize + 1);
-
- String classURI = ArchiveUtil.concatUri(ArchiveConstants.WEBAPP_CLASSES_URI, aFile.getURI(), '/');
- assertTrue(aWarFile.containsFile(classURI));
- aWarFile.save();
-
- File classFile = aWarFile.getFile(classURI);
- assertTrue("File should not be null", classFile != null);
- assertTrue("Wrong loading archive", classFile.getLoadingContainer() == aWarFile);
- assertTrue("Wrong original URI", classFile.getOriginalURI().equals(classURI));
-
- aWarFile.saveAs("testOutput/SaveTests/copy2.war");
- aWarFile.save();
- }
-
- /**
- * This scenario is similar to @link #testSave, except that it tests with a directory instead of a jar file
- */
- public void testSaveDirectory() throws Exception {
-
- //First make a copy of our reference file
- Archive anArchive = getArchiveFactory().openArchive(AutomatedBVT.baseDirectory + "sample.ear");
- anArchive.saveAsNoReopen(AutomatedBVT.baseDirectory + "testOutput/SaveTests/sample-copied.ear");
- anArchive = null;
-
- EARFile anEARFile = (EARFile) getArchiveFactory().openArchive(AutomatedBVT.baseDirectory + "testOutput/SaveTests/sample-copied.ear");
-
- anEARFile.getDeploymentDescriptor();
-
-
- anEARFile.extractNoReopen(Archive.EXPAND_WAR_FILES);
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/SecurityRoleTests.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/SecurityRoleTests.java
deleted file mode 100644
index ee96b631..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/SecurityRoleTests.java
+++ /dev/null
@@ -1,119 +0,0 @@
-package org.eclipse.jst.j2ee.archive.test;
-
- /*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WebModuleRef;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-
-/**
- * Insert the type's description here.
- * Creation date: (02/09/01 12:05:18 AM)
- * @author: Administrator
- */
-public class SecurityRoleTests extends AbstractArchiveTest {
- private final static String copyright = "(c) Copyright IBM Corporation 2001.";//$NON-NLS-1$
-/**
- * SecurityRoleTests constructor comment.
- * @param name java.lang.String
- */
-public SecurityRoleTests(String name) {
- super(name);
-}
-public CommonFactory getCommonFactory() {
- return CommonPackage.eINSTANCE.getCommonFactory();
-}
-/**
- * Starts the application.
- * @param args an array of command-line arguments
- */
-public static void main(java.lang.String[] args) {
- String[] className = {"com.ibm.etools.archive.test.SecurityRoleTests", "-noloading"};
- TestRunner.main(className);
-}
-public static junit.framework.Test suite() {
- return new TestSuite(SecurityRoleTests.class);
-}
-public void testPushDownCopy() throws Exception {
-
- EARFile earFile = getArchiveFactory().openEARFile(AutomatedBVT.baseDirectory + "sample.ear");
-
- WARFile warFile = (WARFile)earFile.getWARFiles().get(0);
-
- EJBJarFile ejbJarFile = (EJBJarFile) earFile.getEJBJarFiles().get(0);
-
- SecurityRole aRole = getCommonFactory().createSecurityRole();
- aRole.setRoleName("administrator");
- aRole.setDescription("The all powerful");
- earFile.getDeploymentDescriptor().getSecurityRoles().add(aRole);
- earFile.pushDownRole(aRole);
-
- assertTrue("Push down failed for ejb jar", ejbJarFile.getDeploymentDescriptor().getAssemblyDescriptor().getSecurityRoleNamed("administrator") != null);
- assertTrue("Push down failed for war", warFile.getDeploymentDescriptor().getSecurityRoleNamed("administrator") != null);
-
- earFile.close();
-
-}
-public void testRollupAddAndPushDown() throws Exception {
-
- EARFile earFile = getArchiveFactory().openEARFile(AutomatedBVT.baseDirectory +"sample.ear");
-
- WebModuleRef webRef = (WebModuleRef)earFile.getWebModuleRefs().get(0);
-
- EJBModuleRef ejbModRef = (EJBModuleRef) earFile.getEJBModuleRefs().get(0);
-
- SecurityRole aRole = getCommonFactory().createSecurityRole();
- aRole.setRoleName("Joe");
- aRole.setDescription("New description");
- webRef.getWebApp().getSecurityRoles().add(aRole);
-
- aRole = getCommonFactory().createSecurityRole();
- aRole.setRoleName("administrator");
- aRole.setDescription("The all powerful");
-
- webRef.getWebApp().getSecurityRoles().add(aRole);
-
- //Test the rollup
- earFile.rollUpRoles();
- //We cheated here because we already knew there were two roles in the ejb jar
- //one of which is named Joe, and zero roles in the war file
- assertTrue("Roll up not right", earFile.getDeploymentDescriptor().getSecurityRoles().size() == 5);
-
- aRole = getCommonFactory().createSecurityRole();
- aRole.setRoleName("manager");
- aRole.setDescription("the manager");
- earFile.addCopy(aRole, webRef.getModule());
-
- //Test the add and rollup
- assertTrue("Add copy not right", earFile.getDeploymentDescriptor().getSecurityRoles().size() == 6
- && earFile.getDeploymentDescriptor().containsSecurityRole(aRole.getRoleName())
- && webRef.getWebApp().containsSecurityRole(aRole.getRoleName()));
-
- //Test the push down
- earFile.renameSecurityRole("Joe", "guest");
-
- assertTrue("Push down not right", !earFile.getDeploymentDescriptor().containsSecurityRole("Joe")
- && earFile.getDeploymentDescriptor().containsSecurityRole("guest")
- && !webRef.getWebApp().containsSecurityRole("Joe")
- && webRef.getWebApp().containsSecurityRole("guest")
- && !ejbModRef.getEJBJar().containsSecurityRole("Joe")
- && ejbModRef.getEJBJar().containsSecurityRole("guest"));
-
- earFile.saveAsNoReopen(AutomatedBVT.baseDirectory +"testOutput/SecurityRoleTests/newSample.ear");
-
-}
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/SimpleTests.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/SimpleTests.java
deleted file mode 100644
index 7d8a2cac..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/SimpleTests.java
+++ /dev/null
@@ -1,433 +0,0 @@
-package org.eclipse.jst.j2ee.archive.test;
-
-/*
-* Licensed Material - Property of IBM
-* (C) Copyright IBM Corp. 2001 - All Rights Reserved.
-* US Government Users Restricted Rights - Use, duplication or disclosure
-* restricted by GSA ADP Schedule Contract with IBM Corp.
-*/
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.emf.common.command.Command;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ValidateXmlCommand;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WebModuleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.XmlValidationResult;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.SaveFailureException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveInit;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-
-/**
- * Insert the type's description here.
- * Creation date: (12/11/00 10:26:11 AM)
- * @author: Administrator
- */
-public class SimpleTests extends TestCase {
- private final static String copyright = "(c) Copyright IBM Corporation 2001."; //$NON-NLS-1$
- /**
- * SimpleTests constructor comment.
- * @param name java.lang.String
- */
- public SimpleTests(String name) {
- super(name);
- }
- public boolean isEmpty(Collection adapters) {
- if (adapters.isEmpty())
- return true;
- for (Iterator iter = adapters.iterator(); iter.hasNext();) {
- if (iter.next() != null)
- return false;
- }
- return true;
- }
- public CommonarchiveFactory getArchiveFactory() {
- return CommonarchivePackage.eINSTANCE.getCommonarchiveFactory();
- }
- /**
- * Starts the application.
- * @param args an array of command-line arguments
- */
- public static void main(java.lang.String[] args) {
- String[] className = { "com.ibm.etools.archive.test.SimpleTests", "-noloading" };
- TestRunner.main(className);
- }
- public void printApplToConsole(Application appl) {
-
- List modules = appl.getModules();
- for (int i = 0; i < modules.size(); i++) {
- System.out.println(modules.get(i));
- }
- }
- public void printEJBJarToConsole(EJBJar ejbJar) {
-
- List ejbs = ejbJar.getEnterpriseBeans();
- for (int i = 0; i < ejbs.size(); i++) {
- System.out.println(ejbs.get(i));
- }
-
- }
- public void printWebAppToConsole(WebApp webApp) {
- List servlets = webApp.getServlets();
-
- for (int i = 0; i < servlets.size(); i++) {
- System.out.println(servlets.get(i));
- }
-
- }
- public static junit.framework.Test suite() {
- return new TestSuite(SimpleTests.class);
- }
- public void testContainerManagedEntityExtensionRead() throws Exception {
- CommonarchiveFactory factory = CommonarchivePackage.eINSTANCE.getCommonarchiveFactory();
- EJBJarFile jarFile = (EJBJarFile) factory.openArchive(AutomatedBVT.baseDirectory + "cmpsample.jar");
- EJBJar jar = jarFile.getDeploymentDescriptor();
-
- }
- public void testEJB11JarAdd() throws Exception {
- EARFile _earFile = getArchiveFactory().createEARFileInitialized(AutomatedBVT.baseDirectory + "testOutput/TestEAREJBAdd.ear");
- CommonarchiveFactory factory = CommonarchivePackage.eINSTANCE.getCommonarchiveFactory();
- EJBJarFile jar = (EJBJarFile) factory.openArchive(AutomatedBVT.baseDirectory + "ejb_compat_entitycmp.jar");
- jar.setURI(AutomatedBVT.baseDirectory + "ejb_compat_entitycmp.jar");
- _earFile.addCopy(jar);
- _earFile.save();
- }
- public void testEJBSetAbstractSchemaName() throws Exception {
- String testSm = AutomatedBVT.baseDirectory + "TestSchema";
- CommonarchiveFactory factory = CommonarchivePackage.eINSTANCE.getCommonarchiveFactory();
- EJBJarFile jarFile = (EJBJarFile) factory.openArchive(AutomatedBVT.baseDirectory + "cmpsample.jar");
- EJBJar jar = jarFile.getDeploymentDescriptor();
- List lst = jar.getContainerManagedBeans();
-
- //I know this will be a CMP, so, lets try set/get on it..
- ContainerManagedEntity cmp = (ContainerManagedEntity) lst.get(0);
-
- //System.out.println("Setting Schema name to: " + testSm);
- cmp.setAbstractSchemaName(testSm);
- //Retrieve it and see if it matches
- //System.out.println("Getting schema name: " + cmp.getAbstractSchemaName());
- assertTrue(cmp.getAbstractSchemaName().equals(testSm));
- }
- /**
- * This excercises the index adapter on Container
- */
- public void testIndexing() throws Exception {
- Archive anArchive = getArchiveFactory().openArchive(AutomatedBVT.baseDirectory + "foo.jar");
- String uri = "com/ibm/etools/archive/test/SimpleTests.java";
-
- List files = anArchive.getFiles();
-
- File aFile = anArchive.getFile(uri);
- assertTrue("Adapter should be attached to aFile", !isEmpty(aFile.eAdapters()));
-
- files.remove(aFile);
-
- assertTrue("Adapter should not be attached to aFile", isEmpty(aFile.eAdapters()));
-
- assertTrue("Contains should return false", !anArchive.containsFile(uri));
-
- File copy = anArchive.addCopy(aFile);
-
- assertTrue("Contains should return true", anArchive.containsFile(uri));
-
- String renamedURI = "com/ibm/goobledygook";
- copy.setURI(renamedURI);
-
- assertTrue("Contains should return false for old uri", !anArchive.containsFile(uri));
-
- assertTrue("Contains should return true for new uri", anArchive.containsFile(renamedURI));
-
- }
- /**
- * This excercises the index adapter on Container
- * Tests notifications with add/remove of lists, and that adapters are set post copy
- */
- public void testIndexingWithCollections() throws Exception {
- Archive anArchive = getArchiveFactory().openArchive(AutomatedBVT.baseDirectory + "bankejbs.jar");
- EARFile earFile = getArchiveFactory().createEARFileInitialized(AutomatedBVT.baseDirectory + "bar.ear");
- earFile.addCopy(anArchive);
- anArchive = (Archive) earFile.getFile(AutomatedBVT.baseDirectory + "bankejbs.jar");
-
- assertTrue("Index out of sync", !anArchive.getFiles().isEmpty() && anArchive.isIndexed());
- List files = anArchive.getFiles();
- for (int i = 0; i < files.size(); i++) {
- File aFile = (File) files.get(i);
- assertTrue("Index out of whack; containment should be true", anArchive.containsFile(aFile.getURI()));
- assertTrue("Adapter should be attached to aFile", !isEmpty(aFile.eAdapters()));
- }
-
- List filesToAdd = getArchiveFactory().openReadOnlyDirectory(AutomatedBVT.baseDirectory + "WarTestClasses").getFilesRecursive();
- List addedFiles = anArchive.addCopyFiles(filesToAdd);
-
- assertTrue("Files added incorrectly", !filesToAdd.isEmpty() && filesToAdd.size() == addedFiles.size());
-
- for (int i = 0; i < addedFiles.size(); i++) {
- File aFile = (File) addedFiles.get(i);
- assertTrue("Contains should be true", anArchive.containsFile(aFile.getURI()));
- assertTrue("Should be same instance", anArchive.getFile(aFile.getURI()) == aFile);
- assertTrue("Adapter should be attached to aFile", !isEmpty(aFile.eAdapters()));
- }
- anArchive.getFiles().removeAll(addedFiles);
-
- for (int i = 0; i < addedFiles.size(); i++) {
- File aFile = (File) addedFiles.get(i);
- assertTrue("Adapter should not be attached to aFile", isEmpty(aFile.eAdapters()));
- assertTrue("Contains should return false", !anArchive.containsFile(aFile.getURI()));
- }
- getArchiveFactory().closeOpenArchives();
- }
- /**
- * Very basic method to open an archive and save it as a directory to a new destination. Requires visual inspection
- * for verification. Nested jars will not be exploded
- */
- public void testOpenAndExtract1() throws Exception {
-
- String in = AutomatedBVT.baseDirectory + "sample.ear";
- EARFile earFile = (EARFile) getArchiveFactory().openArchive(in);
- //System.out.println("EAR spec version " + earFile.getSpecVersion() + " detected.");
-
- String out = AutomatedBVT.baseDirectory + "testOutput/SimpleTests/sample-expanded-out1.ear";
- earFile.extractTo(out, Archive.EXPAND_NONE);
- earFile.close();
- }
- /**
- * Very basic method to open an archive and save it as a directory to a new destination. Requires visual inspection
- * for verification. Nested wars will be exploded but other nested jars will not. This method emulates the websphere install.
- * the archive is opened as read only; test that no temp files are created by putting a breakpoint in ArchiveUtil#createTempFile(String, File)
- * Also the archive is opened with java reflection disabled. Verify no reflection occurs by putting a breakpoints in the constructors
- * of JavaJDKAdapterFactory, and the method reflectValues() in each of the subclasses of JdkAdaptor.
- */
- public void testOpenAndExtract2() throws Exception {
-
- String in = AutomatedBVT.baseDirectory + "sample.ear";
- ArchiveOptions options = new ArchiveOptions();
- options.setIsReadOnly(true);
- options.setUseJavaReflection(false);
- EARFile earFile = (EARFile) getArchiveFactory().openArchive(options, in);
- //The following code forces the load of all the deployment descriptors, just to make sure java reflection doesn't happen
- List moduleRefs = earFile.getModuleRefs();
- for (int i = 0; i < moduleRefs.size(); i++) {
- ModuleRef m = (ModuleRef) moduleRefs.get(i);
- m.getDeploymentDescriptor();
-
- }
-
- String out = "testOutput/SimpleTests/sample-expanded-out2.ear";
- earFile.extractTo(out, Archive.EXPAND_WAR_FILES);
- earFile.close();
- }
- /**
- * Very basic method to open an archive and save it as a directory to a new destination. Requires visual inspection
- * for verification. Nested wars and ejb jars will be exploded but other nested jars will not
- */
- public void testOpenAndExtract3() throws Exception {
-
- String in = AutomatedBVT.baseDirectory + "sample.ear";
- EARFile earFile = (EARFile) getArchiveFactory().openArchive(in);
- String out = AutomatedBVT.baseDirectory + "testOutput/SimpleTests/sample-expanded-out3.ear";
- earFile.extractTo(out, Archive.EXPAND_WAR_FILES | Archive.EXPAND_EJBJAR_FILES);
- earFile.close();
- }
- /**
- * Opens an ear file, and for each module, writes it's dd components to the console. Requires visual inspection
- * for verification
- */
- public void testOpenAndRead() throws Exception {
-
- String in = AutomatedBVT.baseDirectory + "sample.ear";
- EARFile earFile = (EARFile) getArchiveFactory().openArchive(in);
-
- Application appl = earFile.getDeploymentDescriptor();
- printApplToConsole(appl);
-
- List moduleRefs = earFile.getModuleRefs();
-
- for (int i = 0; i < moduleRefs.size(); i++) {
- ModuleRef aModuleRef = (ModuleRef) moduleRefs.get(i);
- if (aModuleRef.isWeb()) {
- WebModuleRef wRef = (WebModuleRef) aModuleRef;
- printWebAppToConsole(wRef.getWebApp());
-
- } else if (aModuleRef.isEJB()) {
- EJBModuleRef eRef = (EJBModuleRef) aModuleRef;
- printEJBJarToConsole(eRef.getEJBJar());
-
- }
- }
- }
- /**
- * Very basic method to open an archive and save it as a jar file to a new destination. Requires visual inspection
- * for verification
- */
- public void testOpenAndSaveAsJarFile() throws Exception {
-
- String in = AutomatedBVT.baseDirectory + "sample.ear";
- EARFile earFile = (EARFile) getArchiveFactory().openArchive(in);
- String out = AutomatedBVT.baseDirectory + "testOutput/SimpleTests/sample-copy.ear";
- earFile.saveAsNoReopen(out);
- }
- /**
- * Test case created as a result of a defect report that currently cannot be reproduced; open an expanded ear file and save it out
- * as a jar file
- */
- public void testOpenDirectoryAndSaveAsJarFile() throws Exception {
-
- String in = AutomatedBVT.baseDirectory + "sample_expanded.ear";
- in = new java.io.File(in).getAbsolutePath();
- //System.out.println(in);
- EARFile earFile = (EARFile) getArchiveFactory().openArchive(in);
- //Added this line to see if loading the dd would make a difference
- earFile.getDeploymentDescriptor();
- String out = "testOutput/SimpleTests/sample-jarred.ear";
- out = new java.io.File(out).getAbsolutePath();
- //System.out.println(out);
- earFile.saveAsNoReopen(out);
- }
- /**
- * @see Archive#canClose()
- */
- public void testSafeClose() throws Exception {
-
- String in = AutomatedBVT.baseDirectory + "sample.ear";
- EARFile earFile = getArchiveFactory().openEARFile(in);
- List modules = earFile.getDeploymentDescriptor().getModules();
- EJBJarFile ejbJarFile = null;
-
- for (int i = 0; i < modules.size(); i++) {
- Module aModule = (Module) modules.get(i);
- if (aModule.isEjbModule()) {
- ejbJarFile = (EJBJarFile) earFile.getFile(aModule.getUri());
- //System.out.println("EJBJar spec version " + ejbJarFile.getSpecVersion() + " detected.");
-
- break;
- }
- }
-
- assertTrue("EJBJarFile should not be null", ejbJarFile != null);
-
- EARFile newEarFile = getArchiveFactory().createEARFileInitialized("testOutput/SimpleTests/safeClose1.ear");
- newEarFile.addCopy(ejbJarFile);
- assertTrue(!earFile.getDependentOpenArchives().isEmpty() && !ejbJarFile.getDependentOpenArchives().isEmpty());
-
- newEarFile.save();
- assertTrue(earFile.getDependentOpenArchives().isEmpty() && ejbJarFile.getDependentOpenArchives().isEmpty());
- earFile.close();
- newEarFile.close();
- }
- /**
- * CMVC defect 99544 - If a save fails and the file didn't exist, one should not
- * be created
- */
- public void testSaveFailure() throws Exception {
-
- String in = AutomatedBVT.baseDirectory + "sample.ear";
- String out = AutomatedBVT.baseDirectory + "testOutput/SimpleTests/saveFailure.ear";
- EARFile earFile = getArchiveFactory().openEARFile(in);
- List modules = earFile.getDeploymentDescriptor().getModules();
- EJBJarFile ejbJarFile = null;
-
- for (int i = 0; i < modules.size(); i++) {
- Module aModule = (Module) modules.get(i);
- if (aModule.isEjbModule()) {
- ejbJarFile = (EJBJarFile) earFile.getFile(aModule.getUri());
- break;
- }
- }
-
- assertTrue("EJBJarFile should not be null", ejbJarFile != null);
-
- EARFile newEarFile = getArchiveFactory().createEARFileInitialized(out);
- newEarFile.addCopy(ejbJarFile);
- ejbJarFile.close();
- try {
- newEarFile.save();
- } catch (SaveFailureException expected) {
- System.out.println("Expected save failure occurred");
- return;
- } finally {
- assertTrue("File should not exist", !(new java.io.File(out).exists()));
- getArchiveFactory().closeOpenArchives();
- }
- assertTrue("Save should have failed", false);
- }
- /**
- * Opens an ear file, makes a few changes to ensure the xml is not valid, and validates the xml in all the dds; verifies that
- * sax exceptions are collected
- */
- public void testXmlValidation() throws Exception {
-
- String in = AutomatedBVT.baseDirectory + "sample.ear";
- EARFile earFile = getArchiveFactory().openEARFile(in);
-
- Application appl = earFile.getDeploymentDescriptor();
- appl.getSecurityRoles().add(CommonPackage.eINSTANCE.getCommonFactory().createSecurityRole());
-
- List moduleFiles = earFile.getModuleFiles();
-
- for (int i = 0; i < moduleFiles.size(); i++) {
- ModuleFile aModuleFile = (ModuleFile) moduleFiles.get(i);
- if (aModuleFile.isWARFile()) {
- WARFile aWarFile = (WARFile) aModuleFile;
- aWarFile.getDeploymentDescriptor().getServlets().add(WebapplicationPackage.eINSTANCE.getWebapplicationFactory().createServlet());
- } else if (aModuleFile.isEJBJarFile()) {
- EJBJarFile anEjbJarFile = (EJBJarFile) aModuleFile;
- anEjbJarFile.getDeploymentDescriptor().getEnterpriseBeans().add(EjbPackage.eINSTANCE.getEjbFactory().createEntity());
- anEjbJarFile.getDeploymentDescriptor().getAssemblyDescriptor().getSecurityRoles().add(CommonPackage.eINSTANCE.getCommonFactory().createSecurityRole());
- }
- }
- Command cmd = new ValidateXmlCommand(earFile);
- cmd.execute();
- List errors = (List) cmd.getResult();
- assertTrue("Total validation errors should be 3, instead of "+errors.size(), errors.size() == 3);
- for (int i = 0; i < 3; i++) {
- XmlValidationResult result = (XmlValidationResult) errors.get(i);
- if (i == 1)
- assertTrue("The ejb module should have 2 errors instead of "+ result.getCaughtExceptions().size(), result.getCaughtExceptions().size() == 2);
- else
- assertTrue("The web module should have 1 error instead of "+ result.getCaughtExceptions().size(), result.getCaughtExceptions().size() == 1);
- }
- earFile.close();
- }
- protected void setUp() throws Exception {
- super.setUp();
- ArchiveInit.init();
- }
-
- public void testReadEmptyTags() throws Exception {
- String uri = AutomatedBVT.baseDirectory + "CHKJ280X.jar";
- EJBJarFile jarfile = getArchiveFactory().openEJBJarFile(uri);
- EJBJar jar = jarfile.getDeploymentDescriptor();
- Session sess = (Session) jar.getEnterpriseBeans().get(0);
- Entity entity = (Entity) jar.getEnterpriseBeans().get(1);
- assertFalse("Value should be unset", entity.isSetReentrant());
- assertFalse("Value should be unset", sess.isSetSessionType());
- assertFalse("Value should be unset", sess.isSetTransactionType());
-}
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/TestInvalidXmlMultiplicity.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/TestInvalidXmlMultiplicity.java
deleted file mode 100644
index be99a157..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/TestInvalidXmlMultiplicity.java
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Created on Dec 2, 2003
- *
- */
-package org.eclipse.jst.j2ee.archive.test;
-
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DeploymentDescriptorLoadException;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-import org.eclipse.jst.j2ee.internal.IWrappedException;
-
-
-/**
- * @author schacher
- */
-public class TestInvalidXmlMultiplicity extends AbstractArchiveTest {
-
- /**
- * @param name
- */
- public TestInvalidXmlMultiplicity(String name) {
- super(name);
- }
-
- /**
- * Starts the application.
- * @param args an array of command-line arguments
- */
- public static void main(java.lang.String[] args) {
- String[] className = { "com.ibm.etools.archive.test.TestInvalidXmlMultiplicity", "-noloading" };
- TestRunner.main(className);
- }
-
- public static junit.framework.Test suite() {
- return new TestSuite(TestInvalidXmlMultiplicity.class);
- }
-
- public void test1() throws Exception {
- String uri = AutomatedBVT.baseDirectory + "BadJspConfig.war";
- runTest(uri);
- }
-
- public void test2() throws Exception {
- String uri = AutomatedBVT.baseDirectory + "BadLoginConfig.war";
- runTest(uri);
- }
-
- public void test3() throws Exception {
- String uri = AutomatedBVT.baseDirectory + "BadSessionConfig.war";
- runTest(uri);
- }
-
- public void runTest(String uri) throws Exception {
- IWrappedException ex = null;
- WARFile war = getArchiveFactory().openWARFile(uri);
- try {
- war.getDeploymentDescriptor();
- } catch (DeploymentDescriptorLoadException ddex) {
- ex = ddex;
- }
- assertNotNull("Exception should have been caught", ex);
- Exception inner = ex.getNestedException();
-
- while (ex != null) {
- if (inner instanceof IWrappedException) {
- ex = (IWrappedException)inner;
- if (ex.getNestedException() != null)
- inner = ex.getNestedException();
- } else
- ex = null;
- }
-
- assertTrue("The exception should be an IllegalStateException", inner instanceof IllegalStateException);
- war.close();
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/TestModuleClassLoading.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/TestModuleClassLoading.java
deleted file mode 100644
index 9ec22471..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/TestModuleClassLoading.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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.archive.test;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.internal.impl.JavaClassImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-
-
-public class TestModuleClassLoading extends TestCase {
- static String testClass = "client.Subtract";
-
-
-
- /**
- *
- */
- public TestModuleClassLoading() {
- super();
- }
-
- public TestModuleClassLoading(String name) {
- super(name);
- }
-
- public CommonarchiveFactory getArchiveFactory() {
- return CommonarchivePackage.eINSTANCE.getCommonarchiveFactory();
- }
- /**
- * Starts the application.
- * @param args an array of command-line arguments
- */
- public static void main(java.lang.String[] args) {
- String[] className = {"com.ibm.etools.archive.test.TestModuleClassLoading", "-noloading"};
- TestRunner.main(className);
- }
- public static junit.framework.Test suite() {
- return new TestSuite(TestModuleClassLoading.class);
- }
- public static void testAddModuleClassLoading() throws Exception {
- String[] files = { "PROTO.ear","SEIinAnotherJar.ear", "SEIinWEB-INF_lib_jar.ear" };
-
- if (files.length == 0) {
- System.out.println("Usage: args specify full path to ear files.");
- }
-
- // com.ibm.websphere.models.config.init.ConfigInit.init();
- for (int i = 0; i < files.length; i++) {
- String filename = files[i];
- CommonarchiveFactory factory = CommonarchiveFactory.eINSTANCE;
-
- String in = AutomatedBVT.baseDirectory + files[i];
- try {
- EARFile earFile = factory.openEARFile (in);
- System.out.println ("uri: " + earFile.getURI());
- System.out.println("Testing " + earFile.getURI());
- doModules(earFile);
- } catch (Exception e) {
- System.out.println(e);
- }
- }
- }
-
-
-
- public static void doModules(EARFile earFile) {
- List modules = earFile.getModuleFiles();
- for (int i = 0; i < modules.size(); i++) {
- Archive module = (Archive) modules.get(i);
- System.out.print("\tLooking for class " + testClass + " in module " + module.getURI());
- doLoad(module, testClass);
- }
- } // validateModules
-
- private static void doLoad(Archive module, String testClass) {
- try {
- JavaClass javaClass =
- (JavaClass) JavaClassImpl.reflect(testClass, module.getResourceSet());
- if (!(javaClass).isExistingType()) {
- // This is what happens if the class can't be loaded.
- System.out.println("- NOT FOUND - isExistingType returns false.");
- } else {
- System.out.println(" - found: isExistingType returns true.");
- }
- } catch (RuntimeException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/WARFileTests.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/WARFileTests.java
deleted file mode 100644
index 6c617f1d..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/test/WARFileTests.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.eclipse.jst.j2ee.archive.test;
-
- /*
- * Licensed Material - Property of IBM
- * (C) Copyright IBM Corp. 2001 - All Rights Reserved.
- * US Government Users Restricted Rights - Use, duplication or disclosure
- * restricted by GSA ADP Schedule Contract with IBM Corp.
- */
-
-import java.util.List;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ReadOnlyDirectory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveConstants;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.core.tests.bvt.AutomatedBVT;
-
-/**
- * Insert the type's description here.
- * Creation date: (12/15/00 2:26:04 PM)
- * @author: Administrator
- */
-public class WARFileTests extends TestCase {
- private final static String copyright = "(c) Copyright IBM Corporation 2001.";//$NON-NLS-1$
-/**
- * WARFileTests constructor comment.
- * @param name java.lang.String
- */
-public WARFileTests(String name) {
- super(name);
-}
-public CommonarchiveFactory getArchiveFactory() {
- return CommonarchivePackage.eINSTANCE.getCommonarchiveFactory();
-}
-/**
- * Starts the application.
- * @param args an array of command-line arguments
- */
-public static void main(java.lang.String[] args) {
- String[] className = {"com.ibm.etools.archive.test.WARFileTests", "-noloading"};
- TestRunner.main(className);
-}
-public static junit.framework.Test suite() {
- return new TestSuite(WARFileTests.class);
-}
-public void testAddCopyClass() throws Exception {
-
- WARFile aWarFile = (WARFile)getArchiveFactory().openArchive(AutomatedBVT.baseDirectory +"example2.war");
-
- ReadOnlyDirectory sampleDirectory = getArchiveFactory().openReadOnlyDirectory(AutomatedBVT.baseDirectory +"WarTestClasses");
-
- int initialSize = aWarFile.getClasses().size();
-
- File aFile = sampleDirectory.getFileInSelfOrSubdirectory("com/ibm/etools/archive/test/WARFileTests.class");
-
- aWarFile.addCopyClass(aFile);
- assertTrue(aWarFile.getClasses().size() == initialSize+1);
-
- String classURI = ArchiveUtil.concatUri(ArchiveConstants.WEBAPP_CLASSES_URI, aFile.getURI(), '/');
- assertTrue(aWarFile.containsFile(classURI));
- //System.out.println(aWarFile.getURI()+" contains class "+classURI);
-
- aWarFile.saveAsNoReopen(AutomatedBVT.baseDirectory +"testOutput/WarTests/addCopyClass.war");
-
-}
-
-public void testAddCopyLib() throws Exception {
-
- WARFile aWarFile = (WARFile)getArchiveFactory().openArchive(AutomatedBVT.baseDirectory + "example2.war");
-
- Archive lib = getArchiveFactory().openArchive(AutomatedBVT.baseDirectory + "foo.jar");
-
- int initialSize = aWarFile.getLibs().size();
-
- aWarFile.addCopyLib(lib);
- assertTrue(aWarFile.getLibs().size() == initialSize+1);
-
- String libURI = ArchiveUtil.concatUri(ArchiveConstants.WEBAPP_LIB_URI, lib.getURI(), '/');
- assertTrue(aWarFile.containsFile(libURI));
- //System.out.println(aWarFile.getURI()+" contains lib "+libURI);
-
- aWarFile.saveAsNoReopen("testOutput/WarTests/addCopyLib.war");
-
-}
-
-public void testListClassesAndLibs() throws Exception {
-
- WARFile aWarFile = (WARFile)getArchiveFactory().openArchive(AutomatedBVT.baseDirectory + "example2.war");
-
- List libs = aWarFile.getLibs();
- List classes = aWarFile.getClasses();
- List resources = aWarFile.getResources();
-// System.out.println("WAR spec version "+aWarFile.getSpecVersion()+" detected.");
-// System.out.println("example2.war contains "+classes.size()+ " files in classes");
-// System.out.println("example2.war contains "+libs.size()+ " libs");
-// System.out.println("example2.war contains "+resources.size()+ " resources");
-
-}
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/testutilities/EAttributeDescriptor.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/testutilities/EAttributeDescriptor.java
deleted file mode 100644
index d8500780..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/testutilities/EAttributeDescriptor.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Created on May 1, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.archive.testutilities;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EStructuralFeature;
-
-/**
- * @author administrator
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class EAttributeDescriptor {
-
- EStructuralFeature feature;
- EClass metaClass;
-
- /**
- *
- */
- public EAttributeDescriptor(EStructuralFeature feature, EClass metaClass) {
- this.feature = feature;
- this.metaClass = metaClass;
- }
-
- /**
- * @return
- */
- public EClass getMetaClass() {
- return metaClass;
- }
-
- /**
- * @param class1
- */
- public void setMetaClass(EClass class1) {
- metaClass = class1;
- }
-
- public boolean equals(Object object) {
- EAttributeDescriptor o = (EAttributeDescriptor)object;
- return o.getFeature() == getFeature() && o.getMetaClass() == getMetaClass();
- }
-
- public int hashCode() {
- return feature.hashCode() ^ metaClass.hashCode();
- }
-
-
- /**
- * @return
- */
- public EStructuralFeature getFeature() {
- return feature;
- }
-
- /**
- * @param attribute
- */
- public void setFeature(EAttribute attribute) {
- this.feature = attribute;
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/testutilities/EMFAttributeFeatureGenerator.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/testutilities/EMFAttributeFeatureGenerator.java
deleted file mode 100644
index 90046a2b..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/testutilities/EMFAttributeFeatureGenerator.java
+++ /dev/null
@@ -1,473 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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.archive.testutilities;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Random;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.emf.ecore.EcorePackage;
-import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.jem.java.internal.impl.JavaClassImpl;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-public class EMFAttributeFeatureGenerator {
- public static String avClass[];
- protected static int count = 0;
- protected static Random randomGenerator = new Random();
- protected static int maxNumberOfProjectsCreated = 1000;
- protected static Map enumMap = new HashMap();
- protected static int paramCount;
- protected static String[] langArray = new String[] { "EN","FR","DE","JP","CN","BR","SP"};
- protected static int langCount = 0;
- protected static Map booleanMap = new HashMap();
- protected static Map attIndex = new HashMap();
- protected static boolean specialNumberGen = false;
- protected static String httpArray[] = null;
- protected static int httpArrayIndex = 0;
-
- public static int version;
- public static int moduleType;
- //static versions
- public static final int VERSION_1_2 = 0;
- public static final int VERSION_1_3 = 1;
- public static final int VERSION_1_4 = 2;
-
- public static final int APPICATION = 0;
- public static final int APP_CLIENT = 1;
- public static final int CONNECTOR = 2;
- public static final int EJB = 3;
- public static final int WEB = 4;
-
- public EMFAttributeFeatureGenerator() {
- super();
- }
-
- public static void resetCount() {
- count = 0;
- return;
- }
- public static Object createAttribute(EAttribute att, EObject obj){
- return createAttribute(new EAttributeDescriptor(att,obj.eClass()));
- }
-
- public static Object createAttribute(EAttribute att, EClass eClass){
- return createAttribute(new EAttributeDescriptor(att,eClass));
- }
-
- public static Object createAttribute(EAttribute att, EObject obj, boolean special){
- specialNumberGen = special;
- return createAttribute(new EAttributeDescriptor(att,obj.eClass()));
- }
-
- public static Object createAttribute(EAttribute att, EObject obj, boolean special, int ver, int modType) {
- specialNumberGen = special;
- version = ver;
- moduleType = modType;
- return createAttribute(new EAttributeDescriptor(att,obj.eClass()));
- }
-
- protected static Object createAttribute(EAttributeDescriptor att) {
- EClassifier meta = att.getFeature().getEType();
- if (meta instanceof EEnum && att.getFeature().isMany()){
- List collection = new ArrayList();
- collection.add(createEnum(att));
- return collection;
- }
- else if (meta instanceof EEnum)
- return createEnum(att);
- else if ((version == VERSION_1_3 || version == VERSION_1_2) && att.getFeature().equals(WebapplicationPackage.eINSTANCE.getHTTPMethodType_HttpMethod()))
- return createSpecialHttpMethodsFor13();
- else if (version == VERSION_1_3 && att.getFeature().equals(CommonPackage.eINSTANCE.getEJBLocalRef_Local()))
- return generateRandomAttributeString(new EAttributeDescriptor(CommonPackage.eINSTANCE.getEjbRef_Remote(), att.getMetaClass()));
- else if (version == VERSION_1_3 && att.getFeature().equals(CommonPackage.eINSTANCE.getEJBLocalRef_LocalHome()))
- return generateRandomAttributeString(new EAttributeDescriptor(CommonPackage.eINSTANCE.getEjbRef_Home(),att.getMetaClass()));
- else if (att.getFeature().getName().equals("parms"))
- return createParams(att);
- else if (att.getFeature().getName().startsWith("location") && version == VERSION_1_4)
- return createLocation(att);
- else if (att.getFeature().getName().startsWith("locale") && version == VERSION_1_4)
- return createLocale();
- else if (att.getFeature().getName().equals("lang"))
- return createLang(att);
- else if (att.getFeature().getName().equals("version"))
- if (att.getFeature() == EjbPackage.eINSTANCE.getContainerManagedEntity_Version())
- return "2.x";
- else
- return createVersion(att);
- else if (att.getFeature().getName().equals("mimeType") && version == VERSION_1_4)
- return "text/plain";
- else if (att.getFeature().getName().equals("errorCode") && version == VERSION_1_4)
- return "404";
- else if (att.getFeature().getName().equals("formLoginPage") && version == VERSION_1_4)
- return "/testFormLoginPage";
- else if (att.getFeature().getName().equals("formErrorPage") && version == VERSION_1_4)
- return "/testFormErrorpage";
- else if(att.getFeature().getName().equals("link") && version == VERSION_1_4)
- return "roleName_0";
- else if(att.getFeature().getName().equals("specVersion") && version == VERSION_1_4)
- return "1.5";
- else if (att.getFeature().isMany())
- return createCollection(att);
- else if (meta.getInstanceClassName().equals("java.lang.String"))
- return generateRandomAttributeString(att);
- else if (meta.getInstanceClassName().equals("java.math.BigInteger"))
- return generateRandomBigInteger(att);
- else if (meta.getInstanceClassName().equals("boolean"))
- return generateRandomBoolean(att);
- else if (meta.getInstanceClassName().equals("java.util.List"))
- return createCollection(att);
- else if(meta.getName().equals("QName")){
- return generateRandomQName(att);
- }
- switch (meta.getClassifierID()) {
- case EcorePackage.ESTRING:
- return generateRandomAttributeString(att);
- case EcorePackage.EBOOLEAN_OBJECT:
- case EcorePackage.EBOOLEAN:
- return generateRandomBoolean(att);
- case EcorePackage.EINTEGER_OBJECT:
- case EcorePackage.EINT:
- return generateRandomInteger(att);
- case EcorePackage.EBIG_INTEGER:
- return generateRandomBigInteger(att);
- case EcorePackage.EFLOAT_OBJECT:
- case EcorePackage.EFLOAT:
- return generateRandomFloat(att);
- case EcorePackage.ECHARACTER_OBJECT:
- case EcorePackage.ECHAR:
- return generateRandomChar(att);
- case EcorePackage.ELONG_OBJECT:
- case EcorePackage.ELONG:
- case XMLTypePackage.LONG:
- return generateRandomLong();
- case EcorePackage.EBYTE_OBJECT:
- case EcorePackage.EBYTE:
- return generateRandomByte();
- case EcorePackage.EDOUBLE_OBJECT:
- case EcorePackage.EDOUBLE:
- return generateRandomDouble();
- case EcorePackage.ESHORT_OBJECT:
- case EcorePackage.ESHORT:
- return generateRandomShort(att);
- case EcorePackage.EJAVA_OBJECT:
- return generateRandomObject(att);
- }
- return null;
- }
-
- /**
- * @return
- */
- private static Object createLocale() {
- return "en_US";
- }
-
- /**
- * @param att
- * @return
- */
- private static Object createLocation(EAttributeDescriptor att) {
- String temp = generateRandomAttributeString(att);
- return "/." + temp;
- }
-
- public static EObject createJavaClassProxy(EStructuralFeature ref, EObject eObject) {
- if (avClass == null) {
- avClass = new String[] { "java.util.HashTable", "java.util.List", "java.sql.Data", "java.lang.Integer", "java.lang.String" };
- }
- EAttributeDescriptor feature = new EAttributeDescriptor(ref,eObject.eClass());
- if (!attIndex.containsKey(feature))
- attIndex.put(feature, new Integer(0));
- int classIndex = ((Integer)attIndex.get(feature)).intValue();
- String name = avClass[classIndex];
- classIndex++;
- if (classIndex == 5)
- classIndex = 0;
- attIndex.put(feature,new Integer(classIndex));
- return JavaClassImpl.createClassRef(name);
- }
- /**
- * @return
- */
- protected static Object createSpecialHttpMethodsFor13() {
- if (httpArray == null)
- httpArray = new String[] {
- "GET",
- "POST",
- "PUT",
- "DELETE",
- "HEAD",
- "OPTIONS",
- "TRACE"
- };
- if (httpArrayIndex >= httpArray.length)
- httpArrayIndex = 0;
- Object holder = httpArray[httpArrayIndex];
- httpArrayIndex++;
- return holder;
- }
-
- /**
- * @param att
- * @return
- */
- protected static String createVersion(EAttributeDescriptor att) {
- String versionHolder = "";
- switch (moduleType) {
- case APPICATION :
- if(version == VERSION_1_2) {
- versionHolder = "1.2";
- break;
- }
- else if(version == VERSION_1_3){
- versionHolder = "1.3";
- break;
- }
- else if(version == VERSION_1_4){
- versionHolder = "1.4";
- break;
- }
- else {
- versionHolder = "5.0";
- break;
- }
- case APP_CLIENT :
- if(version == VERSION_1_2) {
- versionHolder = "1.2";
- break;
- }
- else if(version == VERSION_1_3) {
- versionHolder = "1.3";
- break;
- }
- else if(version == VERSION_1_4) {
- versionHolder = "1.4";
- break;
- }
- else {
- versionHolder = "5.0";
- break;
- }
- case EJB :
- if(version == VERSION_1_2) {
- versionHolder = "1.1";
- break;
- }
- else if(version == VERSION_1_3) {
- versionHolder = "2.0";
- break;
- }
- else if(version == VERSION_1_4) {
- versionHolder = "2.1";
- break;
- }
- else {
- versionHolder = "3.0";
- break;
- }
- case CONNECTOR :
- if(version == VERSION_1_2) {
- versionHolder = "1.0";
- break;
- }
- else if(version == VERSION_1_3) {
- versionHolder = "1.0";
- break;
- }
- else {
- versionHolder = "1.5";
- break;
- }
- case WEB :
- if(version == VERSION_1_2) {
- versionHolder = "2.2";
- break;
- }
- else if(version == VERSION_1_3) {
- versionHolder = "2.3";
- break;
- }
- else if(version == VERSION_1_4) {
- versionHolder = "2.4";
- break;
- }
- else {
- versionHolder = "2.5";
- break;
- }
- }
-
- return versionHolder;
- }
-
- protected static Object createParams(EAttributeDescriptor att) {
- if (paramCount == 0){
- paramCount++;
- return null;
- }
- else if (paramCount == 1){
- paramCount++;
- return "";
- }
- String r = "";
- for (int i = 1 ; i < paramCount ;i++){
- r += generateRandomAttributeString(att) + " ";
- }
- paramCount++;
- if (paramCount == 5)
- paramCount = 0;
- return r;
-
- }
-
-
- protected static Object createLang(EAttributeDescriptor att) {
- String name = langArray[langCount];
- langCount++;
- if (langCount == 7)
- langCount = 0;
- return name;
- }
-
- protected static Object createCollection(EAttributeDescriptor att) {
- ArrayList list = new ArrayList();
- list.add(generateRandomAttributeString(att));
- return list;
- }
-
-
- protected static Object generateRandomObject(EAttributeDescriptor att) {
- return generateRandomAttributeString(att);
- }
-
- protected static Object createEnum(EAttributeDescriptor att) {
- EEnum anEnum = (EEnum) att.getFeature().getEType();
- if (!enumMap.containsKey(att)){
- if (att.getFeature().getName().equals("authMethod"))
- enumMap.put(att,new Integer(1));
- else
- enumMap.put(att,new Integer(0));
- }
- int pos = ((Integer)enumMap.get(att)).intValue();
- EList literals = anEnum.getELiterals();
- int size = literals.size();
- if (pos == size)
- pos = 0;
- Object holder = anEnum.getEEnumLiteral(pos).getInstance();
- pos++;
- enumMap.put(att,new Integer(pos));
- return holder;
-
- }
- public static Object generateRandomClassname(EAttributeDescriptor att) {
- return "com.foo." + generateRandomAttributeString(att);
- }
-
- //REVISIT
- protected static Object generateRandomShort(EAttributeDescriptor att) {
- return new Short(Short.parseShort(String.valueOf(generateNumber(att))));
- }
-
- protected static Object generateRandomDouble() {
- return new Double(randomGenerator.nextDouble());
- }
- //REVISIT
- protected static Object generateRandomByte() {
- return new Byte("byte");
- }
-
- protected static Object generateRandomLong() {
- return new Long(randomGenerator.nextLong());
- }
-
- protected static Object generateRandomChar(EAttributeDescriptor att) {
- return new Character(generateRandomAttributeString(att).charAt(0));
- }
-
-
- protected static Object generateRandomFloat(EAttributeDescriptor att) {
- return new Float(randomGenerator.nextFloat());
- }
-
- protected static Object generateRandomInteger(EAttributeDescriptor att) {
- return new Integer(generateNumber(att));
- }
-
- protected static Object generateRandomBigInteger(EAttributeDescriptor att) {
- return new BigInteger(new Long(generateNumber(att)).toString());
- }
-
- protected static char [] intToCharMapping = new char [] { 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j' };
- protected static char [] charToIntMapping = new char [] { '0', '1', '2', '3', '4', '5', '6', '7', '8', '9' };
- protected static Object generateRandomQName(EAttributeDescriptor att) {
- char [] charArray = Integer.toString(generateNumber(att)).toCharArray();
- for(int i=0;i<charArray.length;i++){
- for(int j=0;j<charToIntMapping.length; j++){
- if (charArray[i] == charToIntMapping[j]){
- charArray[i] = intToCharMapping[j];
- break;
- }
- }
- }
- return new String(charArray);
- }
-
- protected static Object generateRandomBoolean(EAttributeDescriptor att) {
- if (!booleanMap.containsKey(att)){
- booleanMap.put(att,new Boolean(true));
- }
- Boolean holder = (Boolean)booleanMap.get(att);
- booleanMap.put(att, new Boolean(!holder.booleanValue()));
- return holder;
- }
-
- public static String generateRandomAttributeString(EAttributeDescriptor att) {
- return att.getFeature().getName() + "_" + generateNumber(att);
- }
- protected static int generateNumber(EAttributeDescriptor att) {
- if(!specialNumberGen)
- return count ++;
- else{
- if(!attIndex.containsKey(att))
- attIndex.put(att, new Integer(0));
- int holder = ((Integer) attIndex.get(att)).intValue();
- attIndex.put(att, new Integer(holder+1));
- return holder;
- }
- }
-
- public static void reset(){
- count = 0;
- enumMap = new HashMap();
- httpArrayIndex = 0;
- paramCount = 0;
- langCount = 0;
- booleanMap = new HashMap();
- attIndex = new HashMap();
- specialNumberGen = false;
- TestUtilities.reset();
- J2EEVersionCheck.cur_Tags = null;
-
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/testutilities/J2EEVersionCheck.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/testutilities/J2EEVersionCheck.java
deleted file mode 100644
index 21a089da..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/testutilities/J2EEVersionCheck.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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
- *******************************************************************************/
-/*
- * Created on Apr 14, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.archive.testutilities;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-
-public class J2EEVersionCheck {
- public int version;
- //static versions
- public static final int VERSION_1_2 = 0;
- public static final int VERSION_1_3 = 1;
- public static final int VERSION_1_4 = 2;
- public static final int VERSION_5_0 = 3;
-
- //modules
- public static final int APPICATION = 0;
- public static final int APP_CLIENT = 1;
- public static final int CONNECTOR = 2;
- public static final int EJB = 3;
- public static final int WEB = 4;
-
- public static List cur_Tags;
- private static CommonPackage COM = CommonPackage.eINSTANCE;
-
- public J2EEVersionCheck() {
- super();
- }
- public static boolean checkAttributeVersion(EAttribute att, int version, int type){
- //TODO: Add version 1.2 excludes
- if(version == VERSION_1_3 || version == VERSION_1_2){
- if(cur_Tags == null){
- cur_Tags = new ArrayList();
- populate_1_3List(type);
- }
- }
- else if(version == VERSION_1_4 || version == VERSION_5_0){
- return true;
- }
-
- if(cur_Tags.contains(att) || cur_Tags.contains(att.getEType()))
- return false;
- return true;
- }
-
- public static boolean checkReferenceVersion(EStructuralFeature ref, int version, int type){
- //TODO: Add version 1.2 excludes
- if(version == VERSION_1_3 || version == VERSION_1_2){
- if(cur_Tags == null){
- cur_Tags = new ArrayList();
- populate_1_3List(type);
- }
- }
- else if(version == VERSION_1_4 || version == VERSION_5_0){
- return true;
- }
-
- if(cur_Tags.contains(ref) || cur_Tags.contains(ref.getEType()))
- return false;
- return true;
- }
-
- private static void populate_1_2List(int type) {
- switch (type) {
- case APPICATION :
- populate_1_2Application();
- break;
- case APP_CLIENT :
- populate_1_2AppClient();
- break;
- case EJB :
- populate_1_2EJB();
- break;
- case CONNECTOR :
- populate_1_2EJB();
- break;
- case WEB :
- populate_1_2Web();
- default :
- break;
- }
- }
-
- private static void populate_1_3List(int type) {
- switch (type) {
- case APPICATION :
- populate_1_3Application();
- break;
- case APP_CLIENT :
- populate_1_3AppClient();
- break;
- case EJB :
- populate_1_3EJB();
- break;
- case CONNECTOR :
- populate_1_3EJB();
- break;
- case WEB :
- populate_1_3Web();
- default :
- break;
- }
- }
-
- private static void populate_1_2Application(){
- populate_1_3Application();
- }
-
- private static void populate_1_2AppClient(){
- populate_1_3AppClient();
- }
-
- private static void populate_1_2EJB(){
- populate_1_3EJB();
- }
-
- private static void populate_1_2Connector(){
- populate_1_3Connector();
- }
-
- private static void populate_1_2Web(){
- populate_1_3Web();
- }
-
- //1.3
- private static void populate_1_3Application(){
- CommonPackage COM = CommonPackage.eINSTANCE;
- cur_Tags.add(COM.getIconType());
- cur_Tags.add(COM.getDisplayName());
- cur_Tags.add(COM.getDescription());
- cur_Tags.add(COM.getDescriptionGroup());
- cur_Tags.add(COM.getSecurityIdentity_Descriptions());
- cur_Tags.add(ApplicationPackage.eINSTANCE.getApplication_Version());
- }
-
- private static void populate_1_3AppClient(){
- cur_Tags.add(COM.getIconType());
- cur_Tags.add(COM.getDisplayName());
- cur_Tags.add(COM.getDescription());
- cur_Tags.add(COM.getDescriptionGroup());
- cur_Tags.add(ClientPackage.eINSTANCE.getApplicationClient_Version());
- cur_Tags.add(ClientPackage.eINSTANCE.getApplicationClient_ServiceRefs());
- cur_Tags.add(ClientPackage.eINSTANCE.getApplicationClient_MessageDestinationRefs());
- cur_Tags.add(ClientPackage.eINSTANCE.getApplicationClient_MessageDestinations());
- cur_Tags.add(COM.getMessageDestination());
- cur_Tags.add(COM.getMessageDestinationRef());
- //cur_Tags.add(ClientPackage.eINSTANCE.getApplicationClient_ServiceRefs());
- }
-
- private static void populate_1_3Connector(){
- cur_Tags.add(COM.getIconType());
- cur_Tags.add(COM.getDisplayName());
- cur_Tags.add(COM.getDescription());
- cur_Tags.add(COM.getDescriptionGroup());
- cur_Tags.add(JcaPackage.eINSTANCE.getOutboundResourceAdapter());
- cur_Tags.add(JcaPackage.eINSTANCE.getInboundResourceAdapter());
- cur_Tags.add(JcaPackage.eINSTANCE.getAdminObject());
- cur_Tags.add(JcaPackage.eINSTANCE.getConnector_Version());
- }
-
- private static void populate_1_3EJB() {
- cur_Tags.add(COM.getIconType());
- cur_Tags.add(COM.getDisplayName());
- cur_Tags.add(COM.getDescription());
- cur_Tags.add(COM.getDescriptionGroup());
- cur_Tags.add(EjbPackage.eINSTANCE.getEJBJar_Version());
- cur_Tags.add(EjbPackage.eINSTANCE.getSession_ServiceEndpoint());
- cur_Tags.add(COM.getJNDIEnvRefsGroup_MessageDestinationRefs());
- cur_Tags.add(COM.getJNDIEnvRefsGroup_ServiceRefs());
- cur_Tags.add(EjbPackage.eINSTANCE.getMessageDriven_MessagingType());
- cur_Tags.add(EjbPackage.eINSTANCE.getMessageDriven_MessageDestination());
- cur_Tags.add(EjbPackage.eINSTANCE.getMessageDriven_Link());
- cur_Tags.add(EjbPackage.eINSTANCE.getMessageDriven_ActivationConfig());
- }
-
- private static void populate_1_3Web(){
- cur_Tags.add(COM.getIconType());
- cur_Tags.add(COM.getDisplayName());
- cur_Tags.add(COM.getDescription());
- cur_Tags.add(COM.getDescriptionGroup());
- cur_Tags.add(WebapplicationPackage.eINSTANCE.getWebApp_Version());
- cur_Tags.add(WebapplicationPackage.eINSTANCE.getWebApp_JspConfig());
- cur_Tags.add(WebapplicationPackage.eINSTANCE.getWebApp_MessageDestinations());
- cur_Tags.add(WebapplicationPackage.eINSTANCE.getWebApp_LocalEncodingMappingList());
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/testutilities/TestUtilities.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/testutilities/TestUtilities.java
deleted file mode 100644
index 5f778ecc..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/archive/testutilities/TestUtilities.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Created on Apr 3, 2003
- *
- * To change the template for this generated file go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.archive.testutilities;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.emf.ecore.EClassifier;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.util.EcoreUtil;
-
-/**
- * @author administrator
- *
- * To change the template for this generated type comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class TestUtilities extends EcoreUtil {
- private static Map objectMap = new HashMap();
- private static Map subsetMap = new HashMap();
-
-
- /**
- * Returns the first collection member that {@link EClassifier#isInstance is an instance} of the type.
- * @param objects a collection of objects to check.
- * @param type the type of object to find.
- * @return the first object of the specified type.
- */
- public static Object getObjectByType(Resource res, EClassifier type, boolean isMany) {
- if (isMany)
- return getContainedCollectionByType(res.getContents(), type);
- else
- return getContainedObjectByType(res.getContents(), type);
- }
-
- public static Object getContainedObjectByType(List list, EClassifier type) {
- Object found;
- found = getObjectsByType(list, type);
- if (found != null && !((Collection)found).isEmpty())
- return extractObject((List) found,type);
-
- for (int i = 0; i < list.size(); i++) {
- EObject obj = (EObject) list.get(i);
- found = getContainedObjectByType(obj.eContents(), type);
- if (found != null)
- return found;
- }
-
- return null;
- }
-
- public static Object getContainedCollectionByType(List list, EClassifier type) {
- List found;
- found = (List)getObjectsByType(list, type);
- if (found != null && !found.isEmpty())
- return extractSubset(found, type);
-
- for (int i = 0; i < list.size(); i++) {
- EObject obj = (EObject) list.get(i);
- found = (List) getContainedCollectionByType(obj.eContents(), type);
- if (found != null)
- return found;
- }
-
- return null;
-
-
-
- }
-
- public static List extractSubset(List found, EClassifier type) {
- if (!subsetMap.containsKey(type)){
- subsetMap.put(type,new Integer(1));
- }
- int pos = ((Integer)subsetMap.get(type)).intValue();
-
- if (pos == found.size())
- pos = 1;
- List result = new ArrayList();
- for (int i = 0; i < pos; i++)
- result.add(found.get(i));
- pos++;
- subsetMap.put(type,new Integer(pos));
-
- return result;
- }
-
- public static Object extractObject(List found, EClassifier type) {
- if (!objectMap.containsKey(type)){
- objectMap.put(type,new Integer(0));
- }
- int pos = ((Integer)objectMap.get(type)).intValue();
-
- if (pos == found.size())
- pos = 0;
- Object holder = found.get(pos);
- pos++;
- objectMap.put(type,new Integer(pos));
-
- return holder;
- }
-
- public static void reset(){
- subsetMap.clear();
- objectMap.clear();
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/core/tests/bvt/AutomatedBVT.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/core/tests/bvt/AutomatedBVT.java
deleted file mode 100644
index 740689a8..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/core/tests/bvt/AutomatedBVT.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Created on Apr 1, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.core.tests.bvt;
-
-import java.net.URL;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jst.j2ee.archive.emftests.AllTests;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class AutomatedBVT extends TestSuite {
-
- public static String baseDirectory = System.getProperty("user.dir") + java.io.File.separatorChar + "commonArchiveResources" + java.io.File.separatorChar;
-
- static {
- try {
- IPluginDescriptor pluginDescriptor = Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.jst.j2ee.core.tests");
- URL url = pluginDescriptor.getInstallURL();
- AutomatedBVT.baseDirectory = Platform.asLocalURL(url).getFile() + "commonArchiveResources"+ java.io.File.separatorChar;
- } catch (Exception e) {
- System.err.println("Using working directory since a workspace URL could not be located.");
- }
- }
-
- public static int unimplementedMethods;
-
- public static void main(String[] args) {
- unimplementedMethods = 0;
- TestRunner.run(suite());
- if (unimplementedMethods > 0) {
- System.out.println("\nCalls to warnUnimpl: " + unimplementedMethods);
- }
- }
-
- public AutomatedBVT() {
- super();
- TestSuite suite = (TestSuite) AutomatedBVT.suite();
- for (int i = 0; i < suite.testCount(); i++) {
- addTest(suite.testAt(i));
- }
- }
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.jst.j2ee.core.bvt");
- //$JUnit-BEGIN$
- //TODO: Make the Archive Test Work
- // suite.addTest(AllArchiveTestsJava.suite());
- suite.addTest(AllTests.suite());
- //suite.addTest(AllJavaTestsJava.suite());
- //$JUnit-END$
- return suite;
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/core/tests/bvt/AutomatedBVTEclipse.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/core/tests/bvt/AutomatedBVTEclipse.java
deleted file mode 100644
index 9fa118a2..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/core/tests/bvt/AutomatedBVTEclipse.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Created on Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.core.tests.bvt;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * @author jsholl
- *
- * To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-public class AutomatedBVTEclipse extends AutomatedBVT {
-
- public AutomatedBVTEclipse(){
- super();
- IPluginDescriptor pluginDescriptor = Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.jst.j2ee.core.tests");
- URL url = pluginDescriptor.getInstallURL();
- try {
- AutomatedBVT.baseDirectory = Platform.asLocalURL(url).getFile() + "commonArchiveResources"+ java.io.File.separatorChar;
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/emfload/LoadJaxRPCMapOutsideWorkspace.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/emfload/LoadJaxRPCMapOutsideWorkspace.java
deleted file mode 100644
index 9aef4fbf..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/emfload/LoadJaxRPCMapOutsideWorkspace.java
+++ /dev/null
@@ -1,96 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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.emfload;
-
-import java.net.URL;
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.J2EEInit;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResource;
-import org.eclipse.jst.j2ee.webservice.jaxrpcmap.JaxrpcmapResourceFactory;
-import org.eclipse.wst.common.internal.emf.resource.EMF2DOMRendererFactory;
-
-
-public class LoadJaxRPCMapOutsideWorkspace extends TestCase {
-
- //public static String baseDirectory = System.getProperty("user.dir") + java.io.File.separatorChar + "testData" + java.io.File.separatorChar + "webservices" + java.io.File.separatorChar + "META-INF" + java.io.File.separatorChar;
-
- /**
- * <!-- begin-user-doc -->
- * Load all the argument file paths or URIs as instances of the model.
- * <!-- end-user-doc -->
- * @param args the file paths or URIs.
- * @generated
- */
- public void testLoadFile() throws Exception {
-
- IPluginDescriptor pluginDescriptor = Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.jst.j2ee.core.tests");
- URL url = pluginDescriptor.getInstallURL();
- String baseDirectory = Platform.asLocalURL(url).getFile() + "testData" + java.io.File.separatorChar + "webservices" + java.io.File.separatorChar + "META-INF" + java.io.File.separatorChar;
-
- // Call J2EE Init();
-
- J2EEInit.init();
- // Create a resource set to hold the resources.
- //
- ResourceSet resourceSet = new ResourceSetImpl();
- J2EEResourceFactoryRegistry registry = new J2EEResourceFactoryRegistry();
- resourceSet.setResourceFactoryRegistry(registry);
- URIConverter conv = new URIConverterImpl();
- resourceSet.setURIConverter(conv);
- EMF2DOMRendererFactory.INSTANCE.setValidating(false);
-
- URI uri = URI.createFileURI(baseDirectory + "AnnuityServices_mapping.xml");
- registry.registerLastFileSegment(uri.lastSegment(), new JaxrpcmapResourceFactory(EMF2DOMRendererFactory.INSTANCE));
-
- try {
- // Demand load resource for this file.
- //
- JaxrpcmapResource jaxrpcmapRes = (JaxrpcmapResource)resourceSet.getResource(uri, true);
- System.out.println("Loaded " + uri);
- jaxrpcmapRes.getContents();
-
- }
- catch (RuntimeException exception) {
- System.out.println("Problem loading " + uri);
- exception.printStackTrace();
- }
- }
-/**
- * <!-- begin-user-doc -->
- * Prints diagnostics with indentation.
- * <!-- end-user-doc -->
- * @param diagnostic the diagnostic to print.
- * @param indent the indentation for printing.
- * @generated
- */
-protected static void printDiagnostic(Diagnostic diagnostic, String indent) {
- System.out.print(indent);
- System.out.println(diagnostic.getMessage());
- for (Iterator i = diagnostic.getChildren().iterator(); i.hasNext(); ) {
- printDiagnostic((Diagnostic)i.next(), indent + " ");
- }
-}
- }
-
-
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/emfload/LoadWebServicesOutsideWorkspace.java b/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/emfload/LoadWebServicesOutsideWorkspace.java
deleted file mode 100644
index b518a643..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/commonArchiveTests/org/eclipse/jst/j2ee/emfload/LoadWebServicesOutsideWorkspace.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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.emfload;
-
-import java.util.Iterator;
-
-import junit.framework.TestCase;
-
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.URIConverter;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.emf.ecore.resource.impl.URIConverterImpl;
-import org.eclipse.emf.ecore.util.Diagnostician;
-import org.eclipse.jst.j2ee.common.internal.impl.J2EEResourceFactoryRegistry;
-import org.eclipse.jst.j2ee.internal.J2EEInit;
-
-
-public class LoadWebServicesOutsideWorkspace extends TestCase {
- public static String baseDirectory = System.getProperty("user.dir") + java.io.File.separatorChar + "testData" + java.io.File.separatorChar + "webservices" + java.io.File.separatorChar + "META-INF" + java.io.File.separatorChar;
-
- /**
- * <!-- begin-user-doc -->
- * Load all the argument file paths or URIs as instances of the model.
- * <!-- end-user-doc -->
- * @param args the file paths or URIs.
- * @generated
- */
- public void testLoadFile() throws Exception {
-
- // Call J2EE Init();
-
- J2EEInit.init();
- // Create a resource set to hold the resources.
- //
- ResourceSet resourceSet = new ResourceSetImpl();
- resourceSet.setResourceFactoryRegistry(new J2EEResourceFactoryRegistry());
- URIConverter conv = new URIConverterImpl();
- resourceSet.setURIConverter(conv);
-
- URI uri = URI.createFileURI(baseDirectory + "webservices.xml");
-
- try {
- // Demand load resource for this file.
- //
- Resource resource = resourceSet.getResource(uri, true);
- System.out.println("Loaded " + uri);
-
- // Validate the contents of the loaded resource.
- //
- for (Iterator j = resource.getContents().iterator(); j.hasNext(); ) {
- EObject eObject = (EObject)j.next();
- Diagnostic diagnostic = Diagnostician.INSTANCE.validate(eObject);
- if (diagnostic.getSeverity() != Diagnostic.OK) {
- printDiagnostic(diagnostic, "");
- }
- }
- }
- catch (RuntimeException exception) {
- System.out.println("Problem loading " + uri);
- exception.printStackTrace();
- }
- }
-/**
- * <!-- begin-user-doc -->
- * Prints diagnostics with indentation.
- * <!-- end-user-doc -->
- * @param diagnostic the diagnostic to print.
- * @param indent the indentation for printing.
- * @generated
- */
-protected static void printDiagnostic(Diagnostic diagnostic, String indent) {
- System.out.print(indent);
- System.out.println(diagnostic.getMessage());
- for (Iterator i = diagnostic.getChildren().iterator(); i.hasNext(); ) {
- printDiagnostic((Diagnostic)i.next(), indent + " ");
- }
-}
- }
-
-
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/application/test/ApplicationFactoryTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/application/test/ApplicationFactoryTest.java
deleted file mode 100644
index eaba86b2..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/application/test/ApplicationFactoryTest.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package org.eclipse.jst.j2ee.application.test;
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.ConnectorModule;
-import org.eclipse.jst.j2ee.application.EjbModule;
-import org.eclipse.jst.j2ee.application.JavaClientModule;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.application.WebModule;
-
-public class ApplicationFactoryTest extends TestCase {
-
- public static Test suite(){
- return new TestSuite(ApplicationFactoryTest.class);
- }
-
- public ApplicationFactory getInstance() {
- return ApplicationPackage.eINSTANCE.getApplicationFactory();
- }
-
-
- public void test_createApplication() {
-
- ApplicationFactory objApplicationFactory = getInstance();
- Application retValue = null;
- retValue = objApplicationFactory.createApplication();
- assertNotNull(retValue);
- }
-
- public void test_createModule() {
-
- ApplicationFactory objApplicationFactory = getInstance();
- Module retValue = null;
- retValue = objApplicationFactory.createModule();
- assertNotNull(retValue);
- }
-
- public void test_createWebModule() {
-
- ApplicationFactory objApplicationFactory = getInstance();
- WebModule retValue = null;
- retValue = objApplicationFactory.createWebModule();
- assertNotNull(retValue);
- }
-
- public void test_createJavaClientModule() {
-
- ApplicationFactory objApplicationFactory = getInstance();
- JavaClientModule retValue = null;
- retValue = objApplicationFactory.createJavaClientModule();
- assertNotNull(retValue);
- }
-
- public void test_createEjbModule() {
-
- ApplicationFactory objApplicationFactory = getInstance();
- EjbModule retValue = null;
- retValue = objApplicationFactory.createEjbModule();
- assertNotNull(retValue);
- }
-
- public void test_createConnectorModule() {
-
- ApplicationFactory objApplicationFactory = getInstance();
- ConnectorModule retValue = null;
- retValue = objApplicationFactory.createConnectorModule();
- assertNotNull(retValue);
- }
-
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/application/test/ApplicationTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/application/test/ApplicationTest.java
deleted file mode 100644
index 0228cb50..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/application/test/ApplicationTest.java
+++ /dev/null
@@ -1,247 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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.application.test;
-import java.io.FileNotFoundException;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.ApplicationFactory;
-import org.eclipse.jst.j2ee.application.ApplicationPackage;
-import org.eclipse.jst.j2ee.application.ApplicationResource;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.archive.emftests.EarEMFTest;
-import org.eclipse.jst.j2ee.archive.testutilities.EMFAttributeFeatureGenerator;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-public class ApplicationTest extends EarEMFTest {
-
- private static final CommonFactory COMMONFACTORY = CommonPackage.eINSTANCE.getCommonFactory();
- public ApplicationFactory getInstance() {
- return ApplicationPackage.eINSTANCE.getApplicationFactory();
- }
- /**
- * @param name
- */
- public ApplicationTest(String name) {
- super(name);
- }
-
- private void init() throws DuplicateObjectException, ResourceLoadException, FileNotFoundException {
- EMFAttributeFeatureGenerator.reset();
- createEAR();
- }
-
- public void test_containsSecurityRole() {
-
- Application objApplication = getInstance().createApplication();
- String name ="role1" ;
- String name2 ="role2" ;
- boolean retValue = false;
- retValue = objApplication.containsSecurityRole(name);
- assertEquals(retValue, false) ;
- SecurityRole role = COMMONFACTORY.createSecurityRole();
- role.setRoleName(name);
- objApplication.getSecurityRoles().add(role);
- retValue = objApplication.containsSecurityRole(name);
- assertEquals(retValue, true) ;
- retValue = objApplication.containsSecurityRole(name2);
- assertEquals(retValue, false) ;
-
- }
-
- /* public void test_getModule() {
-
- Application objApplication = getInstance().createApplication();
- String uri = "";
- Module retValue = null;
- retValue = objApplication.getModule(uri);
- }*/
-
- public void test_getModule_2() {
-
- Application objApplication = getInstance().createApplication();
- Module module = getInstance().createModule();
- String uri = "uri1";
- String altDD = "altDD1";
- module.setUri(uri);
- module.setAltDD(altDD);
- objApplication.getModules().add(module);
- Module retValue = null;
- retValue = objApplication.getModule(uri, altDD);
- assertEquals(module,retValue);
- }
-
- public void test_getFirstModule() {
-
- Application objApplication = getInstance().createApplication();
- Module module = getInstance().createModule();
- Module module2 = getInstance().createModule();
- Module module3 = getInstance().createModule();
- String uri = "uri1";
- String uri2 = "uri2" ;
- String altDD = "altDD1";
- String altDD2 = "altDD2" ;
-
- module.setUri(uri);
- module.setAltDD(altDD);
-
- module2.setUri(uri2);
- module2.setAltDD(altDD2);
-
- module3.setUri(uri2);
- module3.setAltDD(altDD);
-
- objApplication.getModules().add(module);
- objApplication.getModules().add(module2);
- objApplication.getModules().add(module3);
- Module retValue = null;
- retValue = objApplication.getFirstModule(uri2);
- assertEquals(module2,retValue);
-
- }
-
- public void test_getModuleHavingAltDD() {
-
- Application objApplication = getInstance().createApplication();
- Module module = getInstance().createModule();
- String uri = "uri1";
- String altDD = "altDD1";
- module.setUri(uri);
- module.setAltDD(altDD);
- objApplication.getModules().add(module);
- Module retValue = null;
- retValue = objApplication.getModuleHavingAltDD(altDD);
- assertEquals(module,retValue);
- }
-
- public void test_getSecurityRoleNamed() {
-
- Application objApplication = getInstance().createApplication();
- String name ="role1" ;
- String name2 ="role2" ;
- SecurityRole retValue = null;
- retValue = objApplication.getSecurityRoleNamed(name);
- assertNull(retValue);
- SecurityRole role = COMMONFACTORY.createSecurityRole();
- role.setRoleName(name);
- objApplication.getSecurityRoles().add(role);
- retValue = objApplication.getSecurityRoleNamed(name);
- assertEquals(retValue, role) ;
- retValue = objApplication.getSecurityRoleNamed(name2);
- assertNull(retValue);
-
- }
-
- /* public void test_isVersion1_2Descriptor() {
-
- Application objApplication = getInstance().createApplication();
- boolean retValue = false;
- retValue = objApplication.isVersion1_2Descriptor();
- }
-
- public void test_isVersion1_3Descriptor() {
-
- Application objApplication = getInstance().createApplication();
- boolean retValue = false;
- retValue = objApplication.isVersion1_3Descriptor();
- }*/
-
- /* public void test_getVersion() {
-
- Application objApplication = getInstance().createApplication();
- String retValue = "";
- retValue = objApplication.getVersion();
- }*/
-
- public void test_getVersionID() throws Exception {
- init();
- ApplicationResource DD = (ApplicationResource) earFile.getDeploymentDescriptorResource();
- DD.setVersionID(J2EEVersionConstants.J2EE_1_4_ID);
- setVersion(VERSION_1_4);
- setModuleType(APPLICATION);
- populateRoot(DD.getRootObject());
- int retValue = 0;
- retValue = DD.getApplication().getVersionID();
- assertEquals(retValue,J2EEVersionConstants.VERSION_1_4);
- DD.setVersionID(J2EEVersionConstants.J2EE_1_3_ID);
- setVersion(VERSION_1_3);
- retValue = DD.getApplication().getVersionID();
- assertEquals(retValue,J2EEVersionConstants.VERSION_1_3);
- DD.setVersionID(J2EEVersionConstants.J2EE_1_2_ID);
- setVersion(VERSION_1_2);
- retValue = DD.getApplication().getVersionID();
- assertEquals(retValue,J2EEVersionConstants.VERSION_1_2);
- }
-
- public void test_getJ2EEVersionID() throws IllegalStateException, ResourceLoadException, DuplicateObjectException, FileNotFoundException {
-
- init();
- ApplicationResource DD = (ApplicationResource) earFile.getDeploymentDescriptorResource();
- DD.setVersionID(J2EEVersionConstants.J2EE_1_4_ID);
- setVersion(VERSION_1_4);
- setModuleType(APPLICATION);
- populateRoot(DD.getRootObject());
- int retValue = 0;
- retValue = DD.getApplication().getJ2EEVersionID();
- assertEquals(retValue,J2EEVersionConstants.VERSION_1_4);
- DD.setVersionID(J2EEVersionConstants.J2EE_1_3_ID);
- setVersion(VERSION_1_3);
- retValue = DD.getApplication().getJ2EEVersionID();
- assertEquals(retValue,J2EEVersionConstants.VERSION_1_3);
- DD.setVersionID(J2EEVersionConstants.J2EE_1_2_ID);
- setVersion(VERSION_1_2);
- retValue = DD.getApplication().getJ2EEVersionID();
- assertEquals(retValue,J2EEVersionConstants.VERSION_1_2);
-
-
- }
-
- /* public void test_setVersion() {
-
- Application objApplication = getInstance().createApplication();
- String newVersion = "";
- objApplication.setVersion(newVersion);
- }
-
- public void test_getSecurityRoles() {
-
- Application objApplication = getInstance().createApplication();
- EList retValue = null;
- retValue = objApplication.getSecurityRoles();
- }
-
- public void test_getModules() {
-
- Application objApplication = getInstance().createApplication();
- EList retValue = null;
- retValue = objApplication.getModules();
- }*/
-
- public static junit.framework.Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTest(new ApplicationTest("test_getVersionID"));
- suite.addTest(new ApplicationTest("test_getJ2EEVersionID"));
-
- suite.addTest(new ApplicationTest("test_getSecurityRoleNamed"));
- suite.addTest(new ApplicationTest("test_getModuleHavingAltDD"));
- suite.addTest(new ApplicationTest("test_containsSecurityRole"));
- suite.addTest(new ApplicationTest("test_getModule_2"));
- suite.addTest(new ApplicationTest("test_getFirstModule"));
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/client/test/ApplicationClientTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/client/test/ApplicationClientTest.java
deleted file mode 100644
index 7fe34160..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/client/test/ApplicationClientTest.java
+++ /dev/null
@@ -1,185 +0,0 @@
-package org.eclipse.jst.j2ee.client.test;
-
-import java.io.FileNotFoundException;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.archive.emftests.AppClientEMFTest;
-import org.eclipse.jst.j2ee.archive.testutilities.EMFAttributeFeatureGenerator;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ApplicationClientResource;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.DuplicateObjectException;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.exception.ResourceLoadException;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-public class ApplicationClientTest extends AppClientEMFTest {
-
- /**
- * @param name
- */
- public ApplicationClientTest(String name) {
- super(name);
-
- }
- private void init() throws DuplicateObjectException, ResourceLoadException, FileNotFoundException {
- EMFAttributeFeatureGenerator.reset();
- createEAR();
- createAppClient();
- }
- private ApplicationClient getInstance() {
- return ClientPackage.eINSTANCE.getClientFactory().createApplicationClient();
- }
-
-
- public static junit.framework.Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTest(new ApplicationClientTest("test_getVersionID"));
- suite.addTest(new ApplicationClientTest("test_getJ2EEVersionID"));
-
- suite.addTest(new ApplicationClientTest("test_getCallbackHandlerClassName"));
- suite.addTest(new ApplicationClientTest("test_setCallbackHandlerClassName"));
- return suite;
- }
-
-
- public void test_getCallbackHandlerClassName() {
- ApplicationClient objApplicationClient = getInstance();
- String callBackHandlerName = "TestCallBackHandlerName" ;
- objApplicationClient.setCallbackHandlerClassName(callBackHandlerName);
-
- String retValue = "";
- retValue = objApplicationClient.getCallbackHandlerClassName();
- assertEquals(callBackHandlerName, retValue);
- }
-
- public void test_setCallbackHandlerClassName() {
-
- ApplicationClient objApplicationClient = getInstance();
- String callBackHandlerName = "TestCallBackHandlerName" ;
- objApplicationClient.setCallbackHandlerClassName(callBackHandlerName);
-
- String retValue = "";
- retValue = objApplicationClient.getCallbackHandlerClassName();
- assertEquals(callBackHandlerName, retValue);
- }
-
- public void test_getVersionID() throws Exception {
- init();
- ApplicationClientResource DD = (ApplicationClientResource) appClientFile.getDeploymentDescriptorResource();
- DD.setVersionID(J2EEVersionConstants.J2EE_1_4_ID);
- setVersion(VERSION_1_4);
- setModuleType(APP_CLIENT);
- populateRoot(DD.getRootObject());
- int retValue = 0;
- retValue = DD.getApplicationClient().getVersionID();
- assertEquals(retValue,J2EEVersionConstants.VERSION_1_4);
- DD.setVersionID(J2EEVersionConstants.J2EE_1_3_ID);
- setVersion(VERSION_1_3);
- retValue = DD.getApplicationClient().getVersionID();
- assertEquals(retValue,J2EEVersionConstants.VERSION_1_3);
- DD.setVersionID(J2EEVersionConstants.J2EE_1_2_ID);
- setVersion(VERSION_1_2);
- retValue = DD.getApplicationClient().getVersionID();
- assertEquals(retValue,J2EEVersionConstants.VERSION_1_2);
-
- }
-
- public void test_getJ2EEVersionID() throws Exception {
- init();
- ApplicationClientResource DD = (ApplicationClientResource) appClientFile.getDeploymentDescriptorResource();
- DD.setVersionID(J2EEVersionConstants.J2EE_1_4_ID);
- setVersion(VERSION_1_4);
- setModuleType(APP_CLIENT);
- populateRoot(DD.getRootObject());
- int retValue = 0;
- retValue = DD.getApplicationClient().getJ2EEVersionID();
- assertEquals(retValue,J2EEVersionConstants.VERSION_1_4);
- DD.setVersionID(J2EEVersionConstants.J2EE_1_3_ID);
- setVersion(VERSION_1_3);
- retValue = DD.getApplicationClient().getJ2EEVersionID();
- assertEquals(retValue,J2EEVersionConstants.VERSION_1_3);
- DD.setVersionID(J2EEVersionConstants.J2EE_1_2_ID);
- setVersion(VERSION_1_2);
- retValue = DD.getApplicationClient().getJ2EEVersionID();
- assertEquals(retValue,J2EEVersionConstants.VERSION_1_2);
- }
-
- /* public void test_getVersion() {
-
- ApplicationClient objApplicationClient = getInstance();
- String retValue = "";
- retValue = objApplicationClient.getVersion();
- }
-
- public void test_setVersion() {
-
- ApplicationClient objApplicationClient = getInstance();
- String newVersion = "";
- objApplicationClient.setVersion(newVersion);
- }*/
-
- /*public void test_getResourceRefs() {
-
- ApplicationClient objApplicationClient = getInstance();
- EList retValue = null;
- retValue = objApplicationClient.getResourceRefs();
- }
-*/
- /* public void test_getEnvironmentProps() {
-
- ApplicationClient objApplicationClient = getInstance();
- EList retValue = null;
- retValue = objApplicationClient.getEnvironmentProps();
- }*/
-
- /* public void test_getEjbReferences() {
-
- ApplicationClient objApplicationClient = getInstance();
- EList retValue = null;
- retValue = objApplicationClient.getEjbReferences();
- }*/
-
- /* public void test_getResourceEnvRefs() {
-
- ApplicationClient objApplicationClient = getInstance();
- EList retValue = null;
- retValue = objApplicationClient.getResourceEnvRefs();
- }*/
-
- /* public void test_getCallbackHandler() {
-
- ApplicationClient objApplicationClient = getInstance();
- JavaClass retValue = null;
- retValue = objApplicationClient.getCallbackHandler();
- }*/
-
- /* public void test_setCallbackHandler() {
-
- ApplicationClient objApplicationClient = getInstance();
- JavaClass newCallbackHandler = null;
- objApplicationClient.setCallbackHandler(newCallbackHandler);
- }*/
-
- /* public void test_getServiceRefs() {
-
- ApplicationClient objApplicationClient = getInstance();
- EList retValue = null;
- retValue = objApplicationClient.getServiceRefs();
- }
-
- public void test_getMessageDestinationRefs() {
-
- ApplicationClient objApplicationClient = getInstance();
- EList retValue = null;
- retValue = objApplicationClient.getMessageDestinationRefs();
- }
-
- public void test_getMessageDestinations() {
-
- ApplicationClient objApplicationClient = getInstance();
- EList retValue = null;
- retValue = objApplicationClient.getMessageDestinations();
- }*/
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/client/test/ClientFactoryTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/client/test/ClientFactoryTest.java
deleted file mode 100644
index 42541d2b..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/client/test/ClientFactoryTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package org.eclipse.jst.j2ee.client.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.client.ClientFactory;
-import org.eclipse.jst.j2ee.client.ClientPackage;
-
-public class ClientFactoryTest extends TestCase {
-
- private ClientFactory getInstance() {
- return ClientPackage.eINSTANCE.getClientFactory();
- }
- public void test_ClientFactory() {
- ClientFactory tmpClientFactory = getInstance();
- assertNotNull(tmpClientFactory);
- }
-
-
- public void test_createApplicationClient() {
-
- ClientFactory objClientFactory = getInstance();
- ApplicationClient retValue = null;
- retValue = objClientFactory.createApplicationClient();
- assertNotNull(retValue);
- }
-
- /**
- * @return
- */
- public static Test suite() {
- return new TestSuite(ClientFactoryTest.class);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/CommonFactoryTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/CommonFactoryTest.java
deleted file mode 100644
index 192869c0..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/CommonFactoryTest.java
+++ /dev/null
@@ -1,218 +0,0 @@
-package org.eclipse.jst.j2ee.common.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-import org.eclipse.jst.j2ee.common.Description;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-import org.eclipse.jst.j2ee.common.DisplayName;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-import org.eclipse.jst.j2ee.common.IconType;
-import org.eclipse.jst.j2ee.common.Identity;
-import org.eclipse.jst.j2ee.common.Listener;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.common.QName;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.common.UseCallerIdentity;
-
-public class CommonFactoryTest extends TestCase {
-
- private CommonFactory getInstance() {
- return CommonPackage.eINSTANCE.getCommonFactory();
- }
-
- public void test_CommonFactory() {
-
- CommonFactory tmpCommonFactory =getInstance();
- }
-
-
- public void test_createEjbRef() {
-
- CommonFactory objCommonFactory =getInstance();
- EjbRef retValue = null;
- retValue = objCommonFactory.createEjbRef();
- assertNotNull(retValue);
- }
-
- public void test_createEnvEntry() {
-
- CommonFactory objCommonFactory =getInstance();
- EnvEntry retValue = null;
- retValue = objCommonFactory.createEnvEntry();
- assertNotNull(retValue);
- }
-
- public void test_createResourceRef() {
-
- CommonFactory objCommonFactory =getInstance();
- ResourceRef retValue = null;
- retValue = objCommonFactory.createResourceRef();
- assertNotNull(retValue);
- }
-
- public void test_createSecurityRoleRef() {
-
- CommonFactory objCommonFactory =getInstance();
- SecurityRoleRef retValue = null;
- retValue = objCommonFactory.createSecurityRoleRef();
- assertNotNull(retValue);
- }
-
- public void test_createSecurityRole() {
-
- CommonFactory objCommonFactory =getInstance();
- SecurityRole retValue = null;
- retValue = objCommonFactory.createSecurityRole();
- assertNotNull(retValue);
- }
-
- public void test_createResourceEnvRef() {
-
- CommonFactory objCommonFactory =getInstance();
- ResourceEnvRef retValue = null;
- retValue = objCommonFactory.createResourceEnvRef();
- assertNotNull(retValue);
- }
-
- public void test_createEJBLocalRef() {
-
- CommonFactory objCommonFactory =getInstance();
- EJBLocalRef retValue = null;
- retValue = objCommonFactory.createEJBLocalRef();
- assertNotNull(retValue);
- }
-
- public void test_createRunAsSpecifiedIdentity() {
-
- CommonFactory objCommonFactory =getInstance();
- RunAsSpecifiedIdentity retValue = null;
- retValue = objCommonFactory.createRunAsSpecifiedIdentity();
- assertNotNull(retValue);
- }
-
- public void test_createIdentity() {
-
- CommonFactory objCommonFactory =getInstance();
- Identity retValue = null;
- retValue = objCommonFactory.createIdentity();
- assertNotNull(retValue);
- }
-
- public void test_createIconType() {
-
- CommonFactory objCommonFactory =getInstance();
- IconType retValue = null;
- retValue = objCommonFactory.createIconType();
- assertNotNull(retValue);
- }
-
- public void test_createDisplayName() {
-
- CommonFactory objCommonFactory =getInstance();
- DisplayName retValue = null;
- retValue = objCommonFactory.createDisplayName();
- assertNotNull(retValue);
- }
-
- public void test_createMessageDestinationRef() {
-
- CommonFactory objCommonFactory =getInstance();
- MessageDestinationRef retValue = null;
- retValue = objCommonFactory.createMessageDestinationRef();
- assertNotNull(retValue);
- }
-
- public void test_createMessageDestination() {
-
- CommonFactory objCommonFactory =getInstance();
- MessageDestination retValue = null;
- retValue = objCommonFactory.createMessageDestination();
- assertNotNull(retValue);
- }
-
- public void test_createParamValue() {
-
- CommonFactory objCommonFactory =getInstance();
- ParamValue retValue = null;
- retValue = objCommonFactory.createParamValue();
- assertNotNull(retValue);
- }
-
- public void test_createDescriptionGroup() {
-
- CommonFactory objCommonFactory =getInstance();
- DescriptionGroup retValue = null;
- retValue = objCommonFactory.createDescriptionGroup();
- assertNotNull(retValue);
- }
-
- public void test_createSecurityIdentity() {
-
- CommonFactory objCommonFactory =getInstance();
- SecurityIdentity retValue = null;
- retValue = objCommonFactory.createSecurityIdentity();
- assertNotNull(retValue);
- }
-
- public void test_createUseCallerIdentity() {
-
- CommonFactory objCommonFactory =getInstance();
- UseCallerIdentity retValue = null;
- retValue = objCommonFactory.createUseCallerIdentity();
- assertNotNull(retValue);
- }
-
- public void test_createDescription() {
-
- CommonFactory objCommonFactory =getInstance();
- Description retValue = null;
- retValue = objCommonFactory.createDescription();
- assertNotNull(retValue);
- }
-
- public void test_createQName() {
-
- CommonFactory objCommonFactory =getInstance();
- QName retValue = null;
- retValue = objCommonFactory.createQName();
- assertNotNull(retValue);
- }
-
- public void test_createListener() {
-
- CommonFactory objCommonFactory =getInstance();
- Listener retValue = null;
- retValue = objCommonFactory.createListener();
- assertNotNull(retValue);
- }
-
- public void test_createCompatibilityDescriptionGroup() {
-
- CommonFactory objCommonFactory =getInstance();
- CompatibilityDescriptionGroup retValue = null;
- retValue = objCommonFactory.createCompatibilityDescriptionGroup();
- assertNotNull(retValue);
- }
-
-
- /**
- * @return
- */
- public static Test suite() {
- return new TestSuite(CommonFactoryTest.class);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/CompatibilityDescriptionGroupTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/CompatibilityDescriptionGroupTest.java
deleted file mode 100644
index 92d76f63..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/CompatibilityDescriptionGroupTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-package org.eclipse.jst.j2ee.common.test;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-
-public class CompatibilityDescriptionGroupTest extends TestCase {
-
- private CompatibilityDescriptionGroup getInstance() {
- return CommonFactory.eINSTANCE.createCompatibilityDescriptionGroup();
- }
-
- /* public void test_getSmallIcon() {
- CompatibilityDescriptionGroup objCompatibilityDescriptionGroup = getInstance();
- String retValue = "";
- retValue = objCompatibilityDescriptionGroup.getSmallIcon();
- }
-
- public void test_setSmallIcon() {
-
- CompatibilityDescriptionGroup objCompatibilityDescriptionGroup = getInstance();
- String newSmallIcon = "";
- objCompatibilityDescriptionGroup.setSmallIcon(newSmallIcon);
- } */
-
- /* public void test_setSmallIconGen() {
-
- CompatibilityDescriptionGroup objCompatibilityDescriptionGroup = getInstance();
- String newSmallIcon = "";
- objCompatibilityDescriptionGroup.setSmallIconGen(newSmallIcon);
- }*/
-
- /* public void test_getLargeIcon() {
-
- CompatibilityDescriptionGroup objCompatibilityDescriptionGroup = getInstance();
- String retValue = "";
- retValue = objCompatibilityDescriptionGroup.getLargeIcon();
- }
-
- public void test_setLargeIcon() {
-
- CompatibilityDescriptionGroup objCompatibilityDescriptionGroup = getInstance();
- String newLargeIcon = "";
- objCompatibilityDescriptionGroup.setLargeIcon(newLargeIcon);
- } */
-
- /*public void test_setLargeIconGen() {
-
- CompatibilityDescriptionGroup objCompatibilityDescriptionGroup = getInstance();
- String newLargeIcon = "";
- objCompatibilityDescriptionGroup.setLargeIconGen(newLargeIcon);
- }*/
-
- /* public void test_getDescription() {
-
- CompatibilityDescriptionGroup objCompatibilityDescriptionGroup = getInstance();
- String retValue = "";
- retValue = objCompatibilityDescriptionGroup.getDescription();
- }
-
- public void test_setDescription() {
-
- CompatibilityDescriptionGroup objCompatibilityDescriptionGroup = getInstance();
- String newDescription = "";
- objCompatibilityDescriptionGroup.setDescription(newDescription);
- }
-*/
-
- /* public void test_setDescriptionGen() {
-
- CompatibilityDescriptionGroup objCompatibilityDescriptionGroup = getInstance();
- String newDescription = "";
- objCompatibilityDescriptionGroup.setDescriptionGen(newDescription);
- }*/
-
- /* public void test_getDisplayName() {
-
- CompatibilityDescriptionGroup objCompatibilityDescriptionGroup = getInstance();
- String retValue = "";
- retValue = objCompatibilityDescriptionGroup.getDisplayName();
- }
-
- public void test_setDisplayName() {
-
- CompatibilityDescriptionGroup objCompatibilityDescriptionGroup = getInstance();
- String newDisplayName = "";
- objCompatibilityDescriptionGroup.setDisplayName(newDisplayName);
- }*/
-
- /*public void test_setDisplayNameGen() {
-
- CompatibilityDescriptionGroup objCompatibilityDescriptionGroup = getInstance();
- String newDisplayName = "";
- objCompatibilityDescriptionGroup.setDisplayNameGen(newDisplayName);
- }*/
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/EjbRefTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/EjbRefTest.java
deleted file mode 100644
index 1110adef..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/EjbRefTest.java
+++ /dev/null
@@ -1,257 +0,0 @@
-package org.eclipse.jst.j2ee.common.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Session;
-
-public class EjbRefTest extends TestCase {
-
- private static final EjbFactory EJBFACTORY = EjbPackage.eINSTANCE.getEjbFactory();
- private static final CommonFactory COMMONFACTORY = CommonPackage.eINSTANCE.getCommonFactory();
-
- private EjbRef getInstance() {
- return COMMONFACTORY.createEjbRef();
- }
-
- public void test_EjbRef() {
- EjbRef tmpEjbRef = getInstance();
- assertNotNull(tmpEjbRef);
- }
-
- public void test_getLinkedEjb() {
-
- EJBJar objEJBJar = EJBFACTORY.createEJBJar();
- AssemblyDescriptor descriptor = EJBFACTORY.createAssemblyDescriptor();
- objEJBJar.setAssemblyDescriptor(descriptor);
-
- EjbRef ejbRef = COMMONFACTORY.createEjbRef();
- Session session1 = EJBFACTORY.createSession();
- String name1 = "Name1";
- session1.setName(name1);
-
- Session session2 = EJBFACTORY.createSession();
- String name2 = "Name2";
- session2.setName(name2);
-
- ejbRef.setLink(name2);
- ejbRef.setName("EjbRef_" + name2);
-
- objEJBJar.getEnterpriseBeans().add(session1);
- objEJBJar.getEnterpriseBeans().add(session2);
- EnterpriseBean retValue = null;
- retValue = ejbRef.getLinkedEjb(objEJBJar);
- assertEquals(session2,retValue);
- }
-
- public void test_isEquivalent() {
-
- EJBJar objEJBJar = EJBFACTORY.createEJBJar();
- AssemblyDescriptor descriptor = EJBFACTORY.createAssemblyDescriptor();
- objEJBJar.setAssemblyDescriptor(descriptor);
-
- EjbRef ejbRef1 = COMMONFACTORY.createEjbRef();
- EjbRef ejbRef2 = COMMONFACTORY.createEjbRef();
- Session session1 = EJBFACTORY.createSession();
- String name1 = "Name1";
- session1.setName(name1);
-
- Session session2 = EJBFACTORY.createSession();
- String name2 = "Name2";
- session2.setName(name2);
-
- ejbRef1.setLink(name2);
- ejbRef1.setName("EjbRef_" + name2);
-
- ejbRef2.setLink(name2);
- ejbRef2.setName("EjbRef_" + name2);
-
- String home1 = "home1";
- String home2 = "home2" ;
- String remote1 = "remote1" ;
- String remote2 = "remote2";
-
- ejbRef1.setHome(home1);
- ejbRef2.setHome(home1);
-
- ejbRef1.setRemote(remote1);
- ejbRef2.setRemote(remote1);
-
- objEJBJar.getEnterpriseBeans().add(session1);
- objEJBJar.getEnterpriseBeans().add(session2);
-
- boolean retValue = false;
- retValue = ejbRef1.isEquivalent(ejbRef2);
- assertEquals(retValue,true);
-
- ejbRef2.setRemote(remote2);
- retValue = ejbRef1.isEquivalent(ejbRef2);
- assertEquals(retValue,false);
-
- ejbRef2.setRemote(remote1);
- ejbRef2.setHome(home2);
- retValue = ejbRef1.isEquivalent(ejbRef2);
- assertEquals(retValue,false);
-
- ejbRef2.setHome(home1);
- ejbRef2.setLink(name1);
- retValue = ejbRef1.isEquivalent(ejbRef2);
- assertEquals(retValue,false);
-
- ejbRef2.setLink(name2);
- ejbRef2.setName("EjbRef_" + name1);
- retValue = ejbRef1.isEquivalent(ejbRef2);
- assertEquals(retValue,false);
-
- }
-
- public void test_isLinked() {
-
- Session session1 = EJBFACTORY.createSession();
- String name1 = "Name1";
- session1.setName(name1);
- EjbRef objEjbRef = getInstance();
-
- boolean retValue = false;
- retValue = objEjbRef.isLinked(session1);
- assertEquals(retValue, false);
-
- objEjbRef.setLink(name1);
- retValue = objEjbRef.isLinked(session1);
- assertEquals(retValue, true);
-
-
- }
-
- public void test_isLocal() {
-
- EjbRef objEjbRef = getInstance();
- boolean retValue = false;
- retValue = objEjbRef.isLocal();
- assertEquals(retValue,false);
- EJBLocalRef objLocalRef = CommonPackage.eINSTANCE.getCommonFactory().createEJBLocalRef();
- retValue = objLocalRef.isLocal();
- assertEquals(retValue,true);
- }
-
- /* public void test_getName() {
-
- EjbRef objEjbRef = getInstance();
- String retValue = "";
- retValue = objEjbRef.getName();
- }
-
- public void test_setName() {
-
- EjbRef objEjbRef = getInstance();
- String newName = "";
- objEjbRef.setName(newName);
- }
-
- public void test_getType() {
-
- EjbRef objEjbRef = getInstance();
- EjbRefType retValue = null;
- retValue = objEjbRef.getType();
- }
-
- public void test_setType() {
-
- EjbRef objEjbRef = getInstance();
- EjbRefType newType = null;
- objEjbRef.setType(newType);
- }
-
- public void test_unsetType() {
-
- EjbRef objEjbRef = getInstance();
- objEjbRef.unsetType();
- }
-
- public void test_isSetType() {
-
- EjbRef objEjbRef = getInstance();
- boolean retValue = false;
- retValue = objEjbRef.isSetType();
- }
-
- public void test_getHome() {
-
- EjbRef objEjbRef = getInstance();
- String retValue = "";
- retValue = objEjbRef.getHome();
- }
-
- public void test_setHome() {
-
- EjbRef objEjbRef = getInstance();
- String newHome = "";
- objEjbRef.setHome(newHome);
- }
-
- public void test_getRemote() {
-
- EjbRef objEjbRef = getInstance();
- String retValue = "";
- retValue = objEjbRef.getRemote();
- }
-
- public void test_setRemote() {
-
- EjbRef objEjbRef = getInstance();
- String newRemote = "";
- objEjbRef.setRemote(newRemote);
- }
-
- public void test_getLink() {
-
- EjbRef objEjbRef = getInstance();
- String retValue = "";
- retValue = objEjbRef.getLink();
- }
-
- public void test_setLink() {
-
- EjbRef objEjbRef = getInstance();
- String newLink = "";
- objEjbRef.setLink(newLink);
- }
-
- public void test_setDescription() {
-
- EjbRef objEjbRef = getInstance();
- String newDescription = "";
- objEjbRef.setDescription(newDescription);
- }
-
- public void test_getDescription() {
-
- EjbRef objEjbRef = getInstance();
- String retValue = "";
- retValue = objEjbRef.getDescription();
- }
-
- public void test_getDescriptions() {
-
- EjbRef objEjbRef = getInstance();
- EList retValue = null;
- retValue = objEjbRef.getDescriptions();
- }*/
-
- /**
- * @return
- */
- public static Test suite() {
- return new TestSuite(EjbRefTest.class);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/ListenerTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/ListenerTest.java
deleted file mode 100644
index 54085ec9..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/ListenerTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.jst.j2ee.common.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Listener;
-
-public class ListenerTest extends TestCase {
-
- private Listener getInstance() {
- return CommonFactory.eINSTANCE.createListener();
- }
- /* public void test_getListenerClass() {
- Listener objListener = getInstance();
- JavaClass retValue = null;
- retValue = objListener.getListenerClass();
- }
-
- public void test_setListenerClass() {
-
- Listener objListener = getInstance();
- JavaClass newListenerClass = null;
- objListener.setListenerClass(newListenerClass);
- }*/
-
-
- public void test_getListenerClassName() {
-
- Listener objListener = getInstance();
- String listenerClassName = "org.eclipse.jst.j2ee.common.Listener1" ;
- objListener.setListenerClassName(listenerClassName);
- String retValue = "";
- retValue = objListener.getListenerClassName();
- assertEquals(listenerClassName, retValue);
- }
-
- public void test_setListenerClassName() {
-
- Listener objListener = getInstance();
- String listenerClassName = "org.eclipse.jst.j2ee.common.Listener1";
- objListener.setListenerClassName(listenerClassName);
- String retValue = "";
- retValue = objListener.getListenerClassName();
- assertEquals(listenerClassName, retValue);
- }
-
- /**
- * @return
- */
- public static Test suite() {
- return new TestSuite(ListenerTest.class);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/QNameTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/QNameTest.java
deleted file mode 100644
index d25bf805..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/test/QNameTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.eclipse.jst.j2ee.common.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.QName;
-
-public class QNameTest extends TestCase {
-
- private QName getInstance() {
- return CommonFactory.eINSTANCE.createQName();
- }
-
- /* public void test_getNamespaceURI() {
-
- QName objQName = getInstance();
- String retValue = "";
- retValue = objQName.getNamespaceURI();
- }
-
-
- public void test_setNamespaceURI() {
-
- QName objQName = getInstance();
- String newNamespaceURI = "";
- objQName.setNamespaceURI(newNamespaceURI);
- }
-
- public void test_getLocalPart() {
-
- QName objQName = getInstance();
- String retValue = "";
- retValue = objQName.getLocalPart();
- }
-
- public void test_setLocalPart() {
-
- QName objQName = getInstance();
- String newLocalPart = "";
- objQName.setLocalPart(newLocalPart);
- }
-
- public void test_getCombinedQName() {
-
- QName objQName = getInstance();
- String retValue = "";
- retValue = objQName.getCombinedQName();
- }
-
-
- public void test_setCombinedQName() {
-
- QName objQName = getInstance();
- String newCombinedQName = "";
- objQName.setCombinedQName(newCombinedQName);
- }
-
- public void test_getInternalPrefixOrNsURI() {
-
- QName objQName = getInstance();
- String retValue = "";
- retValue = objQName.getInternalPrefixOrNsURI();
- }
-
-
-
- public void test_setInternalPrefixOrNsURI() {
-
- QName objQName = getInstance();
- String newInternalPrefixOrNsURI = "";
- objQName.setInternalPrefixOrNsURI(newInternalPrefixOrNsURI);
- }*/
-
-
- public void test_setValues() {
-
- QName objQName = getInstance();
- String prefix = "prefix1";
- String nsURI = "nsURI1";
- String localPart = "localPart1";
- objQName.setValues(prefix, nsURI, localPart);
- assertEquals(prefix,objQName.getInternalPrefixOrNsURI());
- assertEquals(nsURI,objQName.getNamespaceURI());
- assertEquals(localPart,objQName.getLocalPart());
- }
-
- /**
- * @return
- */
- public static Test suite() {
- return new TestSuite(QNameTest.class);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/CommonExample.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/CommonExample.java
deleted file mode 100644
index ac930c6e..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/CommonExample.java
+++ /dev/null
@@ -1,128 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CommonExample.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import java.io.File;
-import java.io.IOException;
-
-import java.util.Iterator;
-
-import org.eclipse.emf.common.util.Diagnostic;
-import org.eclipse.emf.common.util.URI;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-
-import org.eclipse.emf.ecore.util.Diagnostician;
-
-import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.EjbRef;
-
-/**
- * <!-- begin-user-doc -->
- * A sample utility for the '<em><b>common</b></em>' package.
- * <!-- end-user-doc -->
- * @generated
- */
-public class CommonExample {
- /**
- * <!-- begin-user-doc -->
- * Load all the argument file paths or URIs as instances of the model.
- * <!-- end-user-doc -->
- * @param args the file paths or URIs.
- * @generated
- */
- public static void main(String[] args) {
- // Create a resource set to hold the resources.
- //
- ResourceSet resourceSet = new ResourceSetImpl();
-
- // Register the appropriate resource factory to handle all file extentions.
- //
- resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put
- (Resource.Factory.Registry.DEFAULT_EXTENSION,
- new XMIResourceFactoryImpl());
-
- // Register the package to ensure it is available during loading.
- //
- resourceSet.getPackageRegistry().put
- (CommonPackage.eNS_URI,
- CommonPackage.eINSTANCE);
-
- // If there are no arguments, emit an appropriate usage message.
- //
- if (args.length == 0) {
- System.out.println("Enter a list of file paths or URIs that have content like this:");
- try {
- Resource resource = resourceSet.createResource(URI.createURI("http:///My.common"));
- EjbRef root = CommonFactory.eINSTANCE.createEjbRef();
- resource.getContents().add(root);
- resource.save(System.out, null);
- }
- catch (IOException exception) {
- exception.printStackTrace();
- }
- }
- else {
- // Iterate over all the arguments.
- //
- for (int i = 0; i < args.length; ++i) {
- // Construct the URI for the instance file.
- // The argument is treated as a file path only if it denotes an existing file.
- // Otherwise, it's directly treated as a URL.
- //
- File file = new File(args[0]);
- URI uri = file.isFile() ? URI.createFileURI(file.getAbsolutePath()): URI.createURI(args[0]);
-
- try {
- // Demand load resource for this file.
- //
- Resource resource = resourceSet.getResource(uri, true);
- System.out.println("Loaded " + uri);
-
- // Validate the contents of the loaded resource.
- //
- for (Iterator j = resource.getContents().iterator(); j.hasNext(); ) {
- EObject eObject = (EObject)j.next();
- Diagnostic diagnostic = Diagnostician.INSTANCE.validate(eObject);
- if (diagnostic.getSeverity() != Diagnostic.OK) {
- printDiagnostic(diagnostic, "");
- }
- }
- }
- catch (RuntimeException exception) {
- System.out.println("Problem loading " + uri);
- exception.printStackTrace();
- }
- }
- }
- }
-
- /**
- * <!-- begin-user-doc -->
- * Prints diagnostics with indentation.
- * <!-- end-user-doc -->
- * @param diagnostic the diagnostic to print.
- * @param indent the indentation for printing.
- * @generated
- */
- protected static void printDiagnostic(Diagnostic diagnostic, String indent) {
- System.out.print(indent);
- System.out.println(diagnostic.getMessage());
- for (Iterator i = diagnostic.getChildren().iterator(); i.hasNext(); ) {
- printDiagnostic((Diagnostic)i.next(), indent + " ");
- }
- }
-
-} //CommonExample
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/CommonTests.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/CommonTests.java
deleted file mode 100644
index 2b1e9304..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/CommonTests.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CommonTests.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import junit.textui.TestRunner;
-
-/**
- * <!-- begin-user-doc -->
- * A test suite for the '<em><b>common</b></em>' package.
- * <!-- end-user-doc -->
- * @generated
- */
-public class CommonTests extends TestSuite {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(suite());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static Test suite() {
- TestSuite suite = new CommonTests("common Tests");
- return suite;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public CommonTests(String name) {
- super(name);
- }
-
-} //CommonTests
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/CompatibilityDescriptionGroupTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/CompatibilityDescriptionGroupTest.java
deleted file mode 100644
index 5f4ad24c..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/CompatibilityDescriptionGroupTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: CompatibilityDescriptionGroupTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CompatibilityDescriptionGroup;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Compatibility Description Group</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class CompatibilityDescriptionGroupTest extends DescriptionGroupTest {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(CompatibilityDescriptionGroupTest.class);
- }
-
- /**
- * Constructs a new Compatibility Description Group test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public CompatibilityDescriptionGroupTest(String name) {
- super(name);
- }
-
- /**
- * Returns the fixture for this Compatibility Description Group test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private CompatibilityDescriptionGroup getFixture() {
- return (CompatibilityDescriptionGroup)fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createCompatibilityDescriptionGroup());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //CompatibilityDescriptionGroupTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/DescriptionGroupTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/DescriptionGroupTest.java
deleted file mode 100644
index 50f02713..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/DescriptionGroupTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DescriptionGroupTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.DescriptionGroup;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Description Group</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class DescriptionGroupTest extends TestCase {
- /**
- * The fixture for this Description Group test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected DescriptionGroup fixture = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(DescriptionGroupTest.class);
- }
-
- /**
- * Constructs a new Description Group test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DescriptionGroupTest(String name) {
- super(name);
- }
-
- /**
- * Sets the fixture for this Description Group test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void setFixture(DescriptionGroup fixture) {
- this.fixture = fixture;
- }
-
- /**
- * Returns the fixture for this Description Group test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private DescriptionGroup getFixture() {
- return fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createDescriptionGroup());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //DescriptionGroupTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/DescriptionTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/DescriptionTest.java
deleted file mode 100644
index daa3d8a8..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/DescriptionTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DescriptionTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Description;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Description</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class DescriptionTest extends TestCase {
- /**
- * The fixture for this Description test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Description fixture = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(DescriptionTest.class);
- }
-
- /**
- * Constructs a new Description test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DescriptionTest(String name) {
- super(name);
- }
-
- /**
- * Sets the fixture for this Description test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void setFixture(Description fixture) {
- this.fixture = fixture;
- }
-
- /**
- * Returns the fixture for this Description test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private Description getFixture() {
- return fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createDescription());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //DescriptionTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/DisplayNameTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/DisplayNameTest.java
deleted file mode 100644
index db803912..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/DisplayNameTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DisplayNameTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.DisplayName;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Display Name</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class DisplayNameTest extends TestCase {
- /**
- * The fixture for this Display Name test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected DisplayName fixture = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(DisplayNameTest.class);
- }
-
- /**
- * Constructs a new Display Name test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public DisplayNameTest(String name) {
- super(name);
- }
-
- /**
- * Sets the fixture for this Display Name test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void setFixture(DisplayName fixture) {
- this.fixture = fixture;
- }
-
- /**
- * Returns the fixture for this Display Name test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private DisplayName getFixture() {
- return fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createDisplayName());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //DisplayNameTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/EJBLocalRefTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/EJBLocalRefTest.java
deleted file mode 100644
index 3a43d4a2..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/EJBLocalRefTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EJBLocalRefTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.EJBLocalRef;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>EJB Local Ref</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class EJBLocalRefTest extends EjbRefTest {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(EJBLocalRefTest.class);
- }
-
- /**
- * Constructs a new EJB Local Ref test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EJBLocalRefTest(String name) {
- super(name);
- }
-
- /**
- * Returns the fixture for this EJB Local Ref test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EJBLocalRef getFixture() {
- return (EJBLocalRef)fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createEJBLocalRef());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //EJBLocalRefTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/EjbRefTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/EjbRefTest.java
deleted file mode 100644
index 7a587e9d..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/EjbRefTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EjbRefTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.EjbRef;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Ejb Ref</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class EjbRefTest extends TestCase {
- /**
- * The fixture for this Ejb Ref test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EjbRef fixture = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(EjbRefTest.class);
- }
-
- /**
- * Constructs a new Ejb Ref test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EjbRefTest(String name) {
- super(name);
- }
-
- /**
- * Sets the fixture for this Ejb Ref test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void setFixture(EjbRef fixture) {
- this.fixture = fixture;
- }
-
- /**
- * Returns the fixture for this Ejb Ref test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EjbRef getFixture() {
- return fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createEjbRef());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //EjbRefTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/EnvEntryTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/EnvEntryTest.java
deleted file mode 100644
index 1e2c0be3..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/EnvEntryTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EnvEntryTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.EnvEntry;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Env Entry</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class EnvEntryTest extends TestCase {
- /**
- * The fixture for this Env Entry test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected EnvEntry fixture = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(EnvEntryTest.class);
- }
-
- /**
- * Constructs a new Env Entry test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public EnvEntryTest(String name) {
- super(name);
- }
-
- /**
- * Sets the fixture for this Env Entry test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void setFixture(EnvEntry fixture) {
- this.fixture = fixture;
- }
-
- /**
- * Returns the fixture for this Env Entry test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private EnvEntry getFixture() {
- return fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createEnvEntry());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //EnvEntryTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/IconTypeTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/IconTypeTest.java
deleted file mode 100644
index 70bbfe5f..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/IconTypeTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IconTypeTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.IconType;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Icon Type</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class IconTypeTest extends TestCase {
- /**
- * The fixture for this Icon Type test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected IconType fixture = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(IconTypeTest.class);
- }
-
- /**
- * Constructs a new Icon Type test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IconTypeTest(String name) {
- super(name);
- }
-
- /**
- * Sets the fixture for this Icon Type test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void setFixture(IconType fixture) {
- this.fixture = fixture;
- }
-
- /**
- * Returns the fixture for this Icon Type test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private IconType getFixture() {
- return fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createIconType());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //IconTypeTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/IdentityTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/IdentityTest.java
deleted file mode 100644
index 6880dffe..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/IdentityTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IdentityTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Identity;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Identity</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class IdentityTest extends TestCase {
- /**
- * The fixture for this Identity test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected Identity fixture = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(IdentityTest.class);
- }
-
- /**
- * Constructs a new Identity test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public IdentityTest(String name) {
- super(name);
- }
-
- /**
- * Sets the fixture for this Identity test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void setFixture(Identity fixture) {
- this.fixture = fixture;
- }
-
- /**
- * Returns the fixture for this Identity test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private Identity getFixture() {
- return fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createIdentity());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //IdentityTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/JNDIEnvRefsGroupTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/JNDIEnvRefsGroupTest.java
deleted file mode 100644
index dd41c02d..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/JNDIEnvRefsGroupTest.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: JNDIEnvRefsGroupTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import org.eclipse.jst.j2ee.common.JNDIEnvRefsGroup;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>JNDI Env Refs Group</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public abstract class JNDIEnvRefsGroupTest extends CompatibilityDescriptionGroupTest {
- /**
- * Constructs a new JNDI Env Refs Group test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public JNDIEnvRefsGroupTest(String name) {
- super(name);
- }
-
- /**
- * Returns the fixture for this JNDI Env Refs Group test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private JNDIEnvRefsGroup getFixture() {
- return (JNDIEnvRefsGroup)fixture;
- }
-
-} //JNDIEnvRefsGroupTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/ListenerTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/ListenerTest.java
deleted file mode 100644
index 70cba58e..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/ListenerTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ListenerTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.Listener;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Listener</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ListenerTest extends CompatibilityDescriptionGroupTest {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(ListenerTest.class);
- }
-
- /**
- * Constructs a new Listener test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ListenerTest(String name) {
- super(name);
- }
-
- /**
- * Returns the fixture for this Listener test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private Listener getFixture() {
- return (Listener)fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createListener());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //ListenerTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/MessageDestinationRefTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/MessageDestinationRefTest.java
deleted file mode 100644
index 554a6829..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/MessageDestinationRefTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MessageDestinationRefTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.MessageDestinationRef;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Message Destination Ref</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class MessageDestinationRefTest extends TestCase {
- /**
- * The fixture for this Message Destination Ref test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected MessageDestinationRef fixture = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(MessageDestinationRefTest.class);
- }
-
- /**
- * Constructs a new Message Destination Ref test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public MessageDestinationRefTest(String name) {
- super(name);
- }
-
- /**
- * Sets the fixture for this Message Destination Ref test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void setFixture(MessageDestinationRef fixture) {
- this.fixture = fixture;
- }
-
- /**
- * Returns the fixture for this Message Destination Ref test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private MessageDestinationRef getFixture() {
- return fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createMessageDestinationRef());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //MessageDestinationRefTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/MessageDestinationTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/MessageDestinationTest.java
deleted file mode 100644
index 98bef404..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/MessageDestinationTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MessageDestinationTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.MessageDestination;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Message Destination</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class MessageDestinationTest extends CompatibilityDescriptionGroupTest {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(MessageDestinationTest.class);
- }
-
- /**
- * Constructs a new Message Destination test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public MessageDestinationTest(String name) {
- super(name);
- }
-
- /**
- * Returns the fixture for this Message Destination test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private MessageDestination getFixture() {
- return (MessageDestination)fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createMessageDestination());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //MessageDestinationTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/ParamValueTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/ParamValueTest.java
deleted file mode 100644
index 2f683281..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/ParamValueTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ParamValueTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.ParamValue;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Param Value</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ParamValueTest extends TestCase {
- /**
- * The fixture for this Param Value test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ParamValue fixture = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(ParamValueTest.class);
- }
-
- /**
- * Constructs a new Param Value test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ParamValueTest(String name) {
- super(name);
- }
-
- /**
- * Sets the fixture for this Param Value test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void setFixture(ParamValue fixture) {
- this.fixture = fixture;
- }
-
- /**
- * Returns the fixture for this Param Value test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private ParamValue getFixture() {
- return fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createParamValue());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //ParamValueTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/QNameTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/QNameTest.java
deleted file mode 100644
index f088b1df..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/QNameTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: QNameTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.QName;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>QName</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class QNameTest extends TestCase {
- /**
- * The fixture for this QName test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected QName fixture = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(QNameTest.class);
- }
-
- /**
- * Constructs a new QName test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public QNameTest(String name) {
- super(name);
- }
-
- /**
- * Sets the fixture for this QName test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void setFixture(QName fixture) {
- this.fixture = fixture;
- }
-
- /**
- * Returns the fixture for this QName test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private QName getFixture() {
- return fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createQName());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //QNameTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/ResourceEnvRefTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/ResourceEnvRefTest.java
deleted file mode 100644
index 2ebc4707..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/ResourceEnvRefTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ResourceEnvRefTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Resource Env Ref</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ResourceEnvRefTest extends TestCase {
- /**
- * The fixture for this Resource Env Ref test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ResourceEnvRef fixture = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(ResourceEnvRefTest.class);
- }
-
- /**
- * Constructs a new Resource Env Ref test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceEnvRefTest(String name) {
- super(name);
- }
-
- /**
- * Sets the fixture for this Resource Env Ref test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void setFixture(ResourceEnvRef fixture) {
- this.fixture = fixture;
- }
-
- /**
- * Returns the fixture for this Resource Env Ref test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private ResourceEnvRef getFixture() {
- return fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createResourceEnvRef());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //ResourceEnvRefTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/ResourceRefTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/ResourceRefTest.java
deleted file mode 100644
index 21b601d6..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/ResourceRefTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ResourceRefTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Resource Ref</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ResourceRefTest extends TestCase {
- /**
- * The fixture for this Resource Ref test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected ResourceRef fixture = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(ResourceRefTest.class);
- }
-
- /**
- * Constructs a new Resource Ref test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public ResourceRefTest(String name) {
- super(name);
- }
-
- /**
- * Sets the fixture for this Resource Ref test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void setFixture(ResourceRef fixture) {
- this.fixture = fixture;
- }
-
- /**
- * Returns the fixture for this Resource Ref test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private ResourceRef getFixture() {
- return fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createResourceRef());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //ResourceRefTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/RunAsSpecifiedIdentityTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/RunAsSpecifiedIdentityTest.java
deleted file mode 100644
index 31339069..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/RunAsSpecifiedIdentityTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: RunAsSpecifiedIdentityTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.RunAsSpecifiedIdentity;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Run As Specified Identity</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class RunAsSpecifiedIdentityTest extends SecurityIdentityTest {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(RunAsSpecifiedIdentityTest.class);
- }
-
- /**
- * Constructs a new Run As Specified Identity test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public RunAsSpecifiedIdentityTest(String name) {
- super(name);
- }
-
- /**
- * Returns the fixture for this Run As Specified Identity test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private RunAsSpecifiedIdentity getFixture() {
- return (RunAsSpecifiedIdentity)fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createRunAsSpecifiedIdentity());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //RunAsSpecifiedIdentityTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/SecurityIdentityTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/SecurityIdentityTest.java
deleted file mode 100644
index 8596457b..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/SecurityIdentityTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SecurityIdentityTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.SecurityIdentity;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Security Identity</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SecurityIdentityTest extends TestCase {
- /**
- * The fixture for this Security Identity test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected SecurityIdentity fixture = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(SecurityIdentityTest.class);
- }
-
- /**
- * Constructs a new Security Identity test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SecurityIdentityTest(String name) {
- super(name);
- }
-
- /**
- * Sets the fixture for this Security Identity test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void setFixture(SecurityIdentity fixture) {
- this.fixture = fixture;
- }
-
- /**
- * Returns the fixture for this Security Identity test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private SecurityIdentity getFixture() {
- return fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createSecurityIdentity());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //SecurityIdentityTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/SecurityRoleRefTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/SecurityRoleRefTest.java
deleted file mode 100644
index d94b633e..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/SecurityRoleRefTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SecurityRoleRefTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Security Role Ref</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SecurityRoleRefTest extends TestCase {
- /**
- * The fixture for this Security Role Ref test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected SecurityRoleRef fixture = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(SecurityRoleRefTest.class);
- }
-
- /**
- * Constructs a new Security Role Ref test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SecurityRoleRefTest(String name) {
- super(name);
- }
-
- /**
- * Sets the fixture for this Security Role Ref test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void setFixture(SecurityRoleRef fixture) {
- this.fixture = fixture;
- }
-
- /**
- * Returns the fixture for this Security Role Ref test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private SecurityRoleRef getFixture() {
- return fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createSecurityRoleRef());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //SecurityRoleRefTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/SecurityRoleTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/SecurityRoleTest.java
deleted file mode 100644
index 8114a3e3..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/SecurityRoleTest.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: SecurityRoleTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.framework.TestCase;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Security Role</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class SecurityRoleTest extends TestCase {
- /**
- * The fixture for this Security Role test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected SecurityRole fixture = null;
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(SecurityRoleTest.class);
- }
-
- /**
- * Constructs a new Security Role test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public SecurityRoleTest(String name) {
- super(name);
- }
-
- /**
- * Sets the fixture for this Security Role test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- protected void setFixture(SecurityRole fixture) {
- this.fixture = fixture;
- }
-
- /**
- * Returns the fixture for this Security Role test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private SecurityRole getFixture() {
- return fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createSecurityRole());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //SecurityRoleTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/UseCallerIdentityTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/UseCallerIdentityTest.java
deleted file mode 100644
index d3cb3a84..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/common/tests/UseCallerIdentityTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: UseCallerIdentityTest.java,v 1.1 2005/08/23 03:31:00 cbridgha Exp $
- */
-package org.eclipse.jst.j2ee.common.tests;
-
-import junit.textui.TestRunner;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.UseCallerIdentity;
-
-/**
- * <!-- begin-user-doc -->
- * A test case for the model object '<em><b>Use Caller Identity</b></em>'.
- * <!-- end-user-doc -->
- * @generated
- */
-public class UseCallerIdentityTest extends SecurityIdentityTest {
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public static void main(String[] args) {
- TestRunner.run(UseCallerIdentityTest.class);
- }
-
- /**
- * Constructs a new Use Caller Identity test case with the given name.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- public UseCallerIdentityTest(String name) {
- super(name);
- }
-
- /**
- * Returns the fixture for this Use Caller Identity test case.
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @generated
- */
- private UseCallerIdentity getFixture() {
- return (UseCallerIdentity)fixture;
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#setUp()
- * @generated
- */
- protected void setUp() throws Exception {
- setFixture(CommonFactory.eINSTANCE.createUseCallerIdentity());
- }
-
- /**
- * <!-- begin-user-doc -->
- * <!-- end-user-doc -->
- * @see junit.framework.TestCase#tearDown()
- * @generated
- */
- protected void tearDown() throws Exception {
- setFixture(null);
- }
-
-} //UseCallerIdentityTest
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/core/api/test/AllCoreAPITests.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/core/api/test/AllCoreAPITests.java
deleted file mode 100644
index 4dd01300..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/core/api/test/AllCoreAPITests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Created on Apr 1, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.core.api.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.core.tests.api.AllAPITest;
-
-/**
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class AllCoreAPITests {
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for J2EE Core Api Test");
- //$JUnit-BEGIN$
- suite.addTest(AllAPITest.suite());
-
- //$JUnit-END$
- return suite;
- }
-
- public static void main(java.lang.String[] args) {
- junit.textui.TestRunner.main(new String[] { AllCoreAPITests.class.getName() });
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/core/api/test/AutomatedAPIBVT.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/core/api/test/AutomatedAPIBVT.java
deleted file mode 100644
index 6524afe4..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/core/api/test/AutomatedAPIBVT.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Created on Apr 1, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.core.api.test;
-
-import java.net.URL;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class AutomatedAPIBVT extends TestSuite {
-
- public static String baseDirectory = System.getProperty("user.dir") + java.io.File.separatorChar + "commonArchiveResources" + java.io.File.separatorChar;
-
- static {
- try {
- IPluginDescriptor pluginDescriptor = Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.jst.j2ee.core.tests");
- URL url = pluginDescriptor.getInstallURL();
- AutomatedAPIBVT.baseDirectory = Platform.asLocalURL(url).getFile() + "commonArchiveResources"+ java.io.File.separatorChar;
- } catch (Exception e) {
- System.err.println("Using working directory since a workspace URL could not be located.");
- }
- }
-
- public static int unimplementedMethods;
-
- public static void main(String[] args) {
- unimplementedMethods = 0;
- TestRunner.run(suite());
- if (unimplementedMethods > 0) {
- System.out.println("\nCalls to warnUnimpl: " + unimplementedMethods);
- }
- }
-
- public AutomatedAPIBVT() {
- super();
- TestSuite suite = (TestSuite) AutomatedAPIBVT.suite();
- for (int i = 0; i < suite.testCount(); i++) {
- addTest(suite.testAt(i));
- }
- }
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.jst.j2ee.core.api.bvt");
- //$JUnit-BEGIN$
- suite.addTest(AllCoreAPITests.suite());
- //$JUnit-END$
- return suite;
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/core/tests/api/AllAPITest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/core/tests/api/AllAPITest.java
deleted file mode 100644
index 59c2e80e..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/core/tests/api/AllAPITest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Created on Mar 18, 2005
- */
-package org.eclipse.jst.j2ee.core.tests.api;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.application.test.ApplicationFactoryTest;
-import org.eclipse.jst.j2ee.application.test.ApplicationTest;
-import org.eclipse.jst.j2ee.client.test.ApplicationClientTest;
-import org.eclipse.jst.j2ee.client.test.ClientFactoryTest;
-import org.eclipse.jst.j2ee.common.test.CommonFactoryTest;
-import org.eclipse.jst.j2ee.common.test.EjbRefTest;
-import org.eclipse.jst.j2ee.common.test.ListenerTest;
-import org.eclipse.jst.j2ee.common.test.QNameTest;
-import org.eclipse.jst.j2ee.ejb.test.AssemblyDescriptorTest;
-import org.eclipse.jst.j2ee.ejb.test.CMPAttributeTest;
-import org.eclipse.jst.j2ee.ejb.test.CMRFieldTest;
-import org.eclipse.jst.j2ee.ejb.test.ContainerManagedEntityTest;
-import org.eclipse.jst.j2ee.ejb.test.EJBRelationTest;
-import org.eclipse.jst.j2ee.ejb.test.EJBRelationshipRoleTest;
-import org.eclipse.jst.j2ee.ejb.test.EjbFactoryTest;
-import org.eclipse.jst.j2ee.ejb.test.EntityTest;
-import org.eclipse.jst.j2ee.ejb.test.MethodElementTest;
-import org.eclipse.jst.j2ee.ejb.test.MethodPermissionTest;
-import org.eclipse.jst.j2ee.ejb.test.QueryMethodTest;
-import org.eclipse.jst.j2ee.ejb.test.QueryTest;
-import org.eclipse.jst.j2ee.ejb.test.SessionTest;
-import org.eclipse.jst.j2ee.jca.test.ConnectorTest;
-import org.eclipse.jst.j2ee.jca.test.JcaFactoryTest;
-import org.eclipse.jst.j2ee.jsp.test.JspFactoryTest;
-import org.eclipse.jst.j2ee.webapplication.test.WebapplicationFactoryTest;
-import org.eclipse.jst.j2ee.webservice.wscommon.test.WscommonFactoryTest;
-import org.eclipse.jst.j2ee.webservice.wsdd.test.WsddFactoryTest;
-
-public class AllAPITest extends TestSuite {
-
- public static Test suite(){
- return new AllAPITest();
- }
-
- public AllAPITest(){
- super("J2EE Core API Tests");
- addTest(ApplicationFactoryTest.suite());
- addTest(ApplicationTest.suite());
- addTest(ApplicationClientTest.suite());
- addTest(ClientFactoryTest.suite());
- addTest(CommonFactoryTest.suite());
- addTest(EjbRefTest.suite());
- addTest(ListenerTest.suite());
- addTest(QNameTest.suite());
- addTest(AssemblyDescriptorTest.suite());
- addTest(CMPAttributeTest.suite());
- addTest(CMRFieldTest.suite());
- addTest(ContainerManagedEntityTest.suite());
- addTest(EjbFactoryTest.suite());
- addTest(EJBRelationshipRoleTest.suite());
- addTest(EJBRelationTest.suite());
- addTest(EntityTest.suite());
- addTest(MethodElementTest.suite());
- addTest(MethodPermissionTest.suite());
- addTest(QueryMethodTest.suite());
- addTest(QueryTest.suite());
- addTest(SessionTest.suite());
- addTest(ConnectorTest.suite());
- addTest(JcaFactoryTest.suite());
- addTest(JspFactoryTest.suite());
- addTest(WebapplicationFactoryTest.suite());
- addTest(WscommonFactoryTest.suite());
- addTest(WsddFactoryTest.suite());
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/AssemblyDescriptorTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/AssemblyDescriptorTest.java
deleted file mode 100644
index 1876e420..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/AssemblyDescriptorTest.java
+++ /dev/null
@@ -1,220 +0,0 @@
-package org.eclipse.jst.j2ee.ejb.test;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-
-public class AssemblyDescriptorTest extends EjbEMFTestBase {
-
- /**
- * @param name
- */
- public AssemblyDescriptorTest(String name) {
- super(name);
- }
-
-
- public void test_getMethodPermissionMethodElements() throws Exception {
- init();
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
- AssemblyDescriptor assemblyDescriptor = DD.getEJBJar().getAssemblyDescriptor();
- assertNotNull(assemblyDescriptor);
- List enterpriseBeans = DD.getEJBJar().getEnterpriseBeans();
- EnterpriseBean eb1 = (EnterpriseBean)enterpriseBeans.get(0);
- List methodPermissionList = assemblyDescriptor.getMethodPermissionMethodElements(eb1);
-
-
- List allMethodElements = new ArrayList();
- List permissions = assemblyDescriptor.getMethodPermissions();
- MethodPermission permission;
- for (int i = 0; i < permissions.size(); i++){
- permission = (MethodPermission) permissions.get(i);
- allMethodElements.addAll(permission.getMethodElements(eb1));
- }
- assertEquals(methodPermissionList,allMethodElements);
-
- }
-
- /**
- * @param expected
- * @param actual
- */
- public static void assertEquals(List expected, List actual) {
- assertEquals(actual.size(), expected.size());
- for (int x=0; x< expected.size(); ++x) {
- Object o = expected.get(x);
- assertEquals(actual.contains(o), true);
- }
-
- }
-
- public static junit.framework.Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTest(new AssemblyDescriptorTest("test_getMethodPermissionMethodElements"));
- suite.addTest(new AssemblyDescriptorTest("test_getMethodTransactionMethodElements"));
- suite.addTest(new AssemblyDescriptorTest("test_getSecurityRoleNamed"));
- suite.addTest(new AssemblyDescriptorTest("test_renameSecurityRole"));
- suite.addTest(new AssemblyDescriptorTest("test_removeData"));
-
-
- return suite;
- }
-
-
- /* public void test_getMethodPermission() {
-
- AssemblyDescriptor objAssemblyDescriptor = getInstance();
- List securityRolesList = null;
- MethodPermission retValue = null;
- retValue = objAssemblyDescriptor
- .getMethodPermission(securityRolesList);
- } */
-
-
-
- public void test_getMethodTransactionMethodElements() throws Exception {
- init();
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
- AssemblyDescriptor assemblyDescriptor = DD.getEJBJar().getAssemblyDescriptor();
- assertNotNull(assemblyDescriptor);
- List enterpriseBeans = DD.getEJBJar().getEnterpriseBeans();
- EnterpriseBean eb1 = (EnterpriseBean)enterpriseBeans.get(0);
- List methodTransactionList = assemblyDescriptor.getMethodTransactionMethodElements(eb1);
-
-
- List allMethodElements = new ArrayList();
- List transactions = assemblyDescriptor.getMethodTransactions();
- MethodTransaction transaction;
- for (int i = 0; i < transactions.size(); i++){
- transaction = (MethodTransaction) transactions.get(i);
- allMethodElements.addAll(transaction.getMethodElements(eb1));
- }
- assertEquals(methodTransactionList,allMethodElements);
- }
-
-
-
- public void test_getSecurityRoleNamed()throws Exception {
- init();
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
- AssemblyDescriptor assemblyDescriptor = DD.getEJBJar().getAssemblyDescriptor();
- assertNotNull(assemblyDescriptor);
- SecurityRole securityRole= CommonPackage.eINSTANCE.getCommonFactory().createSecurityRole();
- String securityRoleName = "testRole";
- securityRole.setRoleName(securityRoleName);
- assemblyDescriptor.getSecurityRoles().add(securityRole);
- SecurityRole retValue = assemblyDescriptor.getSecurityRoleNamed(securityRoleName) ;
- assertEquals(retValue,securityRole);
- }
-
- public void test_renameSecurityRole() throws Exception {
- init();
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
- AssemblyDescriptor assemblyDescriptor = DD.getEJBJar().getAssemblyDescriptor();
- assertNotNull(assemblyDescriptor);
- String securityRoleName = "testRole";
-
- SecurityRole securityRole= CommonPackage.eINSTANCE.getCommonFactory().createSecurityRole();
-
- securityRole.setRoleName(securityRoleName);
- assemblyDescriptor.getSecurityRoles().add(securityRole);
- String newSecurityRoleName = "newTestRole" ;
- SecurityRole retValue = assemblyDescriptor.getSecurityRoleNamed(newSecurityRoleName) ;
- assertNull(retValue);
- assemblyDescriptor.renameSecurityRole(securityRoleName,
- newSecurityRoleName);
- retValue = assemblyDescriptor.getSecurityRoleNamed(newSecurityRoleName) ;
- assertNotNull(retValue);
-
- }
-
- /* public void test_getMethodPermissions() {
-
- AssemblyDescriptor objAssemblyDescriptor = getInstance();
- EList retValue = null;
- retValue = objAssemblyDescriptor.getMethodPermissions();
- }*/
-
- /* public void test_getMethodTransactions() {
-
- AssemblyDescriptor objAssemblyDescriptor = getInstance();
- EList retValue = null;
- retValue = objAssemblyDescriptor.getMethodTransactions();
- } */
-
- /* public void test_getEjbJar() {
-
- AssemblyDescriptor objAssemblyDescriptor = getInstance();
- EJBJar retValue = null;
- retValue = objAssemblyDescriptor.getEjbJar();
- }
-
- public void test_setEjbJar() {
-
- AssemblyDescriptor objAssemblyDescriptor = getInstance();
- EJBJar newEjbJar = null;
- objAssemblyDescriptor.setEjbJar(newEjbJar);
- } */
-
- /* public void test_getSecurityRoles() {
-
- AssemblyDescriptor objAssemblyDescriptor = getInstance();
- EList retValue = null;
- retValue = objAssemblyDescriptor.getSecurityRoles();
- }*/
-
- /* public void test_getExcludeList() {
-
- AssemblyDescriptor objAssemblyDescriptor = getInstance();
- ExcludeList retValue = null;
- retValue = objAssemblyDescriptor.getExcludeList();
- } */
-
-
-
- /* public void test_setExcludeList() {
-
- AssemblyDescriptor objAssemblyDescriptor = getInstance();
- ExcludeList newExcludeList = null;
- objAssemblyDescriptor.setExcludeList(newExcludeList);
- } */
-
- /* public void test_getMessageDestinations() {
-
- AssemblyDescriptor objAssemblyDescriptor = getInstance();
- EList retValue = null;
- retValue = objAssemblyDescriptor.getMessageDestinations();
- } */
-
- public void test_removeData() throws Exception {
- init();
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
- AssemblyDescriptor assemblyDescriptor = DD.getEJBJar().getAssemblyDescriptor();
- assertNotNull(assemblyDescriptor);
- List enterpriseBeans = DD.getEJBJar().getEnterpriseBeans();
- EnterpriseBean eb1 = (EnterpriseBean)enterpriseBeans.get(0);
- List methodTransactionList = assemblyDescriptor.getMethodTransactionMethodElements(eb1);
- List methodPermissionList = assemblyDescriptor.getMethodPermissionMethodElements(eb1);
- assertEquals(methodTransactionList.size() > 0, true);
- assertEquals(methodPermissionList.size() > 0, true);
-
- assemblyDescriptor.removeData(eb1);
-
- methodTransactionList = assemblyDescriptor.getMethodTransactionMethodElements(eb1);
- methodPermissionList = assemblyDescriptor.getMethodPermissionMethodElements(eb1);
- assertEquals(methodTransactionList.size() == 0, true);
- assertEquals(methodPermissionList.size() == 0, true);
-
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/CMPAttributeTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/CMPAttributeTest.java
deleted file mode 100644
index dcafc0d7..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/CMPAttributeTest.java
+++ /dev/null
@@ -1,186 +0,0 @@
-package org.eclipse.jst.j2ee.ejb.test;
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-
-public class CMPAttributeTest extends TestCase {
-
- private EjbFactory EJBFACTORY = EjbPackage.eINSTANCE.getEjbFactory();
-
- public CMPAttributeTest(String name) {
- super(name);
- }
-
- private CMPAttribute getInstance() {
- return EjbPackage.eINSTANCE.getEjbFactory().createCMPAttribute();
-
- }
- /* public void test_getField() {
-
- CMPAttribute objCMPAttribute = getInstance();
- Field retValue = null;
- retValue = objCMPAttribute.getField();
- } */
-
- public void test_getGetterName() {
- CMPAttribute objCMPAttribute = getInstance();
- String name = "attrName" ;
- String getterName = "get" + name.substring(0, 1).toUpperCase() + (name.length() > 1 ? name.substring(1) : "");
- objCMPAttribute.setName(name);
- String retValue = objCMPAttribute.getGetterName();
- assertEquals(getterName,retValue);
- }
-
- public void test_getOriginatingType() {
- CMPAttribute objCMPAttribute = getInstance();
- JavaHelpers retValue = null;
- retValue = objCMPAttribute.getOriginatingType();
- assertNull(retValue);
- JavaHelpers newValue = JavaRefFactory.eINSTANCE.createClassRef("java.lang.String");
- objCMPAttribute.setOriginatingType(newValue);
- retValue = objCMPAttribute.getOriginatingType();
- assertEquals(retValue,newValue);
- }
-
- public void test_getSetterName() {
- CMPAttribute objCMPAttribute = getInstance();
- String name = "attrName" ;
- String setterName = "set" + name.substring(0, 1).toUpperCase() + (name.length() > 1 ? name.substring(1) : "");
- objCMPAttribute.setName(name);
- String retValue = objCMPAttribute.getSetterName();
- assertEquals(setterName,retValue);
- }
-
- public void test_getType() throws Exception {
- CMPAttribute objCMPAttribute = getInstance();
- String name = "attrName" ;
- objCMPAttribute.setName(name);
- JavaHelpers newValue = JavaRefFactory.eINSTANCE.createClassRef("java.lang.String");
- objCMPAttribute.setEType(newValue);
- JavaHelpers retValue = null;
- retValue = objCMPAttribute.getType();
- assertEquals(newValue,retValue);
-
-
- }
-
-
-
-
- public void test_isCMRField() {
- CMPAttribute objCMPAttribute = getInstance();
- boolean retValue = objCMPAttribute.isCMRField();
- assertEquals(retValue,false);
- objCMPAttribute = EJBFACTORY.createCMRField();
- retValue = objCMPAttribute.isCMRField();
- assertEquals(retValue,true);
-
- }
-
- public void test_isKey() {
- EJBJar jar = EJBFACTORY.createEJBJar();
- ContainerManagedEntity entity = EJBFACTORY.createContainerManagedEntity();
- entity.setName("Foo");
- jar.getEnterpriseBeans().add(entity);
- CMPAttribute objCMPAttribute = getInstance();
- objCMPAttribute.setName("fooAttr");
- entity.getPersistentAttributes().add(objCMPAttribute);
- JavaHelpers newValue = JavaRefFactory.eINSTANCE.createClassRef("java.lang.String");
- objCMPAttribute.setEType(newValue);
- ((ContainerManagedEntity)jar.getEnterpriseBeanNamed(entity.getName())).getCMPAttribute().add(objCMPAttribute);
- CMPAttribute retAttribute = (CMPAttribute)entity.getCMPAttribute().get(0);
- boolean retValue = false;
- retValue = retAttribute.isKey();
- assertEquals(retValue,false);
- List list = entity.getKeyAttributes();
- list.add(objCMPAttribute);
- retValue = retAttribute.isKey();
- assertEquals(retValue,true);
- }
-
- public void test_isPrimKeyField() {
- ContainerManagedEntity entity = EJBFACTORY.createContainerManagedEntity();
- CMPAttribute objCMPAttribute = getInstance();
- List list = entity.getCMPAttribute();
- entity.getPersistentAttributes().add(objCMPAttribute);
- list.add(objCMPAttribute);
- boolean retValue = false;
- retValue = objCMPAttribute.isPrimKeyField();
- assertEquals(retValue,false);
- entity.setPrimKeyField(objCMPAttribute);
- retValue = false;
- retValue = objCMPAttribute.isPrimKeyField();
- assertEquals(retValue,true);
- }
-
- public void test_setOriginatingType() {
-
- CMPAttribute objCMPAttribute = getInstance();
- JavaHelpers retValue = null;
- retValue = objCMPAttribute.getOriginatingType();
- assertNull(retValue);
- JavaHelpers newValue = JavaRefFactory.eINSTANCE.createClassRef("java.lang.String");
- objCMPAttribute.setOriginatingType(newValue);
- retValue = objCMPAttribute.getOriginatingType();
- assertEquals(retValue,newValue);
- }
-
- /* public void test_getDescription() {
-
- CMPAttribute objCMPAttribute = getInstance();
- String retValue = "";
- retValue = objCMPAttribute.getDescription();
- }
-
- public void test_setDescription() {
-
- CMPAttribute objCMPAttribute = getInstance();
- String newDescription = "";
- objCMPAttribute.setDescription(newDescription);
- }*/
-
-
-
- public void test_isDerived() {
-
- CMPAttribute objCMPAttribute = getInstance();
- boolean aBoolean = false;
- objCMPAttribute.setDerived(aBoolean);
- boolean retVal = objCMPAttribute.isDerived();
- assertEquals(retVal,aBoolean);
- aBoolean = true;
- objCMPAttribute.setDerived(aBoolean);
- retVal = objCMPAttribute.isDerived();
- assertEquals(retVal,aBoolean);
- }
-
- public void test_setDerived() {
-
- CMPAttribute objCMPAttribute = getInstance();
- boolean aBoolean = false;
- objCMPAttribute.setDerived(aBoolean);
- boolean retVal = objCMPAttribute.isDerived();
- assertEquals(retVal,aBoolean);
- aBoolean = true;
- objCMPAttribute.setDerived(aBoolean);
- retVal = objCMPAttribute.isDerived();
- assertEquals(retVal,aBoolean);
- }
-
- public static Test suite() {
- return new TestSuite(CMPAttributeTest.class);
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/CMRFieldTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/CMRFieldTest.java
deleted file mode 100644
index 8dc74b04..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/CMRFieldTest.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package org.eclipse.jst.j2ee.ejb.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-
-public class CMRFieldTest extends TestCase {
- protected EjbFactory EJBFACTORY = EjbPackage.eINSTANCE.getEjbFactory();
-
- private CMRField getInstance() {
- return EJBFACTORY.createCMRField();
- }
-
- public void test_getCollectionTypeName() {
- CMRField objCMRField = getInstance();
- String typeName = "testName";
- objCMRField.setCollectionTypeName(typeName);
- String retValue = "";
- retValue = objCMRField.getCollectionTypeName();
- assertEquals(typeName,retValue);
- }
-
-
- public void test_setCollectionTypeName() {
-
- CMRField objCMRField = getInstance();
- String typeName = "testName";
- objCMRField.setCollectionTypeName(typeName);
- String retValue = "";
- retValue = objCMRField.getCollectionTypeName();
- assertEquals(typeName,retValue);
- }
-
- public void test_getRole() {
- CMRField objCMRField = getInstance();
- EJBRelationshipRole newRole = EJBFACTORY.createEJBRelationshipRole();
- newRole.setName("Role1");
- objCMRField.setRole(newRole);
- EJBRelationshipRole retValue = objCMRField.getRole();
- assertEquals(newRole,retValue);
- }
-
- public void test_setRole() {
- CMRField objCMRField = getInstance();
- EJBRelationshipRole newRole = EJBFACTORY.createEJBRelationshipRole();
- newRole.setName("Role1");
- objCMRField.setRole(newRole);
- EJBRelationshipRole retValue = objCMRField.getRole();
- assertEquals(newRole,retValue);
-
- }
-
- public void test_getCollectionType() {
-
- CMRField objCMRField = getInstance();
- JavaClass newCollectionType = JavaRefFactory.eINSTANCE.createJavaClass();
- objCMRField.setCollectionType(newCollectionType);
- JavaClass retVal = objCMRField.getCollectionType();
- assertEquals(newCollectionType,retVal);
- }
-
-
- public void test_setCollectionType() {
-
- CMRField objCMRField = getInstance();
- JavaClass newCollectionType = JavaRefFactory.eINSTANCE.createJavaClass();
- objCMRField.setCollectionType(newCollectionType);
- JavaClass retVal = objCMRField.getCollectionType();
- assertEquals(newCollectionType,retVal);
- }
-
- public static Test suite() {
- return new TestSuite(CMRFieldTest.class);
- }
-
-
-
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/ContainerManagedEntityTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/ContainerManagedEntityTest.java
deleted file mode 100644
index 464df5cd..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/ContainerManagedEntityTest.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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.test;
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jem.java.Field;
-import org.eclipse.jem.java.internal.impl.JavaRefFactoryImpl;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-public class ContainerManagedEntityTest extends TestCase {
-
- private static final EjbFactory EJBFACTORY = EjbPackage.eINSTANCE.getEjbFactory();
-
- public static Test suite() {
- return new TestSuite(ContainerManagedEntityTest.class);
- }
-
- private ContainerManagedEntity getInstance() {
- return EJBFACTORY.createContainerManagedEntity();
- }
- public void test_addKeyAttributeName() {
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- CMPAttribute cmpAttribute = EJBFACTORY.createCMPAttribute();
- List persistentAttributes = objContainerManagedEntity.getPersistentAttributes();
- persistentAttributes.add(cmpAttribute);
- String attrName = "attr1" ;
- cmpAttribute.setName(attrName);
- objContainerManagedEntity.addKeyAttributeName(attrName);
- List keys = objContainerManagedEntity.getKeyAttributes();
- boolean retValue = keys.contains(cmpAttribute);
- assertEquals(retValue,true);
- }
-
-
- public void test_addPersistentAttribute() {
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- Field aField = JavaRefFactoryImpl.getActiveFactory().createField();
- String name ="attr1" ;
- aField.setName(name);
- CMPAttribute retValue = null;
- retValue = objContainerManagedEntity.addPersistentAttribute(aField);
- assertNotNull(retValue);
- retValue = objContainerManagedEntity.getPersistentAttribute(name);
- assertNotNull(retValue);
- }
-
- public void test_addPersistentAttributeName() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- String name ="attr1" ;
- CMPAttribute retValue = null;
- retValue = objContainerManagedEntity.addPersistentAttributeName(name);
- assertNotNull(retValue);
- retValue = objContainerManagedEntity.getPersistentAttribute(name);
- assertNotNull(retValue);
- }
-
-
- public void test_getKeyAttribute() {
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- CMPAttribute cmpAttribute = EJBFACTORY.createCMPAttribute();
- List persistentAttributes = objContainerManagedEntity.getPersistentAttributes();
- persistentAttributes.add(cmpAttribute);
- String attrName = "attr1" ;
- cmpAttribute.setName(attrName);
- objContainerManagedEntity.addKeyAttributeName(attrName);
- CMPAttribute retValue = objContainerManagedEntity.getKeyAttribute(attrName);
-
- assertEquals(retValue,cmpAttribute);
-
- }
-
-
- public void test_getPrimaryKeyAttribute() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- CMPAttribute cmpAttribute = EJBFACTORY.createCMPAttribute();
- List persistentAttributes = objContainerManagedEntity.getPersistentAttributes();
- persistentAttributes.add(cmpAttribute);
- String attrName = "attr1" ;
- cmpAttribute.setName(attrName);
- CMPAttribute retValue = objContainerManagedEntity.getPrimaryKeyAttribute();
- assertNotSame(retValue,cmpAttribute);
- objContainerManagedEntity.setPrimKeyField(cmpAttribute);
- retValue = objContainerManagedEntity.getPrimaryKeyAttribute();
- assertEquals(retValue,cmpAttribute);
- }
-
- public void test_isContainerManagedEntity() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- boolean retValue = false;
- retValue = objContainerManagedEntity.isContainerManagedEntity();
- assertEquals(retValue,true);
- }
-
- public void test_isKeyAttribute() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- CMPAttribute cmpAttribute = EJBFACTORY.createCMPAttribute();
- List persistentAttributes = objContainerManagedEntity.getPersistentAttributes();
- persistentAttributes.add(cmpAttribute);
- String attrName = "attr1" ;
- cmpAttribute.setName(attrName);
- boolean retValue = objContainerManagedEntity.isKeyAttribute(cmpAttribute);
- assertEquals(retValue,false);
- objContainerManagedEntity.addKeyAttributeName(attrName);
- retValue = objContainerManagedEntity.isKeyAttribute(cmpAttribute);
- assertEquals(retValue,true);
-
- }
-
- public void test_removePersistentAttribute_2() {
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- CMPAttribute cmpAttribute = EJBFACTORY.createCMPAttribute();
- List persistentAttributes = objContainerManagedEntity.getPersistentAttributes();
- persistentAttributes.add(cmpAttribute);
- String attrName = "attr1" ;
- cmpAttribute.setName(attrName);
- CMPAttribute retValue = objContainerManagedEntity.getPersistentAttribute(attrName);
- assertNotNull(retValue);
- retValue = objContainerManagedEntity.removePersistentAttribute(attrName);
- assertNotNull(retValue);
- retValue = objContainerManagedEntity.getPersistentAttribute(attrName);
- assertNull(retValue);
- }
-
-
- public void test_removePersistentAttribute() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- Field aField = JavaRefFactoryImpl.getActiveFactory().createField();
- String name ="attr1" ;
- aField.setName(name);
- CMPAttribute retValue = null;
- retValue = objContainerManagedEntity.addPersistentAttribute(aField);
- assertNotNull(retValue);
-
- retValue = objContainerManagedEntity.getPersistentAttribute(name);
- assertNotNull(retValue);
-
- retValue = objContainerManagedEntity.removePersistentAttribute(aField);
- assertNotNull(retValue);
-
- retValue = objContainerManagedEntity.getPersistentAttribute(name);
- assertNull(retValue);
- }
-
- public void test_setPrimKeyField() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- CMPAttribute cmpAttribute = EJBFACTORY.createCMPAttribute();
- List persistentAttributes = objContainerManagedEntity.getPersistentAttributes();
- persistentAttributes.add(cmpAttribute);
- String attrName = "attr1" ;
- cmpAttribute.setName(attrName);
- CMPAttribute retValue = objContainerManagedEntity.getPrimKeyField();
- assertNotSame(retValue,cmpAttribute);
- objContainerManagedEntity.setPrimKeyField(cmpAttribute);
- retValue = objContainerManagedEntity.getPrimKeyField();
- assertEquals(retValue,cmpAttribute);
- }
-
-
- public void test_isVersion1_X() {
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- objContainerManagedEntity.setVersion(ContainerManagedEntity.VERSION_1_X);
- boolean retValue = false;
- retValue = objContainerManagedEntity.isVersion1_X();
- assertEquals(retValue,true);
- objContainerManagedEntity.setVersion(ContainerManagedEntity.VERSION_2_X);
- retValue = objContainerManagedEntity.isVersion1_X();
- assertEquals(retValue,false);
- }
-
- public void test_isVersion2_X() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- objContainerManagedEntity.setVersion(ContainerManagedEntity.VERSION_2_X);
- boolean retValue = false;
- retValue = objContainerManagedEntity.isVersion2_X();
- assertEquals(retValue,true);
- objContainerManagedEntity.setVersion(ContainerManagedEntity.VERSION_1_X);
- retValue = objContainerManagedEntity.isVersion2_X();
- assertEquals(retValue,false);
- }
-
- public void test_listPersistentFieldNames() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- CMPAttribute cmpAttribute1 = EJBFACTORY.createCMPAttribute();
- String attrName1 = "attr1" ;
- cmpAttribute1.setName(attrName1);
-
- CMPAttribute cmpAttribute2 = EJBFACTORY.createCMPAttribute();
- String attrName2 = "attr2" ;
- cmpAttribute2.setName(attrName2);
-
- List persistentAttributes = objContainerManagedEntity.getPersistentAttributes();
- persistentAttributes.add(cmpAttribute1);
- persistentAttributes.add(cmpAttribute2);
-
- String[] retValue = null;
- retValue = objContainerManagedEntity.listPersistentFieldNames();
- assertNotNull(retValue);
- assertEquals(retValue.length == 2, true);
- assertEquals((retValue[0]==attrName1 || retValue[1]==attrName1) , true);
- assertEquals((retValue[0]==attrName2 || retValue[1]==attrName2) , true);
-
- }
-
- public void test_isUnknownPrimaryKey() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- objContainerManagedEntity.setPrimaryKeyName("java.lang.String");
-
- boolean retValue = false;
- retValue = objContainerManagedEntity.isUnknownPrimaryKey();
- assertEquals(retValue,false);
-
- objContainerManagedEntity.setPrimaryKeyName("java.lang.Object");
- retValue = objContainerManagedEntity.isUnknownPrimaryKey();
- assertEquals(retValue,true);
-
-
- }
-
- // TODO
- /* public void test_makePrimKeyFieldProxy() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- objContainerManagedEntity.makePrimKeyFieldProxy();
- }
-
- public void test_getAllAvailableQueryMethods() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- List retValue = null;
- retValue = objContainerManagedEntity.getAllAvailableQueryMethods();
- }
-
- public void test_getAvailableSelectQueryMethods() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- List retValue = null;
- retValue = objContainerManagedEntity
- .getAvailableSelectQueryMethods();
- }
-
- public void test_getAvailableFindQueryMethods() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- List retValue = null;
- retValue = objContainerManagedEntity.getAvailableFindQueryMethods();
- } */
-
- public void test_getCMPVersionID() throws IllegalStateException {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- objContainerManagedEntity.setVersion(ContainerManagedEntity.VERSION_1_X);
- int retValue = 0;
- retValue = objContainerManagedEntity.getCMPVersionID();
- assertEquals(J2EEVersionConstants.EJB_1_1_ID, retValue);
- objContainerManagedEntity.setVersion(ContainerManagedEntity.VERSION_2_X);
-
- retValue = objContainerManagedEntity.getCMPVersionID();
- assertEquals(J2EEVersionConstants.EJB_2_0_ID, retValue);
-
- }
-
-
-
- /* public void test_getCMRFields() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- List retValue = null;
- retValue = objContainerManagedEntity.getCMRFields();
- }
-
-
- public void test_getRoles() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- List retValue = null;
- retValue = objContainerManagedEntity.getRoles();
- }
-
- public void test_getRole() {
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- EJBRelationshipRole role = EJBFACTORY.createEJBRelationshipRole();
- String roleName = "role1";
- role.setName(roleName);
- CommonRelationshipRole retValue = null;
- retValue = objContainerManagedEntity.getRole(roleName);
- assertNull(retValue);
- objContainerManagedEntity.getRoles().add(role);
- retValue = objContainerManagedEntity.getRole(roleName);
- assertNotNull(retValue);
- }
- public void test_getFilteredFeatures() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- EJBExtensionFilter aFilter = null;
- List retValue = null;
- retValue = objContainerManagedEntity.getFilteredFeatures(aFilter);
- } */
-
- /* public void test_getPersistentAttribute() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- String aName = "";
- CMPAttribute retValue = null;
- retValue = objContainerManagedEntity.getPersistentAttribute(aName);
-}*/
-
-
- /* public void test_getVersion() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- String retValue = "";
- retValue = objContainerManagedEntity.getVersion();
-}
-
-public void test_setVersion() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- String newVersion = "";
- objContainerManagedEntity.setVersion(newVersion);
-}*/
-
-/* public void test_getAbstractSchemaName() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- String retValue = "";
- retValue = objContainerManagedEntity.getAbstractSchemaName();
-}
-
-public void test_setAbstractSchemaName() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- String newAbstractSchemaName = "";
- objContainerManagedEntity
- .setAbstractSchemaName(newAbstractSchemaName);
-}*/
-
-/* public void test_getPersistentAttributes() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- EList retValue = null;
- retValue = objContainerManagedEntity.getPersistentAttributes();
-}*/
-
-/*public void test_getKeyAttributes() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- EList retValue = null;
- retValue = objContainerManagedEntity.getKeyAttributes();
-}*/
-
-/* public void test_getQueries() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- EList retValue = null;
- retValue = objContainerManagedEntity.getQueries();
-}*/
-
-/* public void test_getCMPAttribute() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- EList retValue = null;
- retValue = objContainerManagedEntity.getCMPAttribute();
-}*/
-
-/* public void test_getPrimKeyField() {
-
- ContainerManagedEntity objContainerManagedEntity = getInstance();
- CMPAttribute retValue = null;
- retValue = objContainerManagedEntity.getPrimKeyField();
-}*/
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EJBJarTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EJBJarTest.java
deleted file mode 100644
index 584f290a..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EJBJarTest.java
+++ /dev/null
@@ -1,589 +0,0 @@
-package org.eclipse.jst.j2ee.ejb.test;
-
-import java.util.List;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.EjbRef;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-public class EJBJarTest extends EjbEMFTestBase {
-
- private static final CommonFactory COMMONFACTORY = CommonPackage.eINSTANCE.getCommonFactory();
- public EJBJarTest(String name) {
- super(name);
- }
- private EJBJar getInstance() {
- return getEjbFactory().createEJBJar();
- }
- public void test_EJBJar() {
- EJBJar tmpEJBJar = getInstance();
- assertNotNull(tmpEJBJar);
- }
-
-
-
-
- public void test_containsContainerManagedBeans() {
-
- EJBJar objEJBJar = getInstance();
- Session session = getEjbFactory().createSession();
- objEJBJar.getEnterpriseBeans().add(session);
-
- boolean retValue = false;
- retValue = objEJBJar.containsContainerManagedBeans();
- assertEquals(retValue,false);
-
- ContainerManagedEntity entity = getEjbFactory().createContainerManagedEntity();
- objEJBJar.getEnterpriseBeans().add(entity);
-
- retValue = objEJBJar.containsContainerManagedBeans();
- assertEquals(retValue,true);
- }
-
- public void test_containsSecurityRole() {
-
- EJBJar objEJBJar = getInstance();
- AssemblyDescriptor descriptor = getEjbFactory().createAssemblyDescriptor();
- objEJBJar.setAssemblyDescriptor(descriptor);
-
- String securityRoleName = "testRole";
- boolean retValue = false;
- retValue = objEJBJar.containsSecurityRole(securityRoleName);
- assertEquals(retValue, false);
-
-
- SecurityRole securityRole= CommonPackage.eINSTANCE.getCommonFactory().createSecurityRole();
- securityRole.setRoleName(securityRoleName);
- descriptor.getSecurityRoles().add(securityRole);
- retValue = objEJBJar.containsSecurityRole(securityRoleName) ;
- assertEquals(retValue,true);
- }
-
-
-
- public void test_getBeanManagedBeans() {
- EJBJar objEJBJar = getInstance();
- Session session = getEjbFactory().createSession();
- objEJBJar.getEnterpriseBeans().add(session);
-
- List retValue = null;
- retValue = objEJBJar.getBeanManagedBeans();
- assertEquals(retValue.size()==0,true);
-
- Entity entity = getEjbFactory().createEntity();
- objEJBJar.getEnterpriseBeans().add(entity);
-
- retValue = objEJBJar.getBeanManagedBeans();
- assertEquals(retValue.size()==1,true);
- assertEquals(retValue.get(0),entity);
- }
-
- public void test_getContainerManagedBeans() {
-
- EJBJar objEJBJar = getInstance();
- Session session = getEjbFactory().createSession();
- objEJBJar.getEnterpriseBeans().add(session);
-
- List retValue = null;
- retValue = objEJBJar.getContainerManagedBeans();
- assertEquals(retValue.size()==0,true);
-
- ContainerManagedEntity entity = getEjbFactory().createContainerManagedEntity();
- objEJBJar.getEnterpriseBeans().add(entity);
-
- retValue = objEJBJar.getContainerManagedBeans();
- assertEquals(retValue.size()==1,true);
- assertEquals(retValue.get(0),entity);
- }
-
-
-
-
- public void test_getEJB11ContainerManagedBeans() {
-
- EJBJar objEJBJar = getInstance();
- Session session = getEjbFactory().createSession();
- objEJBJar.getEnterpriseBeans().add(session);
-
- List retValue = null;
- retValue = objEJBJar.getEJB11ContainerManagedBeans();
- assertEquals(retValue.size()==0,true);
-
- ContainerManagedEntity entity1 = getEjbFactory().createContainerManagedEntity();
- objEJBJar.getEnterpriseBeans().add(entity1);
- entity1.setVersion(ContainerManagedEntity.VERSION_1_X);
-
- ContainerManagedEntity entity2 = getEjbFactory().createContainerManagedEntity();
- objEJBJar.getEnterpriseBeans().add(entity2);
- entity2.setVersion(ContainerManagedEntity.VERSION_2_X);
-
-
- retValue = objEJBJar.getEJB11ContainerManagedBeans();
- assertEquals(retValue.size()==1,true);
- assertEquals(retValue.get(0),entity1);
- }
-
- public void test_getEJB20ContainerManagedBeans() {
-
- EJBJar objEJBJar = getInstance();
- Session session = getEjbFactory().createSession();
- objEJBJar.getEnterpriseBeans().add(session);
-
- List retValue = null;
- retValue = objEJBJar.getEJB20ContainerManagedBeans();
- assertEquals(retValue.size()==0,true);
-
- ContainerManagedEntity entity1 = getEjbFactory().createContainerManagedEntity();
- objEJBJar.getEnterpriseBeans().add(entity1);
- entity1.setVersion(ContainerManagedEntity.VERSION_1_X);
-
- ContainerManagedEntity entity2 = getEjbFactory().createContainerManagedEntity();
- objEJBJar.getEnterpriseBeans().add(entity2);
- entity2.setVersion(ContainerManagedEntity.VERSION_2_X);
-
-
- retValue = objEJBJar.getEJB20ContainerManagedBeans();
- assertEquals(retValue.size()==1,true);
- assertEquals(retValue.get(0),entity2);
- }
-
-
- public void test_getMessageDrivenBeans() {
- EJBJar objEJBJar = getInstance();
- Session session = getEjbFactory().createSession();
- objEJBJar.getEnterpriseBeans().add(session);
-
- List retValue = null;
- retValue = objEJBJar.getMessageDrivenBeans();
- assertEquals(retValue.size()==0,true);
-
- MessageDriven messageDriven = getEjbFactory().createMessageDriven();
- objEJBJar.getEnterpriseBeans().add(messageDriven);
-
- retValue = objEJBJar.getMessageDrivenBeans();
- assertEquals(retValue.size()==1,true);
- assertEquals(retValue.get(0),messageDriven);
- }
-
- public void test_getEjbRelations() {
-
- EJBJar objEJBJar = getInstance();
- Relationships relationships = getEjbFactory().createRelationships();
- objEJBJar.setRelationshipList(relationships);
- relationships.setEjbJar(objEJBJar);
- EList ejbRelations = relationships.getEjbRelations();
- List retValue = null;
- retValue = objEJBJar.getEjbRelations();
-
- assertEquals(ejbRelations,retValue);
- }
-
-
-
-
- public void test_getEnterpiseBeanFromRef() {
-
- EJBJar objEJBJar = getInstance();
- AssemblyDescriptor descriptor = getEjbFactory().createAssemblyDescriptor();
- objEJBJar.setAssemblyDescriptor(descriptor);
-
- EjbRef ejbRef = COMMONFACTORY.createEjbRef();
- Session session1 = getEjbFactory().createSession();
- String name1 = "Name1";
- session1.setName(name1);
-
- Session session2 = getEjbFactory().createSession();
- String name2 = "Name2";
- session2.setName(name2);
-
- ejbRef.setLink(name2);
- ejbRef.setName("EjbRef_" + name2);
-
- objEJBJar.getEnterpriseBeans().add(session1);
- objEJBJar.getEnterpriseBeans().add(session2);
-
- EnterpriseBean retValue = objEJBJar.getEnterpiseBeanFromRef(ejbRef);
- assertEquals(session2,retValue);
- }
-
- public void test_getEnterpriseBeanNamed() {
-
- EJBJar objEJBJar = getInstance();
- AssemblyDescriptor descriptor = getEjbFactory().createAssemblyDescriptor();
- objEJBJar.setAssemblyDescriptor(descriptor);
-
- Session session1 = getEjbFactory().createSession();
- String name1 = "Name1";
- session1.setName(name1);
-
- Session session2 = getEjbFactory().createSession();
- String name2 = "Name2";
- session2.setName(name2);
-
-
- objEJBJar.getEnterpriseBeans().add(session1);
- objEJBJar.getEnterpriseBeans().add(session2);
-
- EnterpriseBean retValue = objEJBJar.getEnterpriseBeanNamed(name2);
- assertEquals(session2,retValue);
- }
-
- public void test_getEnterpriseBeansWithReference() {
-
- EJBJar objEJBJar = getInstance();
- AssemblyDescriptor descriptor = getEjbFactory().createAssemblyDescriptor();
- objEJBJar.setAssemblyDescriptor(descriptor);
-
- Session session1 = getEjbFactory().createSession();
- String name1 = "Name1";
- session1.setName(name1);
-
- Session session2 = getEjbFactory().createSession();
- String name2 = "Name2";
- session2.setName(name2);
-
-
- objEJBJar.getEnterpriseBeans().add(session1);
- objEJBJar.getEnterpriseBeans().add(session2);
-
- JavaClass javaClass1 = JavaRefFactory.eINSTANCE.createClassRef("java.lang.String") ;
- JavaClass javaClass2 = JavaRefFactory.eINSTANCE.createClassRef("java.util.List") ;
-
- session1.setEjbClass(javaClass1);
- session2.setEjbClass(javaClass2);
-
- java.util.List retValue = null;
- retValue = objEJBJar.getEnterpriseBeansWithReference(javaClass1);
- assertEquals(retValue.size()==1, true);
- assertEquals(retValue.contains(session1), true);
-
- session2.setHomeInterface(javaClass1);
- retValue = objEJBJar.getEnterpriseBeansWithReference(javaClass1);
- assertEquals(retValue.size()==2, true);
- assertEquals(retValue.contains(session1), true);
- assertEquals(retValue.contains(session2), true);
-
- }
-
-
-
- public void test_getEnterpriseBeanWithReference() {
-
- EJBJar objEJBJar = getInstance();
- AssemblyDescriptor descriptor = getEjbFactory().createAssemblyDescriptor();
- objEJBJar.setAssemblyDescriptor(descriptor);
-
- Session session1 = getEjbFactory().createSession();
- String name1 = "Name1";
- session1.setName(name1);
-
- Session session2 = getEjbFactory().createSession();
- String name2 = "Name2";
- session2.setName(name2);
-
-
- objEJBJar.getEnterpriseBeans().add(session1);
- objEJBJar.getEnterpriseBeans().add(session2);
-
- JavaClass javaClass1 = JavaRefFactory.eINSTANCE.createClassRef("java.lang.String") ;
-
- session1.setEjbClass(javaClass1);
- session2.setEjbClass(javaClass1);
-
- EnterpriseBean retValue = null;
- retValue = objEJBJar.getEnterpriseBeanWithReference(javaClass1);
- assertEquals(retValue, session1);
-
- }
-
- public void test_getSessionBeans() {
- EJBJar objEJBJar = getInstance();
- MessageDriven messageDriven = getEjbFactory().createMessageDriven();
- objEJBJar.getEnterpriseBeans().add(messageDriven);
-
-
- List retValue = null;
- retValue = objEJBJar.getSessionBeans();
- assertEquals(retValue.size()==0,true);
-
- Session session = getEjbFactory().createSession();
- objEJBJar.getEnterpriseBeans().add(session);
-
-
- retValue = objEJBJar.getSessionBeans();
- assertEquals(retValue.size()==1,true);
- assertEquals(retValue.contains(session), true);
-
- }
-
-
- /* public void test_renameSecurityRole() {
- EJBJar objEJBJar = getInstance();
- java.lang.String existingRoleName = "";
- java.lang.String newRoleName = "";
- objEJBJar.renameSecurityRole(existingRoleName, newRoleName);
- } */
-
- /* public void test_getEjbClientJar() {
-
- EJBJar objEJBJar = getInstance();
- String retValue = "";
- retValue = objEJBJar.getEjbClientJar();
- }
-
- public void test_setEjbClientJar() {
-
- EJBJar objEJBJar = getInstance();
- String newEjbClientJar = "";
- objEJBJar.setEjbClientJar(newEjbClientJar);
- }*/
-
- /* public void test_getVersion() {
-
- EJBJar objEJBJar = getInstance();
- String retValue = "";
- retValue = objEJBJar.getVersion();
- }*/
-
-
-
-
- public void test_getVersionID() throws Exception {
-
- init();
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
- DD.setVersionID(J2EEVersionConstants.J2EE_1_4_ID);
- setVersion(VERSION_1_4);
- setModuleType(EJB);
- populateRoot(DD.getRootObject());
- int retValue = 0;
- retValue = DD.getEJBJar().getVersionID();
- assertEquals(retValue,J2EEVersionConstants.EJB_2_1_ID);
-
- DD.setVersionID(J2EEVersionConstants.J2EE_1_3_ID);
- setVersion(VERSION_1_3);
- retValue = DD.getEJBJar().getVersionID();
- assertEquals(retValue,J2EEVersionConstants.EJB_2_0_ID);
-
- DD.setVersionID(J2EEVersionConstants.J2EE_1_2_ID);
- setVersion(VERSION_1_2);
- retValue = DD.getEJBJar().getVersionID();
- assertEquals(retValue,J2EEVersionConstants.EJB_1_1_ID);
- }
-
- public void test_getJ2EEVersionID() throws Exception {
-
- init();
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
- DD.setVersionID(J2EEVersionConstants.J2EE_1_4_ID);
- setVersion(VERSION_1_4);
- setModuleType(EJB);
- populateRoot(DD.getRootObject());
- int retValue = 0;
- retValue = DD.getEJBJar().getJ2EEVersionID();
- assertEquals(retValue,J2EEVersionConstants.J2EE_1_4_ID);
-
- DD.setVersionID(J2EEVersionConstants.J2EE_1_3_ID);
- setVersion(VERSION_1_3);
- retValue = DD.getEJBJar().getJ2EEVersionID();
- assertEquals(retValue,J2EEVersionConstants.J2EE_1_3_ID);
-
- DD.setVersionID(J2EEVersionConstants.J2EE_1_2_ID);
- setVersion(VERSION_1_2);
- retValue = DD.getEJBJar().getJ2EEVersionID();
- assertEquals(retValue,J2EEVersionConstants.J2EE_1_2_ID);
- }
-
- /* public void test_setVersion() {
-
- EJBJar objEJBJar = getInstance();
- String newVersion = "";
- objEJBJar.setVersion(newVersion);
- }*/
-
- /* public void test_getAssemblyDescriptor() {
-
- EJBJar objEJBJar = getInstance();
- AssemblyDescriptor retValue = null;
- retValue = objEJBJar.getAssemblyDescriptor();
- }
-
-
-
- public void test_setAssemblyDescriptor() {
-
- EJBJar objEJBJar = getInstance();
- AssemblyDescriptor newAssemblyDescriptor = null;
- objEJBJar.setAssemblyDescriptor(newAssemblyDescriptor);
- }*/
-
- /* public void test_getEnterpriseBeans() {
-
- EJBJar objEJBJar = getInstance();
- EList retValue = null;
- retValue = objEJBJar.getEnterpriseBeans();
- }*/
-
- /* public void test_getRelationshipList() {
-
- EJBJar objEJBJar = getInstance();
- Relationships retValue = null;
- retValue = objEJBJar.getRelationshipList();
- }
-
-
-
- public void test_setRelationshipList() {
-
- EJBJar objEJBJar = getInstance();
- Relationships newRelationshipList = null;
- objEJBJar.setRelationshipList(newRelationshipList);
- }
-*/
-
-
- public void test_getEJBRelation() {
- EJBJar objEJBJar = getInstance();
- Relationships relationships = getEjbFactory().createRelationships();
- objEJBJar.setRelationshipList(relationships);
- relationships.setEjbJar(objEJBJar);
-
- EJBRelation relation = getEjbFactory().createEJBRelation();
- String aRelationName = "Relation1";
- relation.setName(aRelationName);
-
- relationships.getEjbRelations().add(relation);
- EJBRelation retValue = null;
- retValue = objEJBJar.getEJBRelation(aRelationName);
- assertEquals(retValue, relation);
- }
-
-
-
- public void test_getEJBRelationsForSource() {
-
- EJBJar objEJBJar = getInstance();
- Relationships relationships = getEjbFactory().createRelationships();
- objEJBJar.setRelationshipList(relationships);
- relationships.setEjbJar(objEJBJar);
-
- EJBRelation relation = getEjbFactory().createEJBRelation();
- String aRelationName = "Relation1";
- relation.setName(aRelationName);
-
- EJBRelationshipRole role1 = getEjbFactory().createEJBRelationshipRole();
- EJBRelationshipRole role2 = getEjbFactory().createEJBRelationshipRole();
-
- List roleList = relation.getRelationshipRoles();
- roleList.add(role1);
- roleList.add(role2);
-
- ContainerManagedEntity entity = getEjbFactory().createContainerManagedEntity();
- ContainerManagedEntity targetEntity = getEjbFactory().createContainerManagedEntity();
-
- RoleSource roleSource = getEjbFactory().createRoleSource();
- roleSource.setEntityBean(entity);
- roleSource.setRole(role1);
- role1.setSource(roleSource);
-
- RoleSource targetRoleSource = getEjbFactory().createRoleSource();
- targetRoleSource.setEntityBean(targetEntity);
- targetRoleSource.setRole(role2);
- role2.setSource(targetRoleSource);
-
- List retValue = null;
- retValue = objEJBJar.getEJBRelationsForSource(entity);
-
- assertNotNull(retValue);
- assertEquals(retValue.size(),1);
- assertEquals(retValue.contains(relation),true);
-
- }
-
- public void test_getEJBRelationshipRolesForType() {
-
- EJBJar objEJBJar = getInstance();
- Relationships relationships = getEjbFactory().createRelationships();
- objEJBJar.setRelationshipList(relationships);
- relationships.setEjbJar(objEJBJar);
-
- EJBRelation relation = getEjbFactory().createEJBRelation();
- String aRelationName = "Relation1";
- relation.setName(aRelationName);
-
- EJBRelationshipRole role1 = getEjbFactory().createEJBRelationshipRole();
- EJBRelationshipRole role2 = getEjbFactory().createEJBRelationshipRole();
-
- List roleList = relation.getRelationshipRoles();
- roleList.add(role1);
- roleList.add(role2);
-
- ContainerManagedEntity entity = getEjbFactory().createContainerManagedEntity();
- ContainerManagedEntity targetEntity = getEjbFactory().createContainerManagedEntity();
-
- RoleSource roleSource = getEjbFactory().createRoleSource();
- roleSource.setEntityBean(entity);
- roleSource.setRole(role1);
- role1.setSource(roleSource);
-
- RoleSource targetRoleSource = getEjbFactory().createRoleSource();
- targetRoleSource.setEntityBean(targetEntity);
- targetRoleSource.setRole(role2);
- role2.setSource(targetRoleSource);
-
- List retValue = null;
- retValue = objEJBJar.getEJBRelationshipRolesForType(targetEntity);
-
- assertNotNull(retValue);
- assertEquals(retValue.size(),1);
- assertEquals(retValue.contains(relation),true);
- }
-
- public static junit.framework.Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTest(new EJBJarTest("test_EJBJar"));
- suite.addTest(new EJBJarTest("test_containsContainerManagedBeans"));
- suite.addTest(new EJBJarTest("test_containsSecurityRole"));
- suite.addTest(new EJBJarTest("test_getBeanManagedBeans"));
- suite.addTest(new EJBJarTest("test_getContainerManagedBeans"));
-
- suite.addTest(new EJBJarTest("test_getEJB11ContainerManagedBeans"));
- suite.addTest(new EJBJarTest("test_getEJB20ContainerManagedBeans"));
- suite.addTest(new EJBJarTest("test_getMessageDrivenBeans"));
- suite.addTest(new EJBJarTest("test_getEjbRelations"));
- suite.addTest(new EJBJarTest("test_getEnterpiseBeanFromRef"));
-
- suite.addTest(new EJBJarTest("test_getEnterpriseBeanNamed"));
- suite.addTest(new EJBJarTest("test_getEnterpriseBeansWithReference"));
- suite.addTest(new EJBJarTest("test_getEnterpriseBeanWithReference"));
- suite.addTest(new EJBJarTest("test_getSessionBeans"));
- suite.addTest(new EJBJarTest("test_getVersionID"));
-
- suite.addTest(new EJBJarTest("test_getJ2EEVersionID"));
- suite.addTest(new EJBJarTest("test_getEJBRelation"));
- suite.addTest(new EJBJarTest("test_getEJBRelationsForSource"));
- suite.addTest(new EJBJarTest("test_getEJBRelationshipRolesForType"));
-
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EJBRelationTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EJBRelationTest.java
deleted file mode 100644
index 05ccec48..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EJBRelationTest.java
+++ /dev/null
@@ -1,154 +0,0 @@
-package org.eclipse.jst.j2ee.ejb.test;
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-
-public class EJBRelationTest extends TestCase {
-
- private EjbFactory EJBFACTORY = EjbPackage.eINSTANCE.getEjbFactory();
- private EJBRelation getInstance() {
- return EjbFactory.eINSTANCE.createEJBRelation();
- }
- public static Test suite() {
- return new TestSuite(EJBRelationTest.class);
- }
-
- public void test_EJBRelation() {
-
- EJBRelation tmpEJBRelation = getInstance();
- assertNotNull(tmpEJBRelation);
- }
-
- public void test_containsRelationshipRole() {
- EJBRelationshipRole role1 = EJBFACTORY.createEJBRelationshipRole();
- EJBRelationshipRole role2 = EJBFACTORY.createEJBRelationshipRole();
- EJBRelation objEJBRelation = getInstance();
- boolean retValue = false;
- retValue = objEJBRelation.containsRelationshipRole(role1);
- assertEquals(false,retValue);
- List roleList = objEJBRelation.getRelationshipRoles();
- roleList.add(role1);
- roleList.add(role2);
- retValue = objEJBRelation.containsRelationshipRole(role1);
- assertEquals(true,retValue);
- }
-
-
- public void test_getFirstRole() {
- EJBRelationshipRole role1 = EJBFACTORY.createEJBRelationshipRole();
- EJBRelationshipRole role2 = EJBFACTORY.createEJBRelationshipRole();
- EJBRelation objEJBRelation = getInstance();
- List roleList = objEJBRelation.getRelationshipRoles();
- roleList.add(role1);
- roleList.add(role2);
- EJBRelationshipRole retValue = null;
- retValue = objEJBRelation.getFirstRole();
- assertEquals(role1,retValue);
- }
-
- public void test_getOppositeRole() {
-
- EJBRelationshipRole role1 = EJBFACTORY.createEJBRelationshipRole();
- EJBRelationshipRole role2 = EJBFACTORY.createEJBRelationshipRole();
- EJBRelation objEJBRelation = getInstance();
- EJBRelationshipRole oppRole = objEJBRelation.getOppositeRole(role1);
- assertNull(oppRole);
-
- List roleList = objEJBRelation.getRelationshipRoles();
- roleList.add(role1);
- roleList.add(role2);
-
- oppRole = objEJBRelation.getOppositeRole(role1);
- assertEquals(role2,oppRole);
-
- oppRole = objEJBRelation.getOppositeRole(role2);
- assertEquals(role1,oppRole);
- }
-
-
- public void test_getSecondRole() {
-
- EJBRelationshipRole role1 = EJBFACTORY.createEJBRelationshipRole();
- EJBRelationshipRole role2 = EJBFACTORY.createEJBRelationshipRole();
- EJBRelation objEJBRelation = getInstance();
- List roleList = objEJBRelation.getRelationshipRoles();
- roleList.add(role1);
- roleList.add(role2);
- EJBRelationshipRole retValue = null;
- retValue = objEJBRelation.getSecondRole();
- assertEquals(role2,retValue);
- }
-
- public void test_setFoward() {
-
- EJBRelationshipRole role1 = EJBFACTORY.createEJBRelationshipRole();
- EJBRelationshipRole role2 = EJBFACTORY.createEJBRelationshipRole();
- EJBRelation objEJBRelation = getInstance();
- List roleList = objEJBRelation.getRelationshipRoles();
- roleList.add(role1);
- roleList.add(role2);
-
- objEJBRelation.setFoward(role2);
- EJBRelationshipRole retValue = null;
- retValue = objEJBRelation.getFirstRole();
- assertEquals(role2,retValue);
- }
-
- /* public void test_getDescription() {
-
- EJBRelation objEJBRelation = getInstance();
- String retValue = "";
- retValue = objEJBRelation.getDescription();
- }
-
- public void test_setDescription() {
-
- EJBRelation objEJBRelation = getInstance();
- String newDescription = "";
- objEJBRelation.setDescription(newDescription);
- }*/
-
- /* public void test_getName() {
-
- EJBRelation objEJBRelation = getInstance();
- String retValue = "";
- retValue = objEJBRelation.getName();
- }
-
- public void test_setName() {
-
- EJBRelation objEJBRelation = getInstance();
- String newName = "";
- objEJBRelation.setName(newName);
- }*/
-
- /* public void test_getRelationshipList() {
-
- EJBRelation objEJBRelation = getInstance();
- Relationships retValue = null;
- retValue = objEJBRelation.getRelationshipList();
- }
-
- public void test_setRelationshipList() {
-
- EJBRelation objEJBRelation = getInstance();
- Relationships newRelationshipList = null;
- objEJBRelation.setRelationshipList(newRelationshipList);
- }
-
-
- public void test_getDescriptions() {
-
- EJBRelation objEJBRelation = getInstance();
- EList retValue = null;
- retValue = objEJBRelation.getDescriptions();
- }*/
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EJBRelationshipRoleTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EJBRelationshipRoleTest.java
deleted file mode 100644
index 432c0584..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EJBRelationshipRoleTest.java
+++ /dev/null
@@ -1,307 +0,0 @@
-package org.eclipse.jst.j2ee.ejb.test;
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.MultiplicityKind;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-
-public class EJBRelationshipRoleTest extends TestCase {
-
- private EjbFactory EJBFACTORY = EjbPackage.eINSTANCE.getEjbFactory();
- EJBRelationshipRole role1 = null, role2 = null;
- ContainerManagedEntity entity = null;
- EJBRelation ejbRelation = null ;
-
- public static Test suite() {
- return new TestSuite(EJBRelationshipRoleTest.class);
- }
-
- private EJBRelationshipRole getInstance() {
- return EJBFACTORY.createEJBRelationshipRole();
- }
-
- public void test_EJBRelationshipRole() {
-
- EJBRelationshipRole tmpEJBRelationshipRole = getInstance();
- assertNotNull(tmpEJBRelationshipRole);
- }
-
- public void test_getLogicalName() {
-
- /* EJBRelationshipRole objEJBRelationshipRole = getInstance();
- String retValue = "";
- retValue = objEJBRelationshipRole.getLogicalName();*/
- }
-
- public void test_getName() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- String name = "role1";
- objEJBRelationshipRole.setName(name);
- String retValue = "";
- retValue = objEJBRelationshipRole.getName();
- assertEquals(name,retValue);
- }
-
- public void test_getOpposite() {
- init();
- EJBRelationshipRole retValue = null;
- retValue = role1.getOpposite();
- assertEquals(retValue,role2);
- retValue = role2.getOpposite();
- assertEquals(retValue,role1);
- }
-
- public void test_getSourceEntity() {
- init();
- ContainerManagedEntity retValue = role1.getSourceEntity();
- assertEquals(retValue,entity);
- }
-
- public void test_isForward() {
- init();
- boolean retValue = role2.isForward();
- assertEquals(retValue,false);
- role2.setFoward();
- retValue = role2.isForward();
- assertEquals(retValue,true);
-
- }
-
- public void test_isKey() {
- init();
- boolean retValue = role2.isKey();
- assertEquals(retValue,false);
- role2.setKey(true);
- retValue = role2.isKey();
- assertEquals(retValue,true);
- }
-
- public void test_setKey() {
-
- init();
- boolean retValue = role2.isKey();
- assertEquals(retValue,false);
- role2.setKey(true);
- retValue = role2.isKey();
- assertEquals(retValue,true);
- }
-
- private void init() {
- role1 = EJBFACTORY.createEJBRelationshipRole();
- role2 = EJBFACTORY.createEJBRelationshipRole();
- ejbRelation = EJBFACTORY.createEJBRelation();
- entity = EJBFACTORY.createContainerManagedEntity();
- RoleSource roleSource = EJBFACTORY.createRoleSource();
- roleSource.setEntityBean(entity);
- roleSource.setRole(role1);
- role1.setSource(roleSource);
- List roleList = ejbRelation.getRelationshipRoles();
- roleList.add(role1);
- roleList.add(role2);
- }
-
- public void test_isMany() {
- init();
- boolean retValue = false;
- retValue = role1.isMany();
- assertEquals(retValue,false) ;
- role2.setMultiplicity(MultiplicityKind.MANY_LITERAL);
- retValue = role1.isMany();
- assertEquals(retValue,true) ;
- }
-
- public void test_isNavigable() {
- init();
- boolean retValue = role1.isNavigable();
- assertEquals(retValue,false);
- CMRField cmrField = EJBFACTORY.createCMRField();
- role1.setCmrField(cmrField);
- retValue = role1.isNavigable();
- assertEquals(retValue,true);
- }
-
-
- public void test_setFoward() {
- init();
- boolean retValue = role2.isForward();
- assertEquals(retValue,false);
- role2.setFoward();
- retValue = role2.isForward();
- assertEquals(retValue,true);
- }
-
- public void test_setName() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- String name = "role1";
- objEJBRelationshipRole.setName(name);
- String retValue = "";
- retValue = objEJBRelationshipRole.getName();
- assertEquals(name,retValue);
- }
-
- /* public void test_getDescription() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- String retValue = "";
- retValue = objEJBRelationshipRole.getDescription();
- }
-
- public void test_setDescription() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- String newDescription = "";
- objEJBRelationshipRole.setDescription(newDescription);
- }*/
-
- /* public void test_getRoleName() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- String retValue = "";
- retValue = objEJBRelationshipRole.getRoleName();
- }
-
- public void test_setRoleName() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- String newRoleName = "";
- objEJBRelationshipRole.setRoleName(newRoleName);
- }*/
-
- /* public void test_getMultiplicity() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- MultiplicityKind retValue = null;
- retValue = objEJBRelationshipRole.getMultiplicity();
- }
-
- public void test_setMultiplicity() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- MultiplicityKind newMultiplicity = null;
- objEJBRelationshipRole.setMultiplicity(newMultiplicity);
- }*/
-
- /* public void test_unsetMultiplicity() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- objEJBRelationshipRole.unsetMultiplicity();
- }
-
- public void test_isSetMultiplicity() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- boolean retValue = false;
- retValue = objEJBRelationshipRole.isSetMultiplicity();
- }*/
-
- /* public void test_isCascadeDelete() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- boolean retValue = false;
- retValue = objEJBRelationshipRole.isCascadeDelete();
- }
-
- public void test_setCascadeDelete() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- boolean newCascadeDelete = false;
- objEJBRelationshipRole.setCascadeDelete(newCascadeDelete);
- }*/
-
- /* public void test_unsetCascadeDelete() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- objEJBRelationshipRole.unsetCascadeDelete();
- }
-
- public void test_isSetCascadeDelete() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- boolean retValue = false;
- retValue = objEJBRelationshipRole.isSetCascadeDelete();
- }*/
-
- /* public void test_getRelationship() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- EJBRelation retValue = null;
- retValue = objEJBRelationshipRole.getRelationship();
- }
-
- public void test_setRelationship() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- EJBRelation newContainer = null;
- objEJBRelationshipRole.setRelationship(newContainer);
- }*/
-
- /*public void test_getSource() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- RoleSource retValue = null;
- retValue = objEJBRelationshipRole.getSource();
- }
-
-
- public void test_setSource() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- RoleSource newSource = null;
- objEJBRelationshipRole.setSource(newSource);
- }*/
-
- /* public void test_getCmrField() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- CMRField retValue = null;
- retValue = objEJBRelationshipRole.getCmrField();
- }
-
-
- public void test_setCmrField() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- CMRField newCmrField = null;
- objEJBRelationshipRole.setCmrField(newCmrField);
- }*/
-
- /* public void test_getDescriptions() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- EList retValue = null;
- retValue = objEJBRelationshipRole.getDescriptions();
- }*/
-
-
- public void test_setRequired() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- Boolean isRequired = Boolean.FALSE;
- objEJBRelationshipRole.setRequired(isRequired);
- assertEquals(false,objEJBRelationshipRole.isRequired());
- isRequired = Boolean.TRUE;
- objEJBRelationshipRole.setRequired(isRequired);
- assertEquals(true,objEJBRelationshipRole.isRequired());
- }
-
- /* public void test_reconcileAttributes() {
-
- EJBRelationshipRole objEJBRelationshipRole = getInstance();
- objEJBRelationshipRole.reconcileAttributes();
- } */
-
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EjbEMFTestBase.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EjbEMFTestBase.java
deleted file mode 100644
index da57d36b..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EjbEMFTestBase.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Created on Mar 14, 2005
- */
-package org.eclipse.jst.j2ee.ejb.test;
-
-import org.eclipse.jst.j2ee.archive.emftests.EjbEMFTest;
-import org.eclipse.jst.j2ee.archive.testutilities.EMFAttributeFeatureGenerator;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-
-public class EjbEMFTestBase extends EjbEMFTest {
-
- /**
- * @param name
- */
- public EjbEMFTestBase(String name) {
- super(name);
- }
-
- protected void init() throws Exception{
- EMFAttributeFeatureGenerator.reset();
- createEAR();
- createEJB();
-
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
- //TODO: individual test for each version
- DD.setVersionID(J2EEVersionConstants.J2EE_1_4_ID);
- setVersion(VERSION_1_4);
- setModuleType(EJB);
- populateRoot(DD.getRootObject());
- }
-
- public void testEJBJarPopulation() throws Exception {
- // dont test the base functions
- }
-
- public void test14EJBJarPopulation() throws Exception {
- // dont test the base functions
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EjbFactoryTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EjbFactoryTest.java
deleted file mode 100644
index 32bc1ab2..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EjbFactoryTest.java
+++ /dev/null
@@ -1,285 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.internal.impl.JavaRefFactoryImpl;
-import org.eclipse.jst.j2ee.ejb.ActivationConfig;
-import org.eclipse.jst.j2ee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.CMPAttribute;
-import org.eclipse.jst.j2ee.ejb.CMRField;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.EJBMethodCategory;
-import org.eclipse.jst.j2ee.ejb.EJBRelation;
-import org.eclipse.jst.j2ee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.Entity;
-import org.eclipse.jst.j2ee.ejb.ExcludeList;
-import org.eclipse.jst.j2ee.ejb.MessageDriven;
-import org.eclipse.jst.j2ee.ejb.MessageDrivenDestination;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-import org.eclipse.jst.j2ee.ejb.Relationships;
-import org.eclipse.jst.j2ee.ejb.RoleSource;
-import org.eclipse.jst.j2ee.ejb.Session;
-
-public class EjbFactoryTest extends TestCase {
-
- private EjbFactory getInstance() {
- return EjbPackage.eINSTANCE.getEjbFactory();
- }
-
-
- public static Test suite() {
- return new TestSuite(EjbFactoryTest.class);
- }
-
- public void test_EjbFactory() {
-
- EjbFactory tmpEjbFactory = getInstance();
- }
-
- public void test_createMethodElement() {
-
- EjbFactory objEjbFactory = getInstance();
- String aSignature = "";
- MethodElement retValue = null;
- retValue = objEjbFactory.createMethodElement(aSignature);
- assertNotNull(retValue);
- }
-
- public void test_createMethodElementFrom() {
-
- EjbFactory objEjbFactory = getInstance();
- Method aMethod = JavaRefFactoryImpl.getActiveFactory().createMethod();
-
- String name = "setTwoParamMethod";
- JavaParameter javaParameter1 = JavaRefFactory.eINSTANCE.createJavaParameter();
- JavaHelpers type1 = JavaRefFactory.eINSTANCE.createClassRef("java.lang.String");
- javaParameter1.setEType(type1);
-
- JavaParameter javaParameter2 = JavaRefFactory.eINSTANCE.createJavaParameter();
- JavaHelpers type2 = JavaRefFactory.eINSTANCE.createClassRef("java.util.List");
- javaParameter2.setEType(type2);
-
- aMethod.setName(name);
- aMethod.getParameters().add(javaParameter1);
- aMethod.getParameters().add(javaParameter2);
-
- MethodElement retValue = null;
- retValue = objEjbFactory.createMethodElementFrom(aMethod);
- assertNotNull(retValue);
- }
-
- public void test_createMethodElementFrom_2() {
-
- EjbFactory objEjbFactory = getInstance();
- java.lang.reflect.Method method = null;
- MethodElement retValue = null;
- retValue = objEjbFactory.createMethodElementFrom(method);
- assertNotNull(retValue);
- }
-
-
- public void test_createMethodPermission() {
-
- EjbFactory objEjbFactory = getInstance();
- MethodPermission retValue = null;
- retValue = objEjbFactory.createMethodPermission();
- assertNotNull(retValue);
- }
-
- public void test_createAssemblyDescriptor() {
-
- EjbFactory objEjbFactory = getInstance();
- AssemblyDescriptor retValue = null;
- retValue = objEjbFactory.createAssemblyDescriptor();
- assertNotNull(retValue);
- }
-
- public void test_createMethodTransaction() {
-
- EjbFactory objEjbFactory = getInstance();
- MethodTransaction retValue = null;
- retValue = objEjbFactory.createMethodTransaction();
- assertNotNull(retValue);
- }
-
- public void test_createEntity() {
-
- EjbFactory objEjbFactory = getInstance();
- Entity retValue = null;
- retValue = objEjbFactory.createEntity();
- assertNotNull(retValue);
- }
-
-
-
- public void test_createContainerManagedEntity() {
-
- EjbFactory objEjbFactory = getInstance();
- ContainerManagedEntity retValue = null;
- retValue = objEjbFactory.createContainerManagedEntity();
- assertNotNull(retValue);
- }
-
- public void test_createCMPAttribute() {
-
- EjbFactory objEjbFactory = getInstance();
- CMPAttribute retValue = null;
- retValue = objEjbFactory.createCMPAttribute();
- assertNotNull(retValue);
- }
-
- public void test_createCMRField() {
-
- EjbFactory objEjbFactory = getInstance();
- CMRField retValue = null;
- retValue = objEjbFactory.createCMRField();
- assertNotNull(retValue);
- }
-
- public void test_createEJBRelationshipRole() {
-
- EjbFactory objEjbFactory = getInstance();
- EJBRelationshipRole retValue = null;
- retValue = objEjbFactory.createEJBRelationshipRole();
- assertNotNull(retValue);
- }
-
-
- public void test_createEJBRelation() {
-
- EjbFactory objEjbFactory = getInstance();
- EJBRelation retValue = null;
- retValue = objEjbFactory.createEJBRelation();
- assertNotNull(retValue);
- }
-
-
- public void test_createRelationships() {
-
- EjbFactory objEjbFactory = getInstance();
- Relationships retValue = null;
- retValue = objEjbFactory.createRelationships();
- assertNotNull(retValue);
- }
-
- public void test_createEJBJar() {
-
- EjbFactory objEjbFactory = getInstance();
- EJBJar retValue = null;
- retValue = objEjbFactory.createEJBJar();
- assertNotNull(retValue);
- }
-
- public void test_createRoleSource() {
-
- EjbFactory objEjbFactory = getInstance();
- RoleSource retValue = null;
- retValue = objEjbFactory.createRoleSource();
- assertNotNull(retValue);
- }
-
- public void test_createQuery() {
-
- EjbFactory objEjbFactory = getInstance();
- Query retValue = null;
- retValue = objEjbFactory.createQuery();
- assertNotNull(retValue);
- }
-
- public void test_createQueryMethod() {
-
- EjbFactory objEjbFactory = getInstance();
- QueryMethod retValue = null;
- retValue = objEjbFactory.createQueryMethod();
- assertNotNull(retValue);
- }
-
- public void test_createActivationConfigProperty() {
-
- EjbFactory objEjbFactory = getInstance();
- ActivationConfigProperty retValue = null;
- retValue = objEjbFactory.createActivationConfigProperty();
- assertNotNull(retValue);
- }
-
- public void test_createActivationConfig() {
-
- EjbFactory objEjbFactory = getInstance();
- ActivationConfig retValue = null;
- retValue = objEjbFactory.createActivationConfig();
- assertNotNull(retValue);
- }
-
- public void test_createMethodElement_2() {
-
- EjbFactory objEjbFactory = getInstance();
- MethodElement retValue = null;
- retValue = objEjbFactory.createMethodElement();
- assertNotNull(retValue);
- }
-
- public void test_createExcludeList() {
-
- EjbFactory objEjbFactory = getInstance();
- ExcludeList retValue = null;
- retValue = objEjbFactory.createExcludeList();
- assertNotNull(retValue);
- }
-
- public void test_createSession() {
-
- EjbFactory objEjbFactory = getInstance();
- Session retValue = null;
- retValue = objEjbFactory.createSession();
- assertNotNull(retValue);
- }
-
- public void test_createMessageDriven() {
-
- EjbFactory objEjbFactory = getInstance();
- MessageDriven retValue = null;
- retValue = objEjbFactory.createMessageDriven();
- assertNotNull(retValue);
- }
-
- public void test_createMessageDrivenDestination() {
-
- EjbFactory objEjbFactory = getInstance();
- MessageDrivenDestination retValue = null;
- retValue = objEjbFactory.createMessageDrivenDestination();
- assertNotNull(retValue);
- }
-
- public void test_createEJBMethodCategory() {
-
- EjbFactory objEjbFactory = getInstance();
- EJBMethodCategory retValue = null;
- retValue = objEjbFactory.createEJBMethodCategory();
- assertNotNull(retValue);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EntityTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EntityTest.java
deleted file mode 100644
index 110a329f..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/EntityTest.java
+++ /dev/null
@@ -1,141 +0,0 @@
-package org.eclipse.jst.j2ee.ejb.test;
-
-import java.util.List;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.Entity;
-
-public class EntityTest extends EjbEMFTestBase{
-
- /**
- * @param name
- */
- public EntityTest(String name) {
- super(name);
- }
-
- private Entity getInstance() {
- return EjbFactory.eINSTANCE.createEntity();
- }
- public void test_Entity() {
- Entity tmpEntity = getInstance();
- assertNotNull(tmpEntity);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setUp()
- */
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- public void test_getPrimaryKeyName() throws Exception{
- init();
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
-
- AssemblyDescriptor assemblyDescriptor = DD.getEJBJar().getAssemblyDescriptor();
- List enterpriseBeans = DD.getEJBJar().getEnterpriseBeans();
- ContainerManagedEntity entityBean = null;
- EnterpriseBean bean = null;
- for (int x=0; x< enterpriseBeans.size(); ++x) {
- bean = (EnterpriseBean) enterpriseBeans.get(x);
- if (bean.isEntity() && bean.isContainerManagedEntity()) {
- entityBean = (ContainerManagedEntity) bean;
- break;
- }
- }
- if (entityBean != null) {
- String name = entityBean.getPrimaryKeyName();
- String primKeyName = entityBean.getPrimaryKey().getQualifiedName();
- assertEquals(name,primKeyName);
-
- }
- }
-
-
- /* public void test_isContainerManagedEntity() {
- Entity objEntity = getInstance();
- boolean retValue = false;
- retValue = objEntity.isContainerManagedEntity();
- }*/
-
- public void test_setPrimaryKeyName() throws Exception {
- init();
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
-
- AssemblyDescriptor assemblyDescriptor = DD.getEJBJar().getAssemblyDescriptor();
- List enterpriseBeans = DD.getEJBJar().getEnterpriseBeans();
- ContainerManagedEntity entityBean = null;
- EnterpriseBean bean = null;
- for (int x=0; x< enterpriseBeans.size(); ++x) {
- bean = (EnterpriseBean) enterpriseBeans.get(x);
- if (bean.isEntity() && bean.isContainerManagedEntity()) {
- entityBean = (ContainerManagedEntity) bean;
- break;
- }
- }
- if (entityBean != null) {
- String name = entityBean.getPrimaryKeyName();
- String newName = "NewName" ;
- entityBean.setPrimaryKeyName(newName);
- assertEquals(newName,entityBean.getPrimaryKeyName());
- }
- }
-
- /* public void test_isReentrant() {
-
- Entity objEntity = getInstance();
- boolean retValue = false;
- retValue = objEntity.isReentrant();
- }
-
- public void test_setReentrant() {
-
- Entity objEntity = getInstance();
- boolean newReentrant = false;
- objEntity.setReentrant(newReentrant);
- }*/
-
- /* public void test_unsetReentrant() {
-
- Entity objEntity = getInstance();
- objEntity.unsetReentrant();
- } */
-
- /* public void test_isSetReentrant() {
-
- Entity objEntity = getInstance();
- boolean retValue = false;
- retValue = objEntity.isSetReentrant();
- } */
-
- /* public void test_getPrimaryKey() {
-
- Entity objEntity = getInstance();
- JavaClass retValue = null;
- retValue = objEntity.getPrimaryKey();
- }
-
- public void test_setPrimaryKey() {
-
- Entity objEntity = getInstance();
- JavaClass newPrimaryKey = null;
- objEntity.setPrimaryKey(newPrimaryKey);
- } */
-
- public static junit.framework.Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTest(new EntityTest("test_setPrimaryKeyName"));
- suite.addTest(new EntityTest("test_getPrimaryKeyName"));
- return suite;
- }
-
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/MethodElementTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/MethodElementTest.java
deleted file mode 100644
index 2aa81ebe..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/MethodElementTest.java
+++ /dev/null
@@ -1,527 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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.test;
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jem.java.JavaHelpers;
-import org.eclipse.jem.java.JavaParameter;
-import org.eclipse.jem.java.JavaRefFactory;
-import org.eclipse.jem.java.Method;
-import org.eclipse.jem.java.internal.impl.JavaRefFactoryImpl;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodElementKind;
-import org.eclipse.jst.j2ee.ejb.Session;
-
-public class MethodElementTest extends EjbEMFTestBase {
- private final int SESSION =0;
- private final int ENTITY = 1;
- private final int CONTAINER_MANAGED_ENTITY =2;
-
-
-
- /**
- * @param name
- */
- public MethodElementTest(String name) {
- super(name);
-
- }
-
- private MethodElement getInstance() {
- return EjbPackage.eINSTANCE.getEjbFactory().createMethodElement();
- }
-
- public void test_MethodElement() {
- MethodElement tmpMethodElement = getInstance();
- assertNotNull(tmpMethodElement);
- }
-
- public void test_addMethodParams() {
- MethodElement objMethodElement = getInstance();
- String param1 = "param1";
- String param2= "param2";
- boolean retValue = false;
- objMethodElement.addMethodParams(param1);
- objMethodElement.addMethodParams(param2);
- List list = objMethodElement.getMethodParams();
- retValue = list.contains(param1);
- assertEquals(retValue,true);
- }
-
- public void test_applyZeroParams() {
- MethodElement objMethodElement = getInstance();
- String param1 = "param1";
- String param2= "param2";
- boolean retValue = false;
- objMethodElement.addMethodParams(param1);
- objMethodElement.addMethodParams(param2);
- List list = objMethodElement.getMethodParams();
- assertEquals(list.size()==2, true) ;
- objMethodElement.applyZeroParams();
- list = objMethodElement.getMethodParams();
- assertEquals(list.size()==0, true) ;
-
- }
-
- public void test_equalSignature() {
-
- MethodElement objMethodElement1 = getInstance();
- MethodElement objMethodElement2 = getInstance();
- MethodElement objMethodElement3 = getInstance();
-
- objMethodElement1.setName("name");
- objMethodElement2.setName("name");
- objMethodElement3.setName("name");
-
- String param1 = "param1";
- String param2= "param2";
- String param3 = "param3";
- String param4= "param4";
-
- objMethodElement1.addMethodParams(param1);
- objMethodElement1.addMethodParams(param2);
-
- objMethodElement2.addMethodParams(param1);
- objMethodElement2.addMethodParams(param2);
-
- objMethodElement3.addMethodParams(param1);
- objMethodElement3.addMethodParams(param2);
-
- objMethodElement1.setType(MethodElementKind.LOCAL_LITERAL);
- objMethodElement2.setType(MethodElementKind.LOCAL_LITERAL);
- objMethodElement3.setType(MethodElementKind.LOCAL_LITERAL);
-
- boolean retValue = false;
- retValue = objMethodElement1.equalSignature(objMethodElement2);
- assertEquals(retValue,true);
- retValue = objMethodElement2.equalSignature(objMethodElement3);
- assertEquals(retValue,true);
-
- objMethodElement3.setName("nameDiff");
- retValue = objMethodElement2.equalSignature(objMethodElement3);
- assertEquals(retValue,false);
-
- objMethodElement2.addMethodParams(param3);
- retValue = objMethodElement1.equalSignature(objMethodElement2);
- assertEquals(retValue,false);
-
- objMethodElement3.setName("name");
- retValue = objMethodElement1.equalSignature(objMethodElement3);
- assertEquals(retValue,true);
-
- objMethodElement3.setType(MethodElementKind.HOME_LITERAL);
- retValue = objMethodElement1.equalSignature(objMethodElement3);
- assertEquals(retValue,false);
- }
-
- public void test_getMethodParams() {
-
- MethodElement objMethodElement = getInstance();
- String param1 = "param1";
- String param2= "param2";
- boolean retValue = false;
- objMethodElement.addMethodParams(param1);
- objMethodElement.addMethodParams(param2);
- List list = objMethodElement.getMethodParams();
- assertEquals(list.size()==2, true) ;
- assertEquals(list.contains(param1),true);
- assertEquals(list.contains(param2),true);
- }
-
-
-
- public void test_getSignature() {
-
- MethodElement objMethodElement = getInstance();
- String name = "test";
- objMethodElement.setName(name);
-
- String param1 = "param1";
- String param2= "param2";
-
- objMethodElement.addMethodParams(param1);
- objMethodElement.addMethodParams(param2);
-
- String signature = name + "(" + param1 + "," + param2 + ")";
- String retValue = objMethodElement.getSignature();
- assertEquals(signature,retValue);
-
-
- }
-
-
-
-
- public void test_getTypeJavaClass() throws Exception {
- init();
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
- List enterpriseBeans = DD.getEJBJar().getEnterpriseBeans();
- EnterpriseBean eb = (EnterpriseBean)enterpriseBeans.get(0);
- MethodElement objMethodElement = getInstance();
- objMethodElement.setEnterpriseBean(eb);
- JavaClass retValue = null;
- if (eb.hasRemoteClient()) {
- objMethodElement.setType(MethodElementKind.HOME_LITERAL);
- retValue = objMethodElement.getTypeJavaClass();
- assertEquals(retValue,eb.getHomeInterface());
- objMethodElement.setType(MethodElementKind.REMOTE_LITERAL);
- retValue = objMethodElement.getTypeJavaClass();
- assertEquals(retValue,eb.getRemoteInterface());
-
- }
- if (eb.hasLocalClient()){
- objMethodElement.setType(MethodElementKind.LOCAL_HOME_LITERAL);
- retValue = objMethodElement.getTypeJavaClass();
- assertEquals(retValue,eb.getLocalHomeInterface());
- objMethodElement.setType(MethodElementKind.LOCAL_LITERAL);
- retValue = objMethodElement.getTypeJavaClass();
- assertEquals(retValue,eb.getLocalInterface());
-
- }
- if (eb.isMessageDriven()) {
- objMethodElement.setType(MethodElementKind.UNSPECIFIED_LITERAL);
- retValue = objMethodElement.getTypeJavaClass();
- assertEquals(retValue,eb.getEjbClass());
- }
-
- }
-
-
-
- /* public void test_getMethods() {
-
- }
-
- public void test_getMostSpecific() {
-
- MethodElement objMethodElement = getInstance();
- MethodElement aMethodElement = null;
- JavaClass aClass = null;
- MethodElement retValue = null;
- retValue = objMethodElement.getMostSpecific(aMethodElement, aClass);
- }*/
-
- public void test_hasMethodParams() {
- MethodElement objMethodElement = getInstance();
- boolean retValue = false;
- retValue = objMethodElement.hasMethodParams();
- assertEquals(retValue,false);
- String param1 = "param1";
- objMethodElement.addMethodParams(param1);
- retValue = objMethodElement.hasMethodParams();
- assertEquals(retValue,true);
- String param2 = "param2";
- objMethodElement.addMethodParams(param2);
- retValue = objMethodElement.hasMethodParams();
- assertEquals(retValue,true);
- }
-
- public void test_initializeFromSignature() {
- MethodElement objMethodElement = getInstance();
- String signature = "setTwoParamMethod(java.lang.String,java.util.List)";
- objMethodElement.initializeFromSignature(signature);
- List list = objMethodElement.getMethodParams();
- assertEquals(list.size()==2, true) ;
- String name = "setTwoParamMethod";
- assertEquals(list.contains("java.lang.String"),true);
- assertEquals(list.contains("java.util.List"),true);
- assertEquals(objMethodElement.getName(), "setTwoParamMethod");
-
- }
-
- public void test_isDefault() {
- MethodElement objMethodElement = getInstance();
- objMethodElement.setName("test");
- boolean retValue = false;
- retValue = objMethodElement.isDefault();
- assertEquals(retValue,false);
- objMethodElement.setName(JavaClass.DEFAULT_METHOD_NAME);
- retValue = objMethodElement.isDefault();
- assertEquals(retValue,true);
-
- }
-
- public void test_isEquivalent() {
-
- MethodElement objMethodElement1 = getInstance();
- MethodElement objMethodElement2 = getInstance();
-
- Session session1 = getEjbFactory().createSession();
- Session session2 = getEjbFactory().createSession();
- objMethodElement1.setEnterpriseBean(session1);
- objMethodElement2.setEnterpriseBean(session1);
- String signature1 = "setTwoParamMethod(java.lang.String,java.util.List)";
- String signature2 = "setTwoParamMethod2(java.lang.String,java.util.List)";
- objMethodElement1.initializeFromSignature(signature1);
- objMethodElement2.initializeFromSignature(signature1);
- boolean retValue = false;
- retValue = objMethodElement1.isEquivalent(objMethodElement2);
- assertEquals(retValue,true);
- objMethodElement2.initializeFromSignature(signature2);
- retValue = objMethodElement1.isEquivalent(objMethodElement2);
- assertEquals(retValue,false);
-
- objMethodElement2.initializeFromSignature(signature1);
- objMethodElement2.setEnterpriseBean(session2);
- retValue = objMethodElement1.isEquivalent(objMethodElement2);
- assertEquals(retValue,false);
- }
-
- public void test_isHome() {
-
- MethodElement objMethodElement = getInstance();
- objMethodElement.setType(MethodElementKind.HOME_LITERAL);
- boolean retValue = false;
- retValue = objMethodElement.isHome();
- assertEquals(retValue,true);
- objMethodElement.setType(MethodElementKind.LOCAL_HOME_LITERAL);
- retValue = objMethodElement.isHome();
- assertEquals(retValue,false);
-
- }
-
- public void test_isRemote() {
- MethodElement objMethodElement = getInstance();
- objMethodElement.setType(MethodElementKind.REMOTE_LITERAL);
- boolean retValue = false;
- retValue = objMethodElement.isRemote();
- assertEquals(retValue,true);
- objMethodElement.setType(MethodElementKind.LOCAL_HOME_LITERAL);
- retValue = objMethodElement.isRemote();
- assertEquals(retValue,false);
- }
-
- public void test_isUnspecified() {
- MethodElement objMethodElement = getInstance();
- objMethodElement.setType(MethodElementKind.UNSPECIFIED_LITERAL);
- boolean retValue = false;
- retValue = objMethodElement.isUnspecified();
- assertEquals(retValue,true);
- objMethodElement.setType(MethodElementKind.LOCAL_HOME_LITERAL);
- retValue = objMethodElement.isUnspecified();
- assertEquals(retValue,false);
-
- }
-
- public void test_isLocalHome() {
-
- MethodElement objMethodElement = getInstance();
- objMethodElement.setType(MethodElementKind.LOCAL_HOME_LITERAL );
- boolean retValue = false;
- retValue = objMethodElement.isLocalHome();
- assertEquals(retValue,true);
- objMethodElement.setType(MethodElementKind.UNSPECIFIED_LITERAL);
- retValue = objMethodElement.isLocalHome();
- assertEquals(retValue,false);
- }
-
- public void test_isLocal() {
- MethodElement objMethodElement = getInstance();
- objMethodElement.setType(MethodElementKind.LOCAL_LITERAL );
- boolean retValue = false;
- retValue = objMethodElement.isLocal();
- assertEquals(retValue,true);
- objMethodElement.setType(MethodElementKind.UNSPECIFIED_LITERAL);
- retValue = objMethodElement.isLocal();
- assertEquals(retValue,false);
- }
-
- public void test_isValid() {
- MethodElement objMethodElement = getInstance();
- boolean retValue = false;
- retValue = objMethodElement.isValid();
- }
-
-
- public void test_nameAndParamsEquals() {
-
- MethodElement objMethodElement = getInstance();
- Method aMethod = JavaRefFactoryImpl.getActiveFactory().createMethod();
- String name = "setTwoParamMethod";
- String param1 = "java.lang.String";
- String param2 = "java.util.List";
-
- JavaParameter javaParameter1 = JavaRefFactory.eINSTANCE.createJavaParameter();
- JavaHelpers type1 = JavaRefFactory.eINSTANCE.createClassRef("java.lang.String");
- javaParameter1.setEType(type1);
-
- JavaParameter javaParameter2 = JavaRefFactory.eINSTANCE.createJavaParameter();
- JavaHelpers type2 = JavaRefFactory.eINSTANCE.createClassRef("java.util.List");
- javaParameter2.setEType(type2);
-
- aMethod.setName(name);
- aMethod.getParameters().add(javaParameter1);
- aMethod.getParameters().add(javaParameter2);
-
- objMethodElement.setName(name);
- objMethodElement.addMethodParams(param1);
- objMethodElement.addMethodParams(param2);
-
- boolean retValue = false;
- retValue = objMethodElement.nameAndParamsEquals(aMethod);
- assertEquals(retValue,true);
-
- String name2 = "setTwoParamMethod2";
- objMethodElement.setName(name2);
- retValue = objMethodElement.nameAndParamsEquals(aMethod);
- assertEquals(retValue,false);
-
- objMethodElement.setName(name);
- String param3 = "java.util.List";
- objMethodElement.addMethodParams(param3);
- retValue = objMethodElement.nameAndParamsEquals(aMethod);
- assertEquals(retValue,false);
-
- }
-
- public void test_removeMethodParams() {
-
- MethodElement objMethodElement = getInstance();
- String param1 = "param1";
- String param2= "param2";
- boolean retValue = false;
- objMethodElement.addMethodParams(param1);
- objMethodElement.addMethodParams(param2);
- List list = objMethodElement.getMethodParams();
- retValue = list.contains(param1);
- assertEquals(retValue,true);
- objMethodElement.removeMethodParams(param1);
- list = objMethodElement.getMethodParams();
- retValue = list.contains(param1);
- assertEquals(retValue,false);
- }
-
- /* public void test_represents() {
-
- MethodElement objMethodElement = getInstance();
- Method aMethod = null;
- boolean retValue = false;
- retValue = objMethodElement.represents(aMethod);
- }
-
- public void test_setIdToReadableString() {
-
- MethodElement objMethodElement = getInstance();
- objMethodElement.setIdToReadableString();
- }
-
- public void test_uniquelyIdentifies() {
-
- MethodElement objMethodElement = getInstance();
- Method aMethod = null;
- boolean retValue = false;
- retValue = objMethodElement.uniquelyIdentifies(aMethod);
- } */
-
- /* public void test_getName() {
-
- MethodElement objMethodElement = getInstance();
- String retValue = "";
- retValue = objMethodElement.getName();
- }*/
-
- /* public void test_setName() {
-
- MethodElement objMethodElement = getInstance();
- String newName = "";
- objMethodElement.setName(newName);
- }*/
-
- /* public void test_getParms() {
-
- MethodElement objMethodElement = getInstance();
- String retValue = "";
- retValue = objMethodElement.getParms();
- }
-
- public void test_setParms() {
-
- MethodElement objMethodElement = getInstance();
- String newParms = "";
- objMethodElement.setParms(newParms);
- }*/
-
- /* public void test_getType() {
-
- MethodElement objMethodElement = getInstance();
- MethodElementKind retValue = null;
- retValue = objMethodElement.getType();
- }
-
- public void test_setType() {
-
- MethodElement objMethodElement = getInstance();
- MethodElementKind newType = null;
- objMethodElement.setType(newType);
- }
-
- public void test_unsetType() {
-
- MethodElement objMethodElement = getInstance();
- objMethodElement.unsetType();
- }
-
- public void test_isSetType() {
-
- MethodElement objMethodElement = getInstance();
- boolean retValue = false;
- retValue = objMethodElement.isSetType();
- }*/
-
- /* public void test_getDescription() {
-
- MethodElement objMethodElement = getInstance();
- String retValue = "";
- retValue = objMethodElement.getDescription();
- }
-
- public void test_setDescription() {
-
- MethodElement objMethodElement = getInstance();
- String newDescription = "";
- objMethodElement.setDescription(newDescription);
- }*/
-
- /* public void test_getEnterpriseBean() {
-
- MethodElement objMethodElement = getInstance();
- EnterpriseBean retValue = null;
- retValue = objMethodElement.getEnterpriseBean();
- }
-
-
- public void test_setEnterpriseBean() {
-
- MethodElement objMethodElement = getInstance();
- EnterpriseBean newEnterpriseBean = null;
- objMethodElement.setEnterpriseBean(newEnterpriseBean);
- }*/
-
- /* public void test_getDescriptions() {
-
- MethodElement objMethodElement = getInstance();
- EList retValue = null;
- retValue = objMethodElement.getDescriptions();
- }*/
-
- public static Test suite() {
- return new TestSuite(MethodElementTest.class);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/MethodPermissionTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/MethodPermissionTest.java
deleted file mode 100644
index f0345708..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/MethodPermissionTest.java
+++ /dev/null
@@ -1,187 +0,0 @@
-package org.eclipse.jst.j2ee.ejb.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.CommonPackage;
-import org.eclipse.jst.j2ee.common.SecurityRole;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.MethodPermission;
-
-public class MethodPermissionTest extends TestCase {
-
- private static final EjbFactory EJBFACTORY = EjbPackage.eINSTANCE.getEjbFactory();
- private static final CommonFactory COMMONFACTORY = CommonPackage.eINSTANCE.getCommonFactory();
- private MethodPermission getInstance() {
- return EJBFACTORY.createMethodPermission();
- }
-
-
- public void test_MethodPermission() {
- MethodPermission tmpMethodPermission = getInstance();
- assertNotNull(tmpMethodPermission);
- }
-
- /*public void test_getMethodElements() {
-
- MethodPermission objMethodPermission = getInstance();
- EnterpriseBean anEJB = null;
- List retValue = null;
- retValue = objMethodPermission.getMethodElements(anEJB);
- }*/
-
- public void test_getSecurityRole() {
-
- MethodPermission objMethodPermission = getInstance();
- SecurityRole securityRole= COMMONFACTORY.createSecurityRole();
- String securityRoleName = "testRole";
- securityRole.setRoleName(securityRoleName);
- objMethodPermission.getRoles().add(securityRole);
-
- SecurityRole retValue = null;
- retValue = objMethodPermission.getSecurityRole(securityRoleName);
- assertEquals(securityRole,retValue);
- }
-
- public void test_hasSecurityRole() {
- MethodPermission objMethodPermission = getInstance();
- SecurityRole securityRole= COMMONFACTORY.createSecurityRole();
- String securityRoleName = "testRole";
- securityRole.setRoleName(securityRoleName);
- objMethodPermission.getRoles().add(securityRole);
- boolean retValue = objMethodPermission.hasSecurityRole(securityRole);
- assertEquals(retValue, true);
- SecurityRole securityRole2= COMMONFACTORY.createSecurityRole();
- retValue = objMethodPermission.hasSecurityRole(securityRole2);
- assertEquals(retValue, false);
- }
-
- public void test_hasSecurityRole_2() {
-
- MethodPermission objMethodPermission = getInstance();
- SecurityRole securityRole= COMMONFACTORY.createSecurityRole();
- String securityRoleName = "testRole";
- securityRole.setRoleName(securityRoleName);
- objMethodPermission.getRoles().add(securityRole);
- boolean retValue = objMethodPermission.hasSecurityRole(securityRoleName);
- assertEquals(retValue, true);
- String securityRoleNameDoesNotExist = "testRoleDoesNotExist";
- retValue = objMethodPermission.hasSecurityRole(securityRoleNameDoesNotExist);
- assertEquals(retValue, false);
- }
-
- public void test_isEquivalent() {
-
- MethodPermission objMethodPermission1 = getInstance();
- MethodPermission objMethodPermission2 = getInstance();
-
- SecurityRole securityRole1= COMMONFACTORY.createSecurityRole();
- securityRole1.setRoleName("testRole1");
- SecurityRole securityRole2= COMMONFACTORY.createSecurityRole();
- securityRole2.setRoleName("testRole2");
- SecurityRole securityRole3= COMMONFACTORY.createSecurityRole();
- securityRole3.setRoleName("testRole3");
-
-
- objMethodPermission1.getRoles().add(securityRole1);
- objMethodPermission1.getRoles().add(securityRole2);
-
- objMethodPermission2.getRoles().add(securityRole1);
- objMethodPermission2.getRoles().add(securityRole2);
-
-
- boolean retValue = objMethodPermission1.isEquivalent(objMethodPermission2);
- assertEquals(retValue, true);
-
- objMethodPermission1.getRoles().add(securityRole3);
- retValue = objMethodPermission1.isEquivalent(objMethodPermission2);
- assertEquals(retValue, false);
-
-
- }
-
- /* public void test_getDescription() {
-
- MethodPermission objMethodPermission = getInstance();
- String retValue = "";
- retValue = objMethodPermission.getDescription();
- }
-
- public void test_setDescription() {
-
- MethodPermission objMethodPermission = getInstance();
- String newDescription = "";
- objMethodPermission.setDescription(newDescription);
- }*/
-
- /* public void test_isUnchecked() {
-
- MethodPermission objMethodPermission = getInstance();
- boolean retValue = false;
- retValue = objMethodPermission.isUnchecked();
- }*/
-
- /* public void test_setUnchecked() {
-
- MethodPermission objMethodPermission = getInstance();
- boolean newUnchecked = false;
- objMethodPermission.setUnchecked(newUnchecked);
- }*/
-
- /* public void test_unsetUnchecked() {
-
- MethodPermission objMethodPermission = getInstance();
- objMethodPermission.unsetUnchecked();
- }*/
-
- /*public void test_isSetUnchecked() {
-
- MethodPermission objMethodPermission = getInstance();
- boolean retValue = false;
- retValue = objMethodPermission.isSetUnchecked();
- }*/
-
- /* public void test_getAssemblyDescriptor() {
-
- MethodPermission objMethodPermission = getInstance();
- AssemblyDescriptor retValue = null;
- retValue = objMethodPermission.getAssemblyDescriptor();
- }
-
- public void test_setAssemblyDescriptor() {
-
- MethodPermission objMethodPermission = getInstance();
- AssemblyDescriptor newAssemblyDescriptor = null;
- objMethodPermission.setAssemblyDescriptor(newAssemblyDescriptor);
- }*/
-
- /* public void test_getRoles() {
-
- MethodPermission objMethodPermission = getInstance();
- EList retValue = null;
- retValue = objMethodPermission.getRoles();
- }*/
-
- /* public void test_getMethodElements_2() {
-
- MethodPermission objMethodPermission = getInstance();
- EList retValue = null;
- retValue = objMethodPermission.getMethodElements();
- }*/
-
- /* public void test_getDescriptions() {
-
- MethodPermission objMethodPermission = getInstance();
- EList retValue = null;
- retValue = objMethodPermission.getDescriptions();
- }*/
-
- public static Test suite() {
- return new TestSuite(MethodPermissionTest.class);
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/MethodTransactionTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/MethodTransactionTest.java
deleted file mode 100644
index 17dd98d5..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/MethodTransactionTest.java
+++ /dev/null
@@ -1,160 +0,0 @@
-package org.eclipse.jst.j2ee.ejb.test;
-
-import java.util.List;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.MethodElement;
-import org.eclipse.jst.j2ee.ejb.MethodTransaction;
-import org.eclipse.jst.j2ee.ejb.TransactionAttributeType;
-
-public class MethodTransactionTest extends EjbEMFTestBase {
-
- /**
- * @param name
- */
- public MethodTransactionTest(String name) {
- super(name);
- }
-
- public void test_MethodTransaction() {
- MethodTransaction tmpMethodTransaction = EjbFactory.eINSTANCE.createMethodTransaction();
- assertNotNull(tmpMethodTransaction);
- }
-
-
- public void test_getMethodElements() throws Exception{
- init();
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
- AssemblyDescriptor assemblyDescriptor = DD.getEJBJar().getAssemblyDescriptor();
- assertNotNull(assemblyDescriptor);
- List enterpriseBeans = DD.getEJBJar().getEnterpriseBeans();
- EnterpriseBean eb1 = (EnterpriseBean)enterpriseBeans.get(0);
- // create a method transaction
- MethodTransaction methodTransaction = getEjbFactory().createMethodTransaction();
- List methodTransactions = assemblyDescriptor.getMethodTransactions();
- methodTransactions.add(methodTransaction);
- // create a method element
- MethodElement methodElement = getEjbFactory().createMethodElement();
- methodElement.setEnterpriseBean(eb1);
- methodTransaction.getMethodElements().add(methodElement);
- // get the method element for the enterprise bean
- List methodElements = methodTransaction.getMethodElements(eb1);
- assertEquals(methodElements.contains(methodElement), true);
- }
-
- /**
- *
- * [issue : SA - getMostSpecificMethodElement() - does it need to be an API as it calls
- * to the static member of MethodElementImpl ]
- *
- */
-
- /* public void test_getMostSpecificMethodElement() {
-
- MethodTransaction objMethodTransaction = EjbFactory.eINSTANCE.createMethodTransaction();
- Method aMethod = null;
- MethodElement retValue = null;
- retValue = objMethodTransaction
- .getMostSpecificMethodElement(aMethod);
- } */
-
- public void test_isEquivalent() {
-
- MethodTransaction objMethodTransaction1 = getEjbFactory().createMethodTransaction();
- MethodTransaction objMethodTransaction2 = getEjbFactory().createMethodTransaction();
-
- objMethodTransaction1.setTransactionAttribute(TransactionAttributeType.SUPPORTS_LITERAL);
- objMethodTransaction2.setTransactionAttribute(TransactionAttributeType.SUPPORTS_LITERAL);
-
- boolean retValue = objMethodTransaction1.isEquivalent(objMethodTransaction2);
- assertEquals(retValue,true);
- objMethodTransaction2.setTransactionAttribute(TransactionAttributeType.REQUIRED_LITERAL);
-
- retValue = objMethodTransaction1.isEquivalent(objMethodTransaction2);
- assertEquals(retValue,false);
- }
-
- /* public void test_getTransactionAttribute() {
-
- MethodTransaction objMethodTransaction = EjbFactory.eINSTANCE.createMethodTransaction();
- TransactionAttributeType retValue = null;
- retValue = objMethodTransaction.getTransactionAttribute();
- }
-
- public void test_setTransactionAttribute() {
-
- MethodTransaction objMethodTransaction = EjbFactory.eINSTANCE.createMethodTransaction();
- TransactionAttributeType newTransactionAttribute = null;
- objMethodTransaction
- .setTransactionAttribute(newTransactionAttribute);
- }
-
- public void test_unsetTransactionAttribute() {
-
- MethodTransaction objMethodTransaction = EjbFactory.eINSTANCE.createMethodTransaction();
- objMethodTransaction.unsetTransactionAttribute();
- }
-
- public void test_isSetTransactionAttribute() {
-
- MethodTransaction objMethodTransaction = EjbFactory.eINSTANCE.createMethodTransaction();
- boolean retValue = false;
- retValue = objMethodTransaction.isSetTransactionAttribute();
- }
-*/
- /* public void test_getDescription() {
-
- MethodTransaction objMethodTransaction = EjbFactory.eINSTANCE.createMethodTransaction();
- String retValue = "";
- retValue = objMethodTransaction.getDescription();
- }
-
- public void test_setDescription() {
-
- MethodTransaction objMethodTransaction = EjbFactory.eINSTANCE.createMethodTransaction();
- String newDescription = "";
- objMethodTransaction.setDescription(newDescription);
- }*/
-
- /* public void test_getAssemblyDescriptor() {
-
- MethodTransaction objMethodTransaction = EjbFactory.eINSTANCE.createMethodTransaction();
- AssemblyDescriptor retValue = null;
- retValue = objMethodTransaction.getAssemblyDescriptor();
- }
-
- public void test_setAssemblyDescriptor() {
-
- MethodTransaction objMethodTransaction = EjbFactory.eINSTANCE.createMethodTransaction();
- AssemblyDescriptor newAssemblyDescriptor = null;
- objMethodTransaction.setAssemblyDescriptor(newAssemblyDescriptor);
- } */
-
- /* public void test_getMethodElements_2() {
-
- MethodTransaction objMethodTransaction = EjbFactory.eINSTANCE.createMethodTransaction();
- EList retValue = null;
- retValue = objMethodTransaction.getMethodElements();
- }
-
- public void test_getDescriptions() {
-
- MethodTransaction objMethodTransaction = EjbFactory.eINSTANCE.createMethodTransaction();
- EList retValue = null;
- retValue = objMethodTransaction.getDescriptions();
- } */
-
- public static junit.framework.Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTest(new MethodTransactionTest("test_isEquivalent"));
- suite.addTest(new MethodTransactionTest("test_getMethodElements"));
- return suite;
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/QueryMethodTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/QueryMethodTest.java
deleted file mode 100644
index 23a6ffd5..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/QueryMethodTest.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package org.eclipse.jst.j2ee.ejb.test;
-
-import java.util.List;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.jem.java.JavaClass;
-import org.eclipse.jst.j2ee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBResource;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.ejb.QueryMethod;
-
-public class QueryMethodTest extends EjbEMFTestBase {
-
- /**
- * @param name
- */
- public QueryMethodTest(String name) {
- super(name);
- }
-
-
- /* public void test_getQuery() {
-
- QueryMethod objQueryMethod = EjbFactory.eINSTANCE.createQueryMethod();
- Query retValue = null;
- retValue = objQueryMethod.getQuery();
- }
-
- public void test_setQuery() {
-
- QueryMethod objQueryMethod = EjbFactory.eINSTANCE.createQueryMethod();
- Query newQuery = null;
- objQueryMethod.setQuery(newQuery);
- } */
-
-
-
- public void test_getClientTypeJavaClasses() throws Exception {
- init();
- EJBResource DD = (EJBResource) ejbFile.getDeploymentDescriptorResource();
-
- AssemblyDescriptor assemblyDescriptor = DD.getEJBJar().getAssemblyDescriptor();
- List enterpriseBeans = DD.getEJBJar().getEnterpriseBeans();
- ContainerManagedEntity entityBean = null;
- EnterpriseBean bean = null;
- for (int x=0; x< enterpriseBeans.size(); ++x) {
- bean = (EnterpriseBean) enterpriseBeans.get(x);
- if (bean.isEntity() && bean.isContainerManagedEntity()) {
- entityBean = (ContainerManagedEntity) bean;
- break;
- }
- }
- assertNotNull(entityBean);
- QueryMethod objQueryMethod =getEjbFactory().createQueryMethod();
- objQueryMethod.setName(QueryMethod.SELECT_PREFIX+"Test");
- objQueryMethod.setEnterpriseBean(entityBean);
- JavaClass[] retValue = objQueryMethod.getClientTypeJavaClasses();
- assertNotNull(retValue);
- assertEquals(retValue.length==1,true );
- assertEquals(retValue[0],entityBean.getEjbClass());
-
- objQueryMethod.setName(QueryMethod.FIND_PREFIX+"Test");
-
- if (entityBean.hasLocalClient() && !entityBean.hasRemoteClient()) {
- retValue = objQueryMethod.getClientTypeJavaClasses();
- assertNotNull(retValue);
- assertEquals(retValue.length==1,true );
- assertEquals(retValue[0],entityBean.getLocalHomeInterface());
- }
- if (entityBean.hasRemoteClient() && !entityBean.hasLocalClient()) {
- retValue = objQueryMethod.getClientTypeJavaClasses();
- assertNotNull(retValue);
- assertEquals(retValue.length==1,true );
- assertEquals(retValue[0],entityBean.getHomeInterface());
- }
- if (entityBean.hasRemoteClient() && entityBean.hasLocalClient()) {
- retValue = objQueryMethod.getClientTypeJavaClasses();
- assertNotNull(retValue);
- assertEquals(retValue.length==2,true );
- assertEquals(retValue[0],entityBean.getLocalHomeInterface());
- assertEquals(retValue[1],entityBean.getHomeInterface());
- }
- }
-
- public static junit.framework.Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTest(new QueryMethodTest("test_getClientTypeJavaClasses"));
- return suite;
- }
-
-
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/QueryTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/QueryTest.java
deleted file mode 100644
index f62d6465..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/QueryTest.java
+++ /dev/null
@@ -1,130 +0,0 @@
-package org.eclipse.jst.j2ee.ejb.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.Query;
-import org.eclipse.jst.j2ee.ejb.ReturnTypeMapping;
-
-public class QueryTest extends TestCase {
-
- public void test_Query() {
- Query tmpQuery = EjbFactory.eINSTANCE.createQuery();
- assertNotNull(tmpQuery);
- }
- public static Test suite() {
- return new TestSuite(QueryTest.class);
- }
-
- public void test_isLocalResultMapping() {
-
- Query objQuery = EjbFactory.eINSTANCE.createQuery();
- objQuery.setReturnTypeMapping(ReturnTypeMapping.LOCAL_LITERAL);
- assertEquals(objQuery.isLocalResultMapping(),true);
- objQuery.setReturnTypeMapping(ReturnTypeMapping.REMOTE_LITERAL);
- assertEquals(objQuery.isLocalResultMapping(),false);
-
- }
-
- public void test_isRemoteResultMapping() {
-
- Query objQuery = EjbFactory.eINSTANCE.createQuery();
- objQuery.setReturnTypeMapping(ReturnTypeMapping.REMOTE_LITERAL);
- assertEquals(objQuery.isLocalResultMapping(),false);
- objQuery.setReturnTypeMapping(ReturnTypeMapping.LOCAL_LITERAL);
- assertEquals(objQuery.isLocalResultMapping(),true);
-
- }
-
- /* public void test_getDescription() {
-
- Query objQuery = EjbFactory.eINSTANCE.createQuery();
- String retValue = "";
- retValue = objQuery.getDescription();
- }
-
- public void test_setDescription() {
-
- Query objQuery = EjbFactory.eINSTANCE.createQuery();
- String newDescription = "";
- objQuery.setDescription(newDescription);
- }
-
- public void test_getEjbQL() {
-
- Query objQuery = EjbFactory.eINSTANCE.createQuery();
- String retValue = "";
- retValue = objQuery.getEjbQL();
- }
-
- public void test_setEjbQL() {
-
- Query objQuery = EjbFactory.eINSTANCE.createQuery();
- String newEjbQL = "";
- objQuery.setEjbQL(newEjbQL);
- } */
-
- /* public void test_getReturnTypeMapping() {
-
- Query objQuery = EjbFactory.eINSTANCE.createQuery();
- ReturnTypeMapping retValue = null;
- retValue = objQuery.getReturnTypeMapping();
- }
-
- public void test_setReturnTypeMapping() {
-
- Query objQuery = EjbFactory.eINSTANCE.createQuery();
- ReturnTypeMapping newReturnTypeMapping = null;
- objQuery.setReturnTypeMapping(newReturnTypeMapping);
- }
-
- public void test_unsetReturnTypeMapping() {
-
- Query objQuery = EjbFactory.eINSTANCE.createQuery();
- objQuery.unsetReturnTypeMapping();
- }
-
- public void test_isSetReturnTypeMapping() {
-
- Query objQuery = EjbFactory.eINSTANCE.createQuery();
- boolean retValue = false;
- retValue = objQuery.isSetReturnTypeMapping();
- }*/
-
- /* public void test_getQueryMethod() {
-
- Query objQuery = EjbFactory.eINSTANCE.createQuery();
- QueryMethod retValue = null;
- retValue = objQuery.getQueryMethod();
- }
-
- public void test_setQueryMethod() {
-
- Query objQuery = EjbFactory.eINSTANCE.createQuery();
- QueryMethod newQueryMethod = null;
- objQuery.setQueryMethod(newQueryMethod);
- }*/
-
- /* public void test_getEntity() {
-
- Query objQuery = EjbFactory.eINSTANCE.createQuery();
- ContainerManagedEntity retValue = null;
- retValue = objQuery.getEntity();
- }
-
- public void test_setEntity() {
-
- Query objQuery = EjbFactory.eINSTANCE.createQuery();
- ContainerManagedEntity newEntity = null;
- objQuery.setEntity(newEntity);
- }*/
-
- /*public void test_getDescriptions() {
-
- Query objQuery = EjbFactory.eINSTANCE.createQuery();
- EList retValue = null;
- retValue = objQuery.getDescriptions();
- }*/
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/SessionTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/SessionTest.java
deleted file mode 100644
index 4077fd00..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/ejb/test/SessionTest.java
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.eclipse.jst.j2ee.ejb.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.ejb.EjbFactory;
-import org.eclipse.jst.j2ee.ejb.EjbPackage;
-import org.eclipse.jst.j2ee.ejb.Session;
-
-public class SessionTest extends TestCase {
-
- public static Test suite() {
- return new TestSuite(SessionTest.class);
- }
-
- /* public void test_getTransactionType() {
-
- Session objSession = EjbFactory.eINSTANCE.createSession();
- TransactionType retValue = null;
- retValue = objSession.getTransactionType();
- }
-
- public void test_setTransactionType() {
-
- Session objSession = EjbFactory.eINSTANCE.createSession();
- TransactionType newTransactionType = null;
- objSession.setTransactionType(newTransactionType);
- }
-
- public void test_unsetTransactionType() {
-
- Session objSession = EjbFactory.eINSTANCE.createSession();
- objSession.unsetTransactionType();
- }
-
- public void test_isSetTransactionType() {
-
- Session objSession = EjbFactory.eINSTANCE.createSession();
- boolean retValue = false;
- retValue = objSession.isSetTransactionType();
- }*/
-
- /* public void test_getSessionType() {
-
- Session objSession = EjbFactory.eINSTANCE.createSession();
- SessionType retValue = null;
- retValue = objSession.getSessionType();
- }
-
- public void test_setSessionType() {
-
- Session objSession = EjbFactory.eINSTANCE.createSession();
- SessionType newSessionType = null;
- objSession.setSessionType(newSessionType);
- }
-
- public void test_unsetSessionType() {
-
- Session objSession = EjbFactory.eINSTANCE.createSession();
- objSession.unsetSessionType();
- }
-
- public void test_isSetSessionType() {
-
- Session objSession = EjbFactory.eINSTANCE.createSession();
- boolean retValue = false;
- retValue = objSession.isSetSessionType();
- }*/
-
- /* public void test_getServiceEndpoint() {
-
- Session objSession = EjbFactory.eINSTANCE.createSession();
- JavaClass retValue = null;
- retValue = objSession.getServiceEndpoint();
- }
-
-
- public void test_setServiceEndpoint() {
-
- Session objSession = EjbFactory.eINSTANCE.createSession();
- JavaClass newServiceEndpoint = null;
- objSession.setServiceEndpoint(newServiceEndpoint);
- }*/
-
- public void test_setServiceEndpointName() {
-
- Session objSession = EjbPackage.eINSTANCE.getEjbFactory().createSession();
- String serviceEndpointName = "SessionEndPoint1";
- objSession.setServiceEndpointName(serviceEndpointName);
- assertEquals(serviceEndpointName,objSession.getServiceEndpointName());
-
- }
-
- public void test_hasServiceEndpoint() {
-
- Session objSession = EjbFactory.eINSTANCE.createSession();
- assertEquals(objSession.hasServiceEndpoint(),false);
- boolean retValue = false;
- String serviceEndpointName = "SessionEndPoint1";
- objSession.setServiceEndpointName(serviceEndpointName);
- retValue = objSession.hasServiceEndpoint();
- assertEquals(objSession.hasServiceEndpoint(),true);
-
- }
-
- public void test_getServiceEndpointName() {
-
- Session objSession = EjbPackage.eINSTANCE.getEjbFactory().createSession();
- String serviceEndpointName = "SessionEndPoint1";
- objSession.setServiceEndpointName(serviceEndpointName);
- assertEquals(serviceEndpointName,objSession.getServiceEndpointName());
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/jca/test/ConnectorTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/jca/test/ConnectorTest.java
deleted file mode 100644
index 317c8d5e..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/jca/test/ConnectorTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eclipse.jst.j2ee.jca.test;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.archive.emftests.RarEMFTest;
-import org.eclipse.jst.j2ee.archive.testutilities.EMFAttributeFeatureGenerator;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.ConnectorResource;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-
-public class ConnectorTest extends RarEMFTest {
-
- /**
- * @param name
- */
- public ConnectorTest(String name) {
- super(name);
- }
-
- public Connector getInstance() {
- return JcaPackage.eINSTANCE.getJcaFactory().createConnector();
- }
-
- public void test_getVersionID() throws Exception {
- EMFAttributeFeatureGenerator.reset();
- createEAR();
- createRAR();
-
- ConnectorResource DD = (ConnectorResource) rarFile.getDeploymentDescriptorResource();
- DD.setVersionID(J2EEVersionConstants.J2EE_1_4_ID);
- setVersion(VERSION_1_4);
- int versionID = DD.getConnector().getVersionID();
- assertEquals(versionID,J2EEVersionConstants.JCA_1_5_ID);
-
- }
-
- public static junit.framework.Test suite() {
- TestSuite suite = new TestSuite();
- suite.addTest(new ConnectorTest("test_getVersionID"));
- return suite;
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/jca/test/JcaFactoryTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/jca/test/JcaFactoryTest.java
deleted file mode 100644
index 48905937..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/jca/test/JcaFactoryTest.java
+++ /dev/null
@@ -1,159 +0,0 @@
-package org.eclipse.jst.j2ee.jca.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.jca.ActivationSpec;
-import org.eclipse.jst.j2ee.jca.AdminObject;
-import org.eclipse.jst.j2ee.jca.AuthenticationMechanism;
-import org.eclipse.jst.j2ee.jca.ConfigProperty;
-import org.eclipse.jst.j2ee.jca.ConnectionDefinition;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.InboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.JcaFactory;
-import org.eclipse.jst.j2ee.jca.JcaPackage;
-import org.eclipse.jst.j2ee.jca.License;
-import org.eclipse.jst.j2ee.jca.MessageAdapter;
-import org.eclipse.jst.j2ee.jca.MessageListener;
-import org.eclipse.jst.j2ee.jca.OutboundResourceAdapter;
-import org.eclipse.jst.j2ee.jca.RequiredConfigPropertyType;
-import org.eclipse.jst.j2ee.jca.ResourceAdapter;
-import org.eclipse.jst.j2ee.jca.SecurityPermission;
-
-public class JcaFactoryTest extends TestCase {
-
- private JcaFactory getInstance() {
- return JcaPackage.eINSTANCE.getJcaFactory();
- }
- public void test_JcaFactory() {
-
- JcaFactory tmpJcaFactory = getInstance();
- }
-
- public static Test suite() {
- return new TestSuite(JcaFactoryTest.class);
- }
-
- public void test_createConnector() {
-
- JcaFactory objJcaFactory = getInstance();
- Connector retValue = null;
- retValue = objJcaFactory.createConnector();
- assertNotNull(retValue);
- }
-
- public void test_createLicense() {
-
- JcaFactory objJcaFactory = getInstance();
- License retValue = null;
- retValue = objJcaFactory.createLicense();
- assertNotNull(retValue);
- }
-
- public void test_createInboundResourceAdapter() {
-
- JcaFactory objJcaFactory = getInstance();
- InboundResourceAdapter retValue = null;
- retValue = objJcaFactory.createInboundResourceAdapter();
- assertNotNull(retValue);
- }
-
- public void test_createOutboundResourceAdapter() {
-
- JcaFactory objJcaFactory = getInstance();
- OutboundResourceAdapter retValue = null;
- retValue = objJcaFactory.createOutboundResourceAdapter();
- assertNotNull(retValue);
- }
-
- public void test_createMessageAdapter() {
-
- JcaFactory objJcaFactory = getInstance();
- MessageAdapter retValue = null;
- retValue = objJcaFactory.createMessageAdapter();
- assertNotNull(retValue);
- }
-
- public void test_createConnectionDefinition() {
-
- JcaFactory objJcaFactory = getInstance();
- ConnectionDefinition retValue = null;
- retValue = objJcaFactory.createConnectionDefinition();
- assertNotNull(retValue);
- }
-
- public void test_createAdminObject() {
-
- JcaFactory objJcaFactory = getInstance();
- AdminObject retValue = null;
- retValue = objJcaFactory.createAdminObject();
- assertNotNull(retValue);
- }
-
- public void test_createMessageListener() {
-
- JcaFactory objJcaFactory = getInstance();
- MessageListener retValue = null;
- retValue = objJcaFactory.createMessageListener();
- assertNotNull(retValue);
- }
-
- public void test_createActivationSpec() {
-
- JcaFactory objJcaFactory = getInstance();
- ActivationSpec retValue = null;
- retValue = objJcaFactory.createActivationSpec();
- assertNotNull(retValue);
- }
-
- public void test_createRequiredConfigPropertyType() {
-
- JcaFactory objJcaFactory = getInstance();
- RequiredConfigPropertyType retValue = null;
- retValue = objJcaFactory.createRequiredConfigPropertyType();
- assertNotNull(retValue);
- }
-
- public void test_createResourceAdapter() {
-
- JcaFactory objJcaFactory = getInstance();
- ResourceAdapter retValue = null;
- retValue = objJcaFactory.createResourceAdapter();
- assertNotNull(retValue);
- }
-
- public void test_createSecurityPermission() {
-
- JcaFactory objJcaFactory = getInstance();
- SecurityPermission retValue = null;
- retValue = objJcaFactory.createSecurityPermission();
- assertNotNull(retValue);
- }
-
- public void test_createAuthenticationMechanism() {
-
- JcaFactory objJcaFactory = getInstance();
- AuthenticationMechanism retValue = null;
- retValue = objJcaFactory.createAuthenticationMechanism();
- assertNotNull(retValue);
- }
-
- public void test_createConfigProperty() {
-
- JcaFactory objJcaFactory = getInstance();
- ConfigProperty retValue = null;
- retValue = objJcaFactory.createConfigProperty();
- assertNotNull(retValue);
- }
-
- public void test_getJcaPackage() {
-
- JcaFactory objJcaFactory = getInstance();
- JcaPackage retValue = null;
- retValue = objJcaFactory.getJcaPackage();
-
- assertNotNull(retValue);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/jsp/test/JspFactoryTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/jsp/test/JspFactoryTest.java
deleted file mode 100644
index 7b1f9876..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/jsp/test/JspFactoryTest.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package org.eclipse.jst.j2ee.jsp.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.jca.test.JcaFactoryTest;
-import org.eclipse.jst.j2ee.jsp.JSPConfig;
-import org.eclipse.jst.j2ee.jsp.JSPPropertyGroup;
-import org.eclipse.jst.j2ee.jsp.JspFactory;
-import org.eclipse.jst.j2ee.jsp.JspPackage;
-import org.eclipse.jst.j2ee.jsp.TagLibRefType;
-
-public class JspFactoryTest extends TestCase {
-
- public static Test suite() {
- return new TestSuite(JcaFactoryTest.class);
- }
-
- private JspFactory getInstance() {
- return JspPackage.eINSTANCE.getJspFactory();
- }
- public void test_createJSPConfig() {
-
- JspFactory objJspFactory = getInstance();
- JSPConfig retValue = null;
- retValue = objJspFactory.createJSPConfig();
- assertNotNull(retValue);
- }
-
- public void test_createJSPPropertyGroup() {
-
- JspFactory objJspFactory = getInstance();
- JSPPropertyGroup retValue = null;
- retValue = objJspFactory.createJSPPropertyGroup();
- assertNotNull(retValue);
- }
-
- public void test_createTagLibRefType() {
-
- JspFactory objJspFactory = getInstance();
- TagLibRefType retValue = null;
- retValue = objJspFactory.createTagLibRefType();
- assertNotNull(retValue);
- }
-
- public void test_getJspPackage() {
-
- JspFactory objJspFactory = getInstance();
- JspPackage retValue = null;
- retValue = objJspFactory.getJspPackage();
- // TODO getWsddPackage method always return null
- assertNotNull(retValue);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/webapplication/test/WebapplicationFactoryTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/webapplication/test/WebapplicationFactoryTest.java
deleted file mode 100644
index 03d0a1d4..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/webapplication/test/WebapplicationFactoryTest.java
+++ /dev/null
@@ -1,281 +0,0 @@
-package org.eclipse.jst.j2ee.webapplication.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.webapplication.AuthConstraint;
-import org.eclipse.jst.j2ee.webapplication.ContextParam;
-import org.eclipse.jst.j2ee.webapplication.ErrorCodeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ErrorPage;
-import org.eclipse.jst.j2ee.webapplication.ExceptionTypeErrorPage;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.FilterMapping;
-import org.eclipse.jst.j2ee.webapplication.FormLoginConfig;
-import org.eclipse.jst.j2ee.webapplication.HTTPMethodType;
-import org.eclipse.jst.j2ee.webapplication.InitParam;
-import org.eclipse.jst.j2ee.webapplication.JSPType;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMapping;
-import org.eclipse.jst.j2ee.webapplication.LocalEncodingMappingList;
-import org.eclipse.jst.j2ee.webapplication.LoginConfig;
-import org.eclipse.jst.j2ee.webapplication.MimeMapping;
-import org.eclipse.jst.j2ee.webapplication.RoleNameType;
-import org.eclipse.jst.j2ee.webapplication.SecurityConstraint;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletMapping;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.SessionConfig;
-import org.eclipse.jst.j2ee.webapplication.TagLibRef;
-import org.eclipse.jst.j2ee.webapplication.URLPatternType;
-import org.eclipse.jst.j2ee.webapplication.UserDataConstraint;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebResourceCollection;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationPackage;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFile;
-import org.eclipse.jst.j2ee.webapplication.WelcomeFileList;
-
-public class WebapplicationFactoryTest extends TestCase {
-
- public static Test suite() {
- return new TestSuite(WebapplicationFactoryTest.class);
- }
-
- private WebapplicationFactory getInstance() {
- return WebapplicationPackage.eINSTANCE.getWebapplicationFactory();
- }
-
- public void test_createWebApp() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- WebApp retValue = null;
- retValue = objWebapplicationFactory.createWebApp();
- assertNotNull(retValue);
- }
-
- public void test_createContextParam() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- ContextParam retValue = null;
- retValue = objWebapplicationFactory.createContextParam();
- assertNotNull(retValue);
- }
-
- public void test_createErrorPage() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- ErrorPage retValue = null;
- retValue = objWebapplicationFactory.createErrorPage();
- assertNotNull(retValue);
- }
-
- public void test_createTagLibRef() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- TagLibRef retValue = null;
- retValue = objWebapplicationFactory.createTagLibRef();
- assertNotNull(retValue);
- }
-
- public void test_createExceptionTypeErrorPage() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- ExceptionTypeErrorPage retValue = null;
- retValue = objWebapplicationFactory.createExceptionTypeErrorPage();
- assertNotNull(retValue);
- }
-
- public void test_createErrorCodeErrorPage() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- ErrorCodeErrorPage retValue = null;
- retValue = objWebapplicationFactory.createErrorCodeErrorPage();
- assertNotNull(retValue);
- }
-
- public void test_createWelcomeFileList() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- WelcomeFileList retValue = null;
- retValue = objWebapplicationFactory.createWelcomeFileList();
- assertNotNull(retValue);
- }
-
- public void test_createWelcomeFile() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- WelcomeFile retValue = null;
- retValue = objWebapplicationFactory.createWelcomeFile();
- assertNotNull(retValue);
- }
-
- public void test_createSecurityConstraint() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- SecurityConstraint retValue = null;
- retValue = objWebapplicationFactory.createSecurityConstraint();
- assertNotNull(retValue);
- }
-
- public void test_createWebResourceCollection() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- WebResourceCollection retValue = null;
- retValue = objWebapplicationFactory.createWebResourceCollection();
- assertNotNull(retValue);
- }
-
- public void test_createURLPatternType() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- URLPatternType retValue = null;
- retValue = objWebapplicationFactory.createURLPatternType();
- assertNotNull(retValue);
- }
-
- public void test_createAuthConstraint() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- AuthConstraint retValue = null;
- retValue = objWebapplicationFactory.createAuthConstraint();
- assertNotNull(retValue);
- }
-
- public void test_createUserDataConstraint() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- UserDataConstraint retValue = null;
- retValue = objWebapplicationFactory.createUserDataConstraint();
- assertNotNull(retValue);
- }
-
- public void test_createLoginConfig() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- LoginConfig retValue = null;
- retValue = objWebapplicationFactory.createLoginConfig();
- assertNotNull(retValue);
- }
-
- public void test_createFormLoginConfig() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- FormLoginConfig retValue = null;
- retValue = objWebapplicationFactory.createFormLoginConfig();
- assertNotNull(retValue);
- }
-
- public void test_createMimeMapping() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- MimeMapping retValue = null;
- retValue = objWebapplicationFactory.createMimeMapping();
- assertNotNull(retValue);
- }
-
- public void test_createSessionConfig() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- SessionConfig retValue = null;
- retValue = objWebapplicationFactory.createSessionConfig();
- assertNotNull(retValue);
- }
-
- public void test_createServletMapping() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- ServletMapping retValue = null;
- retValue = objWebapplicationFactory.createServletMapping();
- assertNotNull(retValue);
- }
-
- public void test_createServlet() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- Servlet retValue = null;
- retValue = objWebapplicationFactory.createServlet();
- assertNotNull(retValue);
- }
-
- public void test_createServletType() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- ServletType retValue = null;
- retValue = objWebapplicationFactory.createServletType();
- assertNotNull(retValue);
- }
-
- public void test_createJSPType() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- JSPType retValue = null;
- retValue = objWebapplicationFactory.createJSPType();
- assertNotNull(retValue);
- }
-
- public void test_createInitParam() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- InitParam retValue = null;
- retValue = objWebapplicationFactory.createInitParam();
- assertNotNull(retValue);
- }
-
- public void test_createFilter() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- Filter retValue = null;
- retValue = objWebapplicationFactory.createFilter();
- assertNotNull(retValue);
- }
-
- public void test_createFilterMapping() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- FilterMapping retValue = null;
- retValue = objWebapplicationFactory.createFilterMapping();
- assertNotNull(retValue);
- }
-
- public void test_createLocalEncodingMappingList() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- LocalEncodingMappingList retValue = null;
- retValue = objWebapplicationFactory
- .createLocalEncodingMappingList();
- assertNotNull(retValue);
- }
-
- public void test_createLocalEncodingMapping() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- LocalEncodingMapping retValue = null;
- retValue = objWebapplicationFactory.createLocalEncodingMapping();
- assertNotNull(retValue);
- }
-
- public void test_createHTTPMethodType() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- HTTPMethodType retValue = null;
- retValue = objWebapplicationFactory.createHTTPMethodType();
- assertNotNull(retValue);
- }
-
- public void test_createRoleNameType() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- RoleNameType retValue = null;
- retValue = objWebapplicationFactory.createRoleNameType();
- assertNotNull(retValue);
- }
-
- public void test_getWebapplicationPackage() {
-
- WebapplicationFactory objWebapplicationFactory = getInstance();
- WebapplicationPackage retValue = null;
- retValue = objWebapplicationFactory.getWebapplicationPackage();
- assertNotNull(retValue);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/webservice/wscommon/test/WscommonFactoryTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/webservice/wscommon/test/WscommonFactoryTest.java
deleted file mode 100644
index fa764fe9..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/webservice/wscommon/test/WscommonFactoryTest.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package org.eclipse.jst.j2ee.webservice.wscommon.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.webservice.wscommon.DescriptionType;
-import org.eclipse.jst.j2ee.webservice.wscommon.DisplayNameType;
-import org.eclipse.jst.j2ee.webservice.wscommon.InitParam;
-import org.eclipse.jst.j2ee.webservice.wscommon.PortName;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPHeader;
-import org.eclipse.jst.j2ee.webservice.wscommon.SOAPRole;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonFactory;
-import org.eclipse.jst.j2ee.webservice.wscommon.WscommonPackage;
-
-public class WscommonFactoryTest extends TestCase {
-
- public static Test suite() {
- return new TestSuite(WscommonFactoryTest.class);
- }
-
- private WscommonFactory getInstance() {
- return WscommonPackage.eINSTANCE.getWscommonFactory();
- }
- public void test_createInitParam() {
-
- WscommonFactory objWscommonFactory = getInstance();
- InitParam retValue = null;
- retValue = objWscommonFactory.createInitParam();
- assertNotNull(retValue);
- }
-
- public void test_createSOAPHeader() {
-
- WscommonFactory objWscommonFactory = getInstance();
- SOAPHeader retValue = null;
- retValue = objWscommonFactory.createSOAPHeader();
- assertNotNull(retValue);
- }
-
- public void test_createSOAPRole() {
-
- WscommonFactory objWscommonFactory = getInstance();
- SOAPRole retValue = null;
- retValue = objWscommonFactory.createSOAPRole();
- assertNotNull(retValue);
- }
-
- public void test_createPortName() {
-
- WscommonFactory objWscommonFactory = getInstance();
- PortName retValue = null;
- retValue = objWscommonFactory.createPortName();
- assertNotNull(retValue);
- }
-
- public void test_createDescriptionType() {
-
- WscommonFactory objWscommonFactory = getInstance();
- DescriptionType retValue = null;
- retValue = objWscommonFactory.createDescriptionType();
- assertNotNull(retValue);
- }
-
- public void test_createDisplayNameType() {
-
- WscommonFactory objWscommonFactory = getInstance();
- DisplayNameType retValue = null;
- retValue = objWscommonFactory.createDisplayNameType();
- assertNotNull(retValue);
- }
-
- public void test_getWscommonPackage() {
-
- WscommonFactory objWscommonFactory = getInstance();
- WscommonPackage retValue = null;
- retValue = objWscommonFactory.getWscommonPackage();
-
- assertNotNull(retValue);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/webservice/wsdd/test/WsddFactoryTest.java b/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/webservice/wsdd/test/WsddFactoryTest.java
deleted file mode 100644
index 6210ab86..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/mofj2eeTests/org/eclipse/jst/j2ee/webservice/wsdd/test/WsddFactoryTest.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package org.eclipse.jst.j2ee.webservice.wsdd.test;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.webservice.wsdd.BeanLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.EJBLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.Handler;
-import org.eclipse.jst.j2ee.webservice.wsdd.PortComponent;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServiceImplBean;
-import org.eclipse.jst.j2ee.webservice.wsdd.ServletLink;
-import org.eclipse.jst.j2ee.webservice.wsdd.WSDLPort;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServiceDescription;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddFactory;
-import org.eclipse.jst.j2ee.webservice.wsdd.WsddPackage;
-
-public class WsddFactoryTest extends TestCase {
-
- public static Test suite() {
- return new TestSuite(WsddFactoryTest.class);
- }
-
- private WsddFactory getInstance() {
- return WsddPackage.eINSTANCE.getWsddFactory();
- }
- public void test_createWebServices() {
-
- WsddFactory objWsddFactory = getInstance();
- WebServices retValue = null;
- retValue = objWsddFactory.createWebServices();
- assertNotNull(retValue);
- }
-
- public void test_createWebServiceDescription() {
-
- WsddFactory objWsddFactory = getInstance();
- WebServiceDescription retValue = null;
- retValue = objWsddFactory.createWebServiceDescription();
- assertNotNull(retValue);
- }
-
- public void test_createPortComponent() {
-
- WsddFactory objWsddFactory = getInstance();
- PortComponent retValue = null;
- retValue = objWsddFactory.createPortComponent();
- assertNotNull(retValue);
- }
-
- public void test_createWSDLPort() {
-
- WsddFactory objWsddFactory = getInstance();
- WSDLPort retValue = null;
- retValue = objWsddFactory.createWSDLPort();
- assertNotNull(retValue);
- }
-
- public void test_createServiceImplBean() {
-
- WsddFactory objWsddFactory = getInstance();
- ServiceImplBean retValue = null;
- retValue = objWsddFactory.createServiceImplBean();
- assertNotNull(retValue);
- }
-
- public void test_createServletLink() {
-
- WsddFactory objWsddFactory = getInstance();
- ServletLink retValue = null;
- retValue = objWsddFactory.createServletLink();
- assertNotNull(retValue);
- }
-
- public void test_createEJBLink() {
-
- WsddFactory objWsddFactory = getInstance();
- EJBLink retValue = null;
- retValue = objWsddFactory.createEJBLink();
- assertNotNull(retValue);
- }
-
- public void test_createHandler() {
-
- WsddFactory objWsddFactory = getInstance();
- Handler retValue = null;
- retValue = objWsddFactory.createHandler();
- assertNotNull(retValue);
- }
-
- public void test_createBeanLink() {
-
- WsddFactory objWsddFactory = getInstance();
- BeanLink retValue = null;
- retValue = objWsddFactory.createBeanLink();
- assertNotNull(retValue);
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/out.xmi b/tests/org.eclipse.jst.j2ee.core.tests/out.xmi
deleted file mode 100644
index 47d30c3a..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/out.xmi
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<org.eclipse.jem.internal.java:JavaClass xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.eclipse.jem.internal.java="java.xmi" name="A" kind="CLASS" public="true">
- <eSuperTypes href="java:/java.lang#Object"/>
- <implementsInterfaces href="java:/com.ibm.etools.java.stressSample#IA"/>
- <fields name="anA" eType="/"/>
- <fields name="aB">
- <eType xsi:type="org.eclipse.jem.internal.java:JavaClass" href="java:/com.ibm.etools.java.stressSample#B"/>
- </fields>
- <fields name="bees">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/com.ibm.etools.java.stressSample#B[]"/>
- </fields>
- <fields name="bees_and_bees">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/com.ibm.etools.java.stressSample#B[][]"/>
- </fields>
- <fields name="ints">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#int[]"/>
- </fields>
- <fields name="ints2">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#int[][]"/>
- </fields>
- <fields name="ints3">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#int[][][]"/>
- </fields>
- <fields name="chars">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#char[]"/>
- </fields>
- <fields name="floats">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#float[]"/>
- </fields>
- <fields name="cools">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#boolean[]"/>
- </fields>
- <fields name="doubles">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#double[]"/>
- </fields>
- <fields name="longs">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#long[]"/>
- </fields>
- <fields name="shorts">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#short[]"/>
- </fields>
- <fields name="bytes">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#byte[]"/>
- </fields>
- <fields name="testString" final="true" static="true">
- <eType xsi:type="org.eclipse.jem.internal.java:JavaClass" href="java:/java.lang#String"/>
- <initializer source="&quot;testing&quot;" name="testString_block"/>
- </fields>
- <methods name="doAllPrimitives">
- <eType xsi:type="org.eclipse.jem.internal.java:JavaDataType" href="java:/#void"/>
- <parameters name="arg0">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#int[]"/>
- </parameters>
- <parameters name="arg1">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#int[][]"/>
- </parameters>
- <parameters name="arg2">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#int[][][]"/>
- </parameters>
- <parameters name="arg3">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#char[]"/>
- </parameters>
- <parameters name="arg4">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#float[]"/>
- </parameters>
- <parameters name="arg5">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#boolean[]"/>
- </parameters>
- <parameters name="arg6">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#double[]"/>
- </parameters>
- <parameters name="arg7">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#long[]"/>
- </parameters>
- <parameters name="arg8">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#short[]"/>
- </parameters>
- <parameters name="arg9">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#byte[]"/>
- </parameters>
- </methods>
- <methods name="doSomething">
- <eType xsi:type="org.eclipse.jem.internal.java:JavaClass" href="java:/com.ibm.etools.java.stressSample#C"/>
- </methods>
- <methods name="getBytes">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#byte[]"/>
- </methods>
- <methods name="getChar">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#char[]"/>
- </methods>
- <methods name="getFloats">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#float[]"/>
- </methods>
- <methods name="getInts">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#int[]"/>
- </methods>
- <methods name="getLongs">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#long[]"/>
- </methods>
- <methods name="getShorts">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/#short[]"/>
- </methods>
- <methods name="returnAs">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/com.ibm.etools.java.stressSample#A[]"/>
- <parameters name="arg0">
- <eType xsi:type="org.eclipse.jem.internal.java:ArrayType" href="java:/com.ibm.etools.java.stressSample#C[]"/>
- </parameters>
- </methods>
- <methods name="A" constructor="true"/>
-</org.eclipse.jem.internal.java:JavaClass>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/plugin.properties b/tests/org.eclipse.jst.j2ee.core.tests/plugin.properties
deleted file mode 100644
index 9f0e0515..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/plugin.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 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
-###############################################################################
-# properties file for org.eclipse.jst.j2ee.core.tests
-Bundle-Name.0 = J2EE Core Tests Component
-Bundle-Vendor.0 = Eclipse Web Tools Platform \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/test.xml b/tests/org.eclipse.jst.j2ee.core.tests/test.xml
deleted file mode 100644
index 79f2b20a..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/test.xml
+++ /dev/null
@@ -1,58 +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.core.tests"/>
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test_3.1.0/library.xml"/>
- <property name="extraVMargs" value="-Xmx700M"/>
-
- <!-- 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.core.tests.bvt.AutomatedBVT" />
- <property name="plugin-path" value="${eclipse-home}/plugins/${plugin-name}"/>
- <property name="extraVMargs" value="${extraVMargs}"/>
- </ant>
- <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.core.api.test.AutomatedAPIBVT" />
- <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
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/MANIFEST.MF
deleted file mode 100644
index 10416508..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,5 +0,0 @@
-Manifest-Version: 1.0
-Ant-Version: Apache Ant 1.5.4
-Created-By: 1.3.0 (IBM Corporation)
-Main-Class: null
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/Table.ddl b/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/Table.ddl
deleted file mode 100644
index 57808613..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/Table.ddl
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
--- Generated by Relational Schema Center on Fri Mar 12 14:32:14 CST 2004
-
-
-CREATE TABLE ACCOUNT
- (ACCOUNTID VARCHAR(250) NOT NULL,
- TYPE1 INTEGER NOT NULL,
- BALANCE DOUBLE PRECISION NOT NULL,
- APR DOUBLE PRECISION NOT NULL);
-
-ALTER TABLE ACCOUNT
- ADD CONSTRAINT PK_ACCOUNT PRIMARY KEY (ACCOUNTID); \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/Map.mapxmi b/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/Map.mapxmi
deleted file mode 100644
index a19a98e5..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/Map.mapxmi
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejbrdbmapping:EjbRdbDocumentRoot xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:RDBSchema="RDBSchema.xmi" xmlns:ejb="ejb.xmi" xmlns:ejbrdbmapping="ejbrdbmapping.xmi" xmlns:Mapping="Mapping.xmi" xmi:id="EjbRdbDocumentRoot_1079123516907" topToBottom="true" commandStack="&lt;collection>&lt;command-creation-record>&lt;class name=&quot;com.ibm.etools.ejbrdbmapping.command.TopDownEjbJarCommand&quot;/>&lt;command-parameter>&lt;ref-object href=&quot;platform:/resource/b63748ba/ejbModule/META-INF/ejb-jar.xml#ejb-jar_ID&quot;/>&lt;null/>&lt;collection>&lt;string value=&quot;TopDownDB&quot;/>&lt;null/>&lt;int value=&quot;18&quot;/>&lt;hashtable>&lt;/hashtable>&lt;hashtable>&lt;/hashtable>&lt;boolean value=&quot;false&quot;/>&lt;boolean value=&quot;false&quot;/>&lt;/collection>&lt;null/>&lt;int value=&quot;-1&quot;/>&lt;/command-parameter>&lt;/command-creation-record>&lt;/collection>">
- <helper xmi:type="ejbrdbmapping:RdbSchemaProperies" xmi:id="RdbSchemaProperies_1079123516907" primitivesDocument="CLOUDSCAPE_V50"/>
- <nested xmi:type="ejbrdbmapping:RDBEjbMapper" xmi:id="RDBEjbMapper_1079123516907">
- <helper xmi:type="ejbrdbmapping:PrimaryTableStrategy" xmi:id="PrimaryTableStrategy_1079123516907">
- <table href="META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID_ACCOUNT.tblxmi#ACCOUNT"/>
- </helper>
- <nested xmi:type="ejbrdbmapping:RDBEjbFieldMapper" xmi:id="RDBEjbFieldMapper_1079123516907">
- <inputs xmi:type="ejb:CMPAttribute" href="META-INF/ejb-jar.xml#Account_accountid"/>
- <outputs xmi:type="RDBSchema:RDBColumn" href="META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID_ACCOUNT.tblxmi#ACCOUNTID"/>
- <typeMapping href="JavatoCLOUDSCAPE_V50TypeMaps.xmi#String-VARCHAR"/>
- </nested>
- <nested xmi:type="ejbrdbmapping:RDBEjbFieldMapper" xmi:id="RDBEjbFieldMapper_1079123516908" optimistic="true">
- <inputs xmi:type="ejb:CMPAttribute" href="META-INF/ejb-jar.xml#Account_type"/>
- <outputs xmi:type="RDBSchema:RDBColumn" href="META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID_ACCOUNT.tblxmi#TYPE1"/>
- <typeMapping href="JavatoCLOUDSCAPE_V50TypeMaps.xmi#int-INTEGER"/>
- </nested>
- <nested xmi:type="ejbrdbmapping:RDBEjbFieldMapper" xmi:id="RDBEjbFieldMapper_1079123516909" optimistic="true">
- <inputs xmi:type="ejb:CMPAttribute" href="META-INF/ejb-jar.xml#Account_balance"/>
- <outputs xmi:type="RDBSchema:RDBColumn" href="META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID_ACCOUNT.tblxmi#BALANCE"/>
- <typeMapping href="JavatoCLOUDSCAPE_V50TypeMaps.xmi#double-DOUBLE"/>
- </nested>
- <nested xmi:type="ejbrdbmapping:RDBEjbFieldMapper" xmi:id="RDBEjbFieldMapper_1079123516910" optimistic="true">
- <inputs xmi:type="ejb:CMPAttribute" href="META-INF/ejb-jar.xml#Account_apr"/>
- <outputs xmi:type="RDBSchema:RDBColumn" href="META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID_ACCOUNT.tblxmi#APR"/>
- <typeMapping href="JavatoCLOUDSCAPE_V50TypeMaps.xmi#double-DOUBLE"/>
- </nested>
- <inputs xmi:type="ejb:ContainerManagedEntity" href="META-INF/ejb-jar.xml#ContainerManagedEntity_1"/>
- <outputs xmi:type="RDBSchema:RDBTable" href="META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID_ACCOUNT.tblxmi#ACCOUNT"/>
- </nested>
- <inputs xmi:type="ejb:EJBJar" href="META-INF/ejb-jar.xml#ejb-jar_ID"/>
- <outputs xmi:type="RDBSchema:RDBDatabase" href="META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB.dbxmi#TopDownDB"/>
- <typeMapping xmi:type="Mapping:MappingRoot" href="JavatoCLOUDSCAPE_V50TypeMaps.xmi#Java_to_CLOUDSCAPE_V50_TypeMaps"/>
-</ejbrdbmapping:EjbRdbDocumentRoot>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/Table.ddl b/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/Table.ddl
deleted file mode 100644
index 57808613..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/Table.ddl
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
--- Generated by Relational Schema Center on Fri Mar 12 14:32:14 CST 2004
-
-
-CREATE TABLE ACCOUNT
- (ACCOUNTID VARCHAR(250) NOT NULL,
- TYPE1 INTEGER NOT NULL,
- BALANCE DOUBLE PRECISION NOT NULL,
- APR DOUBLE PRECISION NOT NULL);
-
-ALTER TABLE ACCOUNT
- ADD CONSTRAINT PK_ACCOUNT PRIMARY KEY (ACCOUNTID); \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB.dbxmi b/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB.dbxmi
deleted file mode 100644
index 914bdeef..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB.dbxmi
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RDBSchema:RDBDatabase xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:RDBSchema="RDBSchema.xmi" xmi:id="TopDownDB" name="TopDownDB">
- <schemata href="META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID.schxmi#NULLID"/>
- <tableGroup xmi:type="RDBSchema:RDBTable" href="META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID_ACCOUNT.tblxmi#ACCOUNT"/>
- <domain href="CLOUDSCAPE_V50_Domain.xmi#SQLVendor_1"/>
-</RDBSchema:RDBDatabase>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID.schxmi b/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID.schxmi
deleted file mode 100644
index ca20a408..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID.schxmi
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RDBSchema:RDBSchema xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:RDBSchema="RDBSchema.xmi" xmi:id="NULLID" name="NULLID">
- <database href="META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB.dbxmi#TopDownDB"/>
- <tables xmi:type="RDBSchema:RDBTable" href="META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID_ACCOUNT.tblxmi#ACCOUNT"/>
-</RDBSchema:RDBSchema>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID_ACCOUNT.tblxmi b/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID_ACCOUNT.tblxmi
deleted file mode 100644
index adf1d752..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID_ACCOUNT.tblxmi
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RDBSchema:RDBTable xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:RDBSchema="RDBSchema.xmi" xmi:id="ACCOUNT" name="ACCOUNT" primaryKey="PK_ACCOUNT">
- <database href="META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB.dbxmi#TopDownDB"/>
- <schema href="META-INF/backends/CLOUDSCAPE_V50_1/TopDownDB_NULLID.schxmi#NULLID"/>
- <columns xmi:type="RDBSchema:RDBColumn" xmi:id="ACCOUNTID" name="ACCOUNTID">
- <type xmi:type="RDBSchema:SQLCharacterStringType" xmi:id="SQLCharacterStringType_1079123516977" length="250">
- <originatingType xmi:type="RDBSchema:SQLCharacterStringType" href="JavatoCLOUDSCAPE_V50TypeMaps.xmi#SQLCharacterStringType_250"/>
- </type>
- </columns>
- <columns xmi:type="RDBSchema:RDBColumn" xmi:id="TYPE1" name="TYPE1">
- <type xmi:type="RDBSchema:SQLExactNumeric" xmi:id="SQLExactNumeric_1079123516977">
- <originatingType xmi:type="RDBSchema:SQLExactNumeric" href="CLOUDSCAPE_V50_Primitives.xmi#SQLExactNumeric_1"/>
- </type>
- </columns>
- <columns xmi:type="RDBSchema:RDBColumn" xmi:id="BALANCE" name="BALANCE">
- <type xmi:type="RDBSchema:SQLApproximateNumeric" xmi:id="SQLApproximateNumeric_1079123516977">
- <originatingType xmi:type="RDBSchema:SQLApproximateNumeric" href="CLOUDSCAPE_V50_Primitives.xmi#SQLApproximateNumeric_1"/>
- </type>
- </columns>
- <columns xmi:type="RDBSchema:RDBColumn" xmi:id="APR" name="APR">
- <type xmi:type="RDBSchema:SQLApproximateNumeric" xmi:id="SQLApproximateNumeric_1079123516978">
- <originatingType xmi:type="RDBSchema:SQLApproximateNumeric" href="CLOUDSCAPE_V50_Primitives.xmi#SQLApproximateNumeric_1"/>
- </type>
- </columns>
- <namedGroup xmi:type="RDBSchema:SQLReference" xmi:id="PK_ACCOUNT" name="PK_ACCOUNT" members="ACCOUNTID" constraint="SQLConstraint_1079123516977"/>
- <constraints xmi:id="SQLConstraint_1079123516977" name="PK_ACCOUNT" type="PRIMARYKEY" primaryKey="PK_ACCOUNT"/>
-</RDBSchema:RDBTable>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/ibm_pmbab.properties b/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/ibm_pmbab.properties
deleted file mode 100644
index d6f62d3a..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/backends/CLOUDSCAPE_V50_1/ibm_pmbab.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-#Fri Mar 12 14:32:01 CST 2004
-Account=com.ibm.websphere.samples.appprofile.accountmanagementejb.websphere_deploy.CLOUDSCAPE_V50_1.AccountBeanAdaptorBinding_0c182135
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/ejb-jar.xml b/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/ejb-jar.xml
deleted file mode 100644
index 9d9860fd..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-
- <ejb-jar id="ejb-jar_ID">
- <display-name>AppProfileSampleEJBModule</display-name>
- <enterprise-beans>
- <entity id="ContainerManagedEntity_1">
- <ejb-name>Account</ejb-name>
- <home>com.ibm.websphere.samples.appprofile.accountmanagementejb.AccountHome</home>
- <remote>com.ibm.websphere.samples.appprofile.accountmanagementejb.Account</remote>
- <local-home>com.ibm.websphere.samples.appprofile.accountmanagementejb.LocalAccountHome</local-home>
- <local>com.ibm.websphere.samples.appprofile.accountmanagementejb.LocalAccount</local>
- <ejb-class>com.ibm.websphere.samples.appprofile.accountmanagementejb.AccountBean</ejb-class>
- <persistence-type>Container</persistence-type>
- <prim-key-class>java.lang.String</prim-key-class>
- <reentrant>False</reentrant>
- <cmp-version>2.x</cmp-version>
- <abstract-schema-name>Account</abstract-schema-name>
- <cmp-field id="Account_accountid">
- <field-name>accountid</field-name>
- </cmp-field>
- <cmp-field id="Account_type">
- <field-name>type</field-name>
- </cmp-field>
- <cmp-field id="Account_balance">
- <field-name>balance</field-name>
- </cmp-field>
- <cmp-field id="Account_apr">
- <field-name>apr</field-name>
- </cmp-field>
- <primkey-field>accountid</primkey-field>
- <query id="Query_1">
- <query-method id="QueryMethod_1">
- <method-name>findLargeAccounts</method-name>
- <method-params>
- <method-param>double</method-param>
- </method-params>
- </query-method>
- <ejb-ql>SELECT OBJECT(a) FROM Account a WHERE a.balance >= ?1</ejb-ql>
- </query>
- <query id="Query_2">
- <query-method id="QueryMethod_2">
- <method-name>findByAccountId</method-name>
- <method-params>
- <method-param>java.lang.String</method-param>
- </method-params>
- </query-method>
- <ejb-ql>SELECT OBJECT(a) FROM Account a WHERE a.accountid = ?1</ejb-ql>
- </query>
- <query id="Query_3">
- <query-method id="QueryMethod_3">
- <method-name>findAllAccounts</method-name>
- <method-params>
- <method-param></method-param>
- </method-params>
- </query-method>
- <ejb-ql>SELECT OBJECT(a) FROM Account a</ejb-ql>
- </query>
- </entity>
- <session id="Session_1">
- <display-name>AccountManager</display-name>
- <ejb-name>AccountManager</ejb-name>
- <home>com.ibm.websphere.samples.appprofile.accountmanagementejb.AccountManagerHome</home>
- <remote>com.ibm.websphere.samples.appprofile.accountmanagementejb.AccountManager</remote>
- <ejb-class>com.ibm.websphere.samples.appprofile.accountmanagementejb.AccountManagerBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <ejb-local-ref id="EJBLocalRef_1">
- <ejb-ref-name>ejb/AppProfileSample-AccountHome</ejb-ref-name>
- <ejb-ref-type>Entity</ejb-ref-type>
- <local-home>com.ibm.websphere.samples.appprofile.accountmanagementejb.LocalAccountHome</local-home>
- <local>com.ibm.websphere.samples.appprofile.accountmanagementejb.LocalAccount</local>
- <ejb-link>Account</ejb-link>
- </ejb-local-ref>
- </session>
- </enterprise-beans>
- </ejb-jar>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/ibm-ejb-jar-bnd.xmi b/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/ibm-ejb-jar-bnd.xmi
deleted file mode 100644
index d690d436..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/ibm-ejb-jar-bnd.xmi
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejbbnd:EJBJarBinding xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ejbbnd="ejbbnd.xmi" xmlns:ejb="ejb.xmi" xmlns:common="common.xmi" xmi:id="ejb-jar_ID_Bnd" currentBackendId="CLOUDSCAPE_V50_1">
- <ejbJar href="META-INF/ejb-jar.xml#ejb-jar_ID"/>
- <ejbBindings xmi:id="ContainerManagedEntity_1_Bnd" jndiName="AppProfileSample-AccountHome">
- <enterpriseBean xmi:type="ejb:ContainerManagedEntity" href="META-INF/ejb-jar.xml#ContainerManagedEntity_1"/>
- </ejbBindings>
- <ejbBindings xmi:id="EnterpriseBeanBinding_1" jndiName="AppProfileSample-AccountManagerHome">
- <enterpriseBean xmi:type="ejb:Session" href="META-INF/ejb-jar.xml#Session_1"/>
- <ejbRefBindings xmi:id="EjbRefBinding_1" jndiName="AppProfileSample-AccountHome">
- <bindingEjbRef xmi:type="common:EJBLocalRef" href="META-INF/ejb-jar.xml#EJBLocalRef_1"/>
- </ejbRefBindings>
- </ejbBindings>
- <defaultCMPConnectionFactory xmi:id="CMPConnectionFactoryBinding_2" jndiName="eis/jdbc/AppProfileSampleDB_CMP" resAuth="Per_Connection_Factory"/>
-</ejbbnd:EJBJarBinding>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/ibm-ejb-jar-ext-pme.xmi b/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/ibm-ejb-jar-ext-pme.xmi
deleted file mode 100644
index 3eeecb16..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/ibm-ejb-jar-ext-pme.xmi
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pmeext:PMEEJBJarExtension xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:appprofileejbext="http://www.ibm.com/websphere/appserver/schemas/5.0/appprofileejbext.xmi" xmlns:ejbext="ejbext.xmi" xmlns:ejb="ejb.xmi" xmlns:pmeext="http://www.ibm.com/websphere/appserver/schemas/5.0/pmeext.xmi" xmi:id="PMEEJBJarExtension_1">
- <appProfileEJBJarExtension xmi:id="AppProfileEJBJarExtension_1">
- <applicationProfiles xmi:id="EJBModuleProfile_1" name="Read-only" description="This profile will apply a read-only access-intent policy to the multifinder for the Account entity bean.">
- <appliedAccessIntents xmi:id="AppliedAccessIntent_1072828753424" name="com.ibm.websphere.ejbquery.Default" description="All methods of the Account bean are set for read only." accessIntentName="wsPessimisticRead">
- <methodElements xmi:id="MethodElement_1072828753424" type="Unspecified">
- <enterpriseBean xmi:type="ejb:ContainerManagedEntity" href="META-INF/ejb-jar.xml#ContainerManagedEntity_1"/>
- </methodElements>
- </appliedAccessIntents>
- <tasks xmi:id="Task_1071093415784" name="getLargeAccounts" description="This task will be used by AccountManager session bean for read-only intent."/>
- </applicationProfiles>
- <ejbJarExtension href="META-INF/ibm-ejb-jar-ext.xmi#ejb-jar_ID_Ext"/>
- <definedAccessIntentPolicies xmi:id="DefinedAccessIntentPolicy_1" name="PessimisticUpdate - Increment 10" description="This is a custom policy that keeps all the attributes of wsPessimisiticUpdate except for collection increment, which is set to 10.">
- <accessIntentEntries xmi:type="ejbext:PessimisticUpdate" xmi:id="PessimisticUpdate_1072824290817"/>
- <accessIntentEntries xmi:type="ejbext:CollectionIncrement" xmi:id="CollectionIncrement_1072824290817" collectionIncrement="10"/>
- <accessIntentEntries xmi:type="ejbext:ResourceManagerPreFetchIncrement" xmi:id="ResourceManagerPreFetchIncrement_1072824290817" preFetchIncrement="0"/>
- <accessIntentEntries xmi:type="ejbext:TransactionScope" xmi:id="TransactionScope_1072824290817"/>
- </definedAccessIntentPolicies>
- <runAsTasks xmi:id="RunAsTask_2" name="getLargeAcounts">
- <taskRunAsKind xmi:type="appprofileejbext:RunAsSpecifiedTask" xmi:id="RunAsSpecifiedTask_2">
- <task xmi:id="Task_5" name="getLargeAccounts" description="for viewing account data only"/>
- </taskRunAsKind>
- <methodElements xmi:id="MethodElement_3" name="getLargeAccounts" parms="double " type="Remote">
- <enterpriseBean xmi:type="ejb:Session" href="META-INF/ejb-jar.xml#Session_1"/>
- </methodElements>
- </runAsTasks>
- <appProfileComponentExtensions xmi:id="AppProfileComponentExtension_1">
- <componentExtension xmi:type="ejbext:SessionExtension" href="META-INF/ibm-ejb-jar-ext.xmi#SessionExtension_1"/>
- </appProfileComponentExtensions>
- <appProfileComponentExtensions xmi:id="AppProfileComponentExtension_2">
- <componentExtension xmi:type="ejbext:ContainerManagedEntityExtension" href="META-INF/ibm-ejb-jar-ext.xmi#ContainerManagedEntity_1_Ext"/>
- </appProfileComponentExtensions>
- </appProfileEJBJarExtension>
-</pmeext:PMEEJBJarExtension>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/ibm-ejb-jar-ext.xmi b/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/ibm-ejb-jar-ext.xmi
deleted file mode 100644
index 673264f2..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/ejb/META-INF/ibm-ejb-jar-ext.xmi
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejbext:EJBJarExtension xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ejbext="ejbext.xmi" xmlns:ejb="ejb.xmi" xmi:id="ejb-jar_ID_Ext">
- <ejbExtensions xmi:type="ejbext:ContainerManagedEntityExtension" xmi:id="ContainerManagedEntity_1_Ext" concurrencyControl="pessimistic">
- <enterpriseBean xmi:type="ejb:ContainerManagedEntity" href="META-INF/ejb-jar.xml#ContainerManagedEntity_1"/>
- <structure xmi:id="BeanStructure_1" inheritenceRoot="false"/>
- <beanCache xmi:id="BeanCache_1" activateAt="TRANSACTION" loadAt="TRANSACTION"/>
- <localTran xmi:id="LocalTran_1" boundary="BEAN_METHOD" unresolvedAction="ROLLBACK"/>
- <dataCache xmi:id="DataCache_1" lifetimeInCache="0" lifetimeInCacheUsage="OFF"/>
- </ejbExtensions>
- <ejbExtensions xmi:type="ejbext:SessionExtension" xmi:id="SessionExtension_1" timeout="600">
- <enterpriseBean xmi:type="ejb:Session" href="META-INF/ejb-jar.xml#Session_1"/>
- <structure xmi:id="BeanStructure_2" inheritenceRoot="false"/>
- <beanCache xmi:id="BeanCache_2" activateAt="ONCE"/>
- <localTran xmi:id="LocalTran_2" boundary="BEAN_METHOD" unresolvedAction="ROLLBACK"/>
- </ejbExtensions>
- <ejbJar href="META-INF/ejb-jar.xml#ejb-jar_ID"/>
- <appliedAccessIntents xmi:id="AppliedAccessIntent_1071093415744" name="com.ibm.websphere.ejbquery.Default" description="" accessIntentName="PessimisticUpdate - Increment 10">
- <methodElements xmi:id="MethodElement_1071093415744" type="Unspecified">
- <enterpriseBean xmi:type="ejb:ContainerManagedEntity" href="META-INF/ejb-jar.xml#ContainerManagedEntity_1"/>
- </methodElements>
- </appliedAccessIntents>
-</ejbext:EJBJarExtension>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/META-INF/MANIFEST.MF
deleted file mode 100644
index 59499bce..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/META-INF/ejb-jar.xml b/tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/META-INF/ejb-jar.xml
deleted file mode 100644
index 2693c860..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar id="ejb-jar_ID" version="2.1"
- xmlns="http://java.sun.com/xml/ns/j2ee" >
- <display-name>
- TestEJB</display-name>
- <enterprise-beans>
- <session id="T1">
- <ejb-name>T1</ejb-name>
- <home>ejbs.T1Home</home>
- <remote>ejbs.T1</remote>
- <ejb-class>ejbs.T1Bean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/ejbs/T1.class b/tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/ejbs/T1.class
deleted file mode 100644
index cda4e08f..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/ejbs/T1.class
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/ejbs/T1Bean.class b/tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/ejbs/T1Bean.class
deleted file mode 100644
index 51cb4f62..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/ejbs/T1Bean.class
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/ejbs/T1Home.class b/tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/ejbs/T1Home.class
deleted file mode 100644
index a5798322..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/no-sl/ejbs/T1Home.class
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/sl/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.j2ee.core.tests/testData/sl/META-INF/MANIFEST.MF
deleted file mode 100644
index 59499bce..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/sl/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/sl/META-INF/ejb-jar.xml b/tests/org.eclipse.jst.j2ee.core.tests/testData/sl/META-INF/ejb-jar.xml
deleted file mode 100644
index af37a039..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/sl/META-INF/ejb-jar.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar id="ejb-jar_ID" 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>
- TestEJB</display-name>
- <enterprise-beans>
- <session id="T1">
- <ejb-name>T1</ejb-name>
- <home>ejbs.T1Home</home>
- <remote>ejbs.T1</remote>
- <ejb-class>ejbs.T1Bean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/sl/ejbs/T1.class b/tests/org.eclipse.jst.j2ee.core.tests/testData/sl/ejbs/T1.class
deleted file mode 100644
index cda4e08f..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/sl/ejbs/T1.class
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/sl/ejbs/T1Bean.class b/tests/org.eclipse.jst.j2ee.core.tests/testData/sl/ejbs/T1Bean.class
deleted file mode 100644
index 51cb4f62..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/sl/ejbs/T1Bean.class
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/sl/ejbs/T1Home.class b/tests/org.eclipse.jst.j2ee.core.tests/testData/sl/ejbs/T1Home.class
deleted file mode 100644
index a5798322..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/sl/ejbs/T1Home.class
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/webservices/META-INF/AnnuityServices_mapping.xml b/tests/org.eclipse.jst.j2ee.core.tests/testData/webservices/META-INF/AnnuityServices_mapping.xml
deleted file mode 100644
index e2fdcbdc..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/webservices/META-INF/AnnuityServices_mapping.xml
+++ /dev/null
@@ -1,461 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd">
- <package-mapping>
- <package-type>com.ibm.wssvt.tc.pli.data</package-type>
- <namespaceURI>http://data.pli.tc.wssvt.ibm.com</namespaceURI>
- </package-mapping>
- <package-mapping>
- <package-type>com.ibm.wssvt.acme.annuity.ws</package-type>
- <namespaceURI>http://ws.annuity.acme.wssvt.ibm.com</namespaceURI>
- </package-mapping>
- <java-xml-type-mapping>
- <java-type>double</java-type>
- <root-type-qname xmlns:rtq="http://www.w3.org/2001/XMLSchema">rtq:double</root-type-qname>
- <qname-scope>simpleType</qname-scope>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>java.util.Vector</java-type>
- <root-type-qname xmlns:rtq="http://xml.apache.org/xml-soap">rtq:Vector</root-type-qname>
- <qname-scope>simpleType</qname-scope>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>java.lang.String</java-type>
- <root-type-qname xmlns:rtq="http://www.w3.org/2001/XMLSchema">rtq:string</root-type-qname>
- <qname-scope>simpleType</qname-scope>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>com.ibm.wssvt.tc.pli.data.WSAnnuityCompositeData</java-type>
- <root-type-qname xmlns:rtq="http://data.pli.tc.wssvt.ibm.com">rtq:WSAnnuityCompositeData</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>WSAnnuity Data</java-variable-name>
- <xml-element-name>WSAnnuity Data</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>subAccounts</java-variable-name>
- <xml-element-name>subAccounts</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>com.ibm.wssvt.tc.pli.data.WSAnnuityData</java-type>
- <root-type-qname xmlns:rtq="http://data.pli.tc.wssvt.ibm.com">rtq:WSAnnuityData</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>taxStatus</java-variable-name>
- <xml-element-name>taxStatus</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>type</java-variable-name>
- <xml-element-name>type</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>amount</java-variable-name>
- <xml-element-name>amount</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>endDate</java-variable-name>
- <xml-element-name>endDate</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>custNumber</java-variable-name>
- <xml-element-name>custNumber</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>custName</java-variable-name>
- <xml-element-name>custName</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>custSSNum</java-variable-name>
- <xml-element-name>custSSNum</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>EMail</java-variable-name>
- <xml-element-name>EMail</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>annuityNo</java-variable-name>
- <xml-element-name>annuityNo</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>premium</java-variable-name>
- <xml-element-name>premium</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>beginDate</java-variable-name>
- <xml-element-name>beginDate</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>status</java-variable-name>
- <xml-element-name>status</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>fixedPeriod</java-variable-name>
- <xml-element-name>fixedPeriod</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>fixedAmount</java-variable-name>
- <xml-element-name>fixedAmount</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>life</java-variable-name>
- <xml-element-name>life</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>lifeWithPeriod</java-variable-name>
- <xml-element-name>lifeWithPeriod</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>fixedPercent</java-variable-name>
- <xml-element-name>fixedPercent</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>actualPercent</java-variable-name>
- <xml-element-name>actualPercent</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>benefitOptions</java-variable-name>
- <xml-element-name>benefitOptions</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>premiumSched</java-variable-name>
- <xml-element-name>premiumSched</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>investCategory</java-variable-name>
- <xml-element-name>investCategory</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>payoutOptions</java-variable-name>
- <xml-element-name>payoutOptions</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>guarPayout</java-variable-name>
- <xml-element-name>guarPayout</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>numSubAccts</java-variable-name>
- <xml-element-name>numSubAccts</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>extraCredits</java-variable-name>
- <xml-element-name>extraCredits</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>cellNodeServerName</java-variable-name>
- <xml-element-name>cellNodeServerName</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>clientId</java-variable-name>
- <xml-element-name>clientId</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>int</java-type>
- <root-type-qname xmlns:rtq="http://www.w3.org/2001/XMLSchema">rtq:int</root-type-qname>
- <qname-scope>simpleType</qname-scope>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>java.util.Calendar</java-type>
- <root-type-qname xmlns:rtq="http://www.w3.org/2001/XMLSchema">rtq:dateTime</root-type-qname>
- <qname-scope>simpleType</qname-scope>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>com.ibm.wssvt.tc.pli.data.SubAcctData[]</java-type>
- <anonymous-type-qname>http://data.pli.tc.wssvt.ibm.com:SubAcctData[0,unbounded]</anonymous-type-qname>
- <qname-scope>complexType</qname-scope>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>com.ibm.wssvt.tc.pli.data.SubAcctData</java-type>
- <root-type-qname xmlns:rtq="http://data.pli.tc.wssvt.ibm.com">rtq:SubAcctData</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>type</java-variable-name>
- <xml-element-name>type</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>value</java-variable-name>
- <xml-element-name>value</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>annuityId</java-variable-name>
- <xml-element-name>annuityId</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>id</java-variable-name>
- <xml-element-name>id</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>name</java-variable-name>
- <xml-element-name>name</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>cellNodeServerName</java-variable-name>
- <xml-element-name>cellNodeServerName</xml-element-name>
- </variable-mapping>
- <variable-mapping>
- <java-variable-name>clientId</java-variable-name>
- <xml-element-name>clientId</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>boolean</java-type>
- <root-type-qname xmlns:rtq="http://www.w3.org/2001/XMLSchema">rtq:boolean</root-type-qname>
- <qname-scope>simpleType</qname-scope>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>com.ibm.wssvt.tc.pli.data.SubAcctData[]</java-type>
- <root-type-qname xmlns:rtq="http://ws.annuity.acme.wssvt.ibm.com">rtq:ArrayOf_tns2_nillable_SubAcctData</root-type-qname>
- <qname-scope>complexType</qname-scope>
- <variable-mapping>
- <java-variable-name>subAcctData</java-variable-name>
- <xml-element-name>SubAcctData</xml-element-name>
- </variable-mapping>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>com.ibm.wssvt.tc.pli.data.SubAcctData[]</java-type>
- <anonymous-type-qname>http://ws.annuity.acme.wssvt.ibm.com:ArrayOf_tns2_nillable_SubAcctData&gt;SubAcctData[0,unbounded]</anonymous-type-qname>
- <qname-scope>complexType</qname-scope>
- </java-xml-type-mapping>
- <java-xml-type-mapping>
- <java-type>java.lang.Object[]</java-type>
- <anonymous-type-qname>http://xml.apache.org/xml-soap:Vector&gt;item[0,unbounded]</anonymous-type-qname>
- <qname-scope>complexType</qname-scope>
- </java-xml-type-mapping>
- <service-interface-mapping>
- <service-interface>com.ibm.wssvt.acme.annuity.ws.WSTAnnuityService</service-interface>
- <wsdl-service-name xmlns:sim="http://ws.annuity.acme.wssvt.ibm.com">sim:WSTAnnuityService</wsdl-service-name>
- <port-mapping>
- <port-name>WSTAnnuityService</port-name>
- <java-port-name>WSTAnnuityService</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>com.ibm.wssvt.acme.annuity.ws.AnnuityServicePortType</service-endpoint-interface>
- <wsdl-port-type xmlns:seimwpt="http://ws.annuity.acme.wssvt.ibm.com">seimwpt:AnnuityServicePortType</wsdl-port-type>
- <wsdl-binding xmlns:seimwb="http://ws.annuity.acme.wssvt.ibm.com">seimwb:AnnuityServiceBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>wsListAnnuityByHolder</java-method-name>
- <wsdl-operation>wsListAnnuityByHolder</wsdl-operation>
- <wrapped-element></wrapped-element>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:mppm="http://ws.annuity.acme.wssvt.ibm.com">mppm:wsListAnnuityByHolderRequest</wsdl-message>
- <wsdl-message-part-name>holderSSN</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.util.Vector</method-return-value>
- <wsdl-message xmlns:wrvm="http://ws.annuity.acme.wssvt.ibm.com">wrvm:wsListAnnuityByHolderResponse</wsdl-message>
- <wsdl-message-part-name>wsListAnnuityByHolderReturn</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- <service-endpoint-method-mapping>
- <java-method-name>wsAddSubAccounts</java-method-name>
- <wsdl-operation>wsAddSubAccounts</wsdl-operation>
- <wrapped-element></wrapped-element>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>com.ibm.wssvt.tc.pli.data.WSAnnuityCompositeData</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:mppm="http://ws.annuity.acme.wssvt.ibm.com">mppm:wsAddSubAccountsRequest</wsdl-message>
- <wsdl-message-part-name>aCD</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <method-param-parts-mapping>
- <param-position>1</param-position>
- <param-type>com.ibm.wssvt.tc.pli.data.SubAcctData[]</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:mppm="http://ws.annuity.acme.wssvt.ibm.com">mppm:wsAddSubAccountsRequest</wsdl-message>
- <wsdl-message-part-name>sAD</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>com.ibm.wssvt.tc.pli.data.WSAnnuityCompositeData</method-return-value>
- <wsdl-message xmlns:wrvm="http://ws.annuity.acme.wssvt.ibm.com">wrvm:wsAddSubAccountsResponse</wsdl-message>
- <wsdl-message-part-name>wsAddSubAccountsReturn</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- <service-endpoint-method-mapping>
- <java-method-name>wsCreateAnnuity</java-method-name>
- <wsdl-operation>wsCreateAnnuity</wsdl-operation>
- <wrapped-element></wrapped-element>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>com.ibm.wssvt.tc.pli.data.WSAnnuityCompositeData</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:mppm="http://ws.annuity.acme.wssvt.ibm.com">mppm:wsCreateAnnuityRequest</wsdl-message>
- <wsdl-message-part-name>aCD</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>com.ibm.wssvt.tc.pli.data.WSAnnuityCompositeData</method-return-value>
- <wsdl-message xmlns:wrvm="http://ws.annuity.acme.wssvt.ibm.com">wrvm:wsCreateAnnuityResponse</wsdl-message>
- <wsdl-message-part-name>wsCreateAnnuityReturn</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
- <service-interface-mapping>
- <service-interface>com.ibm.wssvt.acme.annuity.ws.AnnuityService</service-interface>
- <wsdl-service-name xmlns:sim="http://ws.annuity.acme.wssvt.ibm.com">sim:AnnuityService</wsdl-service-name>
- <port-mapping>
- <port-name>AnnuityService</port-name>
- <java-port-name>AnnuityService</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>com.ibm.wssvt.acme.annuity.ws.AnnuityServicePortType</service-endpoint-interface>
- <wsdl-port-type xmlns:seimwpt="http://ws.annuity.acme.wssvt.ibm.com">seimwpt:AnnuityServicePortType</wsdl-port-type>
- <wsdl-binding xmlns:seimwb="http://ws.annuity.acme.wssvt.ibm.com">seimwb:AnnuityServiceBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>wsListAnnuityByHolder</java-method-name>
- <wsdl-operation>wsListAnnuityByHolder</wsdl-operation>
- <wrapped-element></wrapped-element>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:mppm="http://ws.annuity.acme.wssvt.ibm.com">mppm:wsListAnnuityByHolderRequest</wsdl-message>
- <wsdl-message-part-name>holderSSN</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.util.Vector</method-return-value>
- <wsdl-message xmlns:wrvm="http://ws.annuity.acme.wssvt.ibm.com">wrvm:wsListAnnuityByHolderResponse</wsdl-message>
- <wsdl-message-part-name>wsListAnnuityByHolderReturn</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- <service-endpoint-method-mapping>
- <java-method-name>wsAddSubAccounts</java-method-name>
- <wsdl-operation>wsAddSubAccounts</wsdl-operation>
- <wrapped-element></wrapped-element>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>com.ibm.wssvt.tc.pli.data.WSAnnuityCompositeData</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:mppm="http://ws.annuity.acme.wssvt.ibm.com">mppm:wsAddSubAccountsRequest</wsdl-message>
- <wsdl-message-part-name>aCD</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <method-param-parts-mapping>
- <param-position>1</param-position>
- <param-type>com.ibm.wssvt.tc.pli.data.SubAcctData[]</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:mppm="http://ws.annuity.acme.wssvt.ibm.com">mppm:wsAddSubAccountsRequest</wsdl-message>
- <wsdl-message-part-name>sAD</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>com.ibm.wssvt.tc.pli.data.WSAnnuityCompositeData</method-return-value>
- <wsdl-message xmlns:wrvm="http://ws.annuity.acme.wssvt.ibm.com">wrvm:wsAddSubAccountsResponse</wsdl-message>
- <wsdl-message-part-name>wsAddSubAccountsReturn</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- <service-endpoint-method-mapping>
- <java-method-name>wsCreateAnnuity</java-method-name>
- <wsdl-operation>wsCreateAnnuity</wsdl-operation>
- <wrapped-element></wrapped-element>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>com.ibm.wssvt.tc.pli.data.WSAnnuityCompositeData</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:mppm="http://ws.annuity.acme.wssvt.ibm.com">mppm:wsCreateAnnuityRequest</wsdl-message>
- <wsdl-message-part-name>aCD</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>com.ibm.wssvt.tc.pli.data.WSAnnuityCompositeData</method-return-value>
- <wsdl-message xmlns:wrvm="http://ws.annuity.acme.wssvt.ibm.com">wrvm:wsCreateAnnuityResponse</wsdl-message>
- <wsdl-message-part-name>wsCreateAnnuityReturn</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
- <service-interface-mapping>
- <service-interface>com.ibm.wssvt.acme.annuity.ws.AnnuityService2</service-interface>
- <wsdl-service-name xmlns:sim="http://ws.annuity.acme.wssvt.ibm.com">sim:AnnuityService2</wsdl-service-name>
- <port-mapping>
- <port-name>AnnuityService2</port-name>
- <java-port-name>AnnuityService2</java-port-name>
- </port-mapping>
- </service-interface-mapping>
- <service-endpoint-interface-mapping>
- <service-endpoint-interface>com.ibm.wssvt.acme.annuity.ws.AnnuityServicePortType</service-endpoint-interface>
- <wsdl-port-type xmlns:seimwpt="http://ws.annuity.acme.wssvt.ibm.com">seimwpt:AnnuityServicePortType</wsdl-port-type>
- <wsdl-binding xmlns:seimwb="http://ws.annuity.acme.wssvt.ibm.com">seimwb:AnnuityServiceBinding</wsdl-binding>
- <service-endpoint-method-mapping>
- <java-method-name>wsListAnnuityByHolder</java-method-name>
- <wsdl-operation>wsListAnnuityByHolder</wsdl-operation>
- <wrapped-element></wrapped-element>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>java.lang.String</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:mppm="http://ws.annuity.acme.wssvt.ibm.com">mppm:wsListAnnuityByHolderRequest</wsdl-message>
- <wsdl-message-part-name>holderSSN</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>java.util.Vector</method-return-value>
- <wsdl-message xmlns:wrvm="http://ws.annuity.acme.wssvt.ibm.com">wrvm:wsListAnnuityByHolderResponse</wsdl-message>
- <wsdl-message-part-name>wsListAnnuityByHolderReturn</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- <service-endpoint-method-mapping>
- <java-method-name>wsAddSubAccounts</java-method-name>
- <wsdl-operation>wsAddSubAccounts</wsdl-operation>
- <wrapped-element></wrapped-element>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>com.ibm.wssvt.tc.pli.data.WSAnnuityCompositeData</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:mppm="http://ws.annuity.acme.wssvt.ibm.com">mppm:wsAddSubAccountsRequest</wsdl-message>
- <wsdl-message-part-name>aCD</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <method-param-parts-mapping>
- <param-position>1</param-position>
- <param-type>com.ibm.wssvt.tc.pli.data.SubAcctData[]</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:mppm="http://ws.annuity.acme.wssvt.ibm.com">mppm:wsAddSubAccountsRequest</wsdl-message>
- <wsdl-message-part-name>sAD</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>com.ibm.wssvt.tc.pli.data.WSAnnuityCompositeData</method-return-value>
- <wsdl-message xmlns:wrvm="http://ws.annuity.acme.wssvt.ibm.com">wrvm:wsAddSubAccountsResponse</wsdl-message>
- <wsdl-message-part-name>wsAddSubAccountsReturn</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- <service-endpoint-method-mapping>
- <java-method-name>wsCreateAnnuity</java-method-name>
- <wsdl-operation>wsCreateAnnuity</wsdl-operation>
- <wrapped-element></wrapped-element>
- <method-param-parts-mapping>
- <param-position>0</param-position>
- <param-type>com.ibm.wssvt.tc.pli.data.WSAnnuityCompositeData</param-type>
- <wsdl-message-mapping>
- <wsdl-message xmlns:mppm="http://ws.annuity.acme.wssvt.ibm.com">mppm:wsCreateAnnuityRequest</wsdl-message>
- <wsdl-message-part-name>aCD</wsdl-message-part-name>
- <parameter-mode>IN</parameter-mode>
- </wsdl-message-mapping>
- </method-param-parts-mapping>
- <wsdl-return-value-mapping>
- <method-return-value>com.ibm.wssvt.tc.pli.data.WSAnnuityCompositeData</method-return-value>
- <wsdl-message xmlns:wrvm="http://ws.annuity.acme.wssvt.ibm.com">wrvm:wsCreateAnnuityResponse</wsdl-message>
- <wsdl-message-part-name>wsCreateAnnuityReturn</wsdl-message-part-name>
- </wsdl-return-value-mapping>
- </service-endpoint-method-mapping>
- </service-endpoint-interface-mapping>
-</java-wsdl-mapping>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/webservices/META-INF/ibm-webservices-bnd.xmi b/tests/org.eclipse.jst.j2ee.core.tests/testData/webservices/META-INF/ibm-webservices-bnd.xmi
deleted file mode 100644
index d5dcf6c8..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/webservices/META-INF/ibm-webservices-bnd.xmi
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<com.ibm.etools.webservice.wsbnd:WSBinding xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:com.ibm.etools.webservice.wsbnd="http://www.ibm.com/websphere/appserver/schemas/5.0.2/wsbnd.xmi" xmi:id="WSBinding_1055737241797">
- <wsdescBindings xmi:id="WSDescBinding_1055737241797" wsDescNameLink="StockQuoteFetcher">
- <pcBindings xmi:id="PCBinding_1055737241797" pcNameLink="urn:xmltoday-delayed-quotes" scope="Session"/>
- </wsdescBindings>
- <routerModules xmi:id="RouterModule_1055737241797" transport="http" name="StockQuote.war"/>
-</com.ibm.etools.webservice.wsbnd:WSBinding>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/webservices/META-INF/ibm-webservices-ext.xmi b/tests/org.eclipse.jst.j2ee.core.tests/testData/webservices/META-INF/ibm-webservices-ext.xmi
deleted file mode 100644
index 170500f3..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/webservices/META-INF/ibm-webservices-ext.xmi
+++ /dev/null
@@ -1,6 +0,0 @@
-<com.ibm.etools.webservice.wsext:WsExtension xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:com.ibm.etools.webservice.wsext="http://www.ibm.com/websphere/appserver/schemas/5.0.2/wsext.xmi" xmi:id="WsExtension_1053484615054">
- <wsDescExt xmi:id="WsDescExt_1053484615054" wsDescNameLink="StockQuoteFetcher">
- <pcBinding xmi:id="PcBinding_1053484615054" pcNameLink="urn:xmltoday-delayed-quotes">
- </pcBinding>
- </wsDescExt>
-</com.ibm.etools.webservice.wsext:WsExtension>
diff --git a/tests/org.eclipse.jst.j2ee.core.tests/testData/webservices/META-INF/webservices.xml b/tests/org.eclipse.jst.j2ee.core.tests/testData/webservices/META-INF/webservices.xml
deleted file mode 100644
index 7269077d..00000000
--- a/tests/org.eclipse.jst.j2ee.core.tests/testData/webservices/META-INF/webservices.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE webservices PUBLIC "-//IBM Corporation, Inc.//DTD J2EE Web services 1.0//EN" "http://www.ibm.com/webservices/dtd/j2ee_web_services_1_0.dtd">
-
- <webservices id="WebServices_1055737241672">
- <webservice-description id="WebServiceDescription_1055737241688">
- <webservice-description-name>StockQuoteFetcher</webservice-description-name>
- <wsdl-file>META-INF/wsdl/StockQuoteFetcher.wsdl</wsdl-file>
- <jaxrpc-mapping-file>META-INF/StockQuoteFetcher_mapping.xml</jaxrpc-mapping-file>
- <port-component id="PortComponent_1055737241734">
- <port-component-name>urn:xmltoday-delayed-quotes</port-component-name>
- <wsdl-port id="WSDLPort_1055737241734">
- <namespaceURI>http://stock.webservices.samples.websphere.ibm.com</namespaceURI>
- <localpart>StockQuote</localpart>
- </wsdl-port>
- <service-endpoint-interface>com.ibm.websphere.samples.webservices.stock.StockQuote</service-endpoint-interface>
- <service-impl-bean id="ServiceImplBean_1055737241734">
- <ejb-link>com_ibm_websphere_samples_webservices_stock_StockQuote</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
- </webservices>
diff --git a/tests/org.eclipse.jst.j2ee.tests.performance/.classpath b/tests/org.eclipse.jst.j2ee.tests.performance/.classpath
deleted file mode 100644
index 8bf670e7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests.performance/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="common/"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.j2ee.tests.performance/.cvsignore b/tests/org.eclipse.jst.j2ee.tests.performance/.cvsignore
deleted file mode 100644
index 43ac6065..00000000
--- a/tests/org.eclipse.jst.j2ee.tests.performance/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-temp.folder
-build.xml
-performance.jar
diff --git a/tests/org.eclipse.jst.j2ee.tests.performance/.project b/tests/org.eclipse.jst.j2ee.tests.performance/.project
deleted file mode 100644
index 2aed33e9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests.performance/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.tests.performance</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.tests.performance/about.html b/tests/org.eclipse.jst.j2ee.tests.performance/about.html
deleted file mode 100644
index 2199df3f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests.performance/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>June, 2008</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 Redistributor’s 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.tests.performance/build.properties b/tests/org.eclipse.jst.j2ee.tests.performance/build.properties
deleted file mode 100644
index 21d4547c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests.performance/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.performance.jar = common/
-output.performance.jar = bin/
-bin.includes = plugin.xml,\
- performance.jar,\
- about.html
diff --git a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/BasePerformanceTestCase.java b/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/BasePerformanceTestCase.java
deleted file mode 100644
index ce756af3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/BasePerformanceTestCase.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Created on Dec 6, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.tests.performance;
-
-import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.InvocationTargetException;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.common.tests.BaseTestCase;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public abstract class BasePerformanceTestCase extends BaseTestCase {
- protected static Map performanceClass = null;
- static ClassLoader clazzLoader = null;
- protected static String file= null;
- public static Test suite() {
- performanceClass = null;
- return createTestSuites() ;
- }
- /**
- *
- */
- private static Test createTestSuites() {
- createPerformanceClass();
- TestSuite suite = new TestSuite();
- for (Iterator iter = performanceClass.keySet().iterator(); iter.hasNext();) {
- Class clazz = (Class) iter.next();
- List methodList = (List)performanceClass.get(clazz);
- for (int x=0; x< methodList.size(); ++x) {
- PerformanceTestObject testObject = (PerformanceTestObject)methodList.get(x);
- Test test = createTest(clazz,testObject.getName());
- if (test instanceof BaseTestCase) {
- suite.addTest(new PerformanceTestCaseWrapper((BaseTestCase)test, testObject.getTagging() , testObject.getShortName()));
- }
- }
- }
- return suite;
- }
-
- static public Test createTest(Class theClass, String name) {
- Constructor constructor;
- try {
- constructor= getTestConstructor(theClass);
- } catch (NoSuchMethodException e) {
- return warning("Class "+theClass.getName()+" has no public constructor TestCase(String name) or TestCase()");
- }
- Object test;
- try {
- if (constructor.getParameterTypes().length == 0) {
- test= constructor.newInstance(new Object[0]);
- if (test instanceof TestCase)
- ((TestCase) test).setName(name);
- } else {
- test= constructor.newInstance(new Object[]{name});
- }
- } catch (InstantiationException e) {
- return(warning("Cannot instantiate test case: "+name+" ("+exceptionToString(e)+")"));
- } catch (InvocationTargetException e) {
- return(warning("Exception in constructor: "+name+" ("+exceptionToString(e.getTargetException())+")"));
- } catch (IllegalAccessException e) {
- return(warning("Cannot access test case: "+name+" ("+exceptionToString(e)+")"));
- }
- return (Test) test;
- }
-
- /**
- * Returns a test which will fail and log a warning message.
- */
- private static Test warning(final String message) {
- return new TestCase("warning") {
- protected void runTest() {
- fail(message);
- }
- };
- }
-
- public static Constructor getTestConstructor(Class theClass) throws NoSuchMethodException {
- Class[] args= { String.class };
- try {
- return theClass.getConstructor(args);
- } catch (NoSuchMethodException e) {
- // fall through
- }
- return theClass.getConstructor(new Class[0]);
- }
-
- private static String exceptionToString(Throwable t) {
- StringWriter stringWriter= new StringWriter();
- PrintWriter writer= new PrintWriter(stringWriter);
- t.printStackTrace(writer);
- return stringWriter.toString();
-
- }
- /**
- * @param performanceClass2
- */
-
- public static Map getPerformanceClass() {
- if (performanceClass == null) {
- createPerformanceClass();
- }
- return performanceClass;
- }
-
-
- protected static void createPerformanceClass() {
- if (performanceClass == null) {
- performanceClass = new TestCaseSAXParser().doLoad(new File(file));
- }
- }
-
-
- /**
- * @return Returns the clazzLoader.
- */
- public static ClassLoader getClassLoader() {
- return clazzLoader;
- }
- /**
- * @param clazzLoader The clazzLoader to set.
- */
- public static void setClassLoader(ClassLoader clazzLoader) {
- BasePerformanceTestCase.clazzLoader = clazzLoader;
- }
- /**
- * @return Returns the file.
- */
- public static String getFile() {
- return file;
- }
- /**
- * @param file The file to set.
- */
- public static void setFile(String file) {
- BasePerformanceTestCase.file = file;
- }
-
- /**
- * @param suite
- * @param test
- * @param global
- * @param string
- */
- protected static void addPerformanceTest(TestSuite suite, BaseTestCase test, int tagging, String shortName) {
- PerformanceTestCaseWrapper testCase = new PerformanceTestCaseWrapper(test, tagging , shortName);
- suite.addTest(testCase);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/EJBProjectCreationTestCase.java b/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/EJBProjectCreationTestCase.java
deleted file mode 100644
index f6d4dc4e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/EJBProjectCreationTestCase.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.eclipse.jst.j2ee.tests.performance;
-
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.wtp.j2ee.headless.tests.ejb.operations.EJBProjectCreationOperationTest;
-import org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.JavaEEFacetConstants;
-
-public class EJBProjectCreationTestCase extends PerformanceTestCase {
-
- public void testEJB30_Defaults() throws Exception {
- Dimension[] dims = new Dimension[] { Dimension.ELAPSED_PROCESS, Dimension.USED_JAVA_HEAP };
- tagAsGlobalSummary("EJB project creation", dims);
- startMeasuring();
-
- // Create an EJB 3.0 project with default settings
- EJBProjectCreationOperationTest.
- getEJBDataModel("ejb30_defaults", /* projName */
- null, /* clientName */
- null, /* clientSourceFolder */
- null, /* earName */
- JavaEEFacetConstants.EJB_3, /* version */
- false /* createDD */
- );
-
- stopMeasuring();
- commitMeasurements();
- assertPerformance();
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/HeaderParserPerformanceTest.java b/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/HeaderParserPerformanceTest.java
deleted file mode 100644
index 33a76e1f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/HeaderParserPerformanceTest.java
+++ /dev/null
@@ -1,132 +0,0 @@
-package org.eclipse.jst.j2ee.tests.performance;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.jee.util.internal.JavaEEQuickPeek;
-import org.eclipse.wst.common.tests.ProjectUtility;
-import org.eclipse.wtp.j2ee.headless.tests.plugin.HeadlessTestsPlugin;
-
-public class HeaderParserPerformanceTest {
- private static final String DATA_DIR = "TestData" + java.io.File.separatorChar + "headerParserTestData" + java.io.File.separatorChar;
-
- public void testSpeed() throws Exception {
- List data = getXMLData();
- long[] times = new long[data.size()];
- InputStream in = null;
-
- for (int i = 0; i < data.size(); i++) {
- try {
- TestData testData = (TestData) data.get(i);
- in = new FileInputStream(new File(getDataPath(testData.fileName)));
- long start = System.currentTimeMillis();
- JavaEEQuickPeek peek = new JavaEEQuickPeek(in);
- long end = System.currentTimeMillis();
- times[i] = end - start;
- if (times[i] == 0) {
- times[i] = 10; // stub in a minimum time
- }
- Assert.assertEquals(testData.type, peek.getType());
- Assert.assertEquals(testData.modVersion, peek.getVersion());
- Assert.assertEquals(testData.eeVersion, peek.getJavaEEVersion());
- } finally {
- if (in != null) {
- in.close();
- }
- }
- }
- // all times should be the same
- Arrays.sort(times);
- if (times[0] * 2 < times[times.length - 1]) {
- Assert.fail();
- }
- }
-
- private List getXMLData() {
- List data = new ArrayList();
- data.add(new TestData("application-client12.xml", J2EEVersionConstants.APPLICATION_CLIENT_TYPE, J2EEVersionConstants.J2EE_1_2_ID, J2EEVersionConstants.J2EE_1_2_ID));
- data.add(new TestData("application-client13.xml", J2EEVersionConstants.APPLICATION_CLIENT_TYPE, J2EEVersionConstants.J2EE_1_3_ID, J2EEVersionConstants.J2EE_1_3_ID));
- data.add(new TestData("application-client14.xml", J2EEVersionConstants.APPLICATION_CLIENT_TYPE, J2EEVersionConstants.J2EE_1_4_ID, J2EEVersionConstants.J2EE_1_4_ID));
- data.add(new TestData("application-client5.xml", J2EEVersionConstants.APPLICATION_CLIENT_TYPE, J2EEVersionConstants.JEE_5_0_ID, J2EEVersionConstants.JEE_5_0_ID));
-
- data.add(new TestData("application12.xml", J2EEVersionConstants.APPLICATION_TYPE, J2EEVersionConstants.J2EE_1_2_ID, J2EEVersionConstants.J2EE_1_2_ID));
- data.add(new TestData("application13.xml", J2EEVersionConstants.APPLICATION_TYPE, J2EEVersionConstants.J2EE_1_3_ID, J2EEVersionConstants.J2EE_1_3_ID));
- data.add(new TestData("application14.xml", J2EEVersionConstants.APPLICATION_TYPE, J2EEVersionConstants.J2EE_1_4_ID, J2EEVersionConstants.J2EE_1_4_ID));
- data.add(new TestData("application5.xml", J2EEVersionConstants.APPLICATION_TYPE, J2EEVersionConstants.JEE_5_0_ID, J2EEVersionConstants.JEE_5_0_ID));
-
- data.add(new TestData("ejb-jar11.xml", J2EEVersionConstants.EJB_TYPE, J2EEVersionConstants.EJB_1_1_ID, J2EEVersionConstants.J2EE_1_2_ID));
- data.add(new TestData("ejb-jar20.xml", J2EEVersionConstants.EJB_TYPE, J2EEVersionConstants.EJB_2_0_ID, J2EEVersionConstants.J2EE_1_3_ID));
- data.add(new TestData("ejb-jar21.xml", J2EEVersionConstants.EJB_TYPE, J2EEVersionConstants.EJB_2_1_ID, J2EEVersionConstants.J2EE_1_4_ID));
- data.add(new TestData("ejb-jar30.xml", J2EEVersionConstants.EJB_TYPE, J2EEVersionConstants.EJB_3_0_ID, J2EEVersionConstants.JEE_5_0_ID));
-
- data.add(new TestData("ra10.xml", J2EEVersionConstants.CONNECTOR_TYPE, J2EEVersionConstants.JCA_1_0_ID, J2EEVersionConstants.J2EE_1_3_ID));
- data.add(new TestData("ra15.xml", J2EEVersionConstants.CONNECTOR_TYPE, J2EEVersionConstants.JCA_1_5_ID, J2EEVersionConstants.J2EE_1_4_ID));
-
- data.add(new TestData("web22.xml", J2EEVersionConstants.WEB_TYPE, J2EEVersionConstants.WEB_2_2_ID, J2EEVersionConstants.J2EE_1_2_ID));
- data.add(new TestData("web23.xml", J2EEVersionConstants.WEB_TYPE, J2EEVersionConstants.WEB_2_3_ID, J2EEVersionConstants.J2EE_1_3_ID));
- data.add(new TestData("web24.xml", J2EEVersionConstants.WEB_TYPE, J2EEVersionConstants.WEB_2_4_ID, J2EEVersionConstants.J2EE_1_4_ID));
- data.add(new TestData("web25.xml", J2EEVersionConstants.WEB_TYPE, J2EEVersionConstants.WEB_2_5_ID, J2EEVersionConstants.JEE_5_0_ID));
-
- // test some bogus dds as well
- data.add(new TestData("notxml.xml", J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
- data.add(new TestData("notjavaee.xml", J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
-
- data.add(new TestData("application-client0.xml", J2EEVersionConstants.APPLICATION_CLIENT_TYPE, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
- data.add(new TestData("application-client00.xml", J2EEVersionConstants.APPLICATION_CLIENT_TYPE, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
- data.add(new TestData("application-client000.xml", J2EEVersionConstants.APPLICATION_CLIENT_TYPE, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
-
- data.add(new TestData("application0.xml", J2EEVersionConstants.APPLICATION_TYPE, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
- data.add(new TestData("application00.xml", J2EEVersionConstants.APPLICATION_TYPE, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
- data.add(new TestData("application000.xml", J2EEVersionConstants.APPLICATION_TYPE, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
-
- data.add(new TestData("ejb-jar0.xml", J2EEVersionConstants.EJB_TYPE, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
- data.add(new TestData("ejb-jar00.xml", J2EEVersionConstants.EJB_TYPE, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
- data.add(new TestData("ejb-jar000.xml", J2EEVersionConstants.EJB_TYPE, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
-
- data.add(new TestData("ra0.xml", J2EEVersionConstants.CONNECTOR_TYPE, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
- data.add(new TestData("ra00.xml", J2EEVersionConstants.CONNECTOR_TYPE, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
- data.add(new TestData("ra000.xml", J2EEVersionConstants.CONNECTOR_TYPE, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
-
- data.add(new TestData("web0.xml", J2EEVersionConstants.WEB_TYPE, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
- data.add(new TestData("web00.xml", J2EEVersionConstants.WEB_TYPE, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
- data.add(new TestData("web000.xml", J2EEVersionConstants.WEB_TYPE, J2EEVersionConstants.UNKNOWN, J2EEVersionConstants.UNKNOWN));
- return data;
- }
-
- protected String getDataPath(String shortName) throws Exception {
- HeadlessTestsPlugin plugin = HeadlessTestsPlugin.getDefault();
- String pluginRelativeFileName = DATA_DIR + java.io.File.separatorChar + shortName;
- return ProjectUtility.getFullFileName(plugin, pluginRelativeFileName);
- }
-
- private class TestData {
- String fileName;
-
- int type;
-
- int modVersion;
-
- int eeVersion;
-
- Class modelObjectInterface;
-
- public TestData(String fileName, int type, int modVersion, int eeVersion) {
- this.fileName = fileName;
- this.type = type;
- this.modVersion = modVersion;
- this.eeVersion = eeVersion;
- }
-
- public TestData(String fileName, int type, int modVersion, int eeVersion, Class modelTypeClass) {
- this(fileName, type, modVersion, eeVersion);
- this.modelObjectInterface = modelTypeClass;
- }
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/PerformancePlugin.java b/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/PerformancePlugin.java
deleted file mode 100644
index cd55b79a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/PerformancePlugin.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package org.eclipse.jst.j2ee.tests.performance;
-
-import java.util.MissingResourceException;
-import java.util.ResourceBundle;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The main plugin class to be used in the desktop.
- */
-public class PerformancePlugin extends AbstractUIPlugin {
- //The shared instance.
- private static PerformancePlugin plugin;
- //Resource bundle.
- private ResourceBundle resourceBundle;
-
- /**
- * The constructor.
- */
- public PerformancePlugin() {
- 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 PerformancePlugin 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 = PerformancePlugin.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.tests.performance.PerformancePluginResources");
- } catch (MissingResourceException x) {
- resourceBundle = null;
- }
- return resourceBundle;
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/PerformanceTestCaseWrapper.java b/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/PerformanceTestCaseWrapper.java
deleted file mode 100644
index df87c89d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/PerformanceTestCaseWrapper.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Created on Nov 24, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.tests.performance;
-
-import junit.framework.Test;
-
-import org.eclipse.test.performance.Dimension;
-import org.eclipse.test.performance.Performance;
-import org.eclipse.test.performance.PerformanceTestCase;
-import org.eclipse.wst.common.tests.BaseTestCase;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class PerformanceTestCaseWrapper extends PerformanceTestCase {
- protected BaseTestCase fTest;
- public static final int NONE = 0;
- public static final int LOCAL = 1;
- public static final int GLOBAL = 2;
-
- private boolean tagAsGlobalSummary;
- private boolean tagAsSummary;
- private String shortName;
-
- public static final int ITERATIONS = 10;
-
- public PerformanceTestCaseWrapper(BaseTestCase test,
- int tagging,
- String shortName) {
- fTest=test;
- tagAsGlobalSummary = ((tagging & GLOBAL) != 0);
- tagAsSummary = ((tagging & LOCAL) != 0);
- this.shortName = shortName;
- }
-
- public int countTestCases() {
- return fTest.countTestCases();
- }
-
- public String toString() {
- return fTest.toString();
- }
-
- public Test getTest() {
- return fTest;
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.test.performance.PerformanceTestCase#setUp()
- */
- protected void setUp() throws Exception {
- fTest.setUpTest();
- }
-
- protected void basicSetUp() throws Exception {
- Performance performance= Performance.getDefault();
- fPerformanceMeter= performance.createPerformanceMeter(performance.getDefaultScenarioId(fTest));
- }
-
-
- /**
- * Runs the bare test sequence.
- * @exception Throwable if any exception is thrown
- */
- public void runBare() throws Throwable {
- basicSetUp();
- tagIfNecessary(shortName, Dimension.CPU_TIME);
- try {
- for (int i= 0; i < ITERATIONS; i++) {
- setUp();
- startMeasuring();
- runTest();
- stopMeasuring();
- }
- } catch (Throwable t) {
- // log the error, thrown by the JUnit test, in the console and re-throw it
- t.printStackTrace();
- throw t;
- } finally {
- commitMeasurements();
- assertPerformance();
- tearDown();
- }
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#runTest()
- */
- protected void runTest() throws Throwable {
- // TODO Auto-generated method stub
- fTest.runCoreTest();
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.test.performance.PerformanceTestCase#tearDown()
- */
- protected void tearDown() throws Exception {
- // TODO Auto-generated method stub
- fTest.tearDownTest();
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#setName(java.lang.String)
- */
- public void setName(String name) {
- // TODO Auto-generated method stub
- fTest.setName(name);
- }
-
- /* (non-Javadoc)
- * @see junit.framework.TestCase#getName()
- */
- public String getName() {
- // TODO Auto-generated method stub
- return fTest.getName();
- }
-
- /**
- * Answers whether this test should be tagged globally.
- *
- * @return whether this test should be tagged globally
- */
- private boolean shouldGloballyTag() {
- return tagAsGlobalSummary;
- }
-
- /**
- * Answers whether this test should be tagged locally.
- *
- * @return whether this test should be tagged locally
- */
- private boolean shouldLocallyTag() {
- return tagAsSummary;
- }
-
- public void tagIfNecessary(String shortName, Dimension dimension) {
- if (shouldGloballyTag()) {
- tagAsGlobalSummary(shortName, dimension);
- }
- if (shouldLocallyTag()) {
- tagAsSummary(shortName, dimension);
- }
- }
-
- public void tagIfNecessary(String shortName, Dimension [] dimensions) {
- if (shouldGloballyTag()) {
- tagAsGlobalSummary(shortName, dimensions);
- }
- if (shouldLocallyTag()) {
- tagAsSummary(shortName, dimensions);
- }
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/PerformanceTestObject.java b/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/PerformanceTestObject.java
deleted file mode 100644
index 803934ec..00000000
--- a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/PerformanceTestObject.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Created on Nov 26, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.tests.performance;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class PerformanceTestObject {
- int tagging;
- String shortName;
- String name;
- /**
- *
- */
- public PerformanceTestObject(String name,int tagging, String shortname) {
- super();
- this.tagging = tagging;
- this.name = name;
- this.shortName = shortname;
- }
-
- /**
- * @return Returns the name.
- */
- public String getName() {
- return name;
- }
- /**
- * @return Returns the shortName.
- */
- public String getShortName() {
- return shortName;
- }
- /**
- * @return Returns the tagging.
- */
- public int getTagging() {
- return tagging;
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/PerformanceTestSuite.java b/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/PerformanceTestSuite.java
deleted file mode 100644
index ca283159..00000000
--- a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/PerformanceTestSuite.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- *
- */
-package org.eclipse.jst.j2ee.tests.performance;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.common.tests.BaseTestCase;
-
-/**
- * @author itewk
- *
- */
-public class PerformanceTestSuite extends TestSuite {
- private static final String DEFAULT_SIMPLE_NAME = "Performance Test";
-
- /**
- *
- * @param name
- */
- public PerformanceTestSuite(String name) {
- super(name);
- }
-
- public void addTest(Test test) {
- //must be a BaseTestCase so it can be wrapped in a PerformanceTestCaseWrapper
- if(test instanceof BaseTestCase) {
- PerformanceTestCaseWrapper performanceTest = new PerformanceTestCaseWrapper(
- (BaseTestCase)test,PerformanceTestCaseWrapper.GLOBAL,DEFAULT_SIMPLE_NAME);
- super.addTest(performanceTest);
- }
- }
-
- /**
- *
- */
- public void addTest(Test test, String simpleName) {
- //must be a BaseTestCase so it can be wrapped in a PerformanceTestCaseWrapper
- if(test instanceof BaseTestCase) {
- PerformanceTestCaseWrapper performanceTest = new PerformanceTestCaseWrapper(
- (BaseTestCase)test,PerformanceTestCaseWrapper.GLOBAL,simpleName);
- super.addTest(performanceTest);
- }
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/TestCaseSAXParser.java b/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/TestCaseSAXParser.java
deleted file mode 100644
index 3189ea0b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/TestCaseSAXParser.java
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
- * Created on Nov 29, 2004
- *
- * TODO To change the template for this generated file go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-package org.eclipse.jst.j2ee.tests.performance;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.parsers.SAXParser;
-import javax.xml.parsers.SAXParserFactory;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.DefaultHandler;
-
-/**
- * @author Admin
- *
- * TODO To change the template for this generated type comment go to
- * Window - Preferences - Java - Code Style - Code Templates
- */
-public class TestCaseSAXParser extends DefaultHandler {
- private static Map performanceCases = null;
- private static final String TEST_CASE = "testCase";
- private static final String CLASS = "class";
- private static final String METHOD = "method";
- private static final String SHORT_NAME = "shortName";
- private static final String TAGGING = "tagging";
- private static final String METHOD_NAME = "name";
- private static final String GLOBAL = "GLOBAL";
- private static final String LOCAL = "LOCAL";
- private static Class currentClazz = null;
-
-
-
- public Map doLoad(File file) {
- performanceCases = new HashMap();
- DefaultHandler handler = new TestCaseSAXParser();
- SAXParserFactory factory = SAXParserFactory.newInstance();
- try {
- SAXParser saxParser = factory.newSAXParser();
- saxParser.parse(file , handler );
- }
- catch (ParserConfigurationException ex) {
- System.err.println ("Failed to create SAX parser:" + ex);
- }
- catch (SAXException ex) {
- System.err.println ("SAX parser exceeption:" + ex);
- }
- catch (IOException ex) {
- System.err.println ("IO exeception:" + ex);
- }
- catch (IllegalArgumentException ex) {
- System.err.println ("Invalid file argument" + ex);
- }
- return performanceCases;
- }
-
- public void startElement(String uri, String localName,
- String qualifiedName, Attributes attributes) throws SAXException {
- if (qualifiedName.equals(TEST_CASE)) {
- for (int i = 0; i< attributes.getLength(); i++) {
- if (attributes.getQName(i).equalsIgnoreCase(CLASS)) {
- try {
- currentClazz = loadClass(attributes.getValue(i));
- if (performanceCases.get(currentClazz) == null) {
- ArrayList methodList = new ArrayList();
- performanceCases.put(currentClazz,methodList);
- }
- } catch (ClassNotFoundException e) {
- currentClazz = null;
- System.err.println ("Failed to load class:" + attributes.getValue(i));
- //e.printStackTrace();
- }
- } // end of if
- } // end of for
- } // end of if TEST_CASE
- else if (qualifiedName.equalsIgnoreCase(METHOD)) {
- String methodName = null;
- int tagging = 0;
- String shortName = null;
-
- if (currentClazz == null) return;
-
- for (int i = 0; i< attributes.getLength(); i++) {
- if (attributes.getQName(i).equalsIgnoreCase(METHOD_NAME)) {
- methodName = attributes.getValue(i);
- }
- else if (attributes.getQName(i).equalsIgnoreCase(TAGGING)){
- if (attributes.getValue(i).equalsIgnoreCase(GLOBAL)) {
- tagging = PerformanceTestCaseWrapper.GLOBAL;
- } else if (attributes.getValue(i).equalsIgnoreCase(LOCAL)) {
- tagging = PerformanceTestCaseWrapper.LOCAL;
- } else {
- tagging = PerformanceTestCaseWrapper.NONE;
- }
- } else if(attributes.getQName(i).equalsIgnoreCase(SHORT_NAME)) {
- shortName = attributes.getValue(i);
- }
- } // end of for
- List methodList = (List) performanceCases.get(currentClazz);
- methodList.add(new PerformanceTestObject(methodName,tagging,shortName));
- }
- }
-
- public void endElement(String uri, String localName, String qualifiedName)
- throws SAXException {
- if (qualifiedName.equals(TEST_CASE)) {
- currentClazz = null;
- }
- }
-
- /**
- * Loads the test suite class.
- */
- private Class loadClass(String className) throws ClassNotFoundException {
- if (className == null)
- return null;
- return getClassLoader().loadClass(className);
- }
-
- /**
- * The class loader to be used for loading tests.
- * Subclasses may override to use another class loader.
- */
- protected ClassLoader getClassLoader() {
- return BasePerformanceTestCase.getClassLoader();
- }
-
-}
-
diff --git a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/WTPHeadlessPerformanceTests.java b/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/WTPHeadlessPerformanceTests.java
deleted file mode 100644
index 518cdc09..00000000
--- a/tests/org.eclipse.jst.j2ee.tests.performance/common/org/eclipse/jst/j2ee/tests/performance/WTPHeadlessPerformanceTests.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- *
- */
-package org.eclipse.jst.j2ee.tests.performance;
-
-import junit.framework.Test;
-
-import org.eclipse.wtp.j2ee.headless.tests.ear.operations.EARProjectCreationOperationTest;
-
-/**
- * @author itewk
- *
- */
-public class WTPHeadlessPerformanceTests extends PerformanceTestSuite {
- public WTPHeadlessPerformanceTests() {
- super("All WTP Headless Performances Tests");
-
- addTest(new EARProjectCreationOperationTest("testEAR14_WithDependencies"), "Test EAR 1.4 Project Creation with Dependincies");
- }
-
- public static Test suite(){
- return new WTPHeadlessPerformanceTests();
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests.performance/plugin.xml b/tests/org.eclipse.jst.j2ee.tests.performance/plugin.xml
deleted file mode 100644
index 45e55bd0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests.performance/plugin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-<plugin
- id="org.eclipse.jst.j2ee.tests.performance"
- name="Performance Plug-in"
- version="1.1.0"
- provider-name=""
- class="org.eclipse.jst.j2ee.tests.performance.PerformancePlugin">
-
- <runtime>
- <library name="performance.jar">
- <export name="*"/>
- </library>
- </runtime>
-
- <requires>
- <import plugin="org.eclipse.ui"/>
- <import plugin="org.eclipse.core.runtime"/>
- <import plugin="org.eclipse.test.performance"/>
- <import plugin="org.junit"/>
- <import plugin="org.eclipse.wst.common.tests"/>
- <import plugin="org.eclipse.jst.j2ee.core"/>
- <import plugin="org.eclipse.jst.j2ee.tests"/>
- <import plugin="org.eclipse.wst.common.project.facet.core"/>
- </requires>
-
-</plugin>
diff --git a/tests/org.eclipse.jst.j2ee.tests/.classpath b/tests/org.eclipse.jst.j2ee.tests/.classpath
deleted file mode 100644
index a13b1ceb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="defect-tests"/>
- <classpathentry kind="src" path="webmodule-tests"/>
- <classpathentry kind="src" path="savestrategy-tests"/>
- <classpathentry kind="src" path="j2ee-tests"/>
- <classpathentry kind="src" path="j2ee-verifiers"/>
- <classpathentry kind="src" path="exportmodel-tests"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.jst.j2ee.tests/.cvsignore b/tests/org.eclipse.jst.j2ee.tests/.cvsignore
deleted file mode 100644
index 4a8c6e28..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/.cvsignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bin
-build.xml
-temp.folder
-j2ee-tests.jar
diff --git a/tests/org.eclipse.jst.j2ee.tests/.project b/tests/org.eclipse.jst.j2ee.tests/.project
deleted file mode 100644
index ffec9c0b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.jst.j2ee.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.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.jst.j2ee.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 2a57aff9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,59 +0,0 @@
-#Thu May 10 18:35:31 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
-org.eclipse.jdt.core.compiler.problem.deprecation=warning
-org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
-org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=disabled
-org.eclipse.jdt.core.compiler.problem.discouragedReference=warning
-org.eclipse.jdt.core.compiler.problem.emptyStatement=ignore
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
-org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
-org.eclipse.jdt.core.compiler.problem.fieldHiding=ignore
-org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
-org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
-org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
-org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
-org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
-org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=ignore
-org.eclipse.jdt.core.compiler.problem.localVariableHiding=ignore
-org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
-org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
-org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
-org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
-org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
-org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
-org.eclipse.jdt.core.compiler.problem.nullReference=ignore
-org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
-org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=ignore
-org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
-org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
-org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
-org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
-org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
-org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
-org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
-org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
-org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
-org.eclipse.jdt.core.compiler.problem.unnecessaryElse=ignore
-org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=ignore
-org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=ignore
-org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=disabled
-org.eclipse.jdt.core.compiler.problem.unusedImport=error
-org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
-org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
-org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=disabled
-org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
-org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
-org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/tests/org.eclipse.jst.j2ee.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.jst.j2ee.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 5993ccb4..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Sat Mar 24 11:01:21 EDT 2007
-eclipse.preferences.version=1
-org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8"?><templates/>
diff --git a/tests/org.eclipse.jst.j2ee.tests/.settings/org.eclipse.pde.prefs b/tests/org.eclipse.jst.j2ee.tests/.settings/org.eclipse.pde.prefs
deleted file mode 100644
index ed079711..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/.settings/org.eclipse.pde.prefs
+++ /dev/null
@@ -1,15 +0,0 @@
-#Sat Mar 24 10:56:39 EDT 2007
-compilers.incompatible-environment=1
-compilers.p.build=1
-compilers.p.deprecated=1
-compilers.p.missing-packages=1
-compilers.p.no-required-att=0
-compilers.p.not-externalized-att=1
-compilers.p.unknown-attribute=1
-compilers.p.unknown-class=1
-compilers.p.unknown-element=1
-compilers.p.unknown-resource=1
-compilers.p.unresolved-ex-points=0
-compilers.p.unresolved-import=0
-compilers.use-project=true
-eclipse.preferences.version=1
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/149995.ear b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/149995.ear
deleted file mode 100644
index eecabd6c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/149995.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/149995BinaryClasspathTest.ear b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/149995BinaryClasspathTest.ear
deleted file mode 100644
index 5be9ce77..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/149995BinaryClasspathTest.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/BeenThere.ear b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/BeenThere.ear
deleted file mode 100644
index ad26fae6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/BeenThere.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/Collision.ear b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/Collision.ear
deleted file mode 100644
index 9013a12f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/Collision.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158Client.jar b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158Client.jar
deleted file mode 100644
index df661029..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158Client.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158Connector.rar b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158Connector.rar
deleted file mode 100644
index 59ba234e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158Connector.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158EJB.jar b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158EJB.jar
deleted file mode 100644
index b7d56531..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158EJB.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158Util.jar b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158Util.jar
deleted file mode 100644
index 895c31c5..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158Util.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158Web.war b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158Web.war
deleted file mode 100644
index 0a269393..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/EAR121158Web.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/META-INF/MANIFEST.MF
deleted file mode 100644
index 59499bce..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/META-INF/application.xml b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/META-INF/application.xml
deleted file mode 100644
index a801dd9d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EAR121158.ear/META-INF/application.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application id="Application_ID" version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <display-name>
- EAR121158</display-name>
- <module id="WebModule_1144784925194">
- <web>
- <web-uri>EAR121158Web.war</web-uri>
- <context-root>EAR121158Web</context-root>
- </web>
- </module>
- <module id="EjbModule_1144784925224">
- <ejb>EAR121158EJB.jar</ejb>
- </module>
- <module id="JavaClientModule_1144784925234">
- <java>EAR121158Client.jar</java>
- </module>
- <module id="ConnectorModule_1144784925244">
- <connector>EAR121158Connector.rar</connector>
- </module>
-</application>
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EARForLibDep.ear b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EARForLibDep.ear
deleted file mode 100644
index 607c5386..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EARForLibDep.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EJBLocalAndRemoteRefEARWithClientJars.ear b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EJBLocalAndRemoteRefEARWithClientJars.ear
deleted file mode 100644
index 129f3851..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/EJBLocalAndRemoteRefEARWithClientJars.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/Example1.war b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/Example1.war
deleted file mode 100644
index 9c30a383..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/Example1.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/JarTest.auto.jar b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/JarTest.auto.jar
deleted file mode 100644
index 1c607fe3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/JarTest.auto.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/JarTest.man.jar b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/JarTest.man.jar
deleted file mode 100644
index fe9e2521..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/JarTest.man.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/WebDavTest.war b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/WebDavTest.war
deleted file mode 100644
index b6c2dc00..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/WebDavTest.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/WorkAreaFvtApp.ear b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/WorkAreaFvtApp.ear
deleted file mode 100644
index e28784b2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/WorkAreaFvtApp.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/componentLoadAdapterTestData/testblah.war b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/componentLoadAdapterTestData/testblah.war
deleted file mode 100644
index 14373734..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/componentLoadAdapterTestData/testblah.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/sib.test.mediations.m5.JsMBR.ear b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/sib.test.mediations.m5.JsMBR.ear
deleted file mode 100644
index fe9776b0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/sib.test.mediations.m5.JsMBR.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/undeployed_DefaultApplication.ear b/tests/org.eclipse.jst.j2ee.tests/DefectTestData/undeployed_DefaultApplication.ear
deleted file mode 100644
index 74b10cfb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/DefectTestData/undeployed_DefaultApplication.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.jst.j2ee.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index dd703988..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,71 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: J2EE Tests Plug-in
-Bundle-SymbolicName: org.eclipse.jst.j2ee.tests; singleton:=true
-Bundle-Version: 1.1.402.qualifier
-Bundle-ClassPath: j2ee-tests.jar
-Bundle-Activator: org.eclipse.wtp.j2ee.headless.tests.plugin.HeadlessTestsPlugin
-Bundle-Localization: plugin
-Export-Package: org.eclipse.jst.common.annotations.tests,
- org.eclipse.jst.j2ee.bindingshelper.tests,
- org.eclipse.jst.j2ee.classpath.tests,
- org.eclipse.jst.j2ee.classpath.tests.util,
- org.eclipse.jst.j2ee.defect.tests,
- org.eclipse.jst.j2ee.dependency.tests,
- org.eclipse.jst.j2ee.dependency.tests.util,
- org.eclipse.jst.j2ee.flexible.project.apitests.artifactedit,
- org.eclipse.jst.j2ee.flexible.project.fvtests,
- org.eclipse.jst.j2ee.flexible.project.tests,
- org.eclipse.jst.j2ee.project.facet.tests,
- org.eclipse.jst.j2ee.tests.bvt,
- org.eclipse.jst.j2ee.tests.modulecore,
- org.eclipse.jst.jee.model.tests,
- org.eclipse.wtp.headless.tests.savestrategy,
- org.eclipse.wtp.j2ee.headless.tests.appclient.operations,
- org.eclipse.wtp.j2ee.headless.tests.ear.operations,
- org.eclipse.wtp.j2ee.headless.tests.ejb.operations,
- org.eclipse.wtp.j2ee.headless.tests.ejb.verifiers,
- org.eclipse.wtp.j2ee.headless.tests.j2ee.operations,
- org.eclipse.wtp.j2ee.headless.tests.j2ee.verifiers,
- org.eclipse.wtp.j2ee.headless.tests.jca.operations,
- org.eclipse.wtp.j2ee.headless.tests.jca.verifiers,
- org.eclipse.wtp.j2ee.headless.tests.plugin,
- org.eclipse.wtp.j2ee.headless.tests.web.container,
- org.eclipse.wtp.j2ee.headless.tests.web.operations,
- org.eclipse.wtp.j2ee.headless.tests.web.verifiers
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.core.commands,
- org.eclipse.jst.common.frameworks,
- org.eclipse.wst.common.emfworkbench.integration,
- org.eclipse.wst.common.frameworks,
- org.eclipse.jst.j2ee.core,
- org.eclipse.jst.j2ee.web,
- org.junit,
- org.eclipse.emf.common,
- org.eclipse.emf.ecore,
- org.eclipse.jst.j2ee,
- org.eclipse.wst.common.modulecore,
- org.eclipse.jst.j2ee.ejb,
- org.eclipse.jst.j2ee.jca,
- org.eclipse.wst.common.tests,
- org.eclipse.jst.j2ee.core.tests,
- org.eclipse.wst.server.core,
- org.eclipse.emf.ecore.xmi,
- org.eclipse.wst.common.emf,
- org.eclipse.jst.j2ee.webservice,
- org.eclipse.jem.util,
- org.eclipse.jdt.core,
- org.eclipse.jdt.launching,
- org.eclipse.wst.web,
- org.eclipse.wst.common.project.facet.core,
- org.eclipse.jst.server.core,
- org.eclipse.jst.common.annotations.core,
- org.eclipse.wst.validation,
- org.eclipse.jst.jee,
- org.eclipse.jst.jee.ejb,
- org.eclipse.jface.text,
- org.eclipse.core.filebuffers,
- org.eclipse.jst.jee.web
-Eclipse-LazyStart: true
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/tests/org.eclipse.jst.j2ee.tests/META-INF/eclipse.inf b/tests/org.eclipse.jst.j2ee.tests/META-INF/eclipse.inf
deleted file mode 100644
index 86da494b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/META-INF/eclipse.inf
+++ /dev/null
@@ -1,6 +0,0 @@
-# We do not want any nested jars
-# signed or normalized for packing
-# see bug 274743 Some unit tests are sensitive to details of build
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=274743
-jarprocessor.exclude=true
-jarprocessor.exclude.children=true
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/.cvsignore b/tests/org.eclipse.jst.j2ee.tests/TestData/.cvsignore
deleted file mode 100644
index d30e719a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-tempOutput
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/12AppClientTest.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/12AppClientTest.jar
deleted file mode 100644
index 8cce112b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/12AppClientTest.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/13AppClient.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/13AppClient.jar
deleted file mode 100644
index 79957c4d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/13AppClient.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/13AppClientTest.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/13AppClientTest.jar
deleted file mode 100644
index f00cf8bf..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/13AppClientTest.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/AppClientExpTest.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/AppClientExpTest.jar
deleted file mode 100644
index b3c7ede9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/AppClientExpTest.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/AppClientNoSource.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/AppClientNoSource.jar
deleted file mode 100644
index dbe7dfbf..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/AppClientNoSource.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/AppClientSomeSource.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/AppClientSomeSource.jar
deleted file mode 100644
index def98f6f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/AppClientSomeSource.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/AppClientSource.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/AppClientSource.jar
deleted file mode 100644
index eaac33ad..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/AppClientTests/AppClientSource.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/BindingsHelperTests/BindingsTestEAR.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/BindingsHelperTests/BindingsTestEAR.ear
deleted file mode 100644
index cbedada1..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/BindingsHelperTests/BindingsTestEAR.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/Test1.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/Test1.jar
deleted file mode 100644
index 80f089dd..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/Test1.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/Test2.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/Test2.jar
deleted file mode 100644
index 66c077d3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/Test2.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/Test3.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/Test3.jar
deleted file mode 100644
index 7e597678..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/Test3.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/Test3_bin/test/Test3.class b/tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/Test3_bin/test/Test3.class
deleted file mode 100644
index b0c3c889..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/Test3_bin/test/Test3.class
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/other/Test3.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/other/Test3.jar
deleted file mode 100644
index 7e597678..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/ClasspathDependencyTests/other/Test3.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/DefectTests/EJB100441NoClient.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/DefectTests/EJB100441NoClient.jar
deleted file mode 100644
index cb921c68..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/DefectTests/EJB100441NoClient.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/SimpleEAR.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/SimpleEAR.ear
deleted file mode 100644
index 3bf23c14..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/SimpleEAR.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test12EJBEAR.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test12EJBEAR.ear
deleted file mode 100644
index e7c8dc9b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test12EJBEAR.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test12WEBEJBEAR.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test12WEBEJBEAR.ear
deleted file mode 100644
index c16da2a0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test12WEBEJBEAR.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test13EJBEAR.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test13EJBEAR.ear
deleted file mode 100644
index edc7beb1..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test13EJBEAR.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test13WEBEJBEAR.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test13WEBEJBEAR.ear
deleted file mode 100644
index e932509c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test13WEBEJBEAR.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test14EJBEAR.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test14EJBEAR.ear
deleted file mode 100644
index fd220287..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test14EJBEAR.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test14WEBEJBEAR.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test14WEBEJBEAR.ear
deleted file mode 100644
index 86cb4930..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test14WEBEJBEAR.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test14WEBEJBEARWithMetaData.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test14WEBEJBEARWithMetaData.ear
deleted file mode 100644
index 17b981ab..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/Test14WEBEJBEARWithMetaData.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/UtilityJarTestEAR.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/UtilityJarTestEAR.ear
deleted file mode 100644
index cb831015..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/UtilityJarTestEAR.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/UtilityJarWebLibWithMetaDataFilesEAR.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/UtilityJarWebLibWithMetaDataFilesEAR.ear
deleted file mode 100644
index 5debb3ba..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/EARImportTests/UtilityJarWebLibWithMetaDataFilesEAR.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/EJBImportTests/Test13EJB.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/EJBImportTests/Test13EJB.jar
deleted file mode 100644
index be00332e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/EJBImportTests/Test13EJB.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/EJBImportTests/Test14EJB.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/EJBImportTests/Test14EJB.jar
deleted file mode 100644
index f06f7542..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/EJBImportTests/Test14EJB.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/EJBImportTests/TestEJB3.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/EJBImportTests/TestEJB3.jar
deleted file mode 100644
index 8980df3e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/EJBImportTests/TestEJB3.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/GenralArtifactTest/J2EEArtifactEditTestProjects.zip b/tests/org.eclipse.jst.j2ee.tests/TestData/GenralArtifactTest/J2EEArtifactEditTestProjects.zip
deleted file mode 100644
index b0a4cf3a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/GenralArtifactTest/J2EEArtifactEditTestProjects.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/GenralArtifactTest/perfWAR.zip b/tests/org.eclipse.jst.j2ee.tests/TestData/GenralArtifactTest/perfWAR.zip
deleted file mode 100644
index 98c4b2a9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/GenralArtifactTest/perfWAR.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_Defaults.jar
deleted file mode 100644
index 92786630..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_InterestingName_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_InterestingName_Defaults.jar
deleted file mode 100644
index 32a4ab48..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_InterestingName_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_InterestingName_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_InterestingName_NoBuild.jar
deleted file mode 100644
index 32a4ab48..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_InterestingName_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_InterestingName_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_InterestingName_Source.jar
deleted file mode 100644
index 9818ea04..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_InterestingName_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_InterestingName_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_InterestingName_Source_NoBuild.jar
deleted file mode 100644
index 9818ea04..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_InterestingName_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_NoBuild.jar
deleted file mode 100644
index 92786630..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_Source.jar
deleted file mode 100644
index 1474ac07..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_Source_NoBuild.jar
deleted file mode 100644
index 1474ac07..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_AddToEAR_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_Defaults_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_Defaults_Defaults.jar
deleted file mode 100644
index bde3461a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_Defaults_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_Defaults_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_Defaults_NoBuild.jar
deleted file mode 100644
index bde3461a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_Defaults_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_Defaults_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_Defaults_Source.jar
deleted file mode 100644
index 636ab26a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_Defaults_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_Defaults_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_Defaults_Source_NoBuild.jar
deleted file mode 100644
index 5a7ae5b6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_Defaults_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_InterestingName_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_InterestingName_Defaults.jar
deleted file mode 100644
index 68a5d5fd..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_InterestingName_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_InterestingName_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_InterestingName_NoBuild.jar
deleted file mode 100644
index 68a5d5fd..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_InterestingName_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_InterestingName_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_InterestingName_Source.jar
deleted file mode 100644
index 6de1dfc1..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_InterestingName_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_InterestingName_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_InterestingName_Source_NoBuild.jar
deleted file mode 100644
index 6de1dfc1..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_InterestingName_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_NoDefaultClass_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_NoDefaultClass_Defaults.jar
deleted file mode 100644
index 04b2f240..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_NoDefaultClass_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_NoDefaultClass_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_NoDefaultClass_NoBuild.jar
deleted file mode 100644
index 04b2f240..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_NoDefaultClass_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_NoDefaultClass_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_NoDefaultClass_Source.jar
deleted file mode 100644
index b806faec..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_NoDefaultClass_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_NoDefaultClass_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_NoDefaultClass_Source_NoBuild.jar
deleted file mode 100644
index b806faec..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC12_NoDefaultClass_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_Defaults.jar
deleted file mode 100644
index 56cad7d0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_InterestingName_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_InterestingName_Defaults.jar
deleted file mode 100644
index 7662c871..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_InterestingName_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_InterestingName_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_InterestingName_NoBuild.jar
deleted file mode 100644
index 7662c871..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_InterestingName_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_InterestingName_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_InterestingName_Source.jar
deleted file mode 100644
index 2e170219..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_InterestingName_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_InterestingName_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_InterestingName_Source_NoBuild.jar
deleted file mode 100644
index 2e170219..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_InterestingName_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_NoBuild.jar
deleted file mode 100644
index 56cad7d0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_Source.jar
deleted file mode 100644
index e4af3acb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_Source_NoBuild.jar
deleted file mode 100644
index e4af3acb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_AddToEAR_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_Defaults_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_Defaults_Defaults.jar
deleted file mode 100644
index efc61361..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_Defaults_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_Defaults_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_Defaults_NoBuild.jar
deleted file mode 100644
index efc61361..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_Defaults_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_Defaults_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_Defaults_Source.jar
deleted file mode 100644
index 4f29ca2b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_Defaults_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_Defaults_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_Defaults_Source_NoBuild.jar
deleted file mode 100644
index 4f29ca2b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_Defaults_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_InterestingName_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_InterestingName_Defaults.jar
deleted file mode 100644
index 8f19ba95..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_InterestingName_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_InterestingName_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_InterestingName_NoBuild.jar
deleted file mode 100644
index 8f19ba95..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_InterestingName_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_InterestingName_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_InterestingName_Source.jar
deleted file mode 100644
index 9c3af02a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_InterestingName_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_InterestingName_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_InterestingName_Source_NoBuild.jar
deleted file mode 100644
index 9c3af02a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_InterestingName_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_NoDefaultClass_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_NoDefaultClass_Defaults.jar
deleted file mode 100644
index b6fdbfaf..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_NoDefaultClass_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_NoDefaultClass_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_NoDefaultClass_NoBuild.jar
deleted file mode 100644
index b6fdbfaf..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_NoDefaultClass_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_NoDefaultClass_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_NoDefaultClass_Source.jar
deleted file mode 100644
index c261ea94..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_NoDefaultClass_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_NoDefaultClass_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_NoDefaultClass_Source_NoBuild.jar
deleted file mode 100644
index c261ea94..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC13_NoDefaultClass_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_Defaults.jar
deleted file mode 100644
index f2f6856f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_InterestingName_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_InterestingName_Defaults.jar
deleted file mode 100644
index b859e0b6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_InterestingName_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_InterestingName_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_InterestingName_NoBuild.jar
deleted file mode 100644
index b859e0b6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_InterestingName_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_InterestingName_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_InterestingName_Source.jar
deleted file mode 100644
index 2feac4c6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_InterestingName_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_InterestingName_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_InterestingName_Source_NoBuild.jar
deleted file mode 100644
index 2feac4c6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_InterestingName_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_NoBuild.jar
deleted file mode 100644
index f2f6856f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_Source.jar
deleted file mode 100644
index cb274bed..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_Source_NoBuild.jar
deleted file mode 100644
index cb274bed..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_AddToEAR_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_Defaults_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_Defaults_Defaults.jar
deleted file mode 100644
index 2984fb52..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_Defaults_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_Defaults_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_Defaults_NoBuild.jar
deleted file mode 100644
index 2984fb52..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_Defaults_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_Defaults_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_Defaults_Source.jar
deleted file mode 100644
index f1ac0d0e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_Defaults_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_Defaults_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_Defaults_Source_NoBuild.jar
deleted file mode 100644
index f1ac0d0e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_Defaults_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_InterestingName_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_InterestingName_Defaults.jar
deleted file mode 100644
index 3165ae7b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_InterestingName_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_InterestingName_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_InterestingName_NoBuild.jar
deleted file mode 100644
index 3165ae7b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_InterestingName_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_InterestingName_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_InterestingName_Source.jar
deleted file mode 100644
index a566f681..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_InterestingName_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_InterestingName_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_InterestingName_Source_NoBuild.jar
deleted file mode 100644
index a566f681..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_InterestingName_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_NoDefaultClass_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_NoDefaultClass_Defaults.jar
deleted file mode 100644
index 78f79ef5..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_NoDefaultClass_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_NoDefaultClass_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_NoDefaultClass_NoBuild.jar
deleted file mode 100644
index 121a8fad..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_NoDefaultClass_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_NoDefaultClass_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_NoDefaultClass_Source.jar
deleted file mode 100644
index 9827b052..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_NoDefaultClass_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_NoDefaultClass_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_NoDefaultClass_Source_NoBuild.jar
deleted file mode 100644
index 9827b052..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC14_NoDefaultClass_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Defaults.jar
deleted file mode 100644
index 2d6a5786..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Defaults.jar
deleted file mode 100644
index 1be3b0ea..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_NoBuild.jar
deleted file mode 100644
index 1be3b0ea..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Source.jar
deleted file mode 100644
index 1be3b0ea..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Source_NoBuild.jar
deleted file mode 100644
index 1be3b0ea..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_WithDD_Defaults.jar
deleted file mode 100644
index fdf8e883..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_WithDD_NoBuild.jar
deleted file mode 100644
index fdf8e883..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_WithDD_Source.jar
deleted file mode 100644
index fdf8e883..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_WithDD_Source_NoBuild.jar
deleted file mode 100644
index fdf8e883..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_InterestingName_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_NoBuild.jar
deleted file mode 100644
index 2d6a5786..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Source.jar
deleted file mode 100644
index 2d6a5786..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Source_NoBuild.jar
deleted file mode 100644
index 2d6a5786..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_WithDD_Defaults.jar
deleted file mode 100644
index b8e24624..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_WithDD_NoBuild.jar
deleted file mode 100644
index b8e24624..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_WithDD_Source.jar
deleted file mode 100644
index b8e24624..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_WithDD_Source_NoBuild.jar
deleted file mode 100644
index b8e24624..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_AddToEAR_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Defaults.jar
deleted file mode 100644
index 8f4fee53..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_NoBuild.jar
deleted file mode 100644
index 8f4fee53..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Source.jar
deleted file mode 100644
index 8f4fee53..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Source_NoBuild.jar
deleted file mode 100644
index 8f4fee53..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_Defaults_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Defaults.jar
deleted file mode 100644
index c5d27063..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_NoBuild.jar
deleted file mode 100644
index c5d27063..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Source.jar
deleted file mode 100644
index c5d27063..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Source_NoBuild.jar
deleted file mode 100644
index c5d27063..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_InterestingName_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Defaults.jar
deleted file mode 100644
index 1d171478..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_NoBuild.jar
deleted file mode 100644
index 1d171478..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Source.jar
deleted file mode 100644
index 1d171478..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Source_NoBuild.jar
deleted file mode 100644
index 1d171478..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_WithDD_Defaults.jar
deleted file mode 100644
index 9b074925..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_WithDD_NoBuild.jar
deleted file mode 100644
index 9b074925..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_WithDD_Source.jar
deleted file mode 100644
index 9b074925..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_WithDD_Source_NoBuild.jar
deleted file mode 100644
index 9b074925..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_NoDefaultClass_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_WithDD_Defaults.jar
deleted file mode 100644
index 3138c110..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_WithDD_NoBuild.jar
deleted file mode 100644
index 3138c110..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_WithDD_Source.jar
deleted file mode 100644
index 3138c110..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_WithDD_Source_NoBuild.jar
deleted file mode 100644
index 3138c110..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC50_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Defaults.jar
deleted file mode 100644
index a6350a29..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_NoBuild.jar
deleted file mode 100644
index 63191727..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Source.jar
deleted file mode 100644
index 8afc75c1..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Source_NoBuild.jar
deleted file mode 100644
index fbc1719e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_InterestingName_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Defaults.jar
deleted file mode 100644
index fd2e0a98..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_NoBuild.jar
deleted file mode 100644
index a4ec26df..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Source.jar
deleted file mode 100644
index 7cf87d21..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Source_NoBuild.jar
deleted file mode 100644
index 5eb844e4..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_AddToEAR_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Defaults.jar
deleted file mode 100644
index 30abbedc..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_NoBuild.jar
deleted file mode 100644
index 9e98f9b8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Source.jar
deleted file mode 100644
index 81603416..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Source_NoBuild.jar
deleted file mode 100644
index 4e10e375..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_NoDefaultClass_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Defaults.jar
deleted file mode 100644
index cacb37c9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_NoBuild.jar
deleted file mode 100644
index de17b044..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Source.jar
deleted file mode 100644
index fd4e308b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Source_NoBuild.jar
deleted file mode 100644
index 6849c8c7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/AppClientImportOperationTest/AC60_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/288180.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/288180.ear
deleted file mode 100644
index 9b158b50..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/288180.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_ChangedContentDir_Defaults.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_ChangedContentDir_Defaults.ear
deleted file mode 100644
index 5ad79f03..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_ChangedContentDir_Defaults.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_ChangedContentDir_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_ChangedContentDir_NoBuild.ear
deleted file mode 100644
index 5ad79f03..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_ChangedContentDir_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_ChangedContentDir_Source.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_ChangedContentDir_Source.ear
deleted file mode 100644
index 3c7aab11..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_ChangedContentDir_Source.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_ChangedContentDir_Source_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_ChangedContentDir_Source_NoBuild.ear
deleted file mode 100644
index 3c7aab11..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_ChangedContentDir_Source_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_Defaults.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_Defaults.ear
deleted file mode 100644
index aeb6f5b8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_Defaults.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_NoBuild.ear
deleted file mode 100644
index aeb6f5b8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_Source.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_Source.ear
deleted file mode 100644
index 21fa5655..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_Source.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_Source_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_Source_NoBuild.ear
deleted file mode 100644
index 21fa5655..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR12_Source_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_ChangedContentDir_Defaults.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_ChangedContentDir_Defaults.ear
deleted file mode 100644
index ff457d9b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_ChangedContentDir_Defaults.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_ChangedContentDir_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_ChangedContentDir_NoBuild.ear
deleted file mode 100644
index b6534640..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_ChangedContentDir_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_ChangedContentDir_Source.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_ChangedContentDir_Source.ear
deleted file mode 100644
index 49aad0c6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_ChangedContentDir_Source.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_ChangedContentDir_Source_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_ChangedContentDir_Source_NoBuild.ear
deleted file mode 100644
index 95273067..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_ChangedContentDir_Source_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_Defaults.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_Defaults.ear
deleted file mode 100644
index 6f31632c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_Defaults.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_NoBuild.ear
deleted file mode 100644
index 294e7ad6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_Source.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_Source.ear
deleted file mode 100644
index b50752ea..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_Source.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_Source_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_Source_NoBuild.ear
deleted file mode 100644
index df3a1678..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR13_Source_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_ChangedContentDir_Defaults.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_ChangedContentDir_Defaults.ear
deleted file mode 100644
index a5e4aa53..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_ChangedContentDir_Defaults.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_ChangedContentDir_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_ChangedContentDir_NoBuild.ear
deleted file mode 100644
index e0d0bace..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_ChangedContentDir_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_ChangedContentDir_Source.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_ChangedContentDir_Source.ear
deleted file mode 100644
index d198108d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_ChangedContentDir_Source.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_ChangedContentDir_Source_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_ChangedContentDir_Source_NoBuild.ear
deleted file mode 100644
index e6f515e3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_ChangedContentDir_Source_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_Defaults.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_Defaults.ear
deleted file mode 100644
index fb635f1e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_Defaults.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_NoBuild.ear
deleted file mode 100644
index 0725a279..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_Source.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_Source.ear
deleted file mode 100644
index 380f8257..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_Source.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_Source_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_Source_NoBuild.ear
deleted file mode 100644
index 5a11637e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR14_Source_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_Defaults.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_Defaults.ear
deleted file mode 100644
index 363bf9c5..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_Defaults.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_NoBuild.ear
deleted file mode 100644
index 47a6608a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_Source.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_Source.ear
deleted file mode 100644
index f6e1d065..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_Source.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_Source_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_Source_NoBuild.ear
deleted file mode 100644
index 2119e369..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_Source_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_WithDD_Defaults.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_WithDD_Defaults.ear
deleted file mode 100644
index 87522a2a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_WithDD_Defaults.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_WithDD_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_WithDD_NoBuild.ear
deleted file mode 100644
index 19fb5a7e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_WithDD_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_WithDD_Source.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_WithDD_Source.ear
deleted file mode 100644
index 2ff4724a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_WithDD_Source.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_WithDD_Source_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_WithDD_Source_NoBuild.ear
deleted file mode 100644
index 6bf0da0c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_ChangedContentDir_WithDD_Source_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_Defaults.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_Defaults.ear
deleted file mode 100644
index f060facc..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_Defaults.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_NoBuild.ear
deleted file mode 100644
index 07e01fa8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_Source.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_Source.ear
deleted file mode 100644
index 02a80d8d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_Source.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_Source_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_Source_NoBuild.ear
deleted file mode 100644
index ad4e0a6f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_Source_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_WithDD_Defaults.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_WithDD_Defaults.ear
deleted file mode 100644
index ebf22ffe..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_WithDD_Defaults.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_WithDD_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_WithDD_NoBuild.ear
deleted file mode 100644
index aa81cc6a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_WithDD_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_WithDD_Source.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_WithDD_Source.ear
deleted file mode 100644
index 862ec0c4..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_WithDD_Source.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_WithDD_Source_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_WithDD_Source_NoBuild.ear
deleted file mode 100644
index 28b573af..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR50_WithDD_Source_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesNoDDs.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesNoDDs.ear
deleted file mode 100644
index fd46af67..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesNoDDs.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesNoDDsAndWithDDs.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesNoDDsAndWithDDs.ear
deleted file mode 100644
index a6a5662c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesNoDDsAndWithDDs.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesNoDDsAndWithDDs_WithUtil.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesNoDDsAndWithDDs_WithUtil.ear
deleted file mode 100644
index d6b473f9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesNoDDsAndWithDDs_WithUtil.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesNoDDs_WithUtil.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesNoDDs_WithUtil.ear
deleted file mode 100644
index 4fd58216..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesNoDDs_WithUtil.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesWithDDs.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesWithDDs.ear
deleted file mode 100644
index b6c3f5b0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesWithDDs.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesWithDDs_WithUtil.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesWithDDs_WithUtil.ear
deleted file mode 100644
index 8e0850d4..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5NoDD_DependincesWithDDs_WithUtil.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesNoDDs.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesNoDDs.ear
deleted file mode 100644
index a7d57d9a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesNoDDs.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesNoDDsAndWithDDs.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesNoDDsAndWithDDs.ear
deleted file mode 100644
index d7abc11d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesNoDDsAndWithDDs.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesNoDDsAndWithDDs_WithUtil.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesNoDDsAndWithDDs_WithUtil.ear
deleted file mode 100644
index 73340284..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesNoDDsAndWithDDs_WithUtil.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesNoDDs_WithUtil.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesNoDDs_WithUtil.ear
deleted file mode 100644
index 655737cb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesNoDDs_WithUtil.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesWithDDs.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesWithDDs.ear
deleted file mode 100644
index 790c5cc6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesWithDDs.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesWithDDs_WithUtil.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesWithDDs_WithUtil.ear
deleted file mode 100644
index 134505ef..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EARImportOperationTest/EAR5WithDD_DependincesWithDDs_WithUtil.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_ChangedEJBClientName_WithSource_DontRunBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_ChangedEJBClientName_WithSource_DontRunBuild.jar
deleted file mode 100644
index c3da7c39..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_ChangedEJBClientName_WithSource_DontRunBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_Defaults_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_Defaults_Defaults.jar
deleted file mode 100644
index ef19d092..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_Defaults_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_Defaults_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_Defaults_NoBuild.jar
deleted file mode 100644
index ef19d092..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_Defaults_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_Defaults_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_Defaults_Source.jar
deleted file mode 100644
index 77f5fd2c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_Defaults_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_Defaults_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_Defaults_Source_NoBuild.jar
deleted file mode 100644
index 77f5fd2c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_Defaults_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_Defaults.jar
deleted file mode 100644
index af093f8c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jar
deleted file mode 100644
index 26c9e7f0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jar
deleted file mode 100644
index 26c9e7f0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jar
deleted file mode 100644
index aa960834..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jar
deleted file mode 100644
index aa960834..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_NoBuild.jar
deleted file mode 100644
index af093f8c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_Source.jar
deleted file mode 100644
index c3da7c39..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_Source_NoBuild.jar
deleted file mode 100644
index c3da7c39..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientName_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientSourceFolder_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientSourceFolder_Defaults.jar
deleted file mode 100644
index 28e57b0d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientSourceFolder_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientSourceFolder_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientSourceFolder_NoBuild.jar
deleted file mode 100644
index 28e57b0d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientSourceFolder_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientSourceFolder_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientSourceFolder_Source.jar
deleted file mode 100644
index 7f4dcd4a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientSourceFolder_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jar
deleted file mode 100644
index 7f4dcd4a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_NoClient_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_NoClient_Defaults.jar
deleted file mode 100644
index f414ec83..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_NoClient_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_NoClient_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_NoClient_NoBuild.jar
deleted file mode 100644
index f414ec83..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_NoClient_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_NoClient_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_NoClient_Source.jar
deleted file mode 100644
index 3b60d44b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_NoClient_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_NoClient_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_NoClient_Source_NoBuild.jar
deleted file mode 100644
index 3b60d44b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_AddToEAR_NoClient_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_Defaults_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_Defaults_Defaults.jar
deleted file mode 100644
index cc772d90..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_Defaults_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_Defaults_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_Defaults_NoBuild.jar
deleted file mode 100644
index 0871820a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_Defaults_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_Defaults_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_Defaults_Source.jar
deleted file mode 100644
index e7e7ff3a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_Defaults_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_Defaults_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_Defaults_Source_NoBuild.jar
deleted file mode 100644
index 65262e2f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB11_Defaults_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_Defaults_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_Defaults_Defaults.jar
deleted file mode 100644
index bb531729..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_Defaults_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_Defaults_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_Defaults_NoBuild.jar
deleted file mode 100644
index bb531729..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_Defaults_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_Defaults_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_Defaults_Source.jar
deleted file mode 100644
index 08e2d292..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_Defaults_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_Defaults_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_Defaults_Source_NoBuild.jar
deleted file mode 100644
index 08e2d292..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_Defaults_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_Defaults.jar
deleted file mode 100644
index 467ac404..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jar
deleted file mode 100644
index b0e0e79f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jar
deleted file mode 100644
index b0e0e79f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jar
deleted file mode 100644
index 243122c7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jar
deleted file mode 100644
index 243122c7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_NoBuild.jar
deleted file mode 100644
index 467ac404..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_Source.jar
deleted file mode 100644
index b0c17fa1..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_Source_NoBuild.jar
deleted file mode 100644
index b0c17fa1..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientName_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientSourceFolder_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientSourceFolder_Defaults.jar
deleted file mode 100644
index 6fa6d96f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientSourceFolder_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientSourceFolder_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientSourceFolder_NoBuild.jar
deleted file mode 100644
index 6fa6d96f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientSourceFolder_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientSourceFolder_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientSourceFolder_Source.jar
deleted file mode 100644
index 2d10a5c8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientSourceFolder_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jar
deleted file mode 100644
index 2d10a5c8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_NoClient_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_NoClient_Defaults.jar
deleted file mode 100644
index a662a82e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_NoClient_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_NoClient_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_NoClient_NoBuild.jar
deleted file mode 100644
index a662a82e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_NoClient_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_NoClient_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_NoClient_Source.jar
deleted file mode 100644
index 33ca119c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_NoClient_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_NoClient_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_NoClient_Source_NoBuild.jar
deleted file mode 100644
index 33ca119c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_AddToEAR_NoClient_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_Defaults_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_Defaults_Defaults.jar
deleted file mode 100644
index cbb0a80c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_Defaults_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_Defaults_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_Defaults_NoBuild.jar
deleted file mode 100644
index cbb0a80c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_Defaults_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_Defaults_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_Defaults_Source.jar
deleted file mode 100644
index 3b429d47..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_Defaults_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_Defaults_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_Defaults_Source_NoBuild.jar
deleted file mode 100644
index 3b429d47..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB20_Defaults_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_Defaults_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_Defaults_Defaults.jar
deleted file mode 100644
index 24ceea38..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_Defaults_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_Defaults_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_Defaults_NoBuild.jar
deleted file mode 100644
index 24ceea38..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_Defaults_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_Defaults_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_Defaults_Source.jar
deleted file mode 100644
index 3ef57cdd..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_Defaults_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_Defaults_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_Defaults_Source_NoBuild.jar
deleted file mode 100644
index 3ef57cdd..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_Defaults_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_Defaults.jar
deleted file mode 100644
index 3e89dad5..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jar
deleted file mode 100644
index 2748913c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jar
deleted file mode 100644
index 2748913c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jar
deleted file mode 100644
index 82ff7a79..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jar
deleted file mode 100644
index 82ff7a79..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_NoBuild.jar
deleted file mode 100644
index 3e89dad5..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_Source.jar
deleted file mode 100644
index 72459743..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_Source_NoBuild.jar
deleted file mode 100644
index 72459743..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientName_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientSourceFolder_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientSourceFolder_Defaults.jar
deleted file mode 100644
index e4b6574d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientSourceFolder_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientSourceFolder_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientSourceFolder_NoBuild.jar
deleted file mode 100644
index e4b6574d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientSourceFolder_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientSourceFolder_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientSourceFolder_Source.jar
deleted file mode 100644
index ffcf785e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientSourceFolder_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jar
deleted file mode 100644
index ffcf785e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_NoClient_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_NoClient_Defaults.jar
deleted file mode 100644
index 1c178157..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_NoClient_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_NoClient_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_NoClient_NoBuild.jar
deleted file mode 100644
index 1c178157..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_NoClient_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_NoClient_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_NoClient_Source.jar
deleted file mode 100644
index 252c0bb2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_NoClient_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_NoClient_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_NoClient_Source_NoBuild.jar
deleted file mode 100644
index 252c0bb2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_AddToEAR_NoClient_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_Defaults_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_Defaults_Defaults.jar
deleted file mode 100644
index e81c497b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_Defaults_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_Defaults_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_Defaults_NoBuild.jar
deleted file mode 100644
index e81c497b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_Defaults_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_Defaults_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_Defaults_Source.jar
deleted file mode 100644
index fd864ff9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_Defaults_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_Defaults_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_Defaults_Source_NoBuild.jar
deleted file mode 100644
index fd864ff9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB21_Defaults_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Defaults.jar
deleted file mode 100644
index b09afce6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_NoBuild.jar
deleted file mode 100644
index da70bea2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Source.jar
deleted file mode 100644
index da70bea2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Source_NoBuild.jar
deleted file mode 100644
index da70bea2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_WithDD_Defaults.jar
deleted file mode 100644
index 68b41b9b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_WithDD_NoBuild.jar
deleted file mode 100644
index 68b41b9b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_WithDD_Source.jar
deleted file mode 100644
index 68b41b9b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_WithDD_Source_NoBuild.jar
deleted file mode 100644
index 68b41b9b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_Defaults_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Defaults.jar
deleted file mode 100644
index 0b4213ad..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jar
deleted file mode 100644
index bce64a32..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jar
deleted file mode 100644
index bce64a32..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jar
deleted file mode 100644
index bce64a32..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jar
deleted file mode 100644
index bce64a32..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Defaults.jar
deleted file mode 100644
index 9bc55763..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_NoBuild.jar
deleted file mode 100644
index 9bc55763..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source.jar
deleted file mode 100644
index 9bc55763..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source_NoBuild.jar
deleted file mode 100644
index 9bc55763..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_NoBuild.jar
deleted file mode 100644
index 0b4213ad..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Source.jar
deleted file mode 100644
index 0b4213ad..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Source_NoBuild.jar
deleted file mode 100644
index 0b4213ad..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_WithDD_Defaults.jar
deleted file mode 100644
index 5709ab34..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_WithDD_NoBuild.jar
deleted file mode 100644
index 5709ab34..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_WithDD_Source.jar
deleted file mode 100644
index 5709ab34..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_WithDD_Source_NoBuild.jar
deleted file mode 100644
index 5709ab34..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientName_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Defaults.jar
deleted file mode 100644
index 7a3f0bd0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_NoBuild.jar
deleted file mode 100644
index 7a3f0bd0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Source.jar
deleted file mode 100644
index 7a3f0bd0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jar
deleted file mode 100644
index 7a3f0bd0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_WithDD_Defaults.jar
deleted file mode 100644
index 0a5644ca..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_WithDD_NoBuild.jar
deleted file mode 100644
index 0a5644ca..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_WithDD_Source.jar
deleted file mode 100644
index 0a5644ca..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_WithDD_Source_NoBuild.jar
deleted file mode 100644
index 0a5644ca..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_DiffClientSourceFolder_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Defaults.jar
deleted file mode 100644
index ee27df24..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_NoBuild.jar
deleted file mode 100644
index ee27df24..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Source.jar
deleted file mode 100644
index ee27df24..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Source_NoBuild.jar
deleted file mode 100644
index ee27df24..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_WithDD_Defaults.jar
deleted file mode 100644
index 98ef23cb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_WithDD_NoBuild.jar
deleted file mode 100644
index 98ef23cb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_WithDD_Source.jar
deleted file mode 100644
index 98ef23cb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_WithDD_Source_NoBuild.jar
deleted file mode 100644
index 98ef23cb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_AddToEAR_NoClient_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Defaults.jar
deleted file mode 100644
index ae70f7a7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_NoBuild.jar
deleted file mode 100644
index ae70f7a7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Source.jar
deleted file mode 100644
index ae70f7a7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Source_NoBuild.jar
deleted file mode 100644
index ae70f7a7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_WithDD_Defaults.jar
deleted file mode 100644
index 6a2cadcb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_WithDD_NoBuild.jar
deleted file mode 100644
index 6a2cadcb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_WithDD_Source.jar
deleted file mode 100644
index 6a2cadcb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_WithDD_Source_NoBuild.jar
deleted file mode 100644
index 6a2cadcb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB30_Defaults_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Defaults.jar
deleted file mode 100644
index 183137ea..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_NoBuild.jar
deleted file mode 100644
index 99e278ad..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Source.jar
deleted file mode 100644
index 3fdead63..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Source_NoBuild.jar
deleted file mode 100644
index aa208aae..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_Defaults_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Defaults.jar
deleted file mode 100644
index 17d5b5cf..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_NoBuild.jar
deleted file mode 100644
index 0422489e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source.jar
deleted file mode 100644
index 274aaf52..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source_NoBuild.jar
deleted file mode 100644
index 9fd3d2cc..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_DiffClientSourceFolder_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Defaults.jar
deleted file mode 100644
index af93e198..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_NoBuild.jar
deleted file mode 100644
index 8342436b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Source.jar
deleted file mode 100644
index a88a79e2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Source_NoBuild.jar
deleted file mode 100644
index d19297e3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientName_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Defaults.jar
deleted file mode 100644
index c9f8808b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_NoBuild.jar
deleted file mode 100644
index 46f09c5e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Source.jar
deleted file mode 100644
index 2346692c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Source_NoBuild.jar
deleted file mode 100644
index da365c32..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_DiffClientSourceFolder_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Defaults.jar
deleted file mode 100644
index ffcaa28f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_NoBuild.jar
deleted file mode 100644
index 5f7dde62..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Source.jar
deleted file mode 100644
index 26cb8657..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Source_NoBuild.jar
deleted file mode 100644
index 38db407c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_AddToEAR_NoClient_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Defaults.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Defaults.jar
deleted file mode 100644
index dd0647d0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Defaults.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_NoBuild.jar
deleted file mode 100644
index 2592c8b8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Source.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Source.jar
deleted file mode 100644
index 731966fb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Source.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Source_NoBuild.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Source_NoBuild.jar
deleted file mode 100644
index 2e2d5c35..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/EJBImportOperationTest/EJB31_Defaults_WithDD_Source_NoBuild.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_Defaults_Defaults.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_Defaults_Defaults.rar
deleted file mode 100644
index 3f564926..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_Defaults_Defaults.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_Defaults_NoBuild.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_Defaults_NoBuild.rar
deleted file mode 100644
index 742c03d1..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_Defaults_NoBuild.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_Defaults_Source.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_Defaults_Source.rar
deleted file mode 100644
index 1caa2b3c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_Defaults_Source.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_Defaults_Source_NoBuild.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_Defaults_Source_NoBuild.rar
deleted file mode 100644
index 1caa2b3c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_Defaults_Source_NoBuild.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_Defaults.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_Defaults.rar
deleted file mode 100644
index b63fb894..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_Defaults.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_NoBuild.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_NoBuild.rar
deleted file mode 100644
index b63fb894..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_NoBuild.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_Source.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_Source.rar
deleted file mode 100644
index a09685fb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_Source.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_Source_NoBuild.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_Source_NoBuild.rar
deleted file mode 100644
index a09685fb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_Source_NoBuild.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_WithEAR_Defaults.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_WithEAR_Defaults.rar
deleted file mode 100644
index f03ca407..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_WithEAR_Defaults.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_WithEAR_NoBuild.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_WithEAR_NoBuild.rar
deleted file mode 100644
index f03ca407..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_WithEAR_NoBuild.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_WithEAR_Source.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_WithEAR_Source.rar
deleted file mode 100644
index 68d4fb36..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_WithEAR_Source.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_WithEAR_Source_NoBuild.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_WithEAR_Source_NoBuild.rar
deleted file mode 100644
index 68d4fb36..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_DiffSourceFolder_WithEAR_Source_NoBuild.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_WithEAR_Defaults.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_WithEAR_Defaults.rar
deleted file mode 100644
index 9505a63c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_WithEAR_Defaults.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_WithEAR_NoBuild.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_WithEAR_NoBuild.rar
deleted file mode 100644
index 9505a63c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_WithEAR_NoBuild.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_WithEAR_Source.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_WithEAR_Source.rar
deleted file mode 100644
index 0fc69361..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_WithEAR_Source.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_WithEAR_Source_NoBuild.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_WithEAR_Source_NoBuild.rar
deleted file mode 100644
index 0fc69361..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector10_WithEAR_Source_NoBuild.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_Defaults_Defaults.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_Defaults_Defaults.rar
deleted file mode 100644
index 8fbe6a08..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_Defaults_Defaults.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_Defaults_NoBuild.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_Defaults_NoBuild.rar
deleted file mode 100644
index 8fbe6a08..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_Defaults_NoBuild.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_Defaults_Source.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_Defaults_Source.rar
deleted file mode 100644
index 6efe066d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_Defaults_Source.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_Defaults_Source_NoBuild.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_Defaults_Source_NoBuild.rar
deleted file mode 100644
index 6efe066d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_Defaults_Source_NoBuild.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_Defaults.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_Defaults.rar
deleted file mode 100644
index d4860d0a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_Defaults.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_NoBuild.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_NoBuild.rar
deleted file mode 100644
index 25aeecb9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_NoBuild.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_Source.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_Source.rar
deleted file mode 100644
index 5c4a27f2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_Source.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_Source_NoBuild.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_Source_NoBuild.rar
deleted file mode 100644
index 1e812b00..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_Source_NoBuild.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_WithEAR_Defaults.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_WithEAR_Defaults.rar
deleted file mode 100644
index 4a6626f0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_WithEAR_Defaults.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_WithEAR_NoBuild.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_WithEAR_NoBuild.rar
deleted file mode 100644
index 4a6626f0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_WithEAR_NoBuild.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_WithEAR_Source.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_WithEAR_Source.rar
deleted file mode 100644
index f3a9b5a8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_WithEAR_Source.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_WithEAR_Source_NoBuild.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_WithEAR_Source_NoBuild.rar
deleted file mode 100644
index f3a9b5a8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_DiffSourceFolder_WithEAR_Source_NoBuild.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_WithEAR_Defaults.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_WithEAR_Defaults.rar
deleted file mode 100644
index 5f0cabe5..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_WithEAR_Defaults.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_WithEAR_NoBuild.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_WithEAR_NoBuild.rar
deleted file mode 100644
index 5f0cabe5..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_WithEAR_NoBuild.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_WithEAR_Source.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_WithEAR_Source.rar
deleted file mode 100644
index 32134db8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_WithEAR_Source.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_WithEAR_Source_NoBuild.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_WithEAR_Source_NoBuild.rar
deleted file mode 100644
index 32134db8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/JCAImportOperationTest/Connector15_WithEAR_Source_NoBuild.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR12_Defaults.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR12_Defaults.ear
deleted file mode 100644
index 097894ad..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR12_Defaults.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR12_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR12_NoBuild.ear
deleted file mode 100644
index 097894ad..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR12_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR12_Source.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR12_Source.ear
deleted file mode 100644
index 59911a07..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR12_Source.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR12_Source_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR12_Source_NoBuild.ear
deleted file mode 100644
index 59911a07..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR12_Source_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR13_Defaults.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR13_Defaults.ear
deleted file mode 100644
index a03cf0f2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR13_Defaults.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR13_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR13_NoBuild.ear
deleted file mode 100644
index a03cf0f2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR13_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR13_Source.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR13_Source.ear
deleted file mode 100644
index ef9c07a9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR13_Source.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR13_Source_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR13_Source_NoBuild.ear
deleted file mode 100644
index ef9c07a9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR13_Source_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR14_Defaults.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR14_Defaults.ear
deleted file mode 100644
index a7601cab..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR14_Defaults.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR14_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR14_NoBuild.ear
deleted file mode 100644
index a7601cab..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR14_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR14_Source.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR14_Source.ear
deleted file mode 100644
index ef49a27f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR14_Source.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR14_Source_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR14_Source_NoBuild.ear
deleted file mode 100644
index ef49a27f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR14_Source_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithDD_Defaults.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithDD_Defaults.ear
deleted file mode 100644
index 269458fa..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithDD_Defaults.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithDD_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithDD_NoBuild.ear
deleted file mode 100644
index 269458fa..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithDD_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithDD_Source.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithDD_Source.ear
deleted file mode 100644
index 269458fa..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithDD_Source.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithDD_Source_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithDD_Source_NoBuild.ear
deleted file mode 100644
index 269458fa..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithDD_Source_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithoutDD_Defaults.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithoutDD_Defaults.ear
deleted file mode 100644
index 4f80b48b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithoutDD_Defaults.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithoutDD_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithoutDD_NoBuild.ear
deleted file mode 100644
index 4f80b48b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithoutDD_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithoutDD_Source.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithoutDD_Source.ear
deleted file mode 100644
index 4f80b48b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithoutDD_Source.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithoutDD_Source_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithoutDD_Source_NoBuild.ear
deleted file mode 100644
index 4f80b48b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_AddToExisitingEAR5_WithoutDD_Source_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_Defaults_Defaults.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_Defaults_Defaults.ear
deleted file mode 100644
index e89d68d2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_Defaults_Defaults.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_Defaults_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_Defaults_NoBuild.ear
deleted file mode 100644
index e89d68d2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_Defaults_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_Defaults_Source.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_Defaults_Source.ear
deleted file mode 100644
index 79e59b27..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_Defaults_Source.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_Defaults_Source_NoBuild.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_Defaults_Source_NoBuild.ear
deleted file mode 100644
index 79e59b27..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/UtilityImportOperationTest/Utility_Defaults_Source_NoBuild.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_Defaults.war
deleted file mode 100644
index d9472703..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_NoBuild.war
deleted file mode 100644
index 3bc9b6b3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_Source.war
deleted file mode 100644
index 02148ff3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_Source_NoBuild.war
deleted file mode 100644
index 2a180308..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_WithEAR_Defaults.war
deleted file mode 100644
index ba969647..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_WithEAR_NoBuild.war
deleted file mode 100644
index ba969647..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_WithEAR_Source.war
deleted file mode 100644
index 2619b318..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 2619b318..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_Defaults_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_Defaults.war
deleted file mode 100644
index d42f5058..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_Defaults.war
deleted file mode 100644
index c769162c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_NoBuild.war
deleted file mode 100644
index c769162c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_Source.war
deleted file mode 100644
index 3a9f3ff8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_Source_NoBuild.war
deleted file mode 100644
index 3a9f3ff8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
deleted file mode 100644
index 98715f32..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
deleted file mode 100644
index 98715f32..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_WithEAR_Source.war
deleted file mode 100644
index 1d1e5af7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 1d1e5af7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_NoBuild.war
deleted file mode 100644
index d42f5058..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_Source.war
deleted file mode 100644
index 064b9bab..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_Source_NoBuild.war
deleted file mode 100644
index 064b9bab..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_WithEAR_Defaults.war
deleted file mode 100644
index f0073cc8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_WithEAR_NoBuild.war
deleted file mode 100644
index f0073cc8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_WithEAR_Source.war
deleted file mode 100644
index 8172345a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 8172345a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContentDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
deleted file mode 100644
index 6807fd90..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
deleted file mode 100644
index d6ee3428..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.war
deleted file mode 100644
index d1def2e8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index d1def2e8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_WithEAR_Defaults.war
deleted file mode 100644
index 0023bd13..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.war
deleted file mode 100644
index 0023bd13..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_WithEAR_Source.war
deleted file mode 100644
index 8b24b78c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 8b24b78c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.war
deleted file mode 100644
index f3c84a6f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.war
deleted file mode 100644
index f3c84a6f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffSrcDir_WithEAR_Source.war
deleted file mode 100644
index 895033e3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffSrcDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 895033e3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_WithEAR_Defaults.war
deleted file mode 100644
index c19007e6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_WithEAR_NoBuild.war
deleted file mode 100644
index c19007e6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_WithEAR_Source.war
deleted file mode 100644
index 97465250..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 97465250..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffContextRoot_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_Defaults.war
deleted file mode 100644
index a4399064..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_NoBuild.war
deleted file mode 100644
index a4399064..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_Source.war
deleted file mode 100644
index 36a56150..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_Source_NoBuild.war
deleted file mode 100644
index 36a56150..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_WithEAR_Defaults.war
deleted file mode 100644
index 0121b0dc..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_WithEAR_NoBuild.war
deleted file mode 100644
index 0121b0dc..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_WithEAR_Source.war
deleted file mode 100644
index e3018812..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index e3018812..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web22_DiffSrcDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_Defaults.war
deleted file mode 100644
index afb939bb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_NoBuild.war
deleted file mode 100644
index afb939bb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_Source.war
deleted file mode 100644
index cfbb4008..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_Source_NoBuild.war
deleted file mode 100644
index cfbb4008..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_WithEAR_Defaults.war
deleted file mode 100644
index a336b136..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_WithEAR_NoBuild.war
deleted file mode 100644
index a336b136..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_WithEAR_Source.war
deleted file mode 100644
index 3b14fc4a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 3b14fc4a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_Defaults_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_Defaults.war
deleted file mode 100644
index fd9e050a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_Defaults.war
deleted file mode 100644
index e0aa27d3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_NoBuild.war
deleted file mode 100644
index e0aa27d3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_Source.war
deleted file mode 100644
index 96d3b939..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_Source_NoBuild.war
deleted file mode 100644
index 96d3b939..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
deleted file mode 100644
index 2000597d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
deleted file mode 100644
index 2000597d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_WithEAR_Source.war
deleted file mode 100644
index 5166d7e0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 5166d7e0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_NoBuild.war
deleted file mode 100644
index fd9e050a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_Source.war
deleted file mode 100644
index 1f1fb391..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_Source_NoBuild.war
deleted file mode 100644
index 1f1fb391..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_WithEAR_Defaults.war
deleted file mode 100644
index a8b1146a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_WithEAR_NoBuild.war
deleted file mode 100644
index a8b1146a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_WithEAR_Source.war
deleted file mode 100644
index 964b1ded..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 964b1ded..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContentDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
deleted file mode 100644
index 3e6e3d78..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
deleted file mode 100644
index 3e6e3d78..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.war
deleted file mode 100644
index 91306b59..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 91306b59..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_WithEAR_Defaults.war
deleted file mode 100644
index 5afa0728..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.war
deleted file mode 100644
index 5afa0728..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_WithEAR_Source.war
deleted file mode 100644
index 80158fd1..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 80158fd1..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.war
deleted file mode 100644
index ad3ce652..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.war
deleted file mode 100644
index ad3ce652..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffSrcDir_WithEAR_Source.war
deleted file mode 100644
index 218edf68..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffSrcDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 218edf68..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_WithEAR_Defaults.war
deleted file mode 100644
index 6f8d388e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_WithEAR_NoBuild.war
deleted file mode 100644
index 6f8d388e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_WithEAR_Source.war
deleted file mode 100644
index 117d9aff..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 117d9aff..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffContextRoot_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_Defaults.war
deleted file mode 100644
index ccd1b4ab..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_NoBuild.war
deleted file mode 100644
index ccd1b4ab..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_Source.war
deleted file mode 100644
index 4d056f26..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_Source_NoBuild.war
deleted file mode 100644
index 4d056f26..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_WithEAR_Defaults.war
deleted file mode 100644
index 080c3d33..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_WithEAR_NoBuild.war
deleted file mode 100644
index 080c3d33..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_WithEAR_Source.war
deleted file mode 100644
index 8d636c80..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 8d636c80..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web23_DiffSrcDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_Defaults.war
deleted file mode 100644
index 96671912..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_NoBuild.war
deleted file mode 100644
index 96671912..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_Source.war
deleted file mode 100644
index e52373ed..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_Source_NoBuild.war
deleted file mode 100644
index e52373ed..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_WithEAR_Defaults.war
deleted file mode 100644
index 441a3430..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_WithEAR_NoBuild.war
deleted file mode 100644
index 441a3430..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_WithEAR_Source.war
deleted file mode 100644
index 66989ba1..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 66989ba1..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_Defaults_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_Defaults.war
deleted file mode 100644
index 75f61758..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_Defaults.war
deleted file mode 100644
index 93bf4e7f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_NoBuild.war
deleted file mode 100644
index 93bf4e7f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_Source.war
deleted file mode 100644
index ced5825f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_Source_NoBuild.war
deleted file mode 100644
index ced5825f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
deleted file mode 100644
index d3aac3fc..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
deleted file mode 100644
index d3aac3fc..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_WithEAR_Source.war
deleted file mode 100644
index 9b078889..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 9b078889..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_NoBuild.war
deleted file mode 100644
index 75f61758..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_Source.war
deleted file mode 100644
index 771919a3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_Source_NoBuild.war
deleted file mode 100644
index 771919a3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_WithEAR_Defaults.war
deleted file mode 100644
index 84264848..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_WithEAR_NoBuild.war
deleted file mode 100644
index f93be326..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_WithEAR_Source.war
deleted file mode 100644
index b119bd97..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 4e731930..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContentDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
deleted file mode 100644
index d050a88a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
deleted file mode 100644
index d050a88a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.war
deleted file mode 100644
index 361d88e7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 361d88e7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_WithEAR_Defaults.war
deleted file mode 100644
index 525ecd63..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.war
deleted file mode 100644
index 525ecd63..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_WithEAR_Source.war
deleted file mode 100644
index e17942ff..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index e17942ff..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.war
deleted file mode 100644
index 1ed9ac1e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.war
deleted file mode 100644
index 1ed9ac1e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffSrcDir_WithEAR_Source.war
deleted file mode 100644
index c1c6b6e0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffSrcDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index c1c6b6e0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_WithEAR_Defaults.war
deleted file mode 100644
index f85e1166..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_WithEAR_NoBuild.war
deleted file mode 100644
index f85e1166..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_WithEAR_Source.war
deleted file mode 100644
index 98cbd95e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 98cbd95e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffContextRoot_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_Defaults.war
deleted file mode 100644
index e312c38a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_NoBuild.war
deleted file mode 100644
index e312c38a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_Source.war
deleted file mode 100644
index 6a15b33b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_Source_NoBuild.war
deleted file mode 100644
index 6a15b33b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_WithEAR_Defaults.war
deleted file mode 100644
index ab3b2a3b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_WithEAR_NoBuild.war
deleted file mode 100644
index ab3b2a3b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_WithEAR_Source.war
deleted file mode 100644
index c901deb5..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index c901deb5..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web24_DiffSrcDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Defaults.war
deleted file mode 100644
index ac74c9cc..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_NoBuild.war
deleted file mode 100644
index ac74c9cc..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Source.war
deleted file mode 100644
index ac74c9cc..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Source_NoBuild.war
deleted file mode 100644
index ac74c9cc..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithDD_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithDD_Defaults.war
deleted file mode 100644
index b8ad6e96..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithDD_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithDD_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithDD_NoBuild.war
deleted file mode 100644
index b8ad6e96..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithDD_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithDD_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithDD_Source.war
deleted file mode 100644
index b8ad6e96..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithDD_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithDD_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithDD_Source_NoBuild.war
deleted file mode 100644
index b8ad6e96..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithDD_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Defaults.war
deleted file mode 100644
index 1a24adec..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_NoBuild.war
deleted file mode 100644
index 1a24adec..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Source.war
deleted file mode 100644
index 1a24adec..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 1a24adec..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_WithDD_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_WithDD_Defaults.war
deleted file mode 100644
index 0743d1a7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_WithDD_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_WithDD_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_WithDD_NoBuild.war
deleted file mode 100644
index 0743d1a7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_WithDD_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_WithDD_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_WithDD_Source.war
deleted file mode 100644
index 0743d1a7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_WithDD_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_WithDD_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_WithDD_Source_NoBuild.war
deleted file mode 100644
index 0743d1a7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_Defaults_WithEAR_WithDD_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Defaults.war
deleted file mode 100644
index 95687f88..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Defaults.war
deleted file mode 100644
index 2aaf30e7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_NoBuild.war
deleted file mode 100644
index 2aaf30e7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Source.war
deleted file mode 100644
index 2aaf30e7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Source_NoBuild.war
deleted file mode 100644
index 2aaf30e7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithDD_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithDD_Defaults.war
deleted file mode 100644
index f70cbdbd..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithDD_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithDD_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithDD_NoBuild.war
deleted file mode 100644
index f70cbdbd..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithDD_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithDD_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithDD_Source.war
deleted file mode 100644
index f70cbdbd..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithDD_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithDD_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithDD_Source_NoBuild.war
deleted file mode 100644
index f70cbdbd..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithDD_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
deleted file mode 100644
index 5d22dac8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
deleted file mode 100644
index 5d22dac8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Source.war
deleted file mode 100644
index 5d22dac8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 5d22dac8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Defaults.war
deleted file mode 100644
index 2e266067..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_WithDD_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_WithDD_NoBuild.war
deleted file mode 100644
index 2e266067..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_WithDD_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Source.war
deleted file mode 100644
index 2e266067..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Source_NoBuild.war
deleted file mode 100644
index 2e266067..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_NoBuild.war
deleted file mode 100644
index 95687f88..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Source.war
deleted file mode 100644
index 95687f88..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Source_NoBuild.war
deleted file mode 100644
index 95687f88..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithDD_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithDD_Defaults.war
deleted file mode 100644
index e0242842..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithDD_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithDD_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithDD_NoBuild.war
deleted file mode 100644
index e0242842..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithDD_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithDD_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithDD_Source.war
deleted file mode 100644
index e0242842..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithDD_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithDD_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithDD_Source_NoBuild.war
deleted file mode 100644
index e0242842..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithDD_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Defaults.war
deleted file mode 100644
index 5080a4ba..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_NoBuild.war
deleted file mode 100644
index 5080a4ba..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Source.war
deleted file mode 100644
index 5080a4ba..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 5080a4ba..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_WithDD_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_WithDD_Defaults.war
deleted file mode 100644
index ea85c0b9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_WithDD_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_WithDD_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_WithDD_NoBuild.war
deleted file mode 100644
index ea85c0b9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_WithDD_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_WithDD_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_WithDD_Source.war
deleted file mode 100644
index ea85c0b9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_WithDD_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_WithDD_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_WithDD_Source_NoBuild.war
deleted file mode 100644
index ea85c0b9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContentDir_WithEAR_WithDD_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithDD_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithDD_Defaults.war
deleted file mode 100644
index 14b2ac79..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithDD_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithDD_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithDD_NoBuild.war
deleted file mode 100644
index 14b2ac79..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithDD_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithDD_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithDD_Source.war
deleted file mode 100644
index 14b2ac79..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithDD_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithDD_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithDD_Source_NoBuild.war
deleted file mode 100644
index 14b2ac79..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithDD_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
deleted file mode 100644
index 81ad6ea8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
deleted file mode 100644
index 81ad6ea8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.war
deleted file mode 100644
index 81ad6ea8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 81ad6ea8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Defaults.war
deleted file mode 100644
index 819dd968..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_WithDD_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_WithDD_NoBuild.war
deleted file mode 100644
index 819dd968..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_WithDD_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Source.war
deleted file mode 100644
index 819dd968..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Source_NoBuild.war
deleted file mode 100644
index 819dd968..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_DiffSrcDir_WithEAR_WithDD_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithDD_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithDD_Defaults.war
deleted file mode 100644
index 831b2074..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithDD_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithDD_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithDD_NoBuild.war
deleted file mode 100644
index 831b2074..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithDD_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithDD_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithDD_Source.war
deleted file mode 100644
index 831b2074..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithDD_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithDD_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithDD_Source_NoBuild.war
deleted file mode 100644
index 831b2074..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithDD_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Defaults.war
deleted file mode 100644
index 5ae3c0bf..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.war
deleted file mode 100644
index 5ae3c0bf..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Source.war
deleted file mode 100644
index 5ae3c0bf..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 5ae3c0bf..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_WithDD_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_WithDD_Defaults.war
deleted file mode 100644
index 8824f3f8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_WithDD_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_WithDD_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_WithDD_NoBuild.war
deleted file mode 100644
index 8824f3f8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_WithDD_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_WithDD_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_WithDD_Source.war
deleted file mode 100644
index 8824f3f8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_WithDD_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_WithDD_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_WithDD_Source_NoBuild.war
deleted file mode 100644
index 8824f3f8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffContentDir_WithEAR_WithDD_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithDD_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithDD_Defaults.war
deleted file mode 100644
index 68f8244f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithDD_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithDD_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithDD_NoBuild.war
deleted file mode 100644
index 68f8244f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithDD_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithDD_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithDD_Source.war
deleted file mode 100644
index 68f8244f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithDD_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithDD_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithDD_Source_NoBuild.war
deleted file mode 100644
index 68f8244f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithDD_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.war
deleted file mode 100644
index fb15fcaf..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.war
deleted file mode 100644
index fb15fcaf..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Source.war
deleted file mode 100644
index fb15fcaf..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index fb15fcaf..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_WithDD_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_WithDD_Defaults.war
deleted file mode 100644
index 4fd6ec0d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_WithDD_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_WithDD_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_WithDD_NoBuild.war
deleted file mode 100644
index 4fd6ec0d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_WithDD_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_WithDD_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_WithDD_Source.war
deleted file mode 100644
index 4fd6ec0d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_WithDD_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_WithDD_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_WithDD_Source_NoBuild.war
deleted file mode 100644
index 4fd6ec0d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_DiffSrcDir_WithEAR_WithDD_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithDD_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithDD_Defaults.war
deleted file mode 100644
index e0242842..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithDD_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithDD_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithDD_NoBuild.war
deleted file mode 100644
index e0242842..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithDD_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithDD_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithDD_Source.war
deleted file mode 100644
index e0242842..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithDD_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithDD_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithDD_Source_NoBuild.war
deleted file mode 100644
index e0242842..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithDD_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Defaults.war
deleted file mode 100644
index 30c1bf43..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_NoBuild.war
deleted file mode 100644
index 30c1bf43..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Source.war
deleted file mode 100644
index 30c1bf43..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 30c1bf43..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_WithDD_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_WithDD_Defaults.war
deleted file mode 100644
index 99466101..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_WithDD_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_WithDD_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_WithDD_NoBuild.war
deleted file mode 100644
index 99466101..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_WithDD_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_WithDD_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_WithDD_Source.war
deleted file mode 100644
index 99466101..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_WithDD_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_WithDD_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_WithDD_Source_NoBuild.war
deleted file mode 100644
index 99466101..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffContextRoot_WithEAR_WithDD_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Defaults.war
deleted file mode 100644
index 119bedab..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_NoBuild.war
deleted file mode 100644
index 119bedab..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Source.war
deleted file mode 100644
index 119bedab..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Source_NoBuild.war
deleted file mode 100644
index 119bedab..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithDD_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithDD_Defaults.war
deleted file mode 100644
index d7dc4ee7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithDD_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithDD_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithDD_NoBuild.war
deleted file mode 100644
index d7dc4ee7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithDD_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithDD_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithDD_Source.war
deleted file mode 100644
index d7dc4ee7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithDD_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithDD_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithDD_Source_NoBuild.war
deleted file mode 100644
index d7dc4ee7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithDD_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Defaults.war
deleted file mode 100644
index 3fad1a9d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_NoBuild.war
deleted file mode 100644
index 3fad1a9d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Source.war
deleted file mode 100644
index 3fad1a9d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Source_NoBuild.war
deleted file mode 100644
index 3fad1a9d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_WithDD_Defaults.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_WithDD_Defaults.war
deleted file mode 100644
index 0e227155..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_WithDD_Defaults.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_WithDD_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_WithDD_NoBuild.war
deleted file mode 100644
index 0e227155..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_WithDD_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_WithDD_Source.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_WithDD_Source.war
deleted file mode 100644
index 0e227155..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_WithDD_Source.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_WithDD_Source_NoBuild.war b/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_WithDD_Source_NoBuild.war
deleted file mode 100644
index 0e227155..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/JEEImportOperationTests/WebImportOperationTest/Web25_DiffSrcDir_WithEAR_WithDD_Source_NoBuild.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/RARImportTests/JDEConnector.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/RARImportTests/JDEConnector.rar
deleted file mode 100644
index f1fb89d6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/RARImportTests/JDEConnector.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/SaveStrategyTests/AppClient.zip b/tests/org.eclipse.jst.j2ee.tests/TestData/SaveStrategyTests/AppClient.zip
deleted file mode 100644
index 3817287b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/SaveStrategyTests/AppClient.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/SaveStrategyTests/WarImportFlexProject.zip b/tests/org.eclipse.jst.j2ee.tests/TestData/SaveStrategyTests/WarImportFlexProject.zip
deleted file mode 100644
index eb51480c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/SaveStrategyTests/WarImportFlexProject.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Bug311542.war b/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Bug311542.war
deleted file mode 100644
index a3bac0f5..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Bug311542.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Example1.war b/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Example1.war
deleted file mode 100644
index 9c30a383..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Example1.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/InvalidWebXML1.war b/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/InvalidWebXML1.war
deleted file mode 100644
index 95b1bf8c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/InvalidWebXML1.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/InvalidWebXML14_1.war b/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/InvalidWebXML14_1.war
deleted file mode 100644
index bfd2b4e4..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/InvalidWebXML14_1.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/InvalidWebXML14_2.war b/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/InvalidWebXML14_2.war
deleted file mode 100644
index e253f362..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/InvalidWebXML14_2.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/InvalidWebXML2.war b/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/InvalidWebXML2.war
deleted file mode 100644
index ac126f55..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/InvalidWebXML2.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Test12Web.war b/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Test12Web.war
deleted file mode 100644
index ba220b13..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Test12Web.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Test13Web.war b/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Test13Web.war
deleted file mode 100644
index 22aa926e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Test13Web.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Test14Web.war b/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Test14Web.war
deleted file mode 100644
index 1eb2a3fb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/Test14Web.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/WebContainerClientApp.war b/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/WebContainerClientApp.war
deleted file mode 100644
index 860a2190..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/WebContainerClientApp.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/WebNoSource.war b/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/WebNoSource.war
deleted file mode 100644
index a4a75975..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/WebNoSource.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/WebSomeSource.war b/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/WebSomeSource.war
deleted file mode 100644
index 533b000d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/WebSomeSource.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/WebSource.war b/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/WebSource.war
deleted file mode 100644
index 6b71a0ea..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/WARImportTests/WebSource.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/WebAppLibrariesContainerTests/abc.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/WebAppLibrariesContainerTests/abc.jar
deleted file mode 100644
index 27d1aba9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/WebAppLibrariesContainerTests/abc.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/WebAppLibrariesContainerTests/foo.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/WebAppLibrariesContainerTests/foo.jar
deleted file mode 100644
index 6edac256..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/WebAppLibrariesContainerTests/foo.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/WebDeployTests/WebDeployTest.zip b/tests/org.eclipse.jst.j2ee.tests/TestData/WebDeployTests/WebDeployTest.zip
deleted file mode 100644
index 2504ebc3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/WebDeployTests/WebDeployTest.zip
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/EAR5_NoDD.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/EAR5_NoDD.ear
deleted file mode 100644
index 06dcc929..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/EAR5_NoDD.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/EAR5_WithDD.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/EAR5_WithDD.ear
deleted file mode 100644
index c3b57006..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/EAR5_WithDD.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client0.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client0.xml
deleted file mode 100644
index 8ebf1acc..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client0.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application-client id="Application-client_ID">
- <display-name>EAR12Client</display-name>
-</application-client>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client00.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client00.xml
deleted file mode 100644
index 80a05cdc..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client00.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application-client PUBLIC "test" "test">
-<application-client id="Application-client_ID">
- <display-name>EAR12Client</display-name>
-</application-client>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client000.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client000.xml
deleted file mode 100644
index 2d13d7ae..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client000.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application-client id="Application-client_ID" version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="test">
- <display-name>
- EAR14Client</display-name>
-</application-client>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client12.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client12.jar
deleted file mode 100644
index 1ac9235e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client12.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client12.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client12.xml
deleted file mode 100644
index add0ffc0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client12.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application-client PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.2//EN" "http://java.sun.com/j2ee/dtds/application-client_1_2.dtd">
-<application-client id="Application-client_ID">
- <display-name>EAR12Client</display-name>
-</application-client>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client13.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client13.jar
deleted file mode 100644
index c7202f20..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client13.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client13.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client13.xml
deleted file mode 100644
index 1db72601..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client13.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application-client PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application Client 1.3//EN" "http://java.sun.com/dtd/application-client_1_3.dtd">
-<application-client id="Application-client_ID">
- <display-name>EAR13Client</display-name>
-</application-client>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client14.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client14.jar
deleted file mode 100644
index ae270c97..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client14.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client14.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client14.xml
deleted file mode 100644
index 496b5787..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client14.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application-client id="Application-client_ID" version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <display-name>
- EAR14Client</display-name>
-</application-client>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client5.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client5.jar
deleted file mode 100644
index e6accb49..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client5.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client5.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client5.xml
deleted file mode 100644
index 76e90604..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application-client5.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application-client id="Application-client_ID" version="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/application-client_5.xsd">
- <display-name>
- EAR15Client</display-name>
-</application-client>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application0.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application0.xml
deleted file mode 100644
index 7b94cd69..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application0.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application id="Application_ID">
- <display-name>EAR12</display-name>
- <module id="JavaClientModule_1176405650468">
- <java>EAR12Client.jar</java>
- </module>
- <module id="EjbModule_1176405650484">
- <ejb>EAR12EJB.jar</ejb>
- </module>
- <module id="WebModule_1176405650484">
- <web>
- <web-uri>EAR12Web.war</web-uri>
- <context-root>EAR12Web</context-root>
- </web>
- </module>
-</application>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application00.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application00.xml
deleted file mode 100644
index c4c7cdde..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application00.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "test" "test">
-<application id="Application_ID">
- <display-name>EAR12</display-name>
- <module id="JavaClientModule_1176405650468">
- <java>EAR12Client.jar</java>
- </module>
- <module id="EjbModule_1176405650484">
- <ejb>EAR12EJB.jar</ejb>
- </module>
- <module id="WebModule_1176405650484">
- <web>
- <web-uri>EAR12Web.war</web-uri>
- <context-root>EAR12Web</context-root>
- </web>
- </module>
-</application>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application000.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application000.xml
deleted file mode 100644
index 24644d69..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application000.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application id="Application_ID" version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="test">
- <display-name>
- EAR14</display-name>
- <module id="ConnectorModule_1176405694468">
- <connector>EAR14Connector.rar</connector>
- </module>
- <module id="JavaClientModule_1176405694578">
- <java>EAR14Client.jar</java>
- </module>
- <module id="EjbModule_1176405694578">
- <ejb>EAR14EJB.jar</ejb>
- </module>
- <module id="WebModule_1176405694578">
- <web>
- <web-uri>EAR14Web.war</web-uri>
- <context-root>EAR14Web</context-root>
- </web>
- </module>
-</application>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application12.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application12.ear
deleted file mode 100644
index 2271c196..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application12.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application12.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application12.xml
deleted file mode 100644
index b28f4a1d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application12.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.2//EN" "http://java.sun.com/j2ee/dtds/application_1_2.dtd">
-<application id="Application_ID">
- <display-name>EAR12</display-name>
- <module id="JavaClientModule_1176405650468">
- <java>EAR12Client.jar</java>
- </module>
- <module id="EjbModule_1176405650484">
- <ejb>EAR12EJB.jar</ejb>
- </module>
- <module id="WebModule_1176405650484">
- <web>
- <web-uri>EAR12Web.war</web-uri>
- <context-root>EAR12Web</context-root>
- </web>
- </module>
-</application>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application13.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application13.ear
deleted file mode 100644
index 6cf7458d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application13.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application13.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application13.xml
deleted file mode 100644
index 0b195f5b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application13.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
-<application id="Application_ID">
- <display-name>EAR13</display-name>
- <module id="WebModule_1176405672843">
- <web>
- <web-uri>EAR13Web.war</web-uri>
- <context-root>EAR13Web</context-root>
- </web>
- </module>
- <module id="ConnectorModule_1176405672859">
- <connector>EAR13Connector.rar</connector>
- </module>
- <module id="JavaClientModule_1176405672875">
- <java>EAR13Client.jar</java>
- </module>
- <module id="EjbModule_1176405672875">
- <ejb>EAR13EJB.jar</ejb>
- </module>
-</application>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application14.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application14.ear
deleted file mode 100644
index 47e3d23a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application14.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application14.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application14.xml
deleted file mode 100644
index 12be2583..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application14.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application id="Application_ID" version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <display-name>
- EAR14</display-name>
- <module id="ConnectorModule_1176405694468">
- <connector>EAR14Connector.rar</connector>
- </module>
- <module id="JavaClientModule_1176405694578">
- <java>EAR14Client.jar</java>
- </module>
- <module id="EjbModule_1176405694578">
- <ejb>EAR14EJB.jar</ejb>
- </module>
- <module id="WebModule_1176405694578">
- <web>
- <web-uri>EAR14Web.war</web-uri>
- <context-root>EAR14Web</context-root>
- </web>
- </module>
-</application>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application5.ear b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application5.ear
deleted file mode 100644
index b5dd57d4..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application5.ear
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application5.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application5.xml
deleted file mode 100644
index 51bd3fb3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/application5.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<application id="Application_ID" version="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/application_5.xsd">
- <display-name>
- EAR50</display-name>
- <module id="ConnectorModule_1176405694468">
- <connector>EAR14Connector.rar</connector>
- </module>
- <module id="JavaClientModule_1176405694578">
- <java>EAR14Client.jar</java>
- </module>
- <module id="EjbModule_1176405694578">
- <ejb>EAR14EJB.jar</ejb>
- </module>
- <module id="WebModule_1176405694578">
- <web>
- <web-uri>EAR14Web.war</web-uri>
- <context-root>EAR14Web</context-root>
- </web>
- </module>
-</application>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar0.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar0.xml
deleted file mode 100644
index cae4d200..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar0.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar id="ejb-jar_ID">
- <display-name>EAR12EJB</display-name>
- <enterprise-beans>
- <session id="S">
- <ejb-name>S</ejb-name>
- <home>ejbs.SHome</home>
- <remote>ejbs.S</remote>
- <ejb-class>ejbs.SBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar00.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar00.xml
deleted file mode 100644
index 464538d2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar00.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ejb-jar PUBLIC "test" "test">
-<ejb-jar id="ejb-jar_ID">
- <display-name>EAR12EJB</display-name>
- <enterprise-beans>
- <session id="S">
- <ejb-name>S</ejb-name>
- <home>ejbs.SHome</home>
- <remote>ejbs.S</remote>
- <ejb-class>ejbs.SBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar000.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar000.xml
deleted file mode 100644
index afc230ce..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar000.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar id="ejb-jar_ID" version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="test">
- <display-name>
- EAR14EJB</display-name>
- <enterprise-beans>
- <session id="S">
- <ejb-name>S</ejb-name>
- <home>ejbs.SHome</home>
- <remote>ejbs.S</remote>
- <ejb-class>ejbs.SBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar11.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar11.jar
deleted file mode 100644
index 35b3aece..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar11.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar11.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar11.xml
deleted file mode 100644
index e8d6fe71..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar11.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 1.1//EN" "http://java.sun.com/j2ee/dtds/ejb-jar_1_1.dtd">
-<ejb-jar id="ejb-jar_ID">
- <display-name>EAR12EJB</display-name>
- <enterprise-beans>
- <session id="S">
- <ejb-name>S</ejb-name>
- <home>ejbs.SHome</home>
- <remote>ejbs.S</remote>
- <ejb-class>ejbs.SBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar20.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar20.jar
deleted file mode 100644
index b6d04ab2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar20.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar20.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar20.xml
deleted file mode 100644
index bcbffd68..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar20.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Enterprise JavaBeans 2.0//EN" "http://java.sun.com/dtd/ejb-jar_2_0.dtd">
-<ejb-jar id="ejb-jar_ID">
- <display-name>EAR13EJB</display-name>
- <enterprise-beans>
- <session id="S">
- <ejb-name>S</ejb-name>
- <home>ejbs.SHome</home>
- <remote>ejbs.S</remote>
- <ejb-class>ejbs.SBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar21.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar21.jar
deleted file mode 100644
index b5f1d8eb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar21.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar21.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar21.xml
deleted file mode 100644
index 22b655e3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar21.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar id="ejb-jar_ID" 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>
- EAR14EJB</display-name>
- <enterprise-beans>
- <session id="S">
- <ejb-name>S</ejb-name>
- <home>ejbs.SHome</home>
- <remote>ejbs.S</remote>
- <ejb-class>ejbs.SBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar30.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar30.jar
deleted file mode 100644
index 79d4c6ab..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar30.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar30.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar30.xml
deleted file mode 100644
index b8451bdd..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ejb-jar30.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ejb-jar id="ejb-jar_ID" 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>
- EAR5EJB</display-name>
- <enterprise-beans>
- <session id="S">
- <ejb-name>S</ejb-name>
- <home>ejbs.SHome</home>
- <remote>ejbs.S</remote>
- <ejb-class>ejbs.SBean</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/notjavaee.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/notjavaee.xml
deleted file mode 100644
index c0312d06..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/notjavaee.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<test id="Application-client_ID">
- <display-name>EAR12Client</display-name>
-</test>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/notxml.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/notxml.xml
deleted file mode 100644
index b8ce116a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/notxml.xml
+++ /dev/null
@@ -1 +0,0 @@
-this is not xml
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra0.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra0.xml
deleted file mode 100644
index cd1dcbf3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra0.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<connector>
- <display-name>EAR13Connector</display-name>
- <description></description>
- <vendor-name></vendor-name>
- <spec-version></spec-version>
- <eis-type></eis-type>
- <version></version>
- <license>
- <description></description>
- <license-required>false</license-required>
- </license>
- <resourceadapter>
- <managedconnectionfactory-class></managedconnectionfactory-class>
- <connectionfactory-interface></connectionfactory-interface>
- <connectionfactory-impl-class></connectionfactory-impl-class>
- <connection-interface></connection-interface>
- <connection-impl-class></connection-impl-class>
- <transaction-support></transaction-support>
- <config-property>
- <description></description>
- <config-property-name></config-property-name>
- <config-property-type></config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <authentication-mechanism>
- <description></description>
- <authentication-mechanism-type></authentication-mechanism-type>
- <credential-interface></credential-interface>
- </authentication-mechanism>
- <reauthentication-support>false</reauthentication-support>
- <security-permission>
- <description></description>
- <security-permission-spec>
- </security-permission-spec>
- </security-permission>
- </resourceadapter>
-</connector>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra00.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra00.xml
deleted file mode 100644
index ac63c72d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra00.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE connector PUBLIC "test" "test">
-<connector>
- <display-name>EAR13Connector</display-name>
- <description></description>
- <vendor-name></vendor-name>
- <spec-version></spec-version>
- <eis-type></eis-type>
- <version></version>
- <license>
- <description></description>
- <license-required>false</license-required>
- </license>
- <resourceadapter>
- <managedconnectionfactory-class></managedconnectionfactory-class>
- <connectionfactory-interface></connectionfactory-interface>
- <connectionfactory-impl-class></connectionfactory-impl-class>
- <connection-interface></connection-interface>
- <connection-impl-class></connection-impl-class>
- <transaction-support></transaction-support>
- <config-property>
- <description></description>
- <config-property-name></config-property-name>
- <config-property-type></config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <authentication-mechanism>
- <description></description>
- <authentication-mechanism-type></authentication-mechanism-type>
- <credential-interface></credential-interface>
- </authentication-mechanism>
- <reauthentication-support>false</reauthentication-support>
- <security-permission>
- <description></description>
- <security-permission-spec>
- </security-permission-spec>
- </security-permission>
- </resourceadapter>
-</connector>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra000.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra000.xml
deleted file mode 100644
index 214edb33..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra000.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<connector id="Connector_ID" version="1.5" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="test">
- <description></description>
- <display-name>EAR14Connector</display-name>
- <vendor-name></vendor-name>
- <eis-type></eis-type>
- <resourceadapter-version></resourceadapter-version>
- <resourceadapter>
- </resourceadapter>
-</connector>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra10.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra10.rar
deleted file mode 100644
index 1e0848a4..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra10.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra10.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra10.xml
deleted file mode 100644
index 63d848b6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra10.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE connector PUBLIC "-//Sun Microsystems, Inc.//DTD Connector 1.0//EN" "http://java.sun.com/dtd/connector_1_0.dtd">
-<connector>
- <display-name>EAR13Connector</display-name>
- <description></description>
- <vendor-name></vendor-name>
- <spec-version></spec-version>
- <eis-type></eis-type>
- <version></version>
- <license>
- <description></description>
- <license-required>false</license-required>
- </license>
- <resourceadapter>
- <managedconnectionfactory-class></managedconnectionfactory-class>
- <connectionfactory-interface></connectionfactory-interface>
- <connectionfactory-impl-class></connectionfactory-impl-class>
- <connection-interface></connection-interface>
- <connection-impl-class></connection-impl-class>
- <transaction-support></transaction-support>
- <config-property>
- <description></description>
- <config-property-name></config-property-name>
- <config-property-type></config-property-type>
- <config-property-value></config-property-value>
- </config-property>
- <authentication-mechanism>
- <description></description>
- <authentication-mechanism-type></authentication-mechanism-type>
- <credential-interface></credential-interface>
- </authentication-mechanism>
- <reauthentication-support>false</reauthentication-support>
- <security-permission>
- <description></description>
- <security-permission-spec>
- </security-permission-spec>
- </security-permission>
- </resourceadapter>
-</connector>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra15.rar b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra15.rar
deleted file mode 100644
index dbdad495..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra15.rar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra15.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra15.xml
deleted file mode 100644
index 127636f2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/ra15.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<connector id="Connector_ID" version="1.5" 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/connector_1_5.xsd">
- <description></description>
- <display-name>EAR14Connector</display-name>
- <vendor-name></vendor-name>
- <eis-type></eis-type>
- <resourceadapter-version></resourceadapter-version>
- <resourceadapter>
- </resourceadapter>
-</connector>
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web0.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web0.xml
deleted file mode 100644
index b954cdc6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web0.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID">
- <display-name>EAR12Web</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/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web00.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web00.xml
deleted file mode 100644
index 96114772..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web00.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "test" "test">
-<web-app id="WebApp_ID">
- <display-name>EAR12Web</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/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web000.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web000.xml
deleted file mode 100644
index bdd3f000..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web000.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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="test">
- <display-name>
- EAR14Web</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/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web22.war b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web22.war
deleted file mode 100644
index 7678e1c6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web22.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web22.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web22.xml
deleted file mode 100644
index f9ac38d2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web22.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.2//EN" "http://java.sun.com/j2ee/dtds/web-app_2_2.dtd">
-<web-app id="WebApp_ID">
- <display-name>EAR12Web</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/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web23.war b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web23.war
deleted file mode 100644
index d89fda2c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web23.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web23.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web23.xml
deleted file mode 100644
index 36f56e0a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web23.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app id="WebApp_ID">
- <display-name>EAR13Web</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/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web24.war b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web24.war
deleted file mode 100644
index 9ef73f6f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web24.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web24.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web24.xml
deleted file mode 100644
index 54f82b54..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web24.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
- EAR14Web</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/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web25.war b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web25.war
deleted file mode 100644
index 37f3001a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web25.war
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web25.xml b/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web25.xml
deleted file mode 100644
index 6ccdda74..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/headerParserTestData/web25.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<web-app id="WebApp_ID" 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>
- EAR5Web</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/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/12AppClientTest_withoutSource.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/12AppClientTest_withoutSource.jar
deleted file mode 100644
index b2d7eed2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/12AppClientTest_withoutSource.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/13AppClientTest_withoutSource.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/13AppClientTest_withoutSource.jar
deleted file mode 100644
index b07d371f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/13AppClientTest_withoutSource.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/13AppClient_withoutSource.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/13AppClient_withoutSource.jar
deleted file mode 100644
index 69f4ee49..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/13AppClient_withoutSource.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/AppClientExpTest_withoutSource.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/AppClientExpTest_withoutSource.jar
deleted file mode 100644
index fb54025b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/AppClientExpTest_withoutSource.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/AppClientNoSource_withoutSource.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/AppClientNoSource_withoutSource.jar
deleted file mode 100644
index 2b2168cd..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/AppClientNoSource_withoutSource.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/AppClientSomeSource_withoutSource.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/AppClientSomeSource_withoutSource.jar
deleted file mode 100644
index 0348d598..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/AppClientSomeSource_withoutSource.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/AppClientSource_withoutSource.jar b/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/AppClientSource_withoutSource.jar
deleted file mode 100644
index 421f0ddf..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/TestData/testOutputs/AppClientSource_withoutSource.jar
+++ /dev/null
Binary files differ
diff --git a/tests/org.eclipse.jst.j2ee.tests/about.html b/tests/org.eclipse.jst.j2ee.tests/about.html
deleted file mode 100644
index 2199df3f..00000000
--- a/tests/org.eclipse.jst.j2ee.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>June, 2008</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 Redistributor’s 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.tests/build.properties b/tests/org.eclipse.jst.j2ee.tests/build.properties
deleted file mode 100644
index d0b1dd22..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/build.properties
+++ /dev/null
@@ -1,28 +0,0 @@
-###############################################################################
-# Copyright (c) 2005, 2007 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
-###############################################################################
-source.j2ee-tests.jar = j2ee-tests/,\
- webmodule-tests/,\
- defect-tests/,\
- savestrategy-tests/,\
- j2ee-verifiers/
-output.j2ee-tests.jar = bin/
-bin.includes = plugin.xml,\
- j2ee-tests.jar,\
- TestData/,\
- testHOLD.xml,\
- about.html,\
- DefectTestData/,\
- META-INF/
-src.includes = build.properties,\
- testHOLD.xml,\
- plugin.xml,\
- TestData/,\
- DefectTestData/
diff --git a/tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/ClasspathContainerThreading.java b/tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/ClasspathContainerThreading.java
deleted file mode 100644
index c95a98cb..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/ClasspathContainerThreading.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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.defect.tests;
-
-import java.io.InputStream;
-import java.io.StringBufferInputStream;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-
-public class ClasspathContainerThreading {
-
- public final int LOOPS = 10;
- private final List threads = new ArrayList();
-
- class EARRunnable implements Runnable {
- IProject project;
-
- public EARRunnable(IProject earProject) {
- this.project = earProject;
- }
-
- public void run() {
- try {
- for (int i = 0; i < LOOPS; i++) {
- IVirtualComponent comp = ComponentCore.createComponent(project);
- IVirtualFile vFile = comp.getRootFolder().getFile("foo.jar");
- IFile iFile = vFile.getUnderlyingFile();
- InputStream in = new StringBufferInputStream("foo.jar");
- iFile.create(in, true, null);
- Thread.sleep(10);
- iFile.delete(true, null);
- Thread.sleep(10);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- synchronized (threads) {
- threads.remove(Thread.currentThread());
- }
- }
- }
- };
-
- class ForceUpdateRunnable implements Runnable {
- IProject project;
-
- public ForceUpdateRunnable(IProject project) {
- this.project = project;
- }
-
- public void run() {
- try {
- for (int i = 0; i < LOOPS * 2; i++) {
- J2EEComponentClasspathUpdater.getInstance().queueUpdate(project);
- Thread.sleep(10);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- synchronized (threads) {
- threads.remove(Thread.currentThread());
- }
- }
- }
- };
-
- class ModuleRunnable implements Runnable {
- IProject project;
-
- public ModuleRunnable(IProject project) {
- this.project = project;
- }
-
- public void run() {
- try {
- for (int i = 0; i < LOOPS; i++) {
- ArchiveManifest manifest = J2EEProjectUtilities.readManifest(project);
- manifest.addEntry("foo.jar");
- J2EEProjectUtilities.writeManifest(project, manifest);
- Thread.sleep(10);
- manifest = J2EEProjectUtilities.readManifest(project);
- manifest.removeEntry("foo.jar");
- J2EEProjectUtilities.writeManifest(project, manifest);
- Thread.sleep(10);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- synchronized (threads) {
- threads.remove(Thread.currentThread());
- }
- }
- }
- };
-
-
- public ClasspathContainerThreading() {
-
- }
-
- public void testDeadlock() {
- IProject[] allProjects = J2EEProjectUtilities.getAllProjects();
- List earProjects = new ArrayList();
- List modulesProjects = new ArrayList();
- for (int i = 0; i < allProjects.length; i++) {
- if (JavaEEProjectUtilities.isEARProject(allProjects[i])) {
- earProjects.add(allProjects[i]);
- } else {
- IVirtualComponent comp = ComponentCore.createComponent(allProjects[i]);
- if (comp != null) {
- modulesProjects.add(allProjects[i]);
- }
- }
- }
-
-
-
- for (int i = 0; i < earProjects.size(); i++) {
- threads.add(new Thread(new EARRunnable((IProject) earProjects.get(i))));
- threads.add(new Thread(new ForceUpdateRunnable((IProject) earProjects.get(i))));
- }
- for (int i = 0; i < modulesProjects.size(); i++) {
- threads.add(new Thread(new ModuleRunnable((IProject) modulesProjects.get(i))));
- threads.add(new Thread(new ForceUpdateRunnable((IProject) modulesProjects.get(i))));
- }
-
- synchronized (threads) {
- for (int i = 0; i < threads.size(); i++) {
- ((Thread) threads.get(i)).start();
- }
- }
-
- boolean shouldContinue = true;
- while (shouldContinue) {
- try {
- Thread.sleep(100);
- } catch (Exception e) {
- e.printStackTrace();
- }
- synchronized (threads) {
- shouldContinue = !threads.isEmpty();
- }
- }
-
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/DefectVerificationTests.java b/tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/DefectVerificationTests.java
deleted file mode 100644
index 1cc85e01..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/DefectVerificationTests.java
+++ /dev/null
@@ -1,837 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 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.defect.tests;
-
-//import java.io.File;
-import java.io.File;
-import java.io.StringBufferInputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.logger.proxy.Logger;
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.J2EEComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchiveFactory;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.CommonarchivePackage;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.ModuleFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveOptions;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.RuntimeClasspathEntry;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.util.ArchiveUtil;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualArchiveComponent;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentExportDataModelProperties;
-import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.jst.j2ee.ejb.project.operations.IEjbFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.archive.JavaEEArchiveUtilities;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.plugin.IJ2EEModuleConstants;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentExportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetProjectCreationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJavaProjectMigrationDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.JavaProjectMigrationDataModelProvider;
-import org.eclipse.jst.j2ee.web.datamodel.properties.IWebComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.jee.archive.IArchive;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetInstallDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.internal.util.ComponentUtilities;
-import org.eclipse.wst.common.componentcore.internal.util.IModuleConstants;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.tests.OperationTestCase;
-import org.eclipse.wst.common.tests.ProjectUtility;
-import org.eclipse.wtp.j2ee.headless.tests.plugin.HeadlessTestsPlugin;
-import org.eclipse.wtp.j2ee.headless.tests.web.operations.WebImportOperationTest;
-
-public class DefectVerificationTests extends OperationTestCase {
-
- public static String BASE_DATA_DIRECTORY = System.getProperty("user.dir") + java.io.File.separatorChar + "DefectTestData" + java.io.File.separatorChar;
- private static final String TEST_DATA_PATH = System.getProperty("user.dir") + java.io.File.separatorChar + "TestData" + java.io.File.separatorChar;
-
-
- private static String getDataPath(String suffix) {
- return BASE_DATA_DIRECTORY + "componentLoadAdapterTestData" + java.io.File.separatorChar + suffix;
- }
-
- public static String getFullTestDataPath(String dataPath) {
- try {
- String defectTestDataPath = "DefectTestData" + fileSep + dataPath;
- HeadlessTestsPlugin plugin = HeadlessTestsPlugin.getDefault();
- if (plugin != null) {
- return ProjectUtility.getFullFileName(plugin, defectTestDataPath);
- }
- return System.getProperty("user.dir") + java.io.File.separatorChar + defectTestDataPath;
- } catch (Exception e) {
- e.printStackTrace();
- }
- return "";
- }
-
-
- public void _test261508() throws Exception {
- String earFileName = getFullTestDataPath("EARForLibDep.ear");
- IDataModel model = DataModelFactory.createDataModel(new EARComponentImportDataModelProvider());
- model.setProperty(IEARComponentImportDataModelProperties.FILE_NAME, earFileName);
- runAndVerify(model);
-
- IVirtualComponent webComponent = ComponentCore.createComponent(J2EEProjectUtilities.getProject("WebForLibDep"));
- IVirtualReference[] refs = webComponent.getReferences();
- Assert.assertTrue(refs.length == 2);
- for( IVirtualReference ref : refs ){
- IVirtualComponent refComponent = ref.getReferencedComponent();
- if ( refComponent instanceof J2EEModuleVirtualArchiveComponent ){
- J2EEModuleVirtualArchiveComponent j2eeVirtualArchive = (J2EEModuleVirtualArchiveComponent)refComponent;
- Assert.assertTrue( j2eeVirtualArchive.getName().endsWith("EjbTestClient.jar"));
- }
- }
- }
-
- /**
- * Test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=130657
- */
- public void test130657() throws Exception {
- IDataModel model = DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- model.setProperty(IWebFacetInstallDataModelProperties.FACET_PROJECT_NAME, "Test120018");
- model.getDefaultOperation().execute(null, null);
-
- IVirtualComponent component = ComponentUtilities.getComponent("Test120018");
-
- IFolder folder = component.getProject().getFolder("imported_classes");
- folder.create(true,true,null);
- IFile fakeClassFile = folder.getFile("Fake.class");
- fakeClassFile.create(new StringBufferInputStream(""),true,null);
- Assert.assertTrue("Class file should have been created in project.",component.getProject().exists(fakeClassFile.getProjectRelativePath()));
-
- final IVirtualFolder jsrc = component.getRootFolder().getFolder("/WEB-INF/classes");
- jsrc.createLink(folder.getProjectRelativePath(), 0, null);
- Assert.assertEquals("Should be a link for each class in imported_classes.",folder.members().length, jsrc.members().length);
-
- //Export war
- IDataModel dataModel = DataModelFactory.createDataModel(new WebComponentExportDataModelProvider());
- dataModel.setProperty(J2EEComponentExportDataModelProvider.ARCHIVE_DESTINATION, getDataPath("testblah.war"));
- dataModel.setProperty(J2EEComponentExportDataModelProvider.COMPONENT, component);
- dataModel.setBooleanProperty(J2EEComponentExportDataModelProvider.EXPORT_SOURCE_FILES, true);
- dataModel.setBooleanProperty(J2EEComponentExportDataModelProvider.OVERWRITE_EXISTING, true);
- IStatus status = dataModel.getDefaultOperation().execute(null, null);
- Assert.assertEquals("Creating WAR failed " + status.getMessage(), IStatus.OK, status.getSeverity());
-
- IArchive archiveWAR = JavaEEArchiveUtilities.INSTANCE.openArchive(new Path(getDataPath("testblah.war")));
- for(int i=0; i<jsrc.members().length; i++) {
- Assert.assertTrue("Archive does not contain resource for each linked imported class.",
- archiveWAR.containsArchiveResource((jsrc.members())[i].getRuntimePath().makeRelative()));
- }
-
- //archiveWAR.
- JavaEEArchiveUtilities.INSTANCE.closeArchive(archiveWAR);
- }
-
-
- /**
- * Test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=120018
- */
- public void test120018() throws Exception {
- IDataModel model = DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- model.setProperty(IWebFacetInstallDataModelProperties.FACET_PROJECT_NAME, "Test120018");
- model.getDefaultOperation().execute(null, null);
-
- IVirtualComponent component = ComponentUtilities.getComponent("Test120018");
-
-
- IVirtualFolder folder = component.getRootFolder().getFolder("imported_classes");
- folder.create(IResource.NONE, null);
- IPath folderPath = folder.getProjectRelativePath();
-
- final IVirtualFolder jsrc = component.getRootFolder().getFolder("/WEB-INF/classes");
- jsrc.createLink(folder.getProjectRelativePath(), 0, null);
-
- J2EEComponentClasspathUpdater.getInstance().forceUpdate(Collections.singleton(component.getProject()));
- IJobManager manager = Job.getJobManager();
- Job [] jobs = manager.find(J2EEComponentClasspathUpdater.MODULE_UPDATE_JOB_NAME);
- if(jobs.length > 0){
- try {
- for (int i = 0; i < jobs.length; i++){
- if(jobs[i].getName().equals(J2EEComponentClasspathUpdater.MODULE_UPDATE_JOB_NAME))
- jobs[i].join();
- }
- } catch (InterruptedException e) {
- Logger.getLogger().log(e);
- }
- }
-
- IJavaProject javaProject = JavaCore.create(component.getProject());
- IClasspathEntry[] entries = javaProject.getRawClasspath();
- boolean foundImportedClasses = false;
- for (int i = 0; i < entries.length && !foundImportedClasses; i++) {
- if (IClasspathEntry.CPE_CONTAINER == entries[i].getEntryKind()) {
- IClasspathContainer container = JavaCore.getClasspathContainer(entries[i].getPath(), javaProject);
- IClasspathEntry[] containerEntries = container.getClasspathEntries();
- for (int j = 0; j < containerEntries.length && !foundImportedClasses; j++) {
- IPath entryPath = containerEntries[j].getPath().removeFirstSegments(1);
- foundImportedClasses = folderPath.equals(entryPath);
- if (foundImportedClasses) break;
- }
- }
-
- }
- Assert.assertTrue(foundImportedClasses);
- }
-
- /**
- * Test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=105901
- */
- public void test105901() throws Exception {
- String earFileName = getFullTestDataPath("Collision.ear");
- IDataModel model = DataModelFactory.createDataModel(new EARComponentImportDataModelProvider());
- model.setProperty(IEARComponentImportDataModelProperties.FILE_NAME, earFileName);
- runAndVerify(model);
- IVirtualComponent comp = (IVirtualComponent) model.getProperty(IEARComponentImportDataModelProperties.COMPONENT);
- IVirtualReference[] refs = comp.getReferences();
- assertEquals(3, refs.length);
- }
-
- /**
- * Test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=109430
- */
- public void test109430() throws Exception {
- String earFileName = getFullTestDataPath("EJBLocalAndRemoteRefEARWithClientJars.ear");
- IDataModel model = DataModelFactory.createDataModel(new EARComponentImportDataModelProvider());
- model.setProperty(IEARComponentImportDataModelProperties.FILE_NAME, earFileName);
- List moduleList = (List) model.getProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST);
-
- runAndVerify(model);
- IVirtualComponent component = (IVirtualComponent) model.getProperty(IEARComponentImportDataModelProperties.COMPONENT);
- EnterpriseArtifactEdit artifactEdit = null;
- try {
- artifactEdit = EARArtifactEdit.getEARArtifactEditForRead(component);
- EARFile earFile = null;
- try {
- earFile = (EARFile) artifactEdit.asArchive(true);
- earFile.getEJBReferences(false, false);
- } finally {
- if (earFile != null) {
- earFile.close();
- }
- }
- } finally {
- if (artifactEdit != null) {
- artifactEdit.dispose();
- }
- }
- }
-
- /**
- * Test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=112636
- */
- public void test112636() throws Exception {
- checkDeploy("BeenThere.ear");
- }
-
- /**
- * Test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=112835
- */
- public void test112835() throws Exception {
- checkDeploy("sib.test.mediations.m5.JsMBR.ear");
- }
-
-
- /**
- * Test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=121158
- */
- public void test121158() throws Exception {
- String earFileName = getFullTestDataPath("EAR121158.ear"); //$NON-NLS-1$
- EARFile earFile = null;
- try {
- ArchiveOptions opts = new ArchiveOptions();
- opts.setIsReadOnly(true);
- earFile = CommonarchiveFactory.eINSTANCE.openEARFile(opts, earFileName);
-
- List moduleList = earFile.getModuleFiles();
- for (int i = 0; i < moduleList.size(); i++) {
- ModuleFile module = (ModuleFile) moduleList.get(i);
- RuntimeClasspathEntry[] entries = module.getFullRuntimeClassPath();
- assertEquals(2, entries.length);
- assertTrue(entries[0].toString().endsWith(module.getURI()));
- assertTrue(entries[1].toString().endsWith("EAR121158Util.jar")); //$NON-NLS-1$
- }
-
- } finally {
- if (earFile != null && earFile.isOpen()) {
- earFile.close();
- earFile = null;
- }
- }
- }
-
- protected void checkDeploy(String earName) throws Exception {
- String earFileName = getFullTestDataPath(earName);
- IDataModel model = DataModelFactory.createDataModel(new EARComponentImportDataModelProvider());
- model.setProperty(IEARComponentImportDataModelProperties.FILE_NAME, earFileName);
-
- runAndVerify(model);
- IVirtualComponent comp = (IVirtualComponent) model.getProperty(IEARComponentImportDataModelProperties.COMPONENT);
- EnterpriseArtifactEdit earEdit = EARArtifactEdit.getEARArtifactEditForRead(comp);
- EARFile earFile = (EARFile) earEdit.asArchive(false);
- earFile.getEJBReferences(true, true);
- earFile.getEJBReferences(true, false);
- earFile.getEJBReferences(false, true);
- earFile.getEJBReferences(false, false);
- earFile.close();
- earFile = null;
-
- Thread.sleep(5000);
-
- String earOutputName = "c:\\temp\\Output" + System.currentTimeMillis() + ".ear";
- IDataModel export = DataModelFactory.createDataModel(new EARComponentExportDataModelProvider());
- export.setProperty(IEARComponentExportDataModelProperties.PROJECT_NAME, comp.getProject().getName());
- export.setProperty(IEARComponentExportDataModelProperties.ARCHIVE_DESTINATION, earOutputName);
- runAndVerify(export);
-
-
- }
-
- /**
- * Test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=143483
- */
- public void test143483() throws Exception {
- checkDeploy("undeployed_DefaultApplication.ear");//$NON-NLS-1$
- }
-
- /**
- * Test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=144288
-
- public void test144288() throws Exception {
- String earName = "WorkAreaFvtApp.ear";//$NON-NLS-1$
- String earFileName = getFullTestDataPath(earName);
- IDataModel model = DataModelFactory.createDataModel(new EARComponentImportDataModelProvider());
- model.setProperty(IEARComponentImportDataModelProperties.FILE_NAME, earFileName);
-
- List moduleList = (List) model.getProperty(IEARComponentImportDataModelProperties.SELECTED_MODELS_LIST);
- for (int i = moduleList.size() - 1; i > -1; i--) {
- IDataModel aModel = (IDataModel) moduleList.get(i);
- Object file = aModel.getProperty(IEARComponentImportDataModelProperties.FILE);
- if (file instanceof ModuleFile) {
- ModuleFile moduleFile = (ModuleFile) file;
- if (moduleFile.isWARFile())
- moduleList.remove(aModel);
- if (moduleFile.isApplicationClientFile())
- moduleList.remove(aModel);
- }
- }
-
- runAndVerify(model);
- IVirtualComponent comp = (IVirtualComponent) model.getProperty(IEARComponentImportDataModelProperties.COMPONENT);
- String appClientURI = "WorkAreaFvtClient.jar";//$NON-NLS-1$
-
- IFile file = ComponentUtilities.findFile(comp, new Path(appClientURI));
- ApplicationClientFile appClientJar = CommonarchiveFactoryImpl.getActiveFactory().openApplicationClientFile(file.getLocation().toOSString());
- ArchiveManifest manf = appClientJar.getManifest();
- String existingEntries[] = manf.getClassPathTokenized();
- manf.appendClassPath("foo.jar");//$NON-NLS-1$
- appClientJar.saveNoReopen();
-
- String earOutputName = "d:\\temp\\Output" + System.currentTimeMillis() + ".ear";
- IDataModel export = DataModelFactory.createDataModel(new EARComponentExportDataModelProvider());
- export.setProperty(IEARComponentExportDataModelProperties.PROJECT_NAME, comp.getProject().getName());
- export.setProperty(IEARComponentExportDataModelProperties.ARCHIVE_DESTINATION, earOutputName);
- runAndVerify(export);
- }
- */
-
- /**
- * Test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=145460
- */
- public void test145460() throws Exception {
- String warName = "Example1.war"; //$NON-NLS-1$
- String warFileName = getFullTestDataPath(warName);
-
- IDataModel dataModel = DataModelFactory.createDataModel(new WebComponentImportDataModelProvider());
- dataModel.setProperty(IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME, "AN_EAR");
- dataModel.setBooleanProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, true);
- dataModel.setProperty(IWebComponentImportDataModelProperties.FILE_NAME, warFileName);
- dataModel.setProperty(IWebComponentImportDataModelProperties.PROJECT_NAME, "A_WAR");
- runAndVerify(dataModel);
- }
-
- /**
- * Test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=149995
- */
- public void test149995() throws Exception {
- String earName = "149995.ear";//$NON-NLS-1$
- String earFileName = getFullTestDataPath(earName);
- IDataModel model = DataModelFactory.createDataModel(new EARComponentImportDataModelProvider());
- model.setProperty(IEARComponentImportDataModelProperties.FILE_NAME, earFileName);
- runAndVerify(model);
-
- IVirtualComponent earComponent = ComponentCore.createComponent(J2EEProjectUtilities.getProject("149995"));
- IVirtualResource [] members = earComponent.getRootFolder().members();
- Assert.assertEquals(5, members.length);
-
- setUp();
-
- model = DataModelFactory.createDataModel(new EARComponentImportDataModelProvider());
- model.setProperty(IEARComponentImportDataModelProperties.FILE_NAME, earFileName);
- model.setProperty(IEARComponentImportDataModelProperties.MODULE_MODELS_LIST, Collections.EMPTY_LIST);
- runAndVerify(model);
-
- earComponent = ComponentCore.createComponent(J2EEProjectUtilities.getProject("149995"));
- members = earComponent.getRootFolder().members();
- Assert.assertEquals(5, members.length);
- }
-
- /**
- * The following code checks to ensure classpaths are being setup properly for dependent projects
- * In the ear there is one AppClient which depends directly on the utility jar C which contains class test.C.
- * The utility jar C depends on the utility jar B which contains class test.B
- * The utility jar B depends on the utility jar A which contains class test.A
- *
- * This portion of the test ensures the classpath is setup properly by importing every combination of the
- * A, B, and C utility jars along with AppClient. Then the types test.A, test.B, and test.C are opened through
- * AppClient to ensure they are pulled from the correct location (the utility jars in the EAR, or the expanded projects)
- *
- */
- public void test149995_BinaryClaspathTest() throws Exception {
-// int A = 1;
-// int B = 2;
-// int C = 4;
-//
-// String earName = "149995BinaryClasspathTest.ear";//$NON-NLS-1$
-// String earFileName = getFullTestDataPath(earName);
-//
-// for(int i=0; i<8; i++){
-// setUp();
-//
-// IDataModel model = DataModelFactory.createDataModel(new EARComponentImportDataModelProvider());
-// model.setProperty(IEARComponentImportDataModelProperties.FILE_NAME, earFileName);
-// List utilityArchives = EARComponentImportDataModelProvider.getAllUtilities((EARFile) model.getProperty(IEARComponentImportDataModelProperties.FILE));
-// List utilsList = new ArrayList();
-//
-// for(int j =0;j<utilityArchives.size(); j++){
-// Archive archive = (Archive)utilityArchives.get(j);
-// String projectName = archive.getName();
-// if((i & A) == A && "A.jar".equals(projectName)){
-// utilsList.add(archive);
-// } else if((i & B) == B && "B.jar".equals(projectName)){
-// utilsList.add(archive);
-// } else if((i & C) == C && "C.jar".equals(projectName)){
-// utilsList.add(archive);
-// }
-// }
-// model.setProperty(IEARComponentImportDataModelProperties.UTILITY_LIST, utilsList);
-// runAndVerify(model);
-//
-// IJavaProject appClient = JavaCore.create(J2EEProjectUtilities.getProject("AppClient"));
-// IType aType = appClient.findType("test.A");
-// Assert.assertNotNull(aType);
-// if((i & A) == A ){
-// Assert.assertTrue(aType instanceof SourceType);
-// } else {
-// Assert.assertTrue(aType instanceof BinaryType);
-// }
-//
-// IType bType = appClient.findType("test.B");
-// Assert.assertNotNull(bType);
-// if((i & B) == B ){
-// Assert.assertTrue(bType instanceof SourceType);
-// } else {
-// Assert.assertTrue(bType instanceof BinaryType);
-// }
-//
-// IType cType = appClient.findType("test.C");
-// Assert.assertNotNull(cType);
-// if((i & C) == C ){
-// Assert.assertTrue(cType instanceof SourceType);
-// } else {
-// Assert.assertTrue(cType instanceof BinaryType);
-// }
-// }
- }
-
- /**
- * Test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=145031
- */
- /*
- public void test145031() throws Exception {
- String [] shortNames = new String [] { "JarTest.man.jar", "JarTest.auto.jar"};
-
- for (int i = 0; i < shortNames.length; i++) {
- //System.out.println("trying shortName ="+shortNames[i]);
- String longName = getFullTestDataPath(shortNames[i]);
- //System.out.println("longName ="+longName);
- URLClassLoader jarCL = new URLClassLoader(new URL[] { new URL("file:\\"+longName) });
- Enumeration resources = jarCL.getResources("META-INF/");
- boolean foundResource = false;
- while(resources.hasMoreElements()){
- URL url = (URL)resources.nextElement();
-
- if(url.toString().indexOf(shortNames[i]) != -1){
- //System.out.println(" Found URL with URLClassLoader.getResources(\"META-INF/\") ");
- //System.out.println(" url = "+ url);
- foundResource = true;
- }
- }
-
- //this is cheating because we know the the manual archive is first and does not have the directory info
- // and that second index is auto and should have the directory info
- if(i == 0) {
- Assert.assertFalse("Should not have found URL with URLClassLoader.getResources(\"META-INF/\") ", foundResource);
- } else if(i == 1) {
- Assert.assertTrue("Didn't find URL with URLClassLoader.getResources(\"META-INF/\") ", foundResource);
- }
-
- if(!foundResource){
- System.out.println(" Didn't find URL with URLClassLoader.getResources(\"META-INF/\") ");
- }
-
- ZipFile zipFile = new ZipFile(longName);
- Enumeration entries = zipFile.entries();
- while(entries.hasMoreElements()){
- ZipEntry entry = (ZipEntry)entries.nextElement();
- System.out.println(" Entry found = "+entry);
- }
-
- }
- }
- */
-
- /**
- * Test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=159481
- */
- public void test159481() throws Exception {
- ArchiveOptions options = new ArchiveOptions();
- options.setRendererType(ArchiveOptions.DOM);
- final String earPath = getFullTestDataPath("WebDavTest.war"); //$NON-NLS-1$
- CommonarchivePackage pkg = CommonarchivePackage.eINSTANCE;
- WARFile warFile = pkg.getCommonarchiveFactory().openWARFile(options, earPath);
- warFile.getDeploymentDescriptor();
-
- }
-
-
- /**
- * To run this test, first override setUp() to do nothing, and then import a
- * few ear projects containing modules.
- *
- * @throws Exception
- */
- public void test145805() throws Exception {
- ClasspathContainerThreading threading = new ClasspathContainerThreading();
- threading.testDeadlock();
- }
-
- public void test160562() throws Exception {
- Assert.assertEquals("A.jar", ArchiveUtil.deriveEARRelativeURI("A.jar", "B.jar"));
- Assert.assertEquals("A.jar", ArchiveUtil.deriveEARRelativeURI("./A.jar", "B.jar"));
- Assert.assertEquals("A.jar", ArchiveUtil.deriveEARRelativeURI("A.jar", "./B.jar"));
- Assert.assertEquals("A.jar", ArchiveUtil.deriveEARRelativeURI("././././A.jar", "B.jar"));
- Assert.assertEquals("A.jar", ArchiveUtil.deriveEARRelativeURI("A.jar", "././././B.jar"));
- Assert.assertEquals("A.jar", ArchiveUtil.deriveEARRelativeURI("././././A.jar", "././././B.jar"));
- Assert.assertEquals("lib/A.jar", ArchiveUtil.deriveEARRelativeURI("A.jar", "lib/B.jar"));
- Assert.assertEquals("lib/A.jar", ArchiveUtil.deriveEARRelativeURI("./A.jar", "lib/B.jar"));
- Assert.assertEquals("A.jar", ArchiveUtil.deriveEARRelativeURI("../A.jar", "lib/B.jar"));
- Assert.assertEquals("lib/A.jar", ArchiveUtil.deriveEARRelativeURI("../lib/A.jar", "lib/B.jar"));
- Assert.assertEquals("A.jar", ArchiveUtil.deriveEARRelativeURI("../../../A.jar", "lib/foo/bar/B.jar"));
- Assert.assertEquals("lib/A.jar", ArchiveUtil.deriveEARRelativeURI("../../A.jar", "lib/foo/bar/B.jar"));
- Assert.assertEquals("lib/foo/A.jar", ArchiveUtil.deriveEARRelativeURI("../A.jar", "lib/foo/bar/B.jar"));
- Assert.assertEquals("lib/foo/bar/A.jar", ArchiveUtil.deriveEARRelativeURI("A.jar", "lib/foo/bar/B.jar"));
- Assert.assertEquals("lib/foo/bar/A.jar", ArchiveUtil.deriveEARRelativeURI("./A.jar", "lib/foo/bar/B.jar"));
- Assert.assertEquals("lib/foo/bar/A.jar", ArchiveUtil.deriveEARRelativeURI("./A.jar", "lib/foo/bar/B.jar"));
- Assert.assertEquals("lib/foo/bar/A.jar", ArchiveUtil.deriveEARRelativeURI("./../bar/../../foo/./bar/A.jar", "lib/foo/bar/B.jar"));
- Assert.assertEquals("lib/foo/bar/A.jar", ArchiveUtil.deriveEARRelativeURI("./A.jar", "lib/foo/bar/B.jar"));
- }
-
- /**
- * Test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=184154
- */
- public void test184154() throws Exception {
-
- // Scenario 1 - create ejb project with add to ear and ejb client
-
- IDataModel dataModel = DataModelFactory.createDataModel(IEjbFacetInstallDataModelProperties.class);
-
- String projName = "TestAPIEjbProject";//$NON-NLS-1$
- String ejbVersionString = J2EEVersionUtil.convertVersionIntToString(J2EEVersionConstants.EJB_2_1_ID);
- IProjectFacet ejbFacet = ProjectFacetsManager.getProjectFacet(IModuleConstants.JST_EJB_MODULE);
- IProjectFacetVersion ejbFacetVersion = ejbFacet.getVersion(ejbVersionString); //$NON-NLS-1$
-
-
- dataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, projName);
- FacetDataModelMap map = (FacetDataModelMap) dataModel
- .getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel appmodel = (IDataModel) map.get(IModuleConstants.JST_EJB_MODULE);
- appmodel.setProperty(IFacetInstallDataModelProperties.FACET_VERSION, ejbFacetVersion);
- appmodel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER,"ejb333"); //$NON-NLS-1$
-
- String ejbClientName = projName + "Client"; //$NON-NLS-1$
-
- map = (FacetDataModelMap) dataModel
- .getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- appmodel = (IDataModel) map.get(IModuleConstants.JST_EJB_MODULE);
-
- appmodel.setBooleanProperty(IEjbFacetInstallDataModelProperties.CREATE_CLIENT, true);
- appmodel.setStringProperty(IEjbFacetInstallDataModelProperties.CLIENT_NAME, ejbClientName);
-
- String clientURI = ejbClientName+"zzzzz"+IJ2EEModuleConstants.JAR_EXT;
-
- appmodel.setStringProperty(IEjbFacetInstallDataModelProperties.CLIENT_URI, clientURI);
-
- String earProjName = projName + "EAR"; //$NON-NLS-1$
-
- dataModel.setBooleanProperty(IJ2EEFacetProjectCreationDataModelProperties.ADD_TO_EAR, true);
-
- dataModel.setProperty(IJ2EEFacetProjectCreationDataModelProperties.EAR_PROJECT_NAME, earProjName);
-
- runAndVerify(dataModel);
-
- IVirtualComponent component = ComponentUtilities.getComponent(earProjName);
-
- IVirtualComponent ejbClientComponent = ComponentUtilities.getComponent(ejbClientName);
-
- IVirtualReference reference = component.getReference(ejbClientComponent.getName());
-
- Assert.assertEquals(reference.getReferencedComponent(), ejbClientComponent);
-
- Assert.assertEquals(reference.getArchiveName(), clientURI);
-
- // Scenario 2 - create utility project with add to ear
-
- String utilityProjectName = "TestUtilityProject";
- String utilEarProjectName = utilityProjectName + "EAR"; //$NON-NLS-1$
- String utilityURI = utilityProjectName + IJ2EEModuleConstants.JAR_EXT;
-
- ProjectUtil.createUtilityProject(utilityProjectName , utilEarProjectName);
-
- IVirtualComponent earComponent = ComponentUtilities.getComponent(utilEarProjectName);
-
- IVirtualComponent utilClientComponent = ComponentUtilities.getComponent(utilityProjectName);
-
- IVirtualReference reference1 = earComponent.getReference(utilClientComponent.getName());
-
- Assert.assertEquals(reference1.getReferencedComponent(), utilClientComponent);
-
- Assert.assertEquals(reference1.getArchiveName(), utilityURI);
-
- String javaProjectName = "TestJavaProject";
-
- // Scenario 3 - create java project add it as a j2ee module dependency for an ear project
-
- IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(javaProjectName);
- proj.create(null);
- proj.open(null);
-
- IProjectDescription description = proj.getDescription();
- List natureList = new ArrayList();
- natureList.add(JavaCore.NATURE_ID);
- natureList.addAll(Arrays.asList(description.getNatureIds()));
- description.setNatureIds((String[]) natureList.toArray(new String[natureList.size()]));
- proj.setDescription(description, null);
-
- IJavaProject javaProject = JavaCore.create(proj);
-
- IDataModel migrationdm = DataModelFactory.createDataModel(new JavaProjectMigrationDataModelProvider());
- migrationdm.setProperty(IJavaProjectMigrationDataModelProperties.PROJECT_NAME, proj.getName());
-
- runAndVerify(migrationdm);
-
- String javaProjectURI = proj.getName() + IJ2EEModuleConstants.JAR_EXT;
-
- IDataModel refdm = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
- List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
-
- IVirtualComponent targetcomponent = ComponentCore.createComponent(proj);
- targetCompList.add(targetcomponent);
-
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList);
-
- // referenced java projects should have archiveName attribute
- ((Map)refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP)).put(targetcomponent, javaProjectURI);
-
- runAndVerify(refdm, true, true, null, true, true);
-
- IVirtualReference reference2 = earComponent.getReference(targetcomponent.getName());
-
- Assert.assertEquals(reference2.getReferencedComponent(), targetcomponent);
-
- Assert.assertEquals(reference2.getArchiveName(), javaProjectURI);
-
-
- }
-
- /*
- public void test192752() throws Exception {
- String warPath = null;
- String projectName = null;
- WebArtifactEdit webArtifactEditForRead = null;
- IDataModel model = null;
-
-
- warPath = getWarFile("InvalidWebXML1.war");
- projectName = warPath.substring(warPath.lastIndexOf(File.separator) + 1, warPath.length() - 4);
- model = WebImportOperationTest.getWebImportDataModel(warPath, projectName, null, null, true, null, null);
- OperationTestCase.runAndVerify(model);
- webArtifactEditForRead = WebArtifactEdit.getWebArtifactEditForRead(ProjectUtil.getProject(projectName));
- checkIfModelIsParsed(webArtifactEditForRead.getWebApp());
-
- warPath = getWarFile("InvalidWebXML2.war");
- projectName = warPath.substring(warPath.lastIndexOf(File.separator) + 1, warPath.length() - 4);
- model = WebImportOperationTest.getWebImportDataModel(warPath, projectName, null, null, true, null, null);
- OperationTestCase.runAndVerify(model);
- webArtifactEditForRead = WebArtifactEdit.getWebArtifactEditForRead(ProjectUtil.getProject(projectName));
- checkIfModelIsParsed(webArtifactEditForRead.getWebApp());
-
- warPath = getWarFile("InvalidWebXML14_1.war");
- projectName = warPath.substring(warPath.lastIndexOf(File.separator) + 1, warPath.length() - 4);
- model = WebImportOperationTest.getWebImportDataModel(warPath, projectName, null, null, true, null, null);
- OperationTestCase.runAndVerify(model);
- webArtifactEditForRead = WebArtifactEdit.getWebArtifactEditForRead(ProjectUtil.getProject(projectName));
- checkIfModelIsParsed(webArtifactEditForRead.getWebApp());
-
- warPath = getWarFile("InvalidWebXML14_2.war");
- projectName = warPath.substring(warPath.lastIndexOf(File.separator) + 1, warPath.length() - 4);
- model = WebImportOperationTest.getWebImportDataModel(warPath, projectName, null, null, true, null, null);
- OperationTestCase.runAndVerify(model);
- webArtifactEditForRead = WebArtifactEdit.getWebArtifactEditForRead(ProjectUtil.getProject(projectName));
- checkIfModelIsParsed(webArtifactEditForRead.getWebApp());
- }
- */
-
- /**
- * Test for https://bugs.eclipse.org/bugs/show_bug.cgi?id=311542
- */
- public void test311542() throws Exception {
- String warPath = null;
- String projectName = null;
- IDataModel model = null;
-
-
- warPath = getWarFile("Bug311542.war");
- projectName = warPath.substring(warPath.lastIndexOf(File.separator) + 1, warPath.length() - 4);
- model = WebImportOperationTest.getWebImportDataModel(warPath, projectName, null, true, null, null);
- OperationTestCase.runAndVerify(model);
- }
-
- private String getWarFile(String fileName) {
- return TEST_DATA_PATH + "WarImportTests" + java.io.File.separatorChar + fileName;
- }
-
- private void checkIfModelIsParsed(WebApp deploymentDescriptor1) {
- // tests to ensure model is usable to a degree
- Assert.assertNotNull(deploymentDescriptor1);
- Assert.assertNotNull(deploymentDescriptor1.getConstraints());
- Assert.assertFalse(deploymentDescriptor1.getConstraints().isEmpty());
- Assert.assertNotNull(deploymentDescriptor1.getSecurityRoles());
- Assert.assertFalse(deploymentDescriptor1.getSecurityRoles().isEmpty());
- }
-
-
- /**
- * This defect was canceled.
- public void test147917() throws Exception {
-
- Assert.assertEquals("Lib/A.jar", ArchiveUtil.deriveEARRelativeURI("Lib/A.jar", "B.jar"));
-
-
- String workingDir = new java.io.File(".").getCanonicalPath(); //$NON-NLS-1$
- if(workingDir.lastIndexOf(java.io.File.separatorChar) == -1){
- return;
- }
-
- List prefixes = new ArrayList();
- String lastSegment = workingDir.substring(workingDir.lastIndexOf(java.io.File.separatorChar)+1);
- prefixes.add(lastSegment);
- String lower = lastSegment.toLowerCase();
- prefixes.add(lower);
- String upper = lastSegment.toUpperCase();
- prefixes.add(upper);
- //switch each charactor
- for(int i=0;i<lastSegment.length(); i++){
- char [] newValue = lastSegment.toCharArray();
- char c = Character.toUpperCase(newValue[i]);
- if(c == newValue[i]){
- c = Character.toLowerCase(c);
- }
- if(c != newValue[i]){
- newValue[i] = c;
- String newString = new String(newValue);
- prefixes.add(newString);
- }
- }
-
- for(Iterator itr = prefixes.iterator(); itr.hasNext();){
- String prefix = (String)itr.next();
- Assert.assertEquals("A.jar", ArchiveUtil.deriveEARRelativeURI("/A.jar", "B.jar"));
- Assert.assertEquals(prefix+"/A.jar", ArchiveUtil.deriveEARRelativeURI(prefix+"/A.jar", "B.jar"));
- Assert.assertEquals(prefix+"/A.jar", ArchiveUtil.deriveEARRelativeURI("/"+prefix+"/A.jar", "B.jar"));
- Assert.assertEquals(prefix+"/A.jar", ArchiveUtil.deriveEARRelativeURI(prefix+"/A.jar", "./B.jar"));
- Assert.assertEquals(prefix+"/A.jar", ArchiveUtil.deriveEARRelativeURI("A.jar", prefix+"/B.jar"));
- Assert.assertEquals(prefix+"/A.jar", ArchiveUtil.deriveEARRelativeURI("/A.jar", prefix+"/B.jar"));
- Assert.assertEquals(prefix+"/A.jar", ArchiveUtil.deriveEARRelativeURI("./A.jar", prefix+"/B.jar"));
- Assert.assertEquals("A.jar", ArchiveUtil.deriveEARRelativeURI("../A.jar", prefix+"/B.jar"));
- Assert.assertEquals("A.jar", ArchiveUtil.deriveEARRelativeURI("/../A.jar", prefix+"/B.jar"));
- Assert.assertEquals("A.jar", ArchiveUtil.deriveEARRelativeURI(prefix+"/../../A.jar", prefix+"/B.jar"));
- Assert.assertEquals("A.jar", ArchiveUtil.deriveEARRelativeURI("/"+prefix+"/../../A.jar", prefix+"/B.jar"));
- Assert.assertEquals(prefix+"/A.jar", ArchiveUtil.deriveEARRelativeURI(prefix+"/../A.jar", prefix+"/B.jar"));
- Assert.assertEquals(prefix+"/A.jar", ArchiveUtil.deriveEARRelativeURI("/"+prefix+"/../A.jar", prefix+"/B.jar"));
- Assert.assertEquals(prefix+"/"+prefix+"/A.jar", ArchiveUtil.deriveEARRelativeURI(prefix+"/A.jar", prefix+"/B.jar"));
- Assert.assertEquals(prefix+"/"+prefix+"/A.jar", ArchiveUtil.deriveEARRelativeURI("/"+prefix+"/A.jar", prefix+"/B.jar"));
-
-
- }
- }
- **/
-
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/DefectVerificationTestsSuite.java b/tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/DefectVerificationTestsSuite.java
deleted file mode 100644
index f0195543..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/DefectVerificationTestsSuite.java
+++ /dev/null
@@ -1,29 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.defect.tests;
-
-import org.eclipse.wst.common.tests.SimpleTestSuite;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class DefectVerificationTestsSuite extends TestSuite {
-
- public static Test suite() {
- return new DefectVerificationTestsSuite();
- }
-
- public DefectVerificationTestsSuite() {
- super("Defect Verification Tests");
- addTest(new SimpleTestSuite(DefectVerificationTests.class));
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/exportmodel-tests/org/eclipse/wtp/j2ee/headless/tests/exportmodel/ExportModelTest.java b/tests/org.eclipse.jst.j2ee.tests/exportmodel-tests/org/eclipse/wtp/j2ee/headless/tests/exportmodel/ExportModelTest.java
deleted file mode 100644
index 55685e36..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/exportmodel-tests/org/eclipse/wtp/j2ee/headless/tests/exportmodel/ExportModelTest.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package org.eclipse.wtp.j2ee.headless.tests.exportmodel;
-
-import java.io.ByteArrayInputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.internal.flat.FilterResourceParticipant;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatFolder;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatResource;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlatVirtualComponent;
-import org.eclipse.wst.common.componentcore.internal.flat.IFlattenParticipant;
-import org.eclipse.wst.common.componentcore.internal.flat.FlatVirtualComponent.FlatComponentTaskModel;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModelProvider;
-import org.eclipse.wst.common.tests.OperationTestCase;
-import org.eclipse.wtp.j2ee.headless.tests.ear.operations.EARProjectCreationOperationTest;
-import org.eclipse.wtp.j2ee.headless.tests.j2ee.operations.JavaEEFacetConstants;
-
-public class ExportModelTest extends TestCase {
- public void testSimpleExportModel() throws Exception{
- IDataModel dm = EARProjectCreationOperationTest.getEARDataModel("aEAR", null, null, null, JavaEEFacetConstants.EAR_5, true);
- OperationTestCase.runAndVerify(dm);
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("aEAR");
- assertTrue(p.exists());
- runVerify(p);
- assertEquals(2, countRecurse(p));
- p.getFolder("garbage").create(true, true, null);
- runVerify(p);
- assertEquals(2, countRecurse(p));
- IFile f = p.getFile(new Path("garbage/file.txt"));
- f.create(new ByteArrayInputStream("hello".getBytes()), true, null);
- runVerify(p);
- assertEquals(2, countRecurse(p));
- IFile f2 = p.getFile(new Path("EarContent/file.txt"));
- f2.create(new ByteArrayInputStream("hello2".getBytes()), true, null);
- runVerify(p);
- assertEquals(3, countRecurse(p));
- addMapping(p, new Path("/garbage"), new Path("some/output"));
- assertEquals(6, countRecurse(p)); // (added some, some/output, and some/output/file.txt)
- p.delete(true, null);
- }
-
- public void testConsumesExportModel() throws Exception{
- IDataModel dm = EARProjectCreationOperationTest.getEARDataModel("bEAR", null, null, null, JavaEEFacetConstants.EAR_5, true);
- OperationTestCase.runAndVerify(dm);
- IProject ear = ResourcesPlugin.getWorkspace().getRoot().getProject("bEAR");
- assertTrue(ear.exists());
- runVerify(ear);
- assertEquals(2, countRecurse(ear));
- IVirtualComponent earComponent = ComponentCore.createComponent(ear);
- IProject pojp = ResourcesPlugin.getWorkspace().getRoot().getProject("pojp");
- pojp.create(null);
- assertTrue(pojp.exists());
- pojp.open(null);
- IFile pojpTxt = pojp.getFile(new Path("pojp.txt"));
- pojpTxt.create(new ByteArrayInputStream("pojp".getBytes()), true, null);
- assertTrue(pojpTxt.exists());
- assertEquals(2, countRecurse(ear));
- TestExportVirtualComponent pojpComponent = new TestExportVirtualComponent(pojpTxt);
- addReference(earComponent, pojpComponent, "path/to", "");
- assertEquals(5, countRecurse(ear)); // META-INF, META-INF/application.xml, path, path/to, path/to/pojp.txt
- ear.delete(true, null);
- pojp.delete(true, null);
- }
-
- protected void addReference(IVirtualComponent parent, IVirtualComponent child,
- String path, String archiveName) throws CoreException {
- IDataModelProvider provider = new CreateReferenceComponentsDataModelProvider();
- IDataModel dm = DataModelFactory.createDataModel(provider);
-
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, parent);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, Arrays.asList(child));
-
- //[Bug 238264] the uri map needs to be manually set correctly
- Map<IVirtualComponent, String> uriMap = new HashMap<IVirtualComponent, String>();
- uriMap.put(child, archiveName);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_TO_URI_MAP, uriMap);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, path);
-
- IStatus stat = dm.validateProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- if (!stat.isOK())
- throw new CoreException(stat);
- try {
- dm.getDefaultOperation().execute(new NullProgressMonitor(), null);
- } catch (ExecutionException e) {
- }
- }
-
- public void testSuffixFilterExportModel() throws Exception{
- IDataModel dm = EARProjectCreationOperationTest.getEARDataModel("aEAR", null, null, null, JavaEEFacetConstants.EAR_5, true);
- OperationTestCase.runAndVerify(dm);
- IProject p = ResourcesPlugin.getWorkspace().getRoot().getProject("aEAR");
- assertTrue(p.exists());
- runVerify(p);
- assertEquals(2, countRecurse(p));
- IFile f = p.getFile(new Path("EarContent/file.txt"));
- f.create(new ByteArrayInputStream("hello".getBytes()), true, null);
- IFile f2 = p.getFile(new Path("EarContent/file.java"));
- f2.create(new ByteArrayInputStream("hello2".getBytes()), true, null);
- runVerify(p);
- assertEquals(4, countRecurse(p));
- assertEquals(4, countRecurse(p, FilterResourceParticipant.createSuffixFilterParticipant(new String[]{})));
- assertEquals(3, countRecurse(p, FilterResourceParticipant.createSuffixFilterParticipant(new String[]{".txt"})));
- assertEquals(3, countRecurse(p, FilterResourceParticipant.createSuffixFilterParticipant(new String[]{".java"})));
- assertEquals(2, countRecurse(p, FilterResourceParticipant.createSuffixFilterParticipant(new String[]{".java", ".txt"})));
- assertEquals(1, countRecurse(p, FilterResourceParticipant.createSuffixFilterParticipant(new String[]{".java", ".txt", ".xml"})));
- }
-
- protected static void runVerify(IProject p) throws Exception {
- IVirtualComponent component = ComponentCore.createComponent(p);
- assertTrue(component.exists());
- IFlatVirtualComponent model = new FlatVirtualComponent(component);
- IFlatResource[] resources = model.fetchResources();
- ComponentResource[] mappings = getMappings(p);
- verifyMappingsAndOutput(p, resources, mappings);
- }
-
- protected static int countRecurse(IProject p) throws Exception {
- IVirtualComponent component = ComponentCore.createComponent(p);
- assertTrue(component.exists());
- IFlatVirtualComponent model = new FlatVirtualComponent(component);
- IFlatResource[] resources = model.fetchResources();
- return countRecurse(resources);
- }
-
- protected static int countRecurse(IProject p, IFlattenParticipant participant) throws Exception {
- IVirtualComponent component = ComponentCore.createComponent(p);
- assertTrue(component.exists());
- FlatComponentTaskModel tm = new FlatComponentTaskModel();
- tm.put(IFlatVirtualComponent.PARTICIPANT_LIST, participant);
- IFlatVirtualComponent model = new FlatVirtualComponent(component, tm);
- IFlatResource[] resources = model.fetchResources();
- return countRecurse(resources);
- }
-
-
-
- protected static int countRecurse(IFlatResource[] resources) {
- int count = 0;
- for( int i = 0; i < resources.length; i++ ) {
- if( resources[i] != null ) {
- count++;
- if( resources[i] instanceof IFlatFolder)
- count += countRecurse(((IFlatFolder)resources[i]).members());
- }
- }
- return count;
- }
-
- protected static void verifyMappingsAndOutput(IProject p, IFlatResource[] resources, ComponentResource[] mappings) {
- for( int i = 0; i < resources.length; i++ ) {
- IPath deployPath = resources[i].getModuleRelativePath().append(resources[i].getName());
- IResource workspaceResource = (IResource)resources[i].getAdapter(IResource.class);
- IPath workspacePath = workspaceResource.getFullPath();
- assertNotNull(workspaceResource);
- boolean found = false;
- for( int j = 0; j < mappings.length && !found; j++ ) {
- IPath tmp = new Path(p.getName()).makeAbsolute().append(mappings[j].getSourcePath()).append(deployPath);
- found |= (tmp.equals(workspacePath));
- }
- assertTrue(found);
- if( resources[i] instanceof IFlatFolder)
- verifyMappingsAndOutput(p, ((IFlatFolder)resources[i]).members(), mappings);
- }
- }
-
- protected static ComponentResource[] getMappings(IProject project) {
- StructureEdit structureEdit = null;
- structureEdit = StructureEdit.getStructureEditForRead(project);
- WorkbenchComponent component = structureEdit.getComponent();
- EList list = component.getResources();
- List<ComponentResource> newList = new ArrayList<ComponentResource>();
- for(Iterator i = list.iterator(); i.hasNext();) {
- newList.add((ComponentResource)i.next());
- }
- return (ComponentResource[]) newList.toArray(new ComponentResource[newList
- .size()]);
- }
-
- protected static void addMapping(IProject project, IPath src, IPath runtime) throws CoreException {
- IVirtualComponent vc = ComponentCore.createComponent(project);
- IVirtualFolder vf = vc.getRootFolder();
- vf.getFolder(runtime).createLink(src, 0, null);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/exportmodel-tests/org/eclipse/wtp/j2ee/headless/tests/exportmodel/TestExportReferenceResolver.java b/tests/org.eclipse.jst.j2ee.tests/exportmodel-tests/org/eclipse/wtp/j2ee/headless/tests/exportmodel/TestExportReferenceResolver.java
deleted file mode 100644
index 8b1de0e0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/exportmodel-tests/org/eclipse/wtp/j2ee/headless/tests/exportmodel/TestExportReferenceResolver.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package org.eclipse.wtp.j2ee.headless.tests.exportmodel;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.ComponentcorePackage;
-import org.eclipse.wst.common.componentcore.internal.DependencyType;
-import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
-import org.eclipse.wst.common.componentcore.internal.impl.PlatformURLModuleConnection;
-import org.eclipse.wst.common.componentcore.resolvers.IReferenceResolver;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-public class TestExportReferenceResolver implements IReferenceResolver {
- private static final String FIRST_SEGMENT = "org.eclipse.wtp.j2ee.exportTestResolver";
- public static final String PROTOCOL = PlatformURLModuleConnection.MODULE_PROTOCOL
- +IPath.SEPARATOR + FIRST_SEGMENT + IPath.SEPARATOR;
-
- public boolean canResolve(IVirtualReference reference) {
- if( reference.getReferencedComponent()
- instanceof TestExportVirtualComponent )
- return true;
- return false;
- }
-
- public ReferencedComponent resolve(IVirtualReference reference) {
- TestExportVirtualComponent vc = (TestExportVirtualComponent)reference.getReferencedComponent();
- ReferencedComponent rc = ComponentcorePackage.eINSTANCE.getComponentcoreFactory().createReferencedComponent();
- rc.setArchiveName(reference.getArchiveName());
- rc.setRuntimePath(reference.getRuntimePath());
- rc.setHandle(URI.createURI(PROTOCOL + vc.getFullPath().toString()));
- rc.setDependencyType(DependencyType.CONSUMES_LITERAL);
- return rc;
- }
-
- public boolean canResolve(IVirtualComponent context,
- ReferencedComponent referencedComponent) {
- URI uri = referencedComponent.getHandle();
- if( uri.segmentCount() >= 1 && FIRST_SEGMENT.equals(uri.segment(0)))
- return true;
- return false;
- }
-
- public IVirtualReference resolve(IVirtualComponent context,
- ReferencedComponent referencedComponent) {
- URI uri = referencedComponent.getHandle();
- if( uri.segmentCount() >= 1 && FIRST_SEGMENT.equals(uri.segment(0))) {
- String path = uri.toString().substring(PROTOCOL.length());
- IPath filePath = new Path(path);
- IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(filePath.segment(0));
- IFile f = proj.getFile(filePath.removeFirstSegments(1));
- IVirtualReference ref = ComponentCore.createReference(context,
- new TestExportVirtualComponent(f));
- ref.setArchiveName(referencedComponent.getArchiveName());
- ref.setRuntimePath(referencedComponent.getRuntimePath());
- ref.setDependencyType(referencedComponent.getDependencyType().getValue());
- return ref;
- }
- return null;
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/exportmodel-tests/org/eclipse/wtp/j2ee/headless/tests/exportmodel/TestExportVirtualComponent.java b/tests/org.eclipse.jst.j2ee.tests/exportmodel-tests/org/eclipse/wtp/j2ee/headless/tests/exportmodel/TestExportVirtualComponent.java
deleted file mode 100644
index c2775224..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/exportmodel-tests/org/eclipse/wtp/j2ee/headless/tests/exportmodel/TestExportVirtualComponent.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.eclipse.wtp.j2ee.headless.tests.exportmodel;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualComponent;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualFile;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-public class TestExportVirtualComponent extends VirtualComponent {
- private IFile file;
- public TestExportVirtualComponent(IFile file) {
- super(file.getProject(), new Path(""));
- this.file = file;
- }
-
- public boolean exists() {
- return true;
- }
-
- public IPath getFullPath() {
- return file.getFullPath();
- }
- public IVirtualFolder getRootFolder() {
- return new TestExportVirtualFolder(file.getProject());
- }
-
- public class TestExportVirtualFolder extends VirtualFolder {
- public TestExportVirtualFolder(IProject aComponentProject) {
- super(aComponentProject, new Path("/"));
- }
-
- public IVirtualResource[] members(int memberFlags) throws CoreException {
- return new IVirtualResource[] {
- new VirtualFile(file.getProject(), new Path("inside"), file)
- };
- }
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/common/annotations/tests/AnnotationProviderTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/common/annotations/tests/AnnotationProviderTest.java
deleted file mode 100644
index a05a041d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/common/annotations/tests/AnnotationProviderTest.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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.common.annotations.tests;
-
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.jst.common.internal.annotations.core.AnnotationsProviderManager;
-import org.eclipse.jst.common.internal.annotations.core.IAnnotationsProvider;
-import org.eclipse.wst.common.tests.SimpleTestSuite;
-
-public class AnnotationProviderTest extends TestCase {
-
- public AnnotationProviderTest() {
- super();
- }
-
- public AnnotationProviderTest(String name) {
- super(name);
- }
-
- public static Test suite() {
- return new SimpleTestSuite(AnnotationProviderTest.class);
- }
-
- public void testAnnotationProviderFramework() throws Exception {
- List providers = AnnotationsProviderManager.INSTANCE.getAnnotationsProviders();
- boolean success = false;
- for (int i=0; i<providers.size(); i++) {
- IAnnotationsProvider provider = (IAnnotationsProvider) providers.get(i);
- provider.isAnnotated(null);
- provider.getPrimaryAnnotatedCompilationUnit(null);
- provider.getPrimaryTagset(null);
- success = true;
- }
- assertTrue(success);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/common/annotations/tests/TestAnnotationProvider.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/common/annotations/tests/TestAnnotationProvider.java
deleted file mode 100644
index d7cf5541..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/common/annotations/tests/TestAnnotationProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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.common.annotations.tests;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jst.common.internal.annotations.core.IAnnotationsProvider;
-
-public class TestAnnotationProvider implements IAnnotationsProvider {
-
- public TestAnnotationProvider() {
- super();
- }
-
- public boolean isAnnotated(EObject eObject) {
- return false;
- }
-
- public ICompilationUnit getPrimaryAnnotatedCompilationUnit(EObject eObject) {
- return null;
- }
-
- public String getPrimaryTagset(EObject eObject) {
- return null;
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/bindingshelper/tests/BarBindingsHelper.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/bindingshelper/tests/BarBindingsHelper.java
deleted file mode 100644
index 72a95310..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/bindingshelper/tests/BarBindingsHelper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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.bindingshelper.tests;
-
-public class BarBindingsHelper extends TestBindingsHelper {
-
- public static String getFileName(){
- return "bar.txt"; //$NON-NLS-1$
- }
-
- public String getBindingsFileName() {
- return getFileName();
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/bindingshelper/tests/BindingsHelperTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/bindingshelper/tests/BindingsHelperTest.java
deleted file mode 100644
index b8ab6306..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/bindingshelper/tests/BindingsHelperTest.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2007 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.bindingshelper.tests;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.application.internal.operations.EARComponentImportDataModelProvider;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EJBJarFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.core.internal.bindings.IJNDIBindingsHelper;
-import org.eclipse.jst.j2ee.core.internal.bindings.JNDIBindingsHelperManager;
-import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentImportDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.Session;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.tests.ProjectUtility;
-import org.eclipse.wtp.j2ee.headless.tests.plugin.HeadlessTestsPlugin;
-
-public class BindingsHelperTest extends TestCase {
-
- public static String fileSep = System.getProperty("file.separator"); //$NON-NLS-1$
-
- public static String getFullTestDataPath(String dataPath) {
- try {
- String defectTestDataPath = "TestData" + fileSep + "BindingsHelperTests" + fileSep + dataPath; //$NON-NLS-1$ //$NON-NLS-2$
- HeadlessTestsPlugin plugin = HeadlessTestsPlugin.getDefault();
- if (plugin != null) {
- return ProjectUtility.getFullFileName(plugin, defectTestDataPath);
- }
- return System.getProperty("user.dir") + java.io.File.separatorChar + defectTestDataPath; //$NON-NLS-1$
- } catch (Exception e) {
- e.printStackTrace();
- }
- return ""; //$NON-NLS-1$
- }
-
- private IProject earProject;
- private IVirtualComponent earComponent;
-
- protected void setUp() throws Exception {
- super.setUp();
- IDataModel model = importEar(getFullTestDataPath("BindingsTestEAR.ear")); //$NON-NLS-1$
- earProject = ProjectUtilities.getProject(model.getStringProperty(IEARComponentImportDataModelProperties.PROJECT_NAME));
- earComponent = ComponentCore.createComponent(earProject);
- }
-
- protected EARFile getEarFile() throws Exception {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
- return (EARFile) edit.asArchive(true);
- } finally {
- if (null != edit) {
- edit.dispose();
- }
- }
- }
-
- public static IDataModel importEar(String earPath) throws Exception {
- IDataModel model = DataModelFactory.createDataModel(new EARComponentImportDataModelProvider());
- model.setProperty(IEARComponentImportDataModelProperties.FILE_NAME, earPath);
- model.getDefaultOperation().execute(null, null);
- return model;
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- IProject[] projects = ProjectUtilities.getAllProjects();
- for (int i = 0; i < projects.length; i++) {
- projects[i].delete(true, null);
- }
- }
-
- protected String getSourceFileName() {
- return "test.txt"; //$NON-NLS-1$
- }
-
- public void testHelpers() throws Exception {
- // First check the default helper; i.e. no helpers enabled
- IJNDIBindingsHelper[] helpers = checkHelper(null);
- checkBindings(getEarFile(), helpers[0], ""); //$NON-NLS-1$
-
- // Now check fooHelper (barHelper disabled)
- IFile srcFile = earComponent.getRootFolder().getFile(getSourceFileName()).getUnderlyingFile();
- IFile fooFile = earComponent.getRootFolder().getFile(FooBindingsHelper.getFileName()).getUnderlyingFile();
- srcFile.copy(new Path(fooFile.getFullPath().lastSegment()), true, null);
- assertTrue(fooFile.exists());
-
- helpers = checkHelper(FooBindingsHelper.class);
- checkBindings(getEarFile(), helpers[0], FooBindingsHelper.getFileName());
-
- // Now check barHelper (fooHelper disabled)
- fooFile.delete(true, null);
- assertFalse(fooFile.exists());
-
- IFile barFile = earComponent.getRootFolder().getFile(BarBindingsHelper.getFileName()).getUnderlyingFile();
- srcFile.copy(new Path(barFile.getFullPath().lastSegment()), true, null);
- assertTrue(barFile.exists());
-
- helpers = checkHelper(BarBindingsHelper.class);
- checkBindings(getEarFile(), helpers[0], BarBindingsHelper.getFileName());
-
- // Now check both fooHelper and barHelper (both enabled)
- srcFile.copy(new Path(fooFile.getFullPath().lastSegment()), true, null);
- assertTrue(fooFile.exists());
-
- helpers = JNDIBindingsHelperManager.getInstance().getBindingsHelpers(earProject);
- assertEquals(2, helpers.length);
- int fooIndex = (helpers[0].getClass() == FooBindingsHelper.class) ? 0 : 1;
- int barIndex = (fooIndex == 0) ? 1 : 0;
- assertTrue(helpers[fooIndex].getClass() == FooBindingsHelper.class);
- assertTrue(helpers[barIndex].getClass() == BarBindingsHelper.class);
- EARFile earFile = getEarFile();
- IJNDIBindingsHelper[] tempHelpers = JNDIBindingsHelperManager.getInstance().getBindingsHelpers(earFile);
- assertEquals(2, tempHelpers.length);
- assertTrue(helpers[0] == tempHelpers[0]);
- assertTrue(helpers[1] == tempHelpers[1]);
-
- checkBindings(getEarFile(), helpers[fooIndex], FooBindingsHelper.getFileName());
- checkBindings(getEarFile(), helpers[barIndex], BarBindingsHelper.getFileName());
- }
-
- private IJNDIBindingsHelper[] checkHelper(Class clazz) throws Exception {
- IJNDIBindingsHelper[] helpers = JNDIBindingsHelperManager.getInstance().getBindingsHelpers(earProject);
- assertEquals(1, helpers.length);
- if (null != clazz) {
- assertTrue(helpers[0].getClass() == clazz);
- } else {
- assertTrue(helpers[0].getClass() != FooBindingsHelper.class);
- assertTrue(helpers[0].getClass() != BarBindingsHelper.class);
- }
- EARFile earFile = getEarFile();
- IJNDIBindingsHelper[] tempHelpers = JNDIBindingsHelperManager.getInstance().getBindingsHelpers(earFile);
- assertEquals(1, tempHelpers.length);
- assertTrue(helpers[0] == tempHelpers[0]);
- return helpers;
- }
-
- private void checkBindings(EARFile earFile, IJNDIBindingsHelper helper, String prefix) {
- List ejbJarFiles = earFile.getEJBJarFiles();
- EJBJarFile ejbJarFile = (EJBJarFile) ejbJarFiles.get(0);
- EJBJar ejbJar = ejbJarFile.getDeploymentDescriptor();
-
- List cmps = ejbJar.getContainerManagedBeans();
- ContainerManagedEntity cmp = (ContainerManagedEntity) cmps.get(0);
- String jndiName = helper.getJNDIName(cmp);
- String suffix = prefix.length() > 0 ? TestBindingsHelper.EJB : prefix;
- assertEquals(prefix + cmp.getName() + suffix, jndiName);
-
- jndiName = helper.getJNDINameForDefaultDataSource(cmp);
- suffix = prefix.length() > 0 ? TestBindingsHelper.CMP : prefix;
- assertEquals(prefix + ejbJar.getDisplayName() + suffix, jndiName);
-
- List sessions = ejbJar.getSessionBeans();
-
- Session session = (Session) sessions.get(0);
- // TODO
- // List ejbRefs = session.getEjbRefs();
- // EjbRef ejbRef = (EjbRef) ejbRefs.get(0);
-
- List resRefs = session.getResourceRefs();
- ResourceRef resRef = (ResourceRef) resRefs.get(0);
- jndiName = helper.getJNDINameForRef(session, resRef);
- suffix = prefix.length() > 0 ? TestBindingsHelper.EJB_RES_REF : prefix;
- assertEquals(prefix + resRef.getName() + suffix, jndiName);
-
- List resEnvRefs = session.getResourceEnvRefs();
- ResourceEnvRef resEnvRef = (ResourceEnvRef) resEnvRefs.get(0);
- jndiName = helper.getJNDINameForRef(session, resEnvRef);
- suffix = prefix.length() > 0 ? TestBindingsHelper.EJB_RES_ENV_REF : prefix;
- assertEquals(prefix + resEnvRef.getName() + suffix, jndiName);
-
- List securityRoleRefs = session.getSecurityRoleRefs();
- SecurityRoleRef securityRoleRef = (SecurityRoleRef) securityRoleRefs.get(0);
- jndiName = helper.getJNDINameForRef(session, securityRoleRef);
- suffix = prefix.length() > 0 ? TestBindingsHelper.EJB_SEC_ROLE_REF : prefix;
- assertEquals(prefix + securityRoleRef.getName() + suffix, jndiName);
-
- List warFiles = earFile.getWARFiles();
- WARFile warFile = (WARFile) warFiles.get(0);
- WebApp webApp = warFile.getDeploymentDescriptor();
-
- resRefs = webApp.getResourceRefs();
- resRef = (ResourceRef) resRefs.get(0);
- jndiName = helper.getJNDINameForRef(webApp, resRef);
- suffix = prefix.length() > 0 ? TestBindingsHelper.WEB_RES_REF : prefix;
- assertEquals(prefix + resRef.getName() + suffix, jndiName);
-
- resEnvRefs = session.getResourceEnvRefs();
- resEnvRef = (ResourceEnvRef) resEnvRefs.get(0);
- jndiName = helper.getJNDINameForRef(webApp, resEnvRef);
- suffix = prefix.length() > 0 ? TestBindingsHelper.WEB_RES_ENV_REF : prefix;
- assertEquals(prefix + resEnvRef.getName() + suffix, jndiName);
-
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/bindingshelper/tests/FooBindingsHelper.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/bindingshelper/tests/FooBindingsHelper.java
deleted file mode 100644
index 445356c2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/bindingshelper/tests/FooBindingsHelper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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.bindingshelper.tests;
-
-public class FooBindingsHelper extends TestBindingsHelper {
-
- public static String getFileName(){
- return "foo.txt"; //$NON-NLS-1$
- }
-
- public String getBindingsFileName() {
- return getFileName();
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/bindingshelper/tests/TestBindingsHelper.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/bindingshelper/tests/TestBindingsHelper.java
deleted file mode 100644
index 273f99d7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/bindingshelper/tests/TestBindingsHelper.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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.bindingshelper.tests;
-
-import java.io.FileNotFoundException;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.common.ResourceEnvRef;
-import org.eclipse.jst.j2ee.common.ResourceRef;
-import org.eclipse.jst.j2ee.common.SecurityRoleRef;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.Archive;
-import org.eclipse.jst.j2ee.core.internal.bindings.AbstractJNDIBindingsHelper;
-import org.eclipse.jst.j2ee.ejb.ContainerManagedEntity;
-import org.eclipse.jst.j2ee.ejb.EnterpriseBean;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public abstract class TestBindingsHelper extends AbstractJNDIBindingsHelper {
-
- public abstract String getBindingsFileName();
-
- public boolean appliesFor(IProject project) {
- IVirtualComponent component = ComponentCore.createComponent(project);
- if (null == component) {
- return false;
- }
- IFile bindingsFile = component.getRootFolder().getFile(getBindingsFileName()).getUnderlyingFile();
- return bindingsFile.exists();
- }
-
- public boolean appliesFor(Archive archive) {
- try {
- archive.getFile(getBindingsFileName());
- return true;
- } catch (FileNotFoundException e) {
- return false;
- }
- }
-
- public static final String OBJ = "obj";//$NON-NLS-1$
- public static final String EJB = "ejb";//$NON-NLS-1$
- public static final String EJB_RES_REF = "ejbResRef";//$NON-NLS-1$
- public static final String EJB_RES_ENV_REF = "ejbResEnvRef";//$NON-NLS-1$
- public static final String EJB_SEC_ROLE_REF = "ejbSecRoleRef";//$NON-NLS-1$
- public static final String WEB_RES_REF = "webResRef";//$NON-NLS-1$
- public static final String WEB_RES_ENV_REF = "webResEnvRef";//$NON-NLS-1$
- public static final String CMP = "cmp";//$NON-NLS-1$
-
- public String getJNDIName(Object object) {
- return getBindingsFileName() + super.getJNDIName(object) + OBJ;
- }
-
- public String getJNDIName(EnterpriseBean bean) {
- return getBindingsFileName() + super.getJNDIName(bean) + EJB;
- }
-
- public String getJNDINameForRef(EnterpriseBean bean, ResourceRef resourceRef) {
- return getBindingsFileName() + super.getJNDINameForRef(bean, resourceRef) + EJB_RES_REF;
- }
-
- public String getJNDINameForRef(EnterpriseBean bean, ResourceEnvRef resourceEnvRef) {
- return getBindingsFileName() + super.getJNDINameForRef(bean, resourceEnvRef) + EJB_RES_ENV_REF;
- }
-
- public String getJNDINameForRef(EnterpriseBean bean, SecurityRoleRef securityRoleRef) {
- return getBindingsFileName() + super.getJNDINameForRef(bean, securityRoleRef) + EJB_SEC_ROLE_REF;
- }
-
- public String getJNDINameForRef(WebApp webApp, ResourceRef resourceRef) {
- return getBindingsFileName() + super.getJNDINameForRef(webApp, resourceRef) + WEB_RES_REF;
- }
-
- public String getJNDINameForRef(WebApp webApp, ResourceEnvRef resourceEnvRef) {
- return getBindingsFileName() + super.getJNDINameForRef(webApp, resourceEnvRef) + WEB_RES_ENV_REF;
- }
-
- public String getJNDINameForDefaultDataSource(ContainerManagedEntity bean) {
- return getBindingsFileName() + super.getJNDINameForDefaultDataSource(bean) + CMP;
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/AbstractTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/AbstractTests.java
deleted file mode 100644
index d2f35b88..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/AbstractTests.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.classpath.tests;
-
-import org.eclipse.wst.common.tests.OperationTestCase;
-
-/**
- * Abstract base class for classpath dependency unit tests
- *
- * @author rfrost@bea.com
- */
-public abstract class AbstractTests extends OperationTestCase {
-
- protected AbstractTests(final String name) {
- super(name);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/AllTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/AllTests.java
deleted file mode 100644
index 3fee11e6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/AllTests.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.classpath.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class AllTests extends TestCase {
- public static Test suite() {
- final TestSuite suite = new TestSuite();
-
- suite.setName("All Classpath Dependency Tests");
- suite.addTest(ClasspathDependencyCreationTests.suite());
- //suite.addTest(ClasspathDependencyValidationTests.suite());
- suite.addTest(ClasspathDependencyEARTests.suite());
- suite.addTest(ClasspathDependencyWebTests.suite());
-
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/ClasspathDependencyCreationTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/ClasspathDependencyCreationTests.java
deleted file mode 100644
index d1c9d193..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/ClasspathDependencyCreationTests.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.classpath.tests;
-
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.classpath.tests.util.ClasspathDependencyTestUtil;
-import org.eclipse.jst.j2ee.classpathdep.UpdateClasspathAttributeUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Tests creation of classpath component dependencies via addition of the
- * classpath entry attribute.
- */
-public class ClasspathDependencyCreationTests extends AbstractTests {
-
- private ClasspathDependencyCreationTests(final String name) {
- super(name);
- }
-
- public static Test suite(){
- final TestSuite suite = new TestSuite();
- suite.setName("Classpath Component Dependency Creation Tests" );
- suite.addTest(new ClasspathDependencyCreationTests("testNoClasspathDependencies"));
- suite.addTest(new ClasspathDependencyCreationTests("testAddRemoveClasspathDependency"));
- suite.addTest(new ClasspathDependencyCreationTests("testLibraryClasspathDependency"));
- suite.addTest(new ClasspathDependencyCreationTests("testClassFolderDependency"));
- return suite;
- }
-
- public void testNoClasspathDependencies() throws Exception {
- final IProject project = ProjectUtil.createUtilityProject("TestUtil", "TestEAR");
- final IJavaProject javaProject = JavaCore.create(project);
- final IVirtualComponent comp = ComponentCore.createComponent(project);
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(javaProject);
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(javaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(comp);
- }
-
- public void testAddRemoveClasspathDependency() throws Exception {
- final IProject project = ProjectUtil.createUtilityProject("TestUtil", "TestEAR");
- final IJavaProject javaProject = JavaCore.create(project);
- final IVirtualComponent comp = ComponentCore.createComponent(project);
-
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(javaProject);
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(javaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(comp);
-
- ClasspathDependencyTestUtil.addCustomClasspathContainer(javaProject);
-
- final Set entryPaths = new HashSet();
- entryPaths.add(ClasspathDependencyTestUtil.CUSTOM_CLASSPATH_CONTAINER);
- List entries = ClasspathDependencyTestUtil.verifyPotentialClasspathEntries(javaProject, entryPaths);
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(javaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(comp);
-
- IClasspathEntry entry = (IClasspathEntry) entries.get(0);
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, project.getName(), entry);
-
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(javaProject);
- ClasspathDependencyTestUtil.verifyClasspathAttributes(javaProject, entryPaths);
- final Set archiveNames = new HashSet();
- archiveNames.add(ClasspathDependencyTestUtil.TEST1_JAR);
- archiveNames.add(ClasspathDependencyTestUtil.TEST2_JAR);
- ClasspathDependencyTestUtil.verifyClasspathDependencies(comp, archiveNames);
-
- UpdateClasspathAttributeUtil.removeDependencyAttribute(null, project.getName(), entry);
-
- ClasspathDependencyTestUtil.verifyPotentialClasspathEntries(javaProject, entryPaths);
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(javaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(comp);
- }
-
- public void testLibraryClasspathDependency() throws Exception {
- final IProject project = ProjectUtil.createWebProject("TestWeb", "TestEAR");
- final IJavaProject javaProject = JavaCore.create(project);
- final IVirtualComponent comp = ComponentCore.createComponent(project);
-
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(javaProject);
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(javaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(comp);
-
- ClasspathDependencyTestUtil.addLibraryEntry(javaProject, ClasspathDependencyTestUtil.TEST3_JAR_PATH, true);
-
- final Set entryPaths = new HashSet();
- entryPaths.add(ClasspathDependencyTestUtil.TEST3_JAR_PATH);
- List entries = ClasspathDependencyTestUtil.verifyPotentialClasspathEntries(javaProject, entryPaths);
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(javaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(comp);
-
- IClasspathEntry entry = (IClasspathEntry) entries.get(0);
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, project.getName(), entry);
-
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(javaProject);
- ClasspathDependencyTestUtil.verifyClasspathAttributes(javaProject, entryPaths);
- final Set archiveNames = new HashSet();
- archiveNames.add(ClasspathDependencyTestUtil.TEST3_JAR);
- ClasspathDependencyTestUtil.verifyClasspathDependencies(comp, archiveNames);
- }
-
- public void testClassFolderDependency() throws Exception {
- final IProject project = ProjectUtil.createWebProject("TestWeb", "TestEAR");
- final IJavaProject javaProject = JavaCore.create(project);
- final IVirtualComponent comp = ComponentCore.createComponent(project);
- final IPath binPath = new Path("bin");
- final IPath fullBinPath = project.getFullPath().append(binPath);
- project.getFolder(binPath).create(true, true, null);
-
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(javaProject);
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(javaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(comp);
-
- ClasspathDependencyTestUtil.addLibraryEntry(javaProject, fullBinPath, true);
-
- final Set entryPaths = new HashSet();
- entryPaths.add(fullBinPath);
- List entries = ClasspathDependencyTestUtil.verifyPotentialClasspathEntries(javaProject, entryPaths);
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(javaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(comp);
-
- IClasspathEntry entry = (IClasspathEntry) entries.get(0);
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, project.getName(), entry);
-
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(javaProject);
- ClasspathDependencyTestUtil.verifyClasspathAttributes(javaProject, entryPaths);
- final Set archiveNames = new HashSet();
- archiveNames.add(fullBinPath.toString());
- ClasspathDependencyTestUtil.verifyClasspathDependencies(comp, archiveNames);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/ClasspathDependencyEARTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/ClasspathDependencyEARTests.java
deleted file mode 100644
index adb15edd..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/ClasspathDependencyEARTests.java
+++ /dev/null
@@ -1,647 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.classpath.tests;
-
-import java.io.FileInputStream;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.classpath.tests.util.ClasspathDependencyTestUtil;
-import org.eclipse.jst.j2ee.classpathdep.UpdateClasspathAttributeUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.EARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.ArchiveImpl;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyCreationUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.classpathdep.ClasspathDependencyEnablement;
-import org.eclipse.jst.j2ee.internal.deployables.J2EEFlexProjDeployable;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.model.IModuleFile;
-import org.eclipse.wst.server.core.model.IModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wst.server.core.util.ProjectModule;
-
-/**
- * Tests export and publish behavior for classpath component dependencies on the module projects associated with an EAR.
- */
-public class ClasspathDependencyEARTests extends AbstractTests {
-
- private static final String UTIL_PROJECT = "TestUtil";
- private static final String WEB_PROJECT = "TestWeb";
- private static final String EAR_PROJECT = "TestEAR";
-
- private ClasspathDependencyEARTests(final String name) {
- super(name);
- }
-
- public static Test suite(){
- final TestSuite suite = new TestSuite();
- suite.setName("Classpath Dependency EAR Tests" );
- suite.addTest(new ClasspathDependencyEARTests("testEARExportJ2EE"));
- //suite.addTest(new ClasspathDependencyEARTests("testEARExportJEE5"));
- suite.addTest(new ClasspathDependencyEARTests("testEARPublishJ2EE"));
- suite.addTest(new ClasspathDependencyEARTests("testEARPublishJEE5"));
- suite.addTest(new ClasspathDependencyEARTests("testEARLibPublishJEE5"));
- return suite;
- }
-
- public void testEARExportJ2EE() throws Exception {
- testEARExport(false);
- }
-
- public void testEARExportJEE5() throws Exception {
- testEARExport(true);
- }
-
- // XXX TODO need to modify test logic to work with new JEE5 model provider logic rather than just EARArtifactEdit
- private void testEARExport(boolean JEE5) throws Exception {
- // create the EAR and module projects
- createProjects(JEE5);
- final IProject earProject = ProjectUtil.getProject(EAR_PROJECT);
- final IVirtualComponent earComp = ComponentCore.createComponent(earProject);
- final Set archiveNames = new HashSet();
- archiveNames.add(ClasspathDependencyTestUtil.TEST1_JAR);
- archiveNames.add(ClasspathDependencyTestUtil.TEST2_JAR);
-
- // verify that the exported EAR does not contain the cp container Jars from the utility,
- // that the utility MANIFEST classpath does not include entries for the cp container jars and
- // that the contents of the util and web "bin" class folders are not included in the exported archives.
- verifyExportedEAR(earComp, archiveNames, false);
-
- // add the attribute to the cp container and "bin" class folder in the utility project and to the "bin" class
- // folder in the web project
- addDependencyAttribute(true);
-
- // verify that the exported EAR does contain the cp container Jars from the utility,
- // that the utility MANIFEST classpath includes entries for the cp container
- // jars, that the utility includes the contents of the "bin" class folder and that the web's WEB-INF/classes
- // includes the contents of the web's "bin" class folder.
- verifyExportedEAR(earComp, archiveNames, true);
- }
-
- private void verifyExportedEAR(final IVirtualComponent comp, final Set archiveNames, final boolean shouldHaveDependencies) throws Exception {
- EnterpriseArtifactEdit earEdit = null;
- EARFile earFile = null;
- try {
- earEdit = EARArtifactEdit.getEARArtifactEditForRead(comp);
- if (earEdit != null) {
- earFile = (EARFile) earEdit.asArchive(true);
- List archives = earFile.getArchiveFiles();
- Iterator it = archiveNames.iterator();
- while (it.hasNext()) {
- String name = (String) it.next();
- boolean hasArchive = false;
- for (int i = 0; i < archives.size(); i++) {
- File archive = (File) archives.get(i);
- if (archive.isArchive()) {
- if (archive.getName().equals(name)) {
- hasArchive= true;
- }
- }
- }
- if (shouldHaveDependencies) {
- assertTrue("Exported EAR missing classpath dependency Jar " + name, hasArchive);
- } else {
- assertFalse("Exported EAR has unexpected classpath dependency Jar " + name, hasArchive);
- }
- }
- for (int i = 0; i < archives.size(); i++) {
- File archive = (File) archives.get(i);
- if (archive.isArchive() && archive.getName().equals(UTIL_PROJECT + ".jar")) {
- ArchiveImpl archiveImpl = (ArchiveImpl) archive;
- String[] cp = archiveImpl.getManifest().getClassPathTokenized();
- while (it.hasNext()) {
- String name = (String) it.next();
- boolean isOnCP = false;
- for (int j = 0; j < cp.length; j++) {
- if (cp[j].equals(name)) {
- isOnCP = true;
- }
- }
- if (shouldHaveDependencies) {
- assertTrue("Exported utility project MANIFEST.MF classpath in exported EAR is entry for dependency Jar " + name, isOnCP);
- } else {
- assertFalse("Exported utility project MANIFEST.MF classpath in exported EAR has unexpected entry for dependency Jar " + name, isOnCP);
- }
- }
- archiveImpl.getFiles();
- boolean hasTestFile = archiveImpl.containsFile("test");
- if (shouldHaveDependencies) {
- assertTrue("Exported utility project missing file from published/exported class folder", hasTestFile);
- } else {
- assertFalse("Exported utility project has unexpected entry for file from non-published/exported class folder", hasTestFile);
- }
-
- } else if (archive.isArchive() && archive.getName().equals(WEB_PROJECT + ".war")) {
- ArchiveImpl archiveImpl = (ArchiveImpl) archive;
- archiveImpl.getFiles();
- boolean hasTestFile = archiveImpl.containsFile("WEB-INF/classes/test");
- if (shouldHaveDependencies) {
- assertTrue("Exported web project missing file from published/exported class folder", hasTestFile);
- } else {
- assertFalse("Exported web project has unexpected entry for file from non-published/exported class folder", hasTestFile);
- }
- }
- }
- }
- } finally {
- if (earEdit !=null)
- earEdit.dispose();
- if(earFile != null){
- earFile.close();
- }
- }
- }
-
- public void testEARPublishJ2EE() throws Exception {
- testEARPublish(false);
- }
-
- public void testEARPublishJEE5() throws Exception {
- testEARPublish(true);
- }
-
- public void testEARLibPublishJEE5() throws Exception {
- testEARLibPublishJEE5(true);
- }
-
- private void testEARPublish(boolean JEE5) throws Exception {
-
- // create the EAR and module projects
- createProjects(JEE5);
- final IProject earProject = ProjectUtil.getProject(EAR_PROJECT);
- final IVirtualComponent earComp = ComponentCore.createComponent(earProject);
- final Set archiveNames = new HashSet();
- archiveNames.add(ClasspathDependencyTestUtil.TEST1_JAR);
- archiveNames.add(ClasspathDependencyTestUtil.TEST2_JAR);
-
- // verify that the published EAR does not contain the cp container Jars from the utility,
- // that the utility MANIFEST classpath does not include entries for the cp container jars and
- // that the contents of the util and web "bin" class folders are not included in the exported archives.
- verifyPublishedEAR(earComp, archiveNames, false, JEE5);
-
- // add the attribute to the cp container in the utility project
- addDependencyAttribute(false);
-
- // verify that the published EAR does contain the cp container Jars from the utility,
- // that the utility MANIFEST classpath includes entries for the cp container
- // jars, that the utility includes the contents of the "bin" class folder and that the web's WEB-INF/classes
- // includes the contents of the web's "bin" class folder.
- verifyPublishedEAR(earComp, archiveNames, true, JEE5);
- }
-
- private void testEARLibPublishJEE5(boolean JEE5) throws Exception {
- IVirtualComponent webComp = createWebProject(JEE5);
-
- final Set archiveNames = new HashSet();
- archiveNames.add(ClasspathDependencyTestUtil.TEST1_JAR);
- archiveNames.add(ClasspathDependencyTestUtil.TEST2_JAR);
- final IProject earProject = ProjectUtil.getProject(EAR_PROJECT);
- final IVirtualComponent earComp = ComponentCore.createComponent(earProject);
-
- verifyPublishedEARLibRef(earComp, archiveNames, false, JEE5);
-
- addEARLibDependencyAttribute(false);
-
- verifyPublishedEARLibRef(earComp, archiveNames, true, JEE5);
- }
-
- private void verifyPublishedEAR(final IVirtualComponent comp, final Set archiveNames, final boolean shouldHaveDependencies, boolean isEE5) throws Exception {
-
- // verify that the published EAR contains the cp container jars from the Utility
- J2EEFlexProjDeployable deployable = new J2EEFlexProjDeployable(comp.getProject(), comp);
- try {
- IModuleResource[] rootmembers = deployable.members();
- IModuleResource[] members = null;
- if (isEE5) {
- for (int i=0; i<rootmembers.length; i++) {
- String name = rootmembers[i].getName();
- if (name.equals("lib")) {
- members = ((IModuleFolder)rootmembers[i]).members();
- }
- }
- }
-
- if (members == null)
- members = rootmembers;
-
- Iterator it = archiveNames.iterator();
- while (it.hasNext()) {
- String name = (String) it.next();
- boolean hasArchive = false;
- for (int i=0; i<members.length; i++) {
- if (members[i].getName().equals(name)) {
- hasArchive = true;
- }
- }
- if (shouldHaveDependencies) {
- assertTrue("Published EAR missing classpath dependency Jar " + name, hasArchive);
- } else {
- assertFalse("Published EAR has unexpected classpath dependency Jar " + name, hasArchive);
- }
- }
-
- // get the web and util child modules
-
- IModule utilModule = null;
- IModule webModule = null;
- IModule[] childModules = deployable.getChildModules();
- for (int i=0; i < childModules.length; i++) {
- if (childModules[i].getName().equals(UTIL_PROJECT)) {
- utilModule = childModules[i];
- } else if (childModules[i].getName().equals(WEB_PROJECT)) {
- webModule = childModules[i];
- }
- }
-
- // verify that the util module has MANIFEST.MF classpath references to the cp container jars and has the
- // class folder file
-
- assertNotNull("Missing entry for utility project", utilModule);
-
- J2EEFlexProjDeployable projectModule =(J2EEFlexProjDeployable) utilModule.loadAdapter(ProjectModule.class, null);
- IModuleResource[] moduleMembers = projectModule.members();
- ArchiveManifest manifest = null;
- boolean foundMetaInf = false;
- boolean foundTest = false;
- for (int i=0; i< moduleMembers.length; i++) {
- String name = moduleMembers[i].getName();
- if (name.equals("META-INF")) {
- foundMetaInf = true;
- IModuleResource manifestResource= ((IModuleFolder)moduleMembers[i]).members()[0];
- assertTrue(manifestResource.getModuleRelativePath().toString().equals("META-INF"));
- assertTrue("Expected MANIFEST.MF, got " + manifestResource.getName(), manifestResource.getName().equals("MANIFEST.MF"));
- java.io.File manifestFile = (java.io.File) manifestResource.getAdapter(java.io.File.class);
- if (manifestFile == null) {
- manifestFile = ((IFile) manifestResource.getAdapter(IFile.class)).getLocation().toFile();
- }
- assertNotNull(manifestFile);
- FileInputStream fis = null;
- try {
- fis = new FileInputStream(manifestFile);
- manifest = new ArchiveManifestImpl(fis);
- } finally {
- if (fis != null) {
- fis.close();
- }
- }
- } else if (name.equals("test")) {
- if (moduleMembers[i] instanceof IModuleFile) {
- foundTest = true;
- }
- }
- }
- if (!foundMetaInf) {
- assertTrue("members() failed to return META-INF for utility project module in published EAR", foundMetaInf);
- }
-
- if (shouldHaveDependencies) {
- assertTrue("Published utility project missing file from published/exported class folder", foundTest);
- } else {
- assertFalse("Published utility project has unexpected entry for file from non-published/exported class folder", foundTest);
- }
-
- assertNotNull("Failed to retrieve MANIFEST.MF from utility project module in published EAR", manifest);
-
- it = archiveNames.iterator();
- while (it.hasNext()) {
- String name = (String) it.next();
- boolean isOnCP = false;
- String[] cp = manifest.getClassPathTokenized();
- for (int j = 0; j < cp.length; j++) {
- if (cp[j].equals(name)) {
- isOnCP = true;
- }
- }
- if (shouldHaveDependencies && ClasspathDependencyEnablement.isAllowClasspathComponentDependency()) {
- assertTrue("Utility project MANIFEST.MF classpath in published EAR missing entry for dependency Jar " + name, isOnCP);
- } else {
- assertFalse("Utility project MANIFEST.MF classpath in published EAR has unexpected entry for dependency Jar " + name, isOnCP);
- }
- }
-
- assertNotNull("Missing entry for web project", webModule);
-
- projectModule =(J2EEFlexProjDeployable) webModule.loadAdapter(ProjectModule.class, null);
- moduleMembers = projectModule.members();
- foundTest = false;
- for (int i=0; i< moduleMembers.length; i++) {
- if (moduleMembers[i].getName().equals("WEB-INF")) {
- IModuleResource[] webinfMembers = ((IModuleFolder)moduleMembers[i]).members();
- for (int j = 0; j < webinfMembers.length; j++) {
- if (webinfMembers[j].getName().equals("classes")) {
- IModuleResource[] classesMembers = ((IModuleFolder)webinfMembers[j]).members();
- if (classesMembers.length > 0) {
- IModuleResource test = classesMembers[0];
- if (test.getName().equals("test") && test.getModuleRelativePath().equals(new Path("WEB-INF/classes")) && test instanceof IModuleFile) {
- foundTest = true;
- }
- }
- }
- }
- }
- }
- if (shouldHaveDependencies) {
- assertTrue("Exported web project does not contain class folder file in WEB-INF/classes", foundTest);
- } else {
- assertFalse("Exported Web project should not class folder file in WEB-INF/classes", foundTest);
- }
- } catch (CoreException e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
-private void verifyPublishedEARLibRef(final IVirtualComponent comp, final Set archiveNames, final boolean shouldHaveDependencies, boolean isEE5) throws Exception {
-
- J2EEFlexProjDeployable deployable = new J2EEFlexProjDeployable(comp.getProject(), comp);
- try {
- IModuleResource[] rootmembers = deployable.members();
- IModuleResource[] members = null;
- if (isEE5) {
- for (int i=0; i<rootmembers.length; i++) {
- String name = rootmembers[i].getName();
- if (name.equals("lib")) {
- members = ((IModuleFolder)rootmembers[i]).members();
- }
- }
- }
-
- if (members == null)
- members = rootmembers;
-
- Iterator it = archiveNames.iterator();
- while (it.hasNext()) {
- String name = (String) it.next();
- boolean hasArchive = false;
- for (int i=0; i<members.length; i++) {
- if (members[i].getName().equals(name)) {
- hasArchive = true;
- }
- }
- if (shouldHaveDependencies) {
- assertTrue("Published EAR missing classpath dependency Jar " + name, hasArchive);
- } else {
- assertFalse("Published EAR has unexpected classpath dependency Jar " + name, hasArchive);
- }
- }
-
- IModule webModule = null;
- IModule[] childModules = deployable.getChildModules();
- for (int i=0; i < childModules.length; i++) {
- if (childModules[i].getName().equals(WEB_PROJECT)) {
- webModule = childModules[i];
- }
- }
-
- assertNotNull("Missing entry for web project", webModule);
-
- J2EEFlexProjDeployable projectModule =(J2EEFlexProjDeployable) webModule.loadAdapter(ProjectModule.class, null);
- IModuleResource[] moduleMembers = projectModule.members();
- ArchiveManifest manifest = null;
- boolean foundMetaInf = false;
- for (int i=0; i< moduleMembers.length; i++) {
- String name = moduleMembers[i].getName();
- if (name.equals("META-INF")) {
- foundMetaInf = true;
- IModuleResource manifestResource= ((IModuleFolder)moduleMembers[i]).members()[0];
- assertTrue(manifestResource.getModuleRelativePath().toString().equals("META-INF"));
- assertTrue("Expected MANIFEST.MF, got " + manifestResource.getName(), manifestResource.getName().equals("MANIFEST.MF"));
- java.io.File manifestFile = (java.io.File) manifestResource.getAdapter(java.io.File.class);
- if (manifestFile == null) {
- manifestFile = ((IFile) manifestResource.getAdapter(IFile.class)).getLocation().toFile();
- }
- assertNotNull(manifestFile);
- FileInputStream fis = null;
- try {
- fis = new FileInputStream(manifestFile);
- manifest = new ArchiveManifestImpl(fis);
- } finally {
- if (fis != null) {
- fis.close();
- }
- }
- }
- }
- if (!foundMetaInf) {
- assertTrue("members() failed to return META-INF for web project module in published EAR", foundMetaInf);
- }
-
- assertNotNull("Failed to retrieve MANIFEST.MF from web project module in published EAR", manifest);
-
- it = archiveNames.iterator();
- while (it.hasNext()) {
- String name = (String) it.next();
- boolean isOnCP = false;
- String[] cp = manifest.getClassPathTokenized();
- for (int j = 0; j < cp.length; j++) {
- if (cp[j].equals("lib/" + name)) {
- isOnCP = true;
- }
- }
- if (shouldHaveDependencies && ClasspathDependencyEnablement.isAllowClasspathComponentDependency()) {
- assertTrue("Utility project MANIFEST.MF classpath in published EAR missing entry for dependency Jar " + name, isOnCP);
- } else {
- assertFalse("Utility project MANIFEST.MF classpath in published EAR has unexpected entry for dependency Jar " + name, isOnCP);
- }
- }
-
- } catch (CoreException e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
- private IVirtualComponent createProjects(boolean JEE5) throws Exception {
-
- // create a Web project
- int version = J2EEVersionConstants.SERVLET_2_5;
- if (!JEE5) {
- version = J2EEVersionConstants.SERVLET_2_4;
- }
- final IProject webProject = ProjectUtil.createWebProject(WEB_PROJECT, EAR_PROJECT, version, true);
- final IJavaProject webJavaProject = JavaCore.create(webProject);
- final IVirtualComponent webComp = ComponentCore.createComponent(webProject);
- // create a new "bin" folder
- final IPath binPath = new Path("bin");
- IFolder webBin = webProject.getFolder(binPath);
- webBin.create(true, true, null);
- // add a file
- webBin.getFile("test").create(new java.io.StringBufferInputStream("blah"), true, null);
- // add as a library cp entry
- ClasspathDependencyTestUtil.addLibraryEntry(webJavaProject, webBin.getFullPath(), true);
-
- // create a Utility project
- final IProject util = ProjectUtil.createUtilityProject(UTIL_PROJECT, EAR_PROJECT, true);
- IFolder output = util.getFolder("build").getFolder("classes");
- final IJavaProject utilJava = JavaCore.create(util);
- // create a folder "bin"
- IFolder utilBin = util.getFolder(binPath);
- utilBin.create(true, true, null);
- // add a file
- utilBin.getFile("test").create(new java.io.StringBufferInputStream("blah"), true, null);
- final IVirtualComponent utilComp = ComponentCore.createComponent(util);
- // add as a library cp entry
- ClasspathDependencyTestUtil.addLibraryEntry(utilJava, utilBin.getFullPath(), true);
-
- // add a dependency from the Web to the Utility
- DependencyCreationUtil.createModuleDependency(webProject, util);
-
- // add a cp dependency to the Utility
- ClasspathDependencyTestUtil.addCustomClasspathContainer(utilJava);
-
- return webComp;
- }
-
- private IVirtualComponent createWebProject(boolean JEE5) throws Exception {
- // create a Web project
- int version = J2EEVersionConstants.SERVLET_2_5;
- if (!JEE5) {
- version = J2EEVersionConstants.SERVLET_2_4;
- }
- final IProject webProject = ProjectUtil.createWebProject(WEB_PROJECT, EAR_PROJECT, version, true);
- final IJavaProject webJavaProject = JavaCore.create(webProject);
- final IVirtualComponent webComp = ComponentCore.createComponent(webProject);
-
- // add a cp dependency to the Utility
- ClasspathDependencyTestUtil.addCustomClasspathContainer(webJavaProject);
-
- return webComp;
- }
-
-
- /**
- *
- * @param verifyClasspathDependencies - true if you want to immediately verify that
- * the classpath dependencies were added. Set to false if you want to verify this at
- * a later time (such as thru a members call in export or publish).
- * @throws Exception
- */
- private void addDependencyAttribute(boolean verifyClasspathDependencies) throws Exception {
- final IProject util = ProjectUtil.getProject(UTIL_PROJECT);
- final IPath fullUtilBinPath = util.getFullPath().append("bin");
- final IJavaProject utilJava = JavaCore.create(util);
- final IVirtualComponent utilComp = ComponentCore.createComponent(util);
- final IProject web = ProjectUtil.getProject(WEB_PROJECT);
- final IJavaProject webJava = JavaCore.create(web);
- final IPath fullWebBinPath = web.getFullPath().append("bin");
- final IVirtualComponent webComp = ComponentCore.createComponent(web);
-
- final Set entryPaths = new HashSet();
- entryPaths.add(ClasspathDependencyTestUtil.CUSTOM_CLASSPATH_CONTAINER);
- entryPaths.add(fullUtilBinPath);
- // verify that "bin" and the custom cp container are potential entries
- List entries = ClasspathDependencyTestUtil.verifyPotentialClasspathEntries(utilJava, entryPaths);
- // verify that no entries have the classpath attribute
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(utilJava);
- // verify that there are no classpath dependencies
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(utilComp);
- IClasspathEntry entry = (IClasspathEntry) entries.get(0);
-
- // add the dependency attribute to "bin" and the cp container
- for (Object o: entries) {
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, util.getName(), (IClasspathEntry) o);
- }
- // should no longer have potential entries
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(utilJava);
- // verify that "bin" and the cp container have the attribute
- ClasspathDependencyTestUtil.verifyClasspathAttributes(utilJava, entryPaths);
- // verify that "bin" and the cp container are dependencies
- final Set archiveNames = new HashSet();
- archiveNames.add(ClasspathDependencyTestUtil.TEST1_JAR);
- archiveNames.add(ClasspathDependencyTestUtil.TEST2_JAR);
- archiveNames.add(fullUtilBinPath.toString());
- if (verifyClasspathDependencies)
- ClasspathDependencyTestUtil.verifyClasspathDependencies(utilComp, archiveNames);
-
- entryPaths.clear();
- entryPaths.add(fullWebBinPath);
- // verify that "bin" in the web project is a potential entry
- entries = ClasspathDependencyTestUtil.verifyPotentialClasspathEntries(webJava, entryPaths);
- // verify that no entries have the classpath attribute
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(webJava);
- // verify that there are no classpath dependencies
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(webComp);
-
- // add the dependency attribute to "bin"
- entry = (IClasspathEntry) entries.get(0);
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, web.getName(), entry);
- // should no longer have potential entries
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(webJava);
- // verify that "bin" has the attribute
- ClasspathDependencyTestUtil.verifyClasspathAttributes(webJava, entryPaths);
- // verify that "bin" is a dependency
- archiveNames.clear();
- archiveNames.add(fullWebBinPath.toString());
- if (verifyClasspathDependencies)
- ClasspathDependencyTestUtil.verifyClasspathDependencies(webComp, archiveNames);
- }
-
- /**
- *
- * @param verifyClasspathDependencies - true if you want to immediately verify that
- * the classpath dependencies were added. Set to false if you want to verify this at
- * a later time (such as thru a members call in export or publish)
- * @throws Exception
- */
- private void addEARLibDependencyAttribute(boolean verifyClasspathDependencies) throws Exception {
-
- final IProject web = ProjectUtil.getProject(WEB_PROJECT);
- final IJavaProject webJava = JavaCore.create(web);
- final IVirtualComponent webComp = ComponentCore.createComponent(web);
-
- final Set entryPaths = new HashSet();
- entryPaths.add(ClasspathDependencyTestUtil.CUSTOM_CLASSPATH_CONTAINER);
- // verify that "bin" and the custom cp container are potential entries
- List entries = ClasspathDependencyTestUtil.verifyPotentialClasspathEntries(webJava, entryPaths);
- // verify that no entries have the classpath attribute
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(webJava);
- // verify that there are no classpath dependencies
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(webComp);
- IClasspathEntry entry = (IClasspathEntry) entries.get(0);
-
- // add the dependency attribute to "bin" and the cp container
- for (Object o: entries) {
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, web.getName(), (IClasspathEntry) o, new Path("../lib"));
- }
- // should no longer have potential entries
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(webJava);
- // verify that "bin" and the cp container have the attribute
- ClasspathDependencyTestUtil.verifyClasspathAttributes(webJava, entryPaths);
- // verify that "bin" and the cp container are dependencies
- final Set archiveNames = new HashSet();
- archiveNames.add(ClasspathDependencyTestUtil.TEST1_JAR);
- archiveNames.add(ClasspathDependencyTestUtil.TEST2_JAR);
- if (verifyClasspathDependencies)
- ClasspathDependencyTestUtil.verifyClasspathDependencies(webComp, archiveNames);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/ClasspathDependencyValidationTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/ClasspathDependencyValidationTests.java
deleted file mode 100644
index 4160b2af..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/ClasspathDependencyValidationTests.java
+++ /dev/null
@@ -1,360 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.classpath.tests;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.jst.j2ee.classpath.tests.util.ClasspathDependencyTestUtil;
-import org.eclipse.jst.j2ee.classpathdep.UpdateClasspathAttributeUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyCreationUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathContainer;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualResource;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Tests validation rules for classpath component dependencies.
- */
-public class ClasspathDependencyValidationTests extends AbstractTests {
-
- private ClasspathDependencyValidationTests(final String name) {
- super(name);
- }
-
- public static Test suite(){
- final TestSuite suite = new TestSuite();
- suite.setName("Classpath Component Dependency Validation Tests" );
- suite.addTest(new ClasspathDependencyValidationTests("testSourceEntryRule"));
- suite.addTest(new ClasspathDependencyValidationTests("testProjectEntryRule"));
- suite.addTest(new ClasspathDependencyValidationTests("testDuplicateClassFolderRule"));
- suite.addTest(new ClasspathDependencyValidationTests("testNonWebNonExportedRule"));
- //suite.addTest(new ClasspathDependencyValidationTests("testDuplicateArchiveNamesRule"));
- suite.addTest(new ClasspathDependencyValidationTests("testRootMappingNonEARWARRefRule"));
- suite.addTest(new ClasspathDependencyValidationTests("testInvalidContainerRules"));
- suite.addTest(new ClasspathDependencyValidationTests("testNonTaggedExportedClassesRule"));
-
- return suite;
- }
- //SourceEntry=Invalid classpath component dependency {0}. Source entries not supported.
- public void testSourceEntryRule() throws Exception {
- final IProject project = ProjectUtil.createUtilityProject("TestUtil", "TestEAR", true);
- ClasspathDependencyTestUtil.verifyNoValidationError(project);
- final IJavaProject javaProject = JavaCore.create(project);
- final IVirtualComponent comp = ComponentCore.createComponent(project);
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(javaProject);
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(javaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(comp);
-
- IClasspathEntry[] entries = javaProject.getRawClasspath();
- IClasspathEntry src = null;
- for (int i = 0; i < entries.length; i++) {
- if (entries[i].getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- src = entries[i];
- break;
- }
- }
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, project.getName(), src);
-
- DependencyUtil.waitForValidationJobs(project);
- ClasspathDependencyTestUtil.verifyClasspathDependencyError(project);
-
- UpdateClasspathAttributeUtil.removeDependencyAttribute(null, project.getName(), src);
-
- DependencyUtil.waitForValidationJobs(project);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencyError(project);
- }
-
- //ProjectClasspathEntry=Invalid classpath component dependency {0}. Project entries not supported.
- public void testProjectEntryRule() throws Exception {
- final IProject utilProject = ProjectUtil.createUtilityProject("TestUtil", "TestEAR");
- final IProject webProject = ProjectUtil.createWebProject("TestWeb", "TestEAR", true);
- final IJavaProject webJavaProject = JavaCore.create(webProject);
- final IVirtualComponent webComp = ComponentCore.createComponent(webProject);
-
- final IClasspathEntry entry = JavaCore.newProjectEntry(utilProject.getFullPath());
- ClasspathDependencyTestUtil.addEntryToCP(webJavaProject, entry);
-
- DependencyUtil.waitForValidationJobs(webProject);
- ClasspathDependencyTestUtil.verifyNoValidationError(webProject);
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(webJavaProject);
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(webJavaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(webComp);
-
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, webProject.getName(), entry);
-
- DependencyUtil.waitForValidationJobs(webProject);
- ClasspathDependencyTestUtil.verifyClasspathDependencyError(webProject);
-
- UpdateClasspathAttributeUtil.removeDependencyAttribute(null, webProject.getName(), entry);
-
- DependencyUtil.waitForValidationJobs(webProject);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencyError(webProject);
- }
-
- //DuplicateClassFolderEntry
- public void testDuplicateClassFolderRule() throws Exception {
- final IProject project = ProjectUtil.createUtilityProject("TestUtil", "TestEAR", true);
- final IJavaProject javaProject = JavaCore.create(project);
- final IVirtualComponent comp = ComponentCore.createComponent(project);
- final IPath classFolderPath = project.getFullPath().append(ClasspathDependencyTestUtil.TEST3_BIN_PATH);
-
- // create a library classpath entry
- ClasspathDependencyTestUtil.addLibraryEntry(javaProject, classFolderPath, true);
-
- // link via the component file
- comp.getRootFolder().createLink(ClasspathDependencyTestUtil.TEST3_BIN_PATH, IVirtualResource.FORCE, null);
-
- DependencyUtil.waitForValidationJobs(project);
- ClasspathDependencyTestUtil.verifyNoValidationError(project);
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(javaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(javaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(comp);
-
- IClasspathEntry[] entries = javaProject.getRawClasspath();
- IClasspathEntry lib = null;
- for (int i = 0; i < entries.length; i++) {
- if (entries[i].getEntryKind() == IClasspathEntry.CPE_LIBRARY) {
- lib = entries[i];
- break;
- }
- }
-
- // Mark that cp entry for publish/export
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, project.getName(), lib);
-
- final Set entryPaths = Collections.singleton(classFolderPath);
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(javaProject);
- ClasspathDependencyTestUtil.verifyClasspathAttributes(javaProject, entryPaths);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(comp);
-
- DependencyUtil.waitForValidationJobs(project);
- ClasspathDependencyTestUtil.verifyClasspathDependencyError(project);
-
- UpdateClasspathAttributeUtil.removeDependencyAttribute(null, project.getName(), lib);
-
- DependencyUtil.waitForValidationJobs(project);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencyError(project);
- }
-
- //NonWebNonExported=Invalid classpath component dependency {0}. Classpath component dependencies for non-web projects must be exported.
- public void testNonWebNonExportedRule() throws Exception {
- final IProject project = ProjectUtil.createUtilityProject("TestUtil", "TestEAR", true);
- final IJavaProject javaProject = JavaCore.create(project);
- final IVirtualComponent comp = ComponentCore.createComponent(project);
-
- ClasspathDependencyTestUtil.addLibraryEntry(javaProject, ClasspathDependencyTestUtil.TEST3_JAR_PATH, false);
-
- DependencyUtil.waitForValidationJobs(project);
- ClasspathDependencyTestUtil.verifyNoValidationError(project);
- final Set entryPaths = Collections.singleton(ClasspathDependencyTestUtil.TEST3_JAR_PATH);
- List entries = ClasspathDependencyTestUtil.verifyPotentialClasspathEntries(javaProject, entryPaths);
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(javaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(comp);
-
- IClasspathEntry entry = (IClasspathEntry) entries.get(0);
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, project.getName(), entry);
-
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(javaProject);
- ClasspathDependencyTestUtil.verifyClasspathAttributes(javaProject, entryPaths);
- final Set archiveNames = Collections.singleton(ClasspathDependencyTestUtil.TEST3_JAR);
- ClasspathDependencyTestUtil.verifyClasspathDependencies(comp, archiveNames);
-
- DependencyUtil.waitForValidationJobs(project);
- ClasspathDependencyTestUtil.verifyClasspathDependencyMarker(project);
- }
-
- //DuplicateArchiveName=Invalid classpath component dependency {0}. The project contains another classpath component dependency the same archive name.
- public void testDuplicateArchiveNamesRule() throws Exception {
- final IProject webProject = ProjectUtil.createWebProject("TestWeb", "TestEAR");
- final IJavaProject webJavaProject = JavaCore.create(webProject);
- final IProject util1 = ProjectUtil.createUtilityProject("TestUtil1", "TestEAR");
- DependencyCreationUtil.createWebLibDependency(webProject, util1);
- final IJavaProject utilJava1 = JavaCore.create(util1);
- final IVirtualComponent utilComp1 = ComponentCore.createComponent(util1);
- final IProject util2 = ProjectUtil.createUtilityProject("TestUtil2", "TestEAR");
- DependencyCreationUtil.createWebLibDependency(webProject, util2);
- final IVirtualComponent utilComp2 = ComponentCore.createComponent(util2);
- final IJavaProject utilJava2 = JavaCore.create(util2);
- final IProject util3 = ProjectUtil.createUtilityProject("TestUtil3", "TestEAR", true);
- DependencyCreationUtil.createWebLibDependency(webProject, util3);
- final IVirtualComponent utilComp3 = ComponentCore.createComponent(util3);
- final IJavaProject utilJava3 = JavaCore.create(util3);
- ClasspathDependencyTestUtil.addLibraryEntry(utilJava1, ClasspathDependencyTestUtil.TEST3_JAR_PATH, true);
- ClasspathDependencyTestUtil.addLibraryEntry(utilJava2, ClasspathDependencyTestUtil.TEST3_JAR_PATH, true);
- ClasspathDependencyTestUtil.addLibraryEntry(utilJava3, ClasspathDependencyTestUtil.TEST3_JAR_OTHER_LOCATION_PATH, true);
- final Set entryPaths = Collections.singleton(ClasspathDependencyTestUtil.TEST3_JAR_PATH);
- final Set otherEntryPaths = Collections.singleton(ClasspathDependencyTestUtil.TEST3_JAR_OTHER_LOCATION_PATH);
- final Set archiveNames = Collections.singleton(ClasspathDependencyTestUtil.TEST3_JAR);
-
-
- // add the dependency attribute to util1 and util2 (these point to the same jar so won't
- // generate a validation error)
- List entries = ClasspathDependencyTestUtil.verifyPotentialClasspathEntries(utilJava1, entryPaths);
- IClasspathEntry entry = (IClasspathEntry) entries.get(0);
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, util1.getName(), entry);
- ClasspathDependencyTestUtil.verifyClasspathDependencies(utilComp1, archiveNames);
- entries = ClasspathDependencyTestUtil.verifyPotentialClasspathEntries(utilJava2, entryPaths);
- entry = (IClasspathEntry) entries.get(0);
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, util2.getName(), entry);
- ClasspathDependencyTestUtil.verifyClasspathDependencies(utilComp2, archiveNames);
-
- // no validation error on the EAR or Web
- DependencyUtil.waitForValidationJobs(webProject);
- IProject earProject = ProjectUtil.getProject("TestEAR");
- ClasspathDependencyTestUtil.verifyNoValidationError(earProject);
- ClasspathDependencyTestUtil.verifyNoValidationError(webProject);
-
- // add the dependency attribute to util3
- entries = ClasspathDependencyTestUtil.verifyPotentialClasspathEntries(utilJava3, otherEntryPaths);
- entry = (IClasspathEntry) entries.get(0);
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, util3.getName(), entry);
- ClasspathDependencyTestUtil.verifyClasspathDependencies(utilComp3, archiveNames);
-
- // will have a validation error on the EAR and on the Web
- DependencyUtil.waitForValidationJobs(webProject);
- DependencyUtil.waitForValidationJobs(earProject);
- ClasspathDependencyTestUtil.verifyValidationError(webProject);
- ClasspathDependencyTestUtil.verifyValidationError(earProject);
-
- // remove dependency attribute from util3
- UpdateClasspathAttributeUtil.removeDependencyAttribute(null, util3.getName(), entry);
-
- // will have no validation errors on the EAR and on the Web
- DependencyUtil.waitForValidationJobs(webProject);
- DependencyUtil.waitForValidationJobs(earProject);
- ClasspathDependencyTestUtil.verifyNoValidationError(webProject);
- ClasspathDependencyTestUtil.verifyNoValidationError(earProject);
- }
-
- //RootMappingNonEARWARRef=Non-web projects must be referenced by an EAR or a WAR to use classpath component dependencies.
- public void testRootMappingNonEARWARRefRule() throws Exception {
- final IProject project = ProjectUtil.createUtilityProject("TestUtil", null, true);
- final IJavaProject javaProject = JavaCore.create(project);
- final IVirtualComponent comp = ComponentCore.createComponent(project);
-
- ClasspathDependencyTestUtil.addLibraryEntry(javaProject, ClasspathDependencyTestUtil.TEST3_JAR_PATH, true);
-
- DependencyUtil.waitForValidationJobs(project);
- ClasspathDependencyTestUtil.verifyNoValidationError(project);
- final Set entryPaths = Collections.singleton(ClasspathDependencyTestUtil.TEST3_JAR_PATH);
- List entries = ClasspathDependencyTestUtil.verifyPotentialClasspathEntries(javaProject, entryPaths);
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(javaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(comp);
- IClasspathEntry entry = (IClasspathEntry) entries.get(0);
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, project.getName(), entry);
-
- DependencyUtil.waitForValidationJobs(project);
- ClasspathDependencyTestUtil.verifyClasspathDependencyMarker(project);
-
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(javaProject);
- ClasspathDependencyTestUtil.verifyClasspathAttributes(javaProject, entryPaths);
- final Set archiveNames = Collections.singleton(ClasspathDependencyTestUtil.TEST3_JAR);
- ClasspathDependencyTestUtil.verifyClasspathDependencies(comp, archiveNames);
-
- UpdateClasspathAttributeUtil.removeDependencyAttribute(null, project.getName(), entry);
-
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(javaProject);
- }
-
- //EarLibrariesContainer=Invalid classpath component dependency {0}. The EAR Libraries classpath container cannot be exposed.
- //WebAppLibrariesContainer=Invalid classpath component dependency {0}. The Web App Libraries classpath container cannot be exposed.
- //RuntimeClasspathContainer=Invalid classpath component dependency {0}. Server Runtime classpath containers cannot be exposed.
- //JREContainer=Invalid classpath component dependency {0}. JRE classpath containers cannot be exposed.
- public void testInvalidContainerRules() throws Exception {
- final IProject project = ProjectUtil.createWebProject("TestWeb", "TestEAR", true);
- final IJavaProject javaProject = JavaCore.create(project);
- final IVirtualComponent comp = ComponentCore.createComponent(project);
-
- DependencyUtil.waitForValidationJobs(project);
- ClasspathDependencyTestUtil.verifyNoValidationError(project);
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(javaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(javaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(comp);
-
- IClasspathEntry earLibContainer = null;
- IClasspathEntry webAppLibContainer = null;
- IClasspathEntry jreContainer = null;
- IClasspathEntry[] rawCP = javaProject.getRawClasspath();
- for (int i = 0; i < rawCP.length; i++) {
- if (rawCP[i].getEntryKind() == IClasspathEntry.CPE_CONTAINER) {
- final IPath path = rawCP[i].getPath();
- if (path.equals(J2EEComponentClasspathContainer.CONTAINER_PATH)) {
- earLibContainer = rawCP[i];
- } else if (path.segment(0).equals("org.eclipse.jst.j2ee.internal.web.container")) {
- webAppLibContainer = rawCP[i];
- } else if (path.segment(0).equals(JavaRuntime.JRE_CONTAINER)) {
- jreContainer = rawCP[i];
- }
- }
- }
-
- // XXX Encountering sporadic JUnit problems trying to wait for and verify results of validator
- // the ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(javaProject) will need to be
- // sufficient for now: the results of that call are computed by calling the validator
-
- // try adding the Ear Libraries container
- //testInvalidContainer(javaProject, earLibContainer);
-
- // try adding the Web App Libraries container
- //testInvalidContainer(javaProject, webAppLibContainer);
-
- // try adding the JRE container
- //testInvalidContainer(javaProject, jreContainer);
- }
-
- private void testInvalidContainer(final IJavaProject javaProject, final IClasspathEntry entry) throws Exception {
- IProject project = javaProject.getProject();
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, project.getName(), entry);
- ClasspathDependencyTestUtil.verifyClasspathAttributes(javaProject, Collections.singleton(entry.getPath()));
- DependencyUtil.waitForValidationJobs(project);
- ClasspathDependencyTestUtil.verifyClasspathDependencyError(project);
- UpdateClasspathAttributeUtil.removeDependencyAttribute(null, project.getName(), entry);
- DependencyUtil.waitForValidationJobs(project);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencyError(project);
- }
-
- //NonTaggedExportedClasses=Classpath entry {0} will not be exported or published. Runtime ClassNotFoundExceptions may result.
- public void testNonTaggedExportedClassesRule() throws Exception {
- final IProject project = ProjectUtil.createUtilityProject("TestUtil", "TestEAR", true);
- final IJavaProject javaProject = JavaCore.create(project);
- final IVirtualComponent comp = ComponentCore.createComponent(project);
-
- ClasspathDependencyTestUtil.addLibraryEntry(javaProject, ClasspathDependencyTestUtil.TEST3_JAR_PATH, true);
-
- DependencyUtil.waitForValidationJobs(project);
- ClasspathDependencyTestUtil.verifyClasspathDependencyMarker(project);
- final Set entryPaths = Collections.singleton(ClasspathDependencyTestUtil.TEST3_JAR_PATH);
- List entries = ClasspathDependencyTestUtil.verifyPotentialClasspathEntries(javaProject, entryPaths);
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(javaProject);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(comp);
- IClasspathEntry entry = (IClasspathEntry) entries.get(0);
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, project.getName(), entry);
-
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(javaProject);
- ClasspathDependencyTestUtil.verifyClasspathAttributes(javaProject, entryPaths);
- DependencyUtil.waitForValidationJobs(project);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencyMarker(project);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/ClasspathDependencyWebTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/ClasspathDependencyWebTests.java
deleted file mode 100644
index 5688ec6f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/ClasspathDependencyWebTests.java
+++ /dev/null
@@ -1,435 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.classpath.tests;
-
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.classpath.tests.util.ClasspathDependencyTestUtil;
-import org.eclipse.jst.j2ee.classpathdep.UpdateClasspathAttributeUtil;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.File;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.WARFile;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.impl.FileImpl;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyCreationUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.deployables.J2EEFlexProjDeployable;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.server.core.model.IModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleResource;
-
-/**
- * Tests export and publish behavior for classpath component dependencies and web projects.
- */
-public class ClasspathDependencyWebTests extends AbstractTests {
-
- private static final String UTIL_PROJECT = "TestUtil";
- private static final String WEB_PROJECT = "TestWeb";
-
- private ClasspathDependencyWebTests(final String name) {
- super(name);
- }
-
- public static Test suite(){
- final TestSuite suite = new TestSuite();
- suite.setName("Classpath Dependency Web Tests" );
- suite.addTest(new ClasspathDependencyWebTests("testWebExportJ2EE"));
- //suite.addTest(new ClasspathDependencyWebTests("testWebExportJEE5"));
- suite.addTest(new ClasspathDependencyWebTests("testWebPublishJ2EE"));
- suite.addTest(new ClasspathDependencyWebTests("testWebPublishJEE5"));
- suite.addTest(new ClasspathDependencyWebTests("testWebContainerPublishJEE5"));
- return suite;
- }
-
- public void testWebExportJ2EE() throws Exception {
- testWebExport(false);
- }
-
- public void testWebExportJEE5() throws Exception {
- testWebExport(true);
- }
-
- private void testWebExport(boolean JEE5) throws Exception {
-
- // create the Web and utility projects
- IVirtualComponent webComp = createProjects(JEE5);
-
- // verify that the exported WAR WEB-INF/lib does not contain the cp container jars from the Utility
- final Set archiveNames = new HashSet();
- archiveNames.add(ClasspathDependencyTestUtil.TEST1_JAR);
- archiveNames.add(ClasspathDependencyTestUtil.TEST2_JAR);
- verifyExportedWebInfLibs(webComp, archiveNames, false);
-
- // add the cp dependency attribute to the cp container in the util
- addDependencyAttribute(false);
-
- // verify that the exported WAR WEB-INF/lib does contain the cp container jars from the Utility
- verifyExportedWebInfLibs(webComp, archiveNames, true);
- }
-
- // TODO need to modify to work with both JEE5 model provider and J2EE ArtifactEdit logic
- private void verifyExportedWebInfLibs(final IVirtualComponent comp, final Set archiveNames, final boolean shouldHaveDependencies) throws Exception {
- WebArtifactEdit webEdit = null;
- WARFile warFile = null;
- try {
- webEdit = WebArtifactEdit.getWebArtifactEditForRead(comp);
- if (webEdit != null) {
- warFile = (WARFile) webEdit.asArchive(true);
- List libArchives = warFile.getLibArchives();
- Iterator it = archiveNames.iterator();
- while (it.hasNext()) {
- String name = (String) it.next();
- boolean hasArchive = false;
- for (int i = 0; i < libArchives.size(); i++) {
- File archive = (File) libArchives.get(i);
- if (archive.isArchive()) {
- if (archive.getName().equals(name)) {
- hasArchive= true;
- }
- }
- }
- if (shouldHaveDependencies) {
- assertTrue("Exported WAR missing classpath dependency Jar " + name, hasArchive);
- } else {
- assertFalse("Exported WAR has unexpected classpath dependency Jar " + name, hasArchive);
- }
- }
- List webInfClasses = warFile.getClasses();
- it = webInfClasses.iterator();
- boolean hasNestedTest = false;
- while (it.hasNext()) {
- Object o = it.next();
- if (o instanceof FileImpl && ((FileImpl)o).getURI().toString().equals("WEB-INF/classes/nested/test")) {
- hasNestedTest = true;
- }
- }
- if (shouldHaveDependencies) {
- assertTrue("Exported WAR missing nested class folder file", hasNestedTest);
- } else {
- assertFalse("Exported WAR has unexpected nested class folder file", hasNestedTest);
- }
- }
- } finally {
- if (webEdit !=null)
- webEdit.dispose();
- if(warFile != null){
- warFile.close();
- }
- }
- }
-
- public void testWebPublishJ2EE() throws Exception {
- testWebPublish(false);
- }
-
- public void testWebPublishJEE5() throws Exception {
- testWebPublish(true);
- }
-
- public void testWebContainerPublishJEE5() throws Exception {
- testWebContainerPublish(true);
- }
-
- private void testWebPublish(boolean JEE5) throws Exception {
-
- // create the web and utility projects
- IVirtualComponent webComp = createProjects(JEE5);
-
- // verify that the exported WAR WEB-INF/lib does not contain the cp container jars from the Utility
- final Set archiveNames = new HashSet();
- archiveNames.add(ClasspathDependencyTestUtil.TEST1_JAR);
- archiveNames.add(ClasspathDependencyTestUtil.TEST2_JAR);
- verifyPublishedWebInfLibs(webComp, archiveNames, false);
-
- // add the cp dependency attribute to the cp container in the util
- addDependencyAttribute(true);
-
- // verify that the exported WAR WEB-INF/lib does contain the cp container jars from the Utility
- verifyPublishedWebInfLibs(webComp, archiveNames, true);
- }
-
- private void testWebContainerPublish(boolean JEE5) throws Exception {
- IVirtualComponent webComp = createWebProject(JEE5);
-
- final Set archiveNames = new HashSet();
- archiveNames.add(ClasspathDependencyTestUtil.TEST1_JAR);
- archiveNames.add(ClasspathDependencyTestUtil.TEST2_JAR);
-
- verifyPublishedWebInfContainer(webComp, archiveNames, false);
-
- addWebInfContainerDependencyAttribute(false);
-
- verifyPublishedWebInfContainer(webComp, archiveNames, true);
- }
-
- private void verifyPublishedWebInfLibs(final IVirtualComponent comp, final Set archiveNames, final boolean shouldHaveDependencies) throws Exception {
- J2EEFlexProjDeployable deployable = new J2EEFlexProjDeployable(comp.getProject(), comp);
-
- try {
- IModuleResource[] members = deployable.members();
- assertTrue(members.length==2);
-
- for (int i=0; i<members.length; i++) {
- String name = members[i].getName();
- if (name.equals("WEB-INF")) {
- IModuleResource[] webInf = ((IModuleFolder)members[i]).members();
- for (int j=0; j<webInf.length; j++) {
- IModuleResource webResource = webInf[j];
- assertTrue(webResource.getModuleRelativePath().toString().equals("WEB-INF"));
- if (webResource.getName().equals("lib")) {
- IModuleResource[] webresMembers = ((IModuleFolder)webResource).members();
- Iterator it = archiveNames.iterator();
- while (it.hasNext()) {
- String archiveName = (String) it.next();
- boolean hasArchive = false;
- for (int k = 0; k < webresMembers.length; k++) {
- String localName = webresMembers[k].getName();
- if (localName.equals(archiveName)) {
- hasArchive= true;
- }
- }
- if (shouldHaveDependencies) {
- assertTrue("Published WAR missing classpath dependency Jar " + archiveName, hasArchive);
- } else {
- assertFalse("Published WAR has unexpected classpath dependency Jar " + archiveName, hasArchive);
- }
- }
- } else if (webResource.getName().equals("classes")) {
- IModuleResource[] webresMembers = ((IModuleFolder)webResource).members();
- for (j = 0; j < webresMembers.length; j++) {
- if (webresMembers[j].getName().equals("nested")) {
- IModuleResource[] nestedMembers = ((IModuleFolder)webresMembers[j]).members();
- assertTrue("Published WAR should have have nested folder without class folder dependency", shouldHaveDependencies);
- boolean hasNestedTest = false;
- if (nestedMembers.length == 1 && nestedMembers[0].getName().equals("test")) {
- hasNestedTest = true;
- }
- if (shouldHaveDependencies) {
- assertTrue("Published WAR missing nested class folder file", hasNestedTest);
- } else {
- assertFalse("Published WAR has unexpected nested class folder file", hasNestedTest);
- }
- }
- }
- }
- }
- }
- }
-
- } catch (CoreException e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
- private void verifyPublishedWebInfContainer(final IVirtualComponent comp, final Set archiveNames, final boolean shouldHaveDependencies) throws Exception {
- J2EEFlexProjDeployable deployable = new J2EEFlexProjDeployable(comp.getProject(), comp);
-
- try {
- IModuleResource[] members = deployable.members();
- assertTrue(members.length==2);
-
- for (int i=0; i<members.length; i++) {
- String name = members[i].getName();
- if (name.equals("WEB-INF")) {
- IModuleResource[] webInf = ((IModuleFolder)members[i]).members();
- for (int j=0; j<webInf.length; j++) {
- IModuleResource webResource = webInf[j];
- assertTrue(webResource.getModuleRelativePath().toString().equals("WEB-INF"));
- if (webResource.getName().equals("lib")) {
- IModuleResource[] webresMembers = ((IModuleFolder)webResource).members();
- Iterator it = archiveNames.iterator();
- while (it.hasNext()) {
- String archiveName = (String) it.next();
- boolean hasArchive = false;
- for (int k = 0; k < webresMembers.length; k++) {
- String localName = webresMembers[k].getName();
- if (localName.equals(archiveName)) {
- hasArchive= true;
- }
- }
- if (shouldHaveDependencies) {
- assertTrue("Published WAR missing classpath dependency Jar " + archiveName, hasArchive);
- } else {
- assertFalse("Published WAR has unexpected classpath dependency Jar " + archiveName, hasArchive);
- }
- }
- }
- }
- }
- }
-
- } catch (CoreException e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
- private IVirtualComponent createProjects(boolean JEE5) throws Exception {
- // create a Utility project
- final IProject util = ProjectUtil.createUtilityProject(UTIL_PROJECT, null, true);
- final IJavaProject utilJava = JavaCore.create(util);
- final IVirtualComponent utilComp = ComponentCore.createComponent(util);
-
- // create a Web project
- // create a Web project
- int version = J2EEVersionConstants.SERVLET_2_5;
- if (!JEE5) {
- version = J2EEVersionConstants.SERVLET_2_4;
- }
- final IProject webProject = ProjectUtil.createWebProject(WEB_PROJECT, null, version, true);
- final IJavaProject webJavaProject = JavaCore.create(webProject);
- final IVirtualComponent webComp = ComponentCore.createComponent(webProject);
- // create a new "bin" folder
- final IPath binPath = new Path("bin");
- final IFolder webBin = webProject.getFolder(binPath);
- webBin.create(true, true, null);
- // create a nested folder
- final IFolder nested = webBin.getFolder("nested");
- nested.create(true, true, null);
- // add a file
- nested.getFile("test").create(new java.io.StringBufferInputStream("blah"), true, null);
- // add as a library cp entry
- ClasspathDependencyTestUtil.addLibraryEntry(webJavaProject, webBin.getFullPath(), true);
-
- // add a dependency from the Web to the Utility
- DependencyCreationUtil.createWebLibDependency(webProject, util);
-
- // add a cp dependency to the Utility
- ClasspathDependencyTestUtil.addCustomClasspathContainer(utilJava);
-
- return webComp;
- }
-
- private IVirtualComponent createWebProject(boolean JEE5) throws Exception {
- // create a Web project
- int version = J2EEVersionConstants.SERVLET_2_5;
- if (!JEE5) {
- version = J2EEVersionConstants.SERVLET_2_4;
- }
- final IProject webProject = ProjectUtil.createWebProject(WEB_PROJECT, null, version, true);
- final IJavaProject webJavaProject = JavaCore.create(webProject);
- final IVirtualComponent webComp = ComponentCore.createComponent(webProject);
-
- // add a cp dependency to the Utility
- ClasspathDependencyTestUtil.addCustomClasspathContainer(webJavaProject);
-
- return webComp;
- }
-
- /**
- *
- * @param verifyClasspathDependencies - true if you want to immediately verify that
- * the classpath dependencies were added. Set to false if you want to verify this at
- * a later time (such as thru a members call in export or publish)
- * @throws Exception
- */
- private void addDependencyAttribute(boolean verifyClasspathDependencies) throws Exception {
- final IProject util = ProjectUtil.getProject(UTIL_PROJECT);
- final IJavaProject utilJava = JavaCore.create(util);
- final IVirtualComponent utilComp = ComponentCore.createComponent(util);
- final IProject web = ProjectUtil.getProject(WEB_PROJECT);
- final IJavaProject webJava = JavaCore.create(web);
- final IPath fullWebBinPath = web.getFullPath().append("bin");
- final IVirtualComponent webComp = ComponentCore.createComponent(web);
-
- final Set entryPaths = new HashSet();
- entryPaths.add(ClasspathDependencyTestUtil.CUSTOM_CLASSPATH_CONTAINER);
- List entries = ClasspathDependencyTestUtil.verifyPotentialClasspathEntries(utilJava, entryPaths);
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(utilJava);
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(utilComp);
- IClasspathEntry entry = (IClasspathEntry) entries.get(0);
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, util.getName(), entry);
-
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(utilJava);
- ClasspathDependencyTestUtil.verifyClasspathAttributes(utilJava, entryPaths);
- final Set archiveNames = new HashSet();
- archiveNames.add(ClasspathDependencyTestUtil.TEST1_JAR);
- archiveNames.add(ClasspathDependencyTestUtil.TEST2_JAR);
- ClasspathDependencyTestUtil.verifyClasspathDependencies(utilComp, archiveNames);
-
- entryPaths.clear();
- entryPaths.add(fullWebBinPath);
- // verify that "bin" in the web project is a potential entry
- entries = ClasspathDependencyTestUtil.verifyPotentialClasspathEntries(webJava, entryPaths);
- // verify that no entries have the classpath attribute
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(webJava);
- // verify that there are no classpath dependencies
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(webComp);
-
- // add the dependency attribute to "bin"
- entry = (IClasspathEntry) entries.get(0);
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, web.getName(), entry);
- // should no longer have potential entries
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(webJava);
- // verify that "bin" has the attribute
- ClasspathDependencyTestUtil.verifyClasspathAttributes(webJava, entryPaths);
- // verify that "bin" is a dependency
- archiveNames.clear();
- archiveNames.add(fullWebBinPath.toString());
- ClasspathDependencyTestUtil.verifyClasspathDependencies(webComp, archiveNames);
- }
-
- /**
- *
- * @param verifyClasspathDependencies - true if you want to immediately verify that
- * the classpath dependencies were added. Set to false if you want to verify this at
- * a later time (such as thru a members call in export or publish)
- * @throws Exception
- */
- private void addWebInfContainerDependencyAttribute(boolean verifyClasspathDependencies) throws Exception {
-
- final IProject web = ProjectUtil.getProject(WEB_PROJECT);
- final IJavaProject webJava = JavaCore.create(web);
- final IVirtualComponent webComp = ComponentCore.createComponent(web);
-
- final Set entryPaths = new HashSet();
- entryPaths.add(ClasspathDependencyTestUtil.CUSTOM_CLASSPATH_CONTAINER);
- // verify that "bin" and the custom cp container are potential entries
- List entries = ClasspathDependencyTestUtil.verifyPotentialClasspathEntries(webJava, entryPaths);
- // verify that no entries have the classpath attribute
- ClasspathDependencyTestUtil.verifyNoClasspathAttributes(webJava);
- // verify that there are no classpath dependencies
- ClasspathDependencyTestUtil.verifyNoClasspathDependencies(webComp);
- IClasspathEntry entry = (IClasspathEntry) entries.get(0);
-
- // add the dependency attribute to "bin" and the cp container
- for (Object o: entries) {
- UpdateClasspathAttributeUtil.addDependencyAttribute(null, web.getName(), (IClasspathEntry) o);
- }
- // should no longer have potential entries
- ClasspathDependencyTestUtil.verifyNoPotentialClasspathEntries(webJava);
- // verify that "bin" and the cp container have the attribute
- ClasspathDependencyTestUtil.verifyClasspathAttributes(webJava, entryPaths);
- // verify that "bin" and the cp container are dependencies
- final Set archiveNames = new HashSet();
- archiveNames.add(ClasspathDependencyTestUtil.TEST1_JAR);
- archiveNames.add(ClasspathDependencyTestUtil.TEST2_JAR);
- if (verifyClasspathDependencies)
- ClasspathDependencyTestUtil.verifyClasspathDependencies(webComp, archiveNames);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/util/ClasspathDependencyTestUtil.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/util/ClasspathDependencyTestUtil.java
deleted file mode 100644
index a588fff9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/classpath/tests/util/ClasspathDependencyTestUtil.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.classpath.tests.util;
-
-import java.net.URL;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.jdt.core.IClasspathContainer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.classpathdep.ClasspathDependencyUtil;
-import org.eclipse.jst.j2ee.classpathdep.IClasspathDependencyConstants.DependencyAttributeType;
-import org.eclipse.jst.j2ee.componentcore.J2EEModuleVirtualComponent;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyUtil;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wtp.j2ee.headless.tests.plugin.HeadlessTestsPlugin;
-
-/**
- * Various utility methods.
- */
-public class ClasspathDependencyTestUtil extends DependencyUtil {
-
- public static final IPath CUSTOM_CLASSPATH_CONTAINER = new Path("TEST_CP_CONTAINER");
-
- public static final String TEST_DATA = "TestData" + IPath.SEPARATOR + "ClasspathDependencyTests";
- public static final String TEST1_JAR = "Test1.jar";
- public static final String TEST2_JAR = "Test2.jar";
- public static final String TEST3_JAR = "Test3.jar";
- public static final String TEST3_JAR_OTHER_LOCATION = "other/Test3.jar";
- public static final String TEST3_BIN= "Test3_bin";
-
- public static final IPath TEST1_JAR_PATH = getFullTestDataPath(TEST1_JAR);
- public static final IPath TEST2_JAR_PATH = getFullTestDataPath(TEST2_JAR);
- public static final IPath TEST3_JAR_PATH = getFullTestDataPath(TEST3_JAR);
- public static final IPath TEST3_JAR_OTHER_LOCATION_PATH = getFullTestDataPath(TEST3_JAR_OTHER_LOCATION);
- public static final IPath TEST3_BIN_PATH = new Path(TEST3_BIN);
-
- public static final String CLASSPATH_DEPENDENCY_MARKER_TYPE = "org.eclipse.jst.j2ee.ClasspathDependencyValidatorMarker";
- public static final String VALIDATION_MARKER_TYPE = "org.eclipse.wst.validation.problemmarker";
-
- public static IPath getFullTestDataPath(String dataPath) {
- try {
- final String testDataPath = TEST_DATA + IPath.SEPARATOR + dataPath;
- HeadlessTestsPlugin plugin = HeadlessTestsPlugin.getDefault();
- if (plugin != null) {
- URL url = plugin.getBundle().getEntry(testDataPath);
- if (url != null) {
- url = Platform.asLocalURL(url);
- return new Path(url.getPath());
- }
- }
- return new Path(System.getProperty("user.dir") + IPath.SEPARATOR + testDataPath);
- } catch (Exception e) {
- e.printStackTrace();
- }
- return new Path("");
- }
-
-
- /**
- * Adds a library entry that references a jar file and is optionally exported.
- */
- public static IClasspathEntry addLibraryEntry(final IJavaProject javaProject, final IPath path, final boolean isExported) throws CoreException {
- final IClasspathEntry entry = JavaCore.newLibraryEntry(path, null, null, isExported);
- addEntryToCP(javaProject, entry);
- return entry;
- }
-
- public static void addEntryToCP(final IJavaProject javaProject, final IClasspathEntry entry) throws CoreException {
- final IClasspathEntry[] rawCP = javaProject.getRawClasspath();
- final IClasspathEntry[] newCP = new IClasspathEntry[rawCP.length + 1];
- System.arraycopy(rawCP, 0, newCP, 0, rawCP.length);
- newCP[rawCP.length] = entry;
- javaProject.setRawClasspath(newCP, true, null);
- }
- /**
- * Adds a custom classpath container with the specified name that references two jar files.
- */
- public static IClasspathEntry addCustomClasspathContainer(final IJavaProject javaProject) throws CoreException {
- final IClasspathEntry entry = JavaCore.newContainerEntry(CUSTOM_CLASSPATH_CONTAINER, true);
- addEntryToCP(javaProject, entry);
- JavaCore.setClasspathContainer(
- CUSTOM_CLASSPATH_CONTAINER,
- new IJavaProject[]{ javaProject },
- new IClasspathContainer[] {
- new IClasspathContainer() {
- public IClasspathEntry[] getClasspathEntries() {
- return new IClasspathEntry[]{
- JavaCore.newLibraryEntry(TEST1_JAR_PATH, null, null, false),
- JavaCore.newLibraryEntry(TEST2_JAR_PATH, null, null, false),
- };
- }
- public String getDescription() { return "Test classpath container"; }
- public int getKind() { return IClasspathContainer.K_APPLICATION;}
- public IPath getPath() { return CUSTOM_CLASSPATH_CONTAINER; }
- }
- },
- null);
- return entry;
- }
-
- public static void verifyNoClasspathAttributes(final IJavaProject javaProject) throws Exception {
- verifyClasspathAttributes(javaProject, new HashSet());
- }
-
- public static Map verifyClasspathAttributes(final IJavaProject javaProject, final Set rawEntryPaths) throws Exception {
- final Map entriesToAttrib = ClasspathDependencyUtil.getRawComponentClasspathDependencies(javaProject, DependencyAttributeType.CLASSPATH_COMPONENT_DEPENDENCY);
- Assert.assertTrue("Project " + javaProject + " should have " + rawEntryPaths.size() + " raw classpath dependencies, only has: " +
- entriesToAttrib.size(), entriesToAttrib.size()== rawEntryPaths.size());
- final Iterator i = entriesToAttrib.keySet().iterator();
- while (i.hasNext()) {
- final IClasspathEntry entry = (IClasspathEntry) i.next();
- Assert.assertTrue("Project " + javaProject + " missing expected classpath dependency " + entry.getPath(), rawEntryPaths.contains(entry.getPath()));
- }
- return entriesToAttrib;
- }
-
- public static void verifyNoClasspathDependencies(final IVirtualComponent component) throws Exception {
- verifyClasspathDependencies(component, new HashSet());
- }
-
- public static IVirtualReference[] verifyClasspathDependencies(final IVirtualComponent component, final Set archiveNames) throws Exception {
- Assert.assertTrue("Component " + component.getName() + " not a J2EEModuleVirtualComponent", component instanceof J2EEModuleVirtualComponent);
- J2EEModuleVirtualComponent j2eeComp = (J2EEModuleVirtualComponent) component;
- IVirtualReference[] refs = j2eeComp.getJavaClasspathReferences();
- Assert.assertTrue("Component " + component.getName()+ " should have " + archiveNames.size() + " component classpath dependencies, only has: " +
- refs.length, refs.length == archiveNames.size());
- for (int i = 0; i < refs.length; i++) {
- Assert.assertTrue("Component " + component.getName()+ " has unexpected component classpath dependency " + refs[i].getArchiveName(), archiveNames.contains(refs[i].getArchiveName()));
- }
- return refs;
- }
-
- public static void verifyNoPotentialClasspathEntries(final IJavaProject javaProject) throws Exception {
- verifyPotentialClasspathEntries(javaProject, new HashSet());
- }
-
- public static List verifyPotentialClasspathEntries(final IJavaProject javaProject, final Set potentialEntryPaths) throws Exception {
- List entries = ClasspathDependencyUtil.getPotentialComponentClasspathDependencies(javaProject);
- Assert.assertTrue("Project " + javaProject + " should have " + potentialEntryPaths.size() + " potential classpath dependencies, only has: " +
- entries.size(), entries.size() == potentialEntryPaths.size());
- for (int i = 0; i < entries.size(); i++) {
- IClasspathEntry entry = (IClasspathEntry) entries.get(i);
- Assert.assertTrue("Project " + javaProject + " missing expected potential classpath entry " + entry.getPath(), potentialEntryPaths.contains(entry.getPath()));
- }
- return entries;
- }
-
- public static void verifyValidationError(final IProject project) throws CoreException {
- verifyError(project, VALIDATION_MARKER_TYPE, true);
- }
-
- public static void verifyNoValidationError(final IProject project) throws CoreException {
- verifyError(project, VALIDATION_MARKER_TYPE, false);
- }
-
- public static void verifyClasspathDependencyError(final IProject project) throws CoreException {
- verifyError(project, CLASSPATH_DEPENDENCY_MARKER_TYPE, true);
- }
-
- public static void verifyNoClasspathDependencyError(final IProject project) throws CoreException {
- verifyError(project, CLASSPATH_DEPENDENCY_MARKER_TYPE, false);
- }
-
- private static void verifyError(final IProject project, final String markerType, final boolean shouldHaveErrorMarker) throws CoreException {
- final IMarker[] markers = project.findMarkers(markerType, true, IProject.DEPTH_ZERO);
- boolean hasError = false;
- for (int i = 0; i < markers.length; i++) {
- if (markers[i].getAttribute(IMarker.SEVERITY, IMarker.SEVERITY_INFO) == IMarker.SEVERITY_ERROR) {
- hasError = true;
- break;
- }
- }
- if (shouldHaveErrorMarker) {
- Assert.assertTrue("Project " + project + " missing expected validation error problem marker", hasError);
- } else {
- Assert.assertFalse("Project " + project + " has unexpected validation error problem marker", hasError);
- }
- }
-
- public static void verifyClasspathDependencyMarker(final IProject project) throws CoreException {
- verifyMarker(project, CLASSPATH_DEPENDENCY_MARKER_TYPE, true);
- }
-
- public static void verifyNoClasspathDependencyMarker(final IProject project) throws CoreException {
- verifyMarker(project, CLASSPATH_DEPENDENCY_MARKER_TYPE, false);
- }
-
- private static void verifyMarker(final IProject project, final String markerType, final boolean shouldHaveMarker) throws CoreException {
- final IMarker[] markers = project.findMarkers(markerType, true, IProject.DEPTH_ZERO);
- if (shouldHaveMarker) {
- Assert.assertTrue("Project " + project + " missing expected " + markerType + " problem marker", markers.length > 0);
- } else {
- Assert.assertFalse("Project " + project + " has unexpected " + markerType + " problem marker", markers.length > 0);
- }
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/AbstractTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/AbstractTests.java
deleted file mode 100644
index 7b62b824..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/AbstractTests.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.dependency.tests;
-
-import org.eclipse.wst.common.tests.OperationTestCase;
-
-/**
- * Abstract base class for unit tests
- *
- * @author rfrost@bea.com
- */
-public abstract class AbstractTests extends OperationTestCase {
-
- protected AbstractTests(final String name) {
- super(name);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/AllTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/AllTests.java
deleted file mode 100644
index 466f32b7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/AllTests.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.dependency.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-public class AllTests extends TestCase {
- public static Test suite() {
- final TestSuite suite = new TestSuite();
-
- suite.setName("All J2EE Dependency/Refactoring Tests");
-
- suite.addTest(ProjectCreationTests.suite());
- suite.addTest(ProjectDependencyTests.suite());
- suite.addTest(ProjectEARRefactoringTests.suite());
- //[Bug 234409] Temporarily removing these tests until underlying issue is fixed
-// suite.addTest(ProjectModuleRefactoringTests.suite());
-// suite.addTest(ProjectWebLibRefactoringTests.suite());
- suite.addTest(ProjectClasspathRefactoringTests.suite());
- suite.addTest(ProjectServerRefactoringTests.suite());
- suite.addTest(EarLibDirContainerTests.suite());
-
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/EarLibDirContainerTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/EarLibDirContainerTests.java
deleted file mode 100644
index 3cc9efaa..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/EarLibDirContainerTests.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package org.eclipse.jst.j2ee.dependency.tests;
-
-import java.util.ArrayList;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyCreationUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-
-public class EarLibDirContainerTests extends AbstractTests {
-
- private static final String EAR_PROJECT_NAME = "TestEAR";
- private static final String LIB_PROJECT_NAME = "TestLib";
- private static final String UTIL_PROJECT_NAME = "TestUtil";
-
- public EarLibDirContainerTests(String name) {
- super(name);
- }
-
- public static Test suite() {
- final TestSuite suite = new TestSuite();
- suite.setName("EAR Container Library Directory Tests");
- suite.addTest(new EarLibDirContainerTests("testEarLibDirDependency"));
- return suite;
- }
-
- public void testEarLibDirDependency() throws Exception {
- ResourcesPlugin.getWorkspace().getRoot().getProjects();
- IProject earProject = ProjectUtil.createEARProject(EAR_PROJECT_NAME, J2EEVersionConstants.JEE_5_0_ID, false);
- IProject utilProject = ProjectUtil.createUtilityProject(UTIL_PROJECT_NAME, null);
- DependencyCreationUtil.createEARDependency(earProject, utilProject, false);
- IProject libProject = ProjectUtil.createUtilityProject(LIB_PROJECT_NAME, null);
- DependencyCreationUtil.createEARDependency(earProject, libProject, true);
- updateEARLibrariesContainer(utilProject);
- waitForCondition(cpContains(utilProject, new Path(IPath.SEPARATOR + LIB_PROJECT_NAME)));
- }
-
- private static void updateEARLibrariesContainer(IProject project) {
- ArrayList projectList = new ArrayList();
- projectList.add(project);
- J2EEComponentClasspathUpdater.getInstance().forceUpdate(projectList);
- }
-
- private static ICondition cpContains(final IProject project, final IPath entry) {
- return new ClasspathContainsCondition( project, entry );
- }
-
- private static void waitForCondition( final ICondition condition ) throws Exception {
- waitForCondition( condition, 10 );
- }
-
- private static void waitForCondition( final ICondition condition, final int seconds ) throws Exception {
- for( int i = 0; i < seconds && ! condition.check(); i++ ) {
- try {
- Thread.sleep( 1000 );
- }
- catch( InterruptedException e ) {}
- }
-
- assertCondition( condition );
- }
-
- private static void assertCondition( final ICondition condition ) throws Exception {
- assertTrue( condition.check() );
- }
-
- private static interface ICondition {
- boolean check() throws Exception;
- }
-
- private static abstract class AbstractClasspathCondition implements ICondition {
- private final IProject project;
- private final IPath entry;
-
- public AbstractClasspathCondition( final IProject project, final IPath entry ) {
- this.project = project;
- this.entry = entry;
- }
-
- protected boolean internalCheck() throws Exception {
- final IJavaProject jproj = JavaCore.create( this.project );
- final IClasspathEntry[] cp = jproj.getResolvedClasspath( true );
-
- for( int i = 0; i < cp.length; i++ ) {
- if( cp[ i ].getPath().equals( this.entry ) ) {
- return true;
- }
- }
-
- return false;
- }
- }
-
- private static final class ClasspathContainsCondition extends AbstractClasspathCondition {
- public ClasspathContainsCondition( final IProject project, final IPath entry ) {
- super( project, entry );
- }
-
- public boolean check() throws Exception {
- return internalCheck();
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectClasspathRefactoringTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectClasspathRefactoringTests.java
deleted file mode 100644
index 62f17e9a..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectClasspathRefactoringTests.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.dependency.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
-
-/**
- * Tests refactoring logic that updates component mappings when source IClasspathEntries are
- * added to/removed from the Java build path.
- */
-public class ProjectClasspathRefactoringTests extends AbstractTests {
-
- public ProjectClasspathRefactoringTests(String name) {
- super(name);
- }
-
- public static Test suite(){
- final TestSuite suite = new TestSuite();
- suite.setName("Project Classpath Refactoring Tests" );
- suite.addTest(new ProjectClasspathRefactoringTests("testSourcePathAdditionWeb"));
- suite.addTest(new ProjectClasspathRefactoringTests("testSourcePathRemovalWeb"));
- //suite.addTest(new ProjectClasspathRefactoringTests("testSourcePathRenameWeb"));
- suite.addTest(new ProjectClasspathRefactoringTests("testSourcePathAdditionUtil"));
- suite.addTest(new ProjectClasspathRefactoringTests("testSourcePathRemovalUtil"));
- //suite.addTest(new ProjectClasspathRefactoringTests("testSourcePathRenameUtil"));
- suite.addTest(new ProjectClasspathRefactoringTests("testWebContentRename"));
- suite.addTest(new ProjectClasspathRefactoringTests("testEarContentRename"));
- return suite;
- }
-
- public void testSourcePathAdditionWeb() throws Exception {
- testSourcePathAddition(ProjectUtil.createWebProject("TestWeb", null));
- }
-
- public void testSourcePathAdditionUtil() throws Exception {
- testSourcePathAddition(ProjectUtil.createUtilityProject("TestUtil", null));
- }
-
- private static void testSourcePathAddition(final IProject project) throws Exception {
- final IPath srcPath = new Path("src");
- final IPath newSrcPath = new Path("newSrc");
-
- DependencyUtil.verifyComponentMapping(project, srcPath, true);
- DependencyUtil.verifyComponentMapping(project, newSrcPath, false);
-
- assertTrue("Failed to add new source path " + newSrcPath, DependencyUtil.addJavaSrcPath(project, newSrcPath));
-
- DependencyUtil.verifyComponentMapping(project, srcPath, true);
- DependencyUtil.verifyComponentMapping(project, newSrcPath, true);
- }
-
- public void testSourcePathRemovalWeb() throws Exception {
- testSourcePathRemoval(ProjectUtil.createWebProject("TestWeb", null));
- }
-
- public void testSourcePathRemovalUtil() throws Exception {
- testSourcePathRemoval(ProjectUtil.createUtilityProject("TestUtil", null));
- }
-
- private static void testSourcePathRemoval(final IProject project) throws Exception {
- final IPath srcPath = new Path("src");
- DependencyUtil.verifyComponentMapping(project, srcPath, true);
- assertTrue("Failed to remove src path " + srcPath, DependencyUtil.removeJavaSrcPath(project, srcPath));
- DependencyUtil.verifyComponentMapping(project, srcPath, false);
- }
-
- public void testWebContentRename() throws Exception {
- final IProject webProject = ProjectUtil.createWebProject("TestWeb", null);
- final IPath webContent = new Path(J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.WEB_CONTENT_FOLDER));
- final IPath newWebContent = new Path("WebContent2");
-
- DependencyUtil.verifyComponentMapping(webProject, webContent, Path.ROOT, true);
- DependencyUtil.verifyComponentMapping(webProject, newWebContent, Path.ROOT, false);
-
- // rename the WebContent
- final IFolder folder = webProject.getFolder(webContent);
- folder.move(webProject.getFullPath().append(newWebContent), true, null);
- DependencyUtil.waitForComponentRefactoringJobs();
-
- DependencyUtil.verifyComponentMapping(webProject, webContent, Path.ROOT, false);
- DependencyUtil.verifyComponentMapping(webProject, newWebContent, Path.ROOT, true);
- }
-
- public void testEarContentRename() throws Exception {
- final IProject earProject = ProjectUtil.createEARProject("TestEAR");
- final IPath earContent = new Path(J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.APPLICATION_CONTENT_FOLDER));
- final IPath newEarContent = new Path("EarContent2");
-
- DependencyUtil.verifyComponentMapping(earProject, earContent, Path.ROOT, true);
- DependencyUtil.verifyComponentMapping(earProject, newEarContent, Path.ROOT, false);
-
- // rename the EarContent
- final IFolder folder = earProject.getFolder(earContent);
- folder.move(earProject.getFullPath().append(newEarContent), true, null);
- DependencyUtil.waitForComponentRefactoringJobs();
-
- DependencyUtil.verifyComponentMapping(earProject, earContent, Path.ROOT, false);
- DependencyUtil.verifyComponentMapping(earProject, newEarContent, Path.ROOT, true);
- }
-
-// XXX need to change to execute a refactor->rename
-// public void testSourcePathRenameWeb() throws Exception {
-// testSourcePathRename(ProjectUtil.createWebProject("TestWeb", null));
-// }
-//
-// public void testSourcePathRenameUtil() throws Exception {
-// testSourcePathRename(ProjectUtil.createUtilityProject("TestUtil", null));
-// }
-//
-// private static void testSourcePathRename(final IProject project) throws Exception {
-// final IPath srcPath = new Path("src");
-// final IPath newSrcPath = new Path("newSrc");
-//
-// DependencyUtil.verifyComponentMapping(project, srcPath, true);
-//
-// final IFolder srcFolder = project.getFolder(srcPath);
-// srcFolder.move(newSrcPath, true, null);
-//
-// DependencyUtil.verifyComponentMapping(project, srcPath, false);
-// DependencyUtil.verifyComponentMapping(project, newSrcPath, true);
-// }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectCreationTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectCreationTests.java
deleted file mode 100644
index f60dc2e1..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectCreationTests.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.dependency.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyVerificationUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-
-/**
- * Tests project creation logic in the ProjectCreationUtil helper class.
- */
-public class ProjectCreationTests extends AbstractTests {
-
- private ProjectCreationTests(final String name) {
- super(name);
- }
-
- public static Test suite(){
- final TestSuite suite = new TestSuite();
- suite.setName("Project Creation Tests" );
- suite.addTest(new ProjectCreationTests("testEARCreation"));
- suite.addTest(new ProjectCreationTests("testWebCreation"));
- suite.addTest(new ProjectCreationTests("testWebWithEARCreation"));
- suite.addTest(new ProjectCreationTests("testEJBCreation"));
- suite.addTest(new ProjectCreationTests("testEJBWithEARCreation"));
- suite.addTest(new ProjectCreationTests("testUtilCreation"));
- suite.addTest(new ProjectCreationTests("testUtilWithEARCreation"));
- return suite;
- }
-
- public void testEARCreation() throws Exception {
- ProjectUtil.createEARProject("TestEAR");
- }
-
- public void testWebCreation() throws Exception {
- ProjectUtil.createWebProject("TestWeb", null);
- }
-
- public void testWebWithEARCreation() throws Exception {
- final IProject earProject = ProjectUtil.getProject("TestEAR");
- DependencyVerificationUtil.verifyEARDependency(earProject, ProjectUtil.createWebProject("TestWeb", earProject.getName()), true);
- }
-
- public void testEJBCreation() throws Exception {
- ProjectUtil.createEJBProject("TestEJB", null);
- }
-
- public void testEJBWithEARCreation() throws Exception {
- final IProject earProject = ProjectUtil.getProject("TestEAR");
- final IProject ejbProject = ProjectUtil.createEJBProject("TestEJB", earProject.getName());
- DependencyVerificationUtil.verifyEARDependency(earProject, ejbProject, true);
- testEJBClient(ejbProject, earProject);
- }
-
- private void testEJBClient(final IProject ejbProject, final IProject earProject) throws Exception {
- final IProject ejbClient = ProjectUtil.getProject(ejbProject.getName() + "Client");
- // check dependencies from EAR to EJB client
- DependencyVerificationUtil.verifyProjectReference(earProject, ejbClient, true);
- DependencyVerificationUtil.verifyComponentReference(earProject, ejbClient, DependencyVerificationUtil.ROOT, true);
-
- // check dependencies from EJB to EJB client
- //DependencyVerificationUtil.verifyModuleDependency(ejbProject, ejbClient);
- DependencyVerificationUtil.verifyManifestReference(ejbProject, ejbClient.getName() + ".jar", true);
- }
-
- public void testUtilCreation() throws Exception {
- ProjectUtil.createUtilityProject("TestUtil", null);
- }
-
- public void testUtilWithEARCreation() throws Exception {
- final IProject earProject = ProjectUtil.getProject("TestEAR");
- DependencyVerificationUtil.verifyEARDependency(earProject, ProjectUtil.createUtilityProject("TestUtil", earProject.getName()), false);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectDependencyTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectDependencyTests.java
deleted file mode 100644
index c83fd920..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectDependencyTests.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.dependency.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyCreationUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyVerificationUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-
-/**
- * Tests project creation logic in the DependencyCreationUtil helper class.
- */
-public class ProjectDependencyTests extends AbstractTests {
-
- private ProjectDependencyTests(final String name) {
- super(name);
- }
-
- public static Test suite(){
- final TestSuite suite = new TestSuite();
- suite.setName("Project Dependency Tests" );
- suite.addTest(new ProjectDependencyTests("testEARWebDependency"));
- suite.addTest(new ProjectDependencyTests("testEARDependencyRemoval"));
- suite.addTest(new ProjectDependencyTests("testEARUtilDependency"));
- suite.addTest(new ProjectDependencyTests("testEAREJBDependency"));
- suite.addTest(new ProjectDependencyTests("testStandaloneWebUtilDependency"));
- suite.addTest(new ProjectDependencyTests("testWebUtilWebInfLibDependency"));
- suite.addTest(new ProjectDependencyTests("testWebEJBModuleDependency"));
- return suite;
- }
-
- public void testEARWebDependency() throws Exception {
- testEARDependency(ProjectUtil.createEARProject("TestEAR"),
- ProjectUtil.createWebProject("TestWeb", null), true);
- }
-
- public void testEARDependencyRemoval() throws Exception {
- final IProject earProject = ProjectUtil.createEARProject("TestEAR");
- final IProject webProject = ProjectUtil.createWebProject("TestWeb", null);
- final String moduleURI = testEARDependency(earProject, webProject, true);
- DependencyCreationUtil.removeEARDependency(earProject, webProject);
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject, webProject, moduleURI);
- }
-
- public void testEARUtilDependency() throws Exception {
- testEARDependency(ProjectUtil.createEARProject("TestEAR"),
- ProjectUtil.createUtilityProject("TestUtil", null), false);
- }
-
- public void testEAREJBDependency() throws Exception {
- testEARDependency(ProjectUtil.createEARProject("TestEAR"),
- ProjectUtil.createEJBProject("TestEJB", null), true);
- }
-
- private String testEARDependency(final IProject earProject, final IProject childProject, final boolean moduleRef) throws Exception {
- DependencyCreationUtil.createEARDependency(earProject, childProject);
- return DependencyVerificationUtil.verifyEARDependency(earProject, childProject, moduleRef);
- }
-
- public void testStandaloneWebUtilDependency() throws Exception {
- final IProject saWeb = ProjectUtil.createWebProject("TestWeb", null);
- final IProject util = ProjectUtil.createUtilityProject("TestUtil", null);
- DependencyCreationUtil.createWebLibDependency(saWeb, util);
- DependencyVerificationUtil.verifyWebLibDependency(saWeb, util);
- }
-
- public void testWebUtilWebInfLibDependency() throws Exception {
- final IProject web = ProjectUtil.createWebProject("TestWeb", null);
- final IProject util = ProjectUtil.createUtilityProject("TestUtil", null);
- final IProject ear = ProjectUtil.createEARProject("TestEAR");
- testEARDependency(ear, web, true);
- testEARDependency(ear, util, false);
- DependencyCreationUtil.createWebLibDependency(web, util);
- DependencyVerificationUtil.verifyWebLibDependency(web, util);
- }
-
- public void testWebEJBModuleDependency() throws Exception {
- final IProject web = ProjectUtil.createWebProject("TestWeb", null);
- final IProject ejb = ProjectUtil.createEJBProject("TestEJB", null);
- final IProject ear = ProjectUtil.createEARProject("TestEAR");
- testEARDependency(ear, web, true);
- testEARDependency(ear, ejb, true);
- DependencyCreationUtil.createModuleDependency(web, ejb);
- DependencyVerificationUtil.verifyModuleDependency(web, ejb);
- }
-} \ No newline at end of file
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectEARRefactoringTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectEARRefactoringTests.java
deleted file mode 100644
index 1949b8d8..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectEARRefactoringTests.java
+++ /dev/null
@@ -1,289 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.dependency.tests;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyCreationUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyVerificationUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Tests the refactoring logic that handles rename/delete refactoring of EAR child
- * projects.
- */
-public class ProjectEARRefactoringTests extends AbstractTests {
-
- public ProjectEARRefactoringTests(String name) {
- super(name);
- }
-
- public static Test suite(){
- final TestSuite suite = new TestSuite();
- suite.setName("Project EAR Refactoring Tests" );
- //suite.addTest(new ProjectEARRefactoringTests("testDeleteEARWebModule"));
- // XXX this can fail
- //suite.addTest(new ProjectEARRefactoringTests("testDeleteEARWebModuleWithValidation"));
- //suite.addTest(new ProjectEARRefactoringTests("testDeleteEARUtilModule"));
- //suite.addTest(new ProjectEARRefactoringTests("testDeleteEAREJBModule"));
- suite.addTest(new ProjectEARRefactoringTests("testRenameEARWebModule"));
- suite.addTest(new ProjectEARRefactoringTests("testRenameEARUtilModule"));
- //suite.addTest(new ProjectEARRefactoringTests("testRenameEAREJBModule"));
- //suite.addTest(new ProjectEARRefactoringTests("testMultipleEARWebDelete"));
- suite.addTest(new ProjectEARRefactoringTests("testMultipleEARWebRename"));
- //suite.addTest(new ProjectEARRefactoringTests("testMultipleEARUtilDelete"));
- suite.addTest(new ProjectEARRefactoringTests("testMultipleEARUtilRename"));
- //suite.addTest(new ProjectEARRefactoringTests("testDeleteWithEARModuleDependency"));
- suite.addTest(new ProjectEARRefactoringTests("testRenameWithMultipleEARModuleDependency"));
- //suite.addTest(new ProjectEARRefactoringTests("testDependencyRemovalWithMultipleEARModuleDependency"));
- return suite;
- }
-
- // bug 261555 switches us to use LTK refactoring- need to update the delete test cases
- public void _testDeleteEARWebModule() throws Exception {
- DependencyUtil.disableValidation();
-
- final IProject earProject = ProjectUtil.getProject("TestEAR");
- final IProject webProject = ProjectUtil.createWebProject("TestWeb", earProject.getName());
- String moduleURI = DependencyVerificationUtil.verifyEARDependency(earProject, webProject, true);
-
- ProjectUtil.deleteProject(webProject);
-
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject, webProject, moduleURI);
-
- DependencyUtil.enableValidation();
- }
-
- // bug 261555 switches us to use LTK refactoring- need to update the delete test cases
- public void _testDeleteEARWebModuleWithValidation() throws Exception {
- final IProject earProject = ProjectUtil.getProject("TestEAR");
- final IProject webProject = ProjectUtil.createWebProject("TestWeb", earProject.getName());
- String moduleURI = DependencyVerificationUtil.verifyEARDependency(earProject, webProject, true);
- ProjectUtil.deleteProject(webProject);
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject, webProject, moduleURI);
- }
-
- // bug 261555 switches us to use LTK refactoring- need to update the delete test cases
- public void _testDeleteEARUtilModule() throws Exception {
- final IProject earProject = ProjectUtil.getProject("TestEAR");
- final IProject utilProject = ProjectUtil.createUtilityProject("TestUtil", earProject.getName());
-
- DependencyVerificationUtil.verifyEARDependency(earProject, utilProject, false);
-
- ProjectUtil.deleteProject(utilProject);
-
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject, utilProject);
- }
-
- // bug 261555 switches us to use LTK refactoring- need to update the delete test cases
- public void _testDeleteEAREJBModule() throws Exception {
- final IProject earProject = ProjectUtil.getProject("TestEAR");
- final IProject ejbProject = ProjectUtil.createEJBProject("TestEJB", earProject.getName());
-
- final IProject ejbClientProject = ProjectUtil.getProject("TestEJBClient");
- String moduleURI = DependencyVerificationUtil.verifyEARDependency(earProject, ejbProject, true);
-
- DependencyVerificationUtil.verifyEARDependency(earProject, ejbClientProject, false);
- DependencyVerificationUtil.verifyModuleDependency(ejbProject, ejbClientProject);
-
- ProjectUtil.deleteProject(ejbProject);
- ProjectUtil.deleteProject(ejbClientProject);
-
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject, ejbProject, moduleURI);
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject, ejbClientProject);
- }
-
- public void testRenameEARWebModule() throws Exception {
- DependencyUtil.disableValidation();
-
- final IProject earProject = ProjectUtil.getProject("TestEAR");
- final IProject webProject = ProjectUtil.createWebProject("TestWeb", earProject.getName());
- String moduleURI = DependencyVerificationUtil.verifyEARDependency(earProject, webProject, true);
-
- final IProject newWeb = ProjectUtil.renameProject(webProject, "newWeb");
-
- DependencyVerificationUtil.verifyEARDependencyChanged(earProject, webProject, moduleURI, newWeb);
-
- DependencyUtil.enableValidation();
- }
-
- public void testRenameEARUtilModule() throws Exception {
- final IProject earProject = ProjectUtil.getProject("TestEAR");
- final IProject utilProject = ProjectUtil.createUtilityProject("TestUtil", earProject.getName());
-
- DependencyVerificationUtil.verifyEARDependency(earProject, utilProject, false);
-
- final IProject newUtil = ProjectUtil.renameProject(utilProject, "newUtil");
-
- DependencyVerificationUtil.verifyEARDependencyChanged(earProject, utilProject, newUtil);
- }
-
- public void testRenameEAREJBModule() throws Exception {
- final IProject earProject = ProjectUtil.getProject("TestEAR");
- final IProject ejbProject = ProjectUtil.createEJBProject("TestEJB", earProject.getName());
- final IProject ejbClientProject = ProjectUtil.getProject("TestEJBClient");
-
- String moduleURI = DependencyVerificationUtil.verifyEARDependency(earProject, ejbProject, true);
- DependencyVerificationUtil.verifyEARDependency(earProject, ejbClientProject, false);
-
- final IProject newEJB = ProjectUtil.renameProject(ejbProject, "newEJB");
-
- DependencyVerificationUtil.verifyEARDependencyChanged(earProject, ejbProject, moduleURI, newEJB);
- DependencyVerificationUtil.verifyModuleDependency(newEJB, ejbClientProject);
- }
-
- // bug 261555 switches us to use LTK refactoring- need to update the delete test cases
- public void _testMultipleEARWebDelete() throws Exception {
- DependencyUtil.disableValidation();
-
- final IProject earProject1 = ProjectUtil.getProject("TestEAR1");
- final IProject earProject2 = ProjectUtil.createEARProject("TestEAR2");
- final IProject webProject = ProjectUtil.createWebProject("TestWeb", earProject1.getName());
- DependencyCreationUtil.createEARDependency(earProject2, webProject);
-
- final String moduleURI1 = DependencyVerificationUtil.verifyEARDependency(earProject1, webProject, true);
- final String moduleURI2 = DependencyVerificationUtil.verifyEARDependency(earProject2, webProject, true);
-
- ProjectUtil.deleteProject(webProject);
-
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject1, webProject, moduleURI1);
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject2, webProject, moduleURI2);
-
- DependencyUtil.enableValidation();
- }
-
- public void testMultipleEARWebRename() throws Exception {
- DependencyUtil.disableValidation();
-
- final IProject earProject1 = ProjectUtil.getProject("TestEAR1");
- final IProject earProject2 = ProjectUtil.createEARProject("TestEAR2");
- final IProject webProject = ProjectUtil.createWebProject("TestWeb", earProject1.getName());
- DependencyCreationUtil.createEARDependency(earProject2, webProject);
-
- final String moduleURI1 = DependencyVerificationUtil.verifyEARDependency(earProject1, webProject, true);
- final String moduleURI2 = DependencyVerificationUtil.verifyEARDependency(earProject2, webProject, true);
-
- final IProject newWeb = ProjectUtil.renameProject(webProject, "newWeb");
-
- DependencyVerificationUtil.verifyEARDependencyChanged(earProject1, webProject, moduleURI1, newWeb);
- DependencyVerificationUtil.verifyEARDependencyChanged(earProject2, webProject, moduleURI2, newWeb);
-
- DependencyUtil.enableValidation();
- }
-
- // bug 261555 switches us to use LTK refactoring- need to update the delete test cases
- public void _testMultipleEARUtilDelete() throws Exception {
- final IProject earProject1 = ProjectUtil.getProject("TestEAR1");
- final IProject earProject2 = ProjectUtil.createEARProject("TestEAR2");
- final IProject utilProject = ProjectUtil.createUtilityProject("TestUtil", earProject1.getName());
- DependencyCreationUtil.createEARDependency(earProject2, utilProject);
- DependencyVerificationUtil.verifyEARDependency(earProject1, utilProject, false);
- DependencyVerificationUtil.verifyEARDependency(earProject2, utilProject, false);
- ProjectUtil.deleteProject(utilProject);
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject1, utilProject);
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject2, utilProject);
- }
-
- public void testMultipleEARUtilRename() throws Exception {
- final IProject earProject1 = ProjectUtil.getProject("TestEAR1");
- final IProject earProject2 = ProjectUtil.createEARProject("TestEAR2");
- final IProject utilProject = ProjectUtil.createUtilityProject("TestUtil", earProject1.getName());
- DependencyCreationUtil.createEARDependency(earProject2, utilProject);
- DependencyVerificationUtil.verifyEARDependency(earProject1, utilProject, false);
- DependencyVerificationUtil.verifyEARDependency(earProject2, utilProject, false);
-
- final IProject newUtil= ProjectUtil.renameProject(utilProject, "newUtil");
-
- DependencyVerificationUtil.verifyEARDependencyChanged(earProject1, utilProject, newUtil);
- DependencyVerificationUtil.verifyEARDependencyChanged(earProject2, utilProject, newUtil);
- }
-
- // bug 261555 switches us to use LTK refactoring- need to update the delete test cases
- public void _testDeleteWithEARModuleDependency() throws Exception {
- final IProject earProject = ProjectUtil.getProject("TestEAR");
- final IProject utilProject = ProjectUtil.createUtilityProject("TestUtil", earProject.getName());
- final IProject webProject = ProjectUtil.createWebProject("TestWeb", earProject.getName());
- DependencyCreationUtil.createModuleDependency(webProject, utilProject);
-
- DependencyVerificationUtil.verifyEARDependency(earProject, utilProject, false);
- DependencyVerificationUtil.verifyEARDependency(earProject, webProject, true);
- DependencyVerificationUtil.verifyModuleDependency(webProject, utilProject);
-
- ProjectUtil.deleteProject(utilProject);
-
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject, utilProject);
- DependencyVerificationUtil.verifyModuleDependencyRemoved(webProject, utilProject);
- DependencyVerificationUtil.verifyEARDependency(earProject, webProject, true);
- }
-
- public void testRenameWithMultipleEARModuleDependency() throws Exception {
- final IProject earProject1 = ProjectUtil.getProject("TestEAR1");
- final IProject earProject2 = ProjectUtil.createEARProject("TestEAR2");
- final IProject ejbProject = ProjectUtil.createEJBProject("TestEJB", earProject1.getName());
- DependencyCreationUtil.createEARDependency(earProject2, ejbProject);
- final IProject webProject1 = ProjectUtil.createWebProject("TestWeb1", earProject1.getName());
- final IProject webProject2 = ProjectUtil.createWebProject("TestWeb2", earProject2.getName());
- DependencyCreationUtil.createModuleDependency(webProject1, ejbProject);
- DependencyCreationUtil.createWebLibDependency(webProject2, ejbProject);
-
- final String moduleURI1 = DependencyVerificationUtil.verifyEARDependency(earProject1, ejbProject, true);
- final String moduleURI2 = DependencyVerificationUtil.verifyEARDependency(earProject2, ejbProject, true);
- DependencyVerificationUtil.verifyEARDependency(earProject1, webProject1, true);
- DependencyVerificationUtil.verifyEARDependency(earProject2, webProject2, true);
- DependencyVerificationUtil.verifyModuleDependency(webProject1, ejbProject);
- DependencyVerificationUtil.verifyWebLibDependency(webProject2, ejbProject);
-
- IProject newEJB = ProjectUtil.renameProject(ejbProject, "newEJB");
-
- DependencyVerificationUtil.verifyEARDependencyChanged(earProject1, ejbProject, moduleURI1, newEJB);
- DependencyVerificationUtil.verifyEARDependencyChanged(earProject2, ejbProject, moduleURI2, newEJB);
- DependencyVerificationUtil.verifyModuleDependencyChanged(webProject1, ejbProject, newEJB);
- DependencyVerificationUtil.verifyWebLibDependencyChanged(webProject2, ejbProject, newEJB);
- }
-
- /* XXX only works through the UI right now
- public void testDependencyRemovalWithMultipleEARModuleDependency() throws Exception {
- final IProject earProject1 = ProjectUtil.getProject("TestEAR1");
- final IProject earProject2 = ProjectUtil.createEARProject("TestEAR2");
- final IProject utilProject = ProjectUtil.createUtilityProject("TestUtil", earProject1.getName());
- DependencyCreationUtil.createEARDependency(earProject2, utilProject);
- final IProject webProject1 = ProjectUtil.createWebProject("TestWeb1", earProject1.getName());
- final IProject webProject2 = ProjectUtil.createWebProject("TestWeb2", earProject2.getName());
- DependencyCreationUtil.createModuleDependency(webProject1, utilProject);
- DependencyCreationUtil.createModuleDependency(webProject2, utilProject);
-
- // verify all of the dependencies
- DependencyVerificationUtil.verifyEARDependency(earProject1, utilProject, false);
- DependencyVerificationUtil.verifyEARDependency(earProject2, utilProject, false);
- DependencyVerificationUtil.verifyEARDependency(earProject1, webProject1, true);
- DependencyVerificationUtil.verifyEARDependency(earProject2, webProject2, true);
- DependencyVerificationUtil.verifyModuleDependency(webProject1, utilProject);
- DependencyVerificationUtil.verifyModuleDependency(webProject2, utilProject);
-
- // remove the dependency between the util and just EAR1
- DependencyCreationUtil.removeEARDependency(earProject1, utilProject);
-
- // verify the changed dependencies
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject1, utilProject);
- DependencyVerificationUtil.verifyModuleDependencyRemoved(webProject1, utilProject);
-
- // verify the dependencies that should be unchanged
- DependencyVerificationUtil.verifyEARDependency(earProject1, webProject1, true);
- DependencyVerificationUtil.verifyEARDependency(earProject2, webProject2, true);
- DependencyVerificationUtil.verifyEARDependency(earProject2, utilProject, false);
- DependencyVerificationUtil.verifyWebLibDependency(webProject2, utilProject);
- }
- */
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectModuleRefactoringTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectModuleRefactoringTests.java
deleted file mode 100644
index 7dc8fd92..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectModuleRefactoringTests.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.dependency.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyCreationUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyVerificationUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-
-/**
- * Tests the refactoring logic that handles rename/delete refactoring of projects that
- * participate in inter-module dependencies.
- */
-public class ProjectModuleRefactoringTests extends AbstractTests {
-
- public ProjectModuleRefactoringTests(String name) {
- super(name);
- }
-
- public static Test suite(){
- final TestSuite suite = new TestSuite();
- suite.setName("Project Module Dependency Refactoring Tests" );
- suite.addTest(new ProjectModuleRefactoringTests("testDeleteModuleDependency"));
- suite.addTest(new ProjectModuleRefactoringTests("testRenameModuleDependency"));
- suite.addTest(new ProjectModuleRefactoringTests("testDeleteModuleDependencyWithMarker"));
- suite.addTest(new ProjectModuleRefactoringTests("testRenameModuleDependencyWithMarker"));
- suite.addTest(new ProjectModuleRefactoringTests("testDeleteMultipleDependency"));
- suite.addTest(new ProjectModuleRefactoringTests("testRenameMultipleModuleDependency"));
- return suite;
- }
-
- public void testDeleteModuleDependency() throws Exception {
- final IProject[] projects = setupModuleDependency();
- final IProject earProject = projects[0];
- final IProject webProject = projects[1];
- final IProject utilProject = projects[2];
-
- ProjectUtil.deleteProject(utilProject);
-
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject, utilProject);
- DependencyVerificationUtil.verifyModuleDependencyRemoved(webProject, utilProject);
- }
-
- public void testDeleteModuleDependencyWithMarker() throws Exception {
- final IProject[] projects = setupModuleDependency();
- final IProject earProject = projects[0];
- final IProject webProject = projects[1];
- final IProject utilProject = projects[2];
-
- // add a marker
- utilProject.createMarker("TEST_MARKER");
-
- ProjectUtil.deleteProject(utilProject);
-
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject, utilProject);
- DependencyVerificationUtil.verifyModuleDependencyRemoved(webProject, utilProject);
- }
-
- public void testRenameModuleDependency() throws Exception {
- final IProject[] projects = setupModuleDependency();
- final IProject earProject = projects[0];
- final IProject webProject = projects[1];
- final IProject utilProject = projects[2];
-
- final IProject newUtil = ProjectUtil.renameProject(utilProject, "newUtil");
-
- DependencyVerificationUtil.verifyEARDependencyChanged(earProject, utilProject, newUtil);
- DependencyVerificationUtil.verifyModuleDependencyChanged(webProject, utilProject, newUtil);
- }
-
- public void testRenameModuleDependencyWithMarker() throws Exception {
- final IProject[] projects = setupModuleDependency();
- final IProject earProject = projects[0];
- final IProject webProject = projects[1];
- final IProject utilProject = projects[2];
-
- // add a marker
- utilProject.createMarker("TEST_MARKER");
-
- final IProject newUtil = ProjectUtil.renameProject(utilProject, "newUtil");
-
- DependencyVerificationUtil.verifyEARDependencyChanged(earProject, utilProject, newUtil);
- DependencyVerificationUtil.verifyModuleDependencyChanged(webProject, utilProject, newUtil);
- }
-
- public void testDeleteMultipleDependency() throws Exception {
- final IProject[] projects = setupMultipleDependency();
- final IProject earProject1 = projects[0];
- final IProject earProject2 = projects[1];
- final IProject webProject = projects[2];
- final IProject ejbProject = projects[3];
- final IProject utilProject = projects[4];
-
- ProjectUtil.deleteProject(utilProject);
-
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject1, utilProject);
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject2, utilProject);
- DependencyVerificationUtil.verifyModuleDependencyRemoved(webProject, utilProject);
- DependencyVerificationUtil.verifyModuleDependencyRemoved(ejbProject, utilProject);
- }
-
- public void testRenameMultipleModuleDependency() throws Exception {
- final IProject[] projects = setupMultipleDependency();
- final IProject earProject1 = projects[0];
- final IProject earProject2 = projects[1];
- final IProject webProject = projects[2];
- final IProject ejbProject = projects[3];
- final IProject utilProject = projects[4];
-
- final IProject newUtil = ProjectUtil.renameProject(utilProject, "newUtil");
-
- DependencyVerificationUtil.verifyEARDependencyChanged(earProject1, utilProject, newUtil);
- DependencyVerificationUtil.verifyEARDependencyChanged(earProject2, utilProject, newUtil);
- DependencyVerificationUtil.verifyModuleDependencyChanged(webProject, utilProject, newUtil);
- DependencyVerificationUtil.verifyModuleDependencyChanged(ejbProject, utilProject, newUtil);
- }
-
- private static IProject[] setupModuleDependency() throws Exception {
- final IProject earProject = ProjectUtil.getProject("TestEAR");
- final IProject utilProject = ProjectUtil.createUtilityProject("TestUtil", earProject.getName());
- final IProject webProject = ProjectUtil.createWebProject("TestWeb", earProject.getName());
- DependencyCreationUtil.createModuleDependency(webProject, utilProject);
- DependencyVerificationUtil.verifyEARDependency(earProject, utilProject, false);
- DependencyVerificationUtil.verifyEARDependency(earProject, webProject, true);
- DependencyVerificationUtil.verifyModuleDependency(webProject, utilProject);
- return new IProject[] {earProject, webProject, utilProject};
- }
-
- private static IProject[] setupMultipleDependency() throws Exception {
- // create the projects
- final IProject earProject1 = ProjectUtil.getProject("TestEAR1");
- final IProject earProject2 = ProjectUtil.createEARProject("TestEAR2");
- final IProject utilProject = ProjectUtil.createUtilityProject("TestUtil", earProject1.getName());
-
- // create the dependencies
- DependencyCreationUtil.createEARDependency(earProject2, utilProject);
- final IProject webProject = ProjectUtil.createWebProject("TestWeb", earProject1.getName());
- final IProject ejbProject = ProjectUtil.createEJBProject("TestEJB", earProject2.getName());
- final IProject ejbClientProject = ProjectUtil.getProject("TestEJBClient");
- DependencyCreationUtil.createModuleDependency(webProject, utilProject);
- DependencyCreationUtil.createModuleDependency(ejbProject, utilProject);
-
- // verify the dependencies
- DependencyVerificationUtil.verifyEARDependency(earProject1, utilProject, false);
- DependencyVerificationUtil.verifyEARDependency(earProject1, webProject, true);
- DependencyVerificationUtil.verifyEARDependency(earProject2, utilProject, false);
- DependencyVerificationUtil.verifyEARDependency(earProject2, ejbProject, true);
- DependencyVerificationUtil.verifyEARDependency(earProject2, ejbClientProject, false);
- DependencyVerificationUtil.verifyModuleDependency(webProject, utilProject);
- DependencyVerificationUtil.verifyModuleDependency(ejbProject, utilProject);
-
- return new IProject[] {earProject1, earProject2, webProject, ejbProject, utilProject};
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectServerRefactoringTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectServerRefactoringTests.java
deleted file mode 100644
index b9fa0c12..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectServerRefactoringTests.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.dependency.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Tests refactoring logic that updates server instances when associated modules are
- * renamed or deleted.
- */
-public class ProjectServerRefactoringTests extends AbstractTests {
-
- public ProjectServerRefactoringTests(String name) {
- super(name);
- }
-
- public static Test suite(){
- final TestSuite suite = new TestSuite();
- suite.setName("Project Server Refactoring Tests" );
- //suite.addTest(new ProjectServerRefactoringTests("testEARWebDependency"));
- return suite;
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectWebLibRefactoringTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectWebLibRefactoringTests.java
deleted file mode 100644
index fe6c1657..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/ProjectWebLibRefactoringTests.java
+++ /dev/null
@@ -1,133 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.dependency.tests;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyCreationUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.DependencyVerificationUtil;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * Tests the refactoring logic that handles rename/delete refactoring of projects that
- * participate in web-inf/lib module dependencies.
- */
-public class ProjectWebLibRefactoringTests extends AbstractTests {
-
- public ProjectWebLibRefactoringTests(String name) {
- super(name);
- }
-
- public static Test suite(){
- final TestSuite suite = new TestSuite();
- suite.setName("Project WEB-INF/lib Dependency Refactoring Tests" );
- suite.addTest(new ProjectWebLibRefactoringTests("testDeleteWebLibDependency"));
- suite.addTest(new ProjectWebLibRefactoringTests("testRenameWebLibDependency"));
- suite.addTest(new ProjectWebLibRefactoringTests("testDeleteMultipleDependency"));
- suite.addTest(new ProjectWebLibRefactoringTests("testRenameMultipleModuleDependency"));
- return suite;
- }
-
- public void testDeleteWebLibDependency() throws Exception {
- final IProject[] projects = setupWebLibDependency();
- final IProject earProject = projects[0];
- final IProject webProject = projects[1];
- final IProject utilProject = projects[2];
-
- ProjectUtil.deleteProject(utilProject);
-
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject, utilProject);
- DependencyVerificationUtil.verifyWebLibDependencyRemoved(webProject, utilProject);
- }
-
- public void testRenameWebLibDependency() throws Exception {
- final IProject[] projects = setupWebLibDependency();
- final IProject earProject = projects[0];
- final IProject webProject = projects[1];
- final IProject utilProject = projects[2];
-
- final IProject newUtil = ProjectUtil.renameProject(utilProject, "newUtil");
-
- DependencyVerificationUtil.verifyEARDependencyChanged(earProject, utilProject, newUtil);
- DependencyVerificationUtil.verifyWebLibDependencyChanged(webProject, utilProject, newUtil);
- }
-
- public void testDeleteMultipleDependency() throws Exception {
- final IProject[] projects = setupMultipleDependency();
- final IProject earProject1 = projects[0];
- final IProject earProject2 = projects[1];
- final IProject webProject1 = projects[2];
- final IProject webProject2 = projects[3];
- final IProject utilProject = projects[4];
-
- ProjectUtil.deleteProject(utilProject);
-
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject1, utilProject);
- DependencyVerificationUtil.verifyEARDependencyRemoved(earProject2, utilProject);
- DependencyVerificationUtil.verifyWebLibDependencyRemoved(webProject1, utilProject);
- DependencyVerificationUtil.verifyWebLibDependencyRemoved(webProject2, utilProject);
- }
-
- public void testRenameMultipleModuleDependency() throws Exception {
- final IProject[] projects = setupMultipleDependency();
- final IProject earProject1 = projects[0];
- final IProject earProject2 = projects[1];
- final IProject webProject1 = projects[2];
- final IProject webProject2 = projects[3];
- final IProject utilProject = projects[4];
-
- final IProject newUtil = ProjectUtil.renameProject(utilProject, "newUtil");
-
- DependencyVerificationUtil.verifyEARDependencyChanged(earProject1, utilProject, newUtil);
- DependencyVerificationUtil.verifyEARDependencyChanged(earProject2, utilProject, newUtil);
- DependencyVerificationUtil.verifyWebLibDependencyChanged(webProject1, utilProject, newUtil);
- DependencyVerificationUtil.verifyWebLibDependencyChanged(webProject2, utilProject, newUtil);
- }
-
- private static IProject[] setupWebLibDependency() throws Exception {
- final IProject earProject = ProjectUtil.getProject("TestEAR");
- final IProject utilProject = ProjectUtil.createUtilityProject("TestUtil", earProject.getName());
- final IProject webProject = ProjectUtil.createWebProject("TestWeb", earProject.getName());
- DependencyCreationUtil.createWebLibDependency(webProject, utilProject);
- DependencyVerificationUtil.verifyEARDependency(earProject, utilProject, false);
- DependencyVerificationUtil.verifyEARDependency(earProject, webProject, true);
- DependencyVerificationUtil.verifyWebLibDependency(webProject, utilProject);
- return new IProject[] {earProject, webProject, utilProject};
- }
-
- private static IProject[] setupMultipleDependency() throws Exception {
- // create the projects
- final IProject earProject1 = ProjectUtil.getProject("TestEAR1");
- final IProject earProject2 = ProjectUtil.createEARProject("TestEAR2");
- final IProject utilProject = ProjectUtil.createUtilityProject("TestUtil", earProject1.getName());
-
- // create the dependencies
- DependencyCreationUtil.createEARDependency(earProject2, utilProject);
- final IProject webProject1 = ProjectUtil.createWebProject("TestWeb1", earProject1.getName());
- final IProject webProject2 = ProjectUtil.createWebProject("TestWeb2", earProject2.getName());
-
- DependencyCreationUtil.createWebLibDependency(webProject1, utilProject);
- DependencyCreationUtil.createWebLibDependency(webProject2, utilProject);
-
- // verify the dependencies
- DependencyVerificationUtil.verifyEARDependency(earProject1, utilProject, false);
- DependencyVerificationUtil.verifyEARDependency(earProject1, webProject1, true);
- DependencyVerificationUtil.verifyEARDependency(earProject2, utilProject, false);
- DependencyVerificationUtil.verifyEARDependency(earProject2, webProject2, true);
- DependencyVerificationUtil.verifyWebLibDependency(webProject1, utilProject);
- DependencyVerificationUtil.verifyWebLibDependency(webProject2, utilProject);
-
- return new IProject[] {earProject1, earProject2, webProject1, webProject2, utilProject};
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/DependencyCreationUtil.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/DependencyCreationUtil.java
deleted file mode 100644
index 94259960..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/DependencyCreationUtil.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.dependency.tests.util;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.jar.Manifest;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.application.internal.operations.AddComponentToEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.RemoveComponentFromEnterpriseApplicationDataModelProvider;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProperties;
-import org.eclipse.jst.j2ee.application.internal.operations.UpdateManifestDataModelProvider;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifestImpl;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.operation.CreateReferenceComponentsDataModelProvider;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * Test utility class that programmatically creates J2EE dependencies.
- */
-public class DependencyCreationUtil {
-
- public static void createEARDependency(final IProject earProject, final IProject childProject) throws ExecutionException {
- createEARDependency(earProject, childProject, false);
- }
-
- public static void createEARDependency(final IProject earProject, final IProject childProject, final boolean inLibDir) throws ExecutionException {
- final IDataModel dm = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
- IVirtualComponent earComp = ComponentCore.createComponent(earProject);
- IVirtualComponent childComp = ComponentCore.createComponent(childProject);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
- final List depList = new ArrayList();
- depList.add(childComp);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, depList);
- if (inLibDir) {
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, J2EEConstants.EAR_DEFAULT_LIB_DIR); //$NON-NLS-1$
- } else {
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, J2EEConstants.EAR_ROOT_DIR); //$NON-NLS-1$
- Map modDeployPathMap = (Map) dm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH_MAP);
- modDeployPathMap.put(childComp, J2EEConstants.EAR_ROOT_DIR);
- }
- dm.getDefaultOperation().execute(null, null);
- ProjectUtil.waitForClasspathUpdate();
- }
-
- public static void removeEARDependency(final IProject earProject, final IProject childProject) throws ExecutionException {
- final IDataModel dm = DataModelFactory.createDataModel(new RemoveComponentFromEnterpriseApplicationDataModelProvider());
- IVirtualComponent earComp = ComponentCore.createComponent(earProject);
- IVirtualComponent childComp = ComponentCore.createComponent(childProject);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComp);
- final List depList = new ArrayList();
- depList.add(childComp);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, depList);
- dm.getDefaultOperation().execute(null, null);
- ProjectUtil.waitForClasspathUpdate();
- }
-
- public static void createModuleDependency(final IProject source, final IProject target) throws ExecutionException, CoreException, IOException {
- createProjectDependency(source, target, false);
- }
-
- public static void createWebLibDependency(final IProject source, final IProject target) throws ExecutionException, CoreException, IOException {
- createProjectDependency(source, target, true);
- }
-
- private static void createProjectDependency(final IProject source, final IProject target, final boolean webLibDep) throws ExecutionException, CoreException, IOException {
- IVirtualComponent sourceComp = ComponentCore.createComponent(source);
- IVirtualComponent targetComp = ComponentCore.createComponent(target);
- if (webLibDep) {
- // add component and project refs
- final IDataModel refdm = DataModelFactory.createDataModel(new CreateReferenceComponentsDataModelProvider());
- final List targetCompList = (List) refdm.getProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST);
- targetCompList.add(targetComp);
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, sourceComp);
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, targetCompList);
- refdm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH,"/WEB-INF/lib"); //$NON-NLS-1$
- refdm.getDefaultOperation().execute(null, null);
- } else {
- // just add a manifest ref
- final IVirtualComponent dependentComp = sourceComp;
- final String dependentProjName = source.getName();
- final String refactoredProjName = target.getName();
- final IVirtualFile vf = dependentComp.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI) );
- final IFile manifestmf = vf.getUnderlyingFile();
- final IProgressMonitor monitor = new NullProgressMonitor();
- final IDataModel updateManifestDataModel = DataModelFactory.createDataModel(new UpdateManifestDataModelProvider());
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.PROJECT_NAME, dependentProjName);
- updateManifestDataModel.setBooleanProperty(UpdateManifestDataModelProperties.MERGE, false);
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.MANIFEST_FILE, manifestmf);
- final ArchiveManifest manifest = getArchiveManifest(manifestmf);
- String[] cp = manifest.getClassPathTokenized();
- List cpList = new ArrayList();
- String newCp = refactoredProjName + ".jar";//$NON-NLS-1$
- for (int i = 0; i < cp.length; i++) {
- if (!cp[i].equals(newCp)) {
- cpList.add(cp[i]);
- }
- }
- cpList.add(newCp);
- updateManifestDataModel.setProperty(UpdateManifestDataModelProperties.JAR_LIST, cpList);
- updateManifestDataModel.getDefaultOperation().execute(monitor, null );
- }
- ProjectUtil.waitForClasspathUpdate();
- }
-
- public static ArchiveManifest getArchiveManifest(final IFile manifestFile) throws CoreException, IOException {
- InputStream in = null;
- try {
- in = manifestFile.getContents();
- ArchiveManifest mf = new ArchiveManifestImpl(new Manifest(in));
- return mf;
- } finally {
- if (in != null) {
- try {
- in.close();
- } catch (IOException weTried) {
- //Ignore
- }
- }
- }
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/DependencyUtil.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/DependencyUtil.java
deleted file mode 100644
index 4ca171b3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/DependencyUtil.java
+++ /dev/null
@@ -1,272 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.dependency.tests.util;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.core.runtime.jobs.IJobManager;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.refactor.listeners.J2EEElementChangedListener;
-import org.eclipse.jst.j2ee.refactor.listeners.ProjectRefactoringListener;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFolder;
-import org.eclipse.wst.common.tests.OperationTestCase;
-import org.eclipse.wst.common.tests.ProjectUtility;
-import org.eclipse.wst.validation.internal.ConfigurationManager;
-import org.eclipse.wst.validation.internal.GlobalConfiguration;
-import org.eclipse.wst.validation.internal.ValidatorMetaData;
-
-/**
- * Various utility methods.
- */
-public class DependencyUtil {
-
- public static final IWorkspace ws = ResourcesPlugin.getWorkspace();
-
- /**
- * Retrieves a unique name.
- * @param prefix
- * @return
- */
- public static String getUniqueName(final String prefix) {
- return prefix + System.currentTimeMillis();
- }
-
- public static void waitForValidationJobs() {
- // Wait for all validation jobs to end
- final IJobManager jobMgr = Platform.getJobManager();
- IProject[] projects = ProjectUtility.getAllProjects();
- for (int i = 0; i < projects.length; i++) {
- final IProject p = projects[i];
- waitForValidationJobs(p);
- }
- }
-
- public static void waitForValidationJobs(final IProject project) {
- // Wait for all validation jobs to end
- final IJobManager jobMgr = Platform.getJobManager();
- final String family = project.getName() + OperationTestCase.VALIDATOR_JOB_FAMILY;
- waitForJobs(family);
- }
-
- public static void waitForProjectRefactoringJobs() {
- waitForJobs(ProjectRefactoringListener.PROJECT_REFACTORING_JOB_FAMILY);
- }
-
- public static void waitForComponentRefactoringJobs() {
- waitForJobs(J2EEElementChangedListener.PROJECT_COMPONENT_UPDATE_JOB_FAMILY);
- }
-
- /**
- * Waits for jobs in the specified family
- * @param family
- */
- public static void waitForJobs(final String family) {
- final IJobManager jobMgr = Platform.getJobManager();
- for (int i = 0; i < 1000; i++) {
- final Job[] jobs = jobMgr.find(family);
- if (jobs.length > 0) {
- try {
- jobMgr.join(family, null);
- } catch (InterruptedException ie) {
- // make one last check for jobs before exiting
- i = 999;
- continue;
- }
- break;
- }
- try {
- Thread.sleep(10);
- } catch (InterruptedException ie) {
- }
- }
- }
-
- /**
- * Disables all validators (if this is not done, getting error deleting/renaming projects
- * because one of the validators is holding onto web.xml)
- */
- public static void disableValidation() throws InvocationTargetException {
- disableValidation(true);
- }
-
- public static void enableValidation() throws InvocationTargetException {
- disableValidation(false);
- }
-
- private static void disableValidation(final boolean disabled) throws InvocationTargetException {
- final GlobalConfiguration config = new GlobalConfiguration(ConfigurationManager.getManager().getGlobalConfiguration());
- config.setDisableAllValidation(disabled);
- config.passivate();
- config.store();
- }
-
- /**
- * Disables all validators except the specified validator
- * @param project Project on which to disable the validator. Cannot be null.
- * @param validatorToLeaveEnabled Name of the validator to leave enabled
- * @throws CoreException Thrown if an error is encountered disabling the validator.
- */
- public static void disableValidation(final String validatorToLeaveEnabled) throws InvocationTargetException {
- final GlobalConfiguration config = new GlobalConfiguration(ConfigurationManager.getManager().getGlobalConfiguration());
- final List listVmd = new ArrayList();
- ValidatorMetaData[] enabledValidators = config.getEnabledValidators();
-
- // filter out validators to disable
- boolean disabledSomeValidators = false;
- for (int i = 0; i < enabledValidators.length; i++) {
- final String uniqueName = enabledValidators[i].getValidatorUniqueName();
- if (uniqueName.equals(validatorToLeaveEnabled)) {
- listVmd.add(enabledValidators[i]);
- } else {
- disabledSomeValidators = true;
- }
- }
-
- if (disabledSomeValidators) {
- config.setEnabledValidators((ValidatorMetaData[]) listVmd.toArray(new ValidatorMetaData[0]));
- config.passivate();
- config.store();
- }
- }
-
- /**
- * Adds a Java source path
- * @param path project relative path.
- * @throws CoreException
- */
- public static boolean addJavaSrcPath(final IProject project, final IPath path) throws CoreException {
- final IFolder folder = project.getFolder(path);
- if (!folder.exists()) {
- folder.create(true, true, null);
- }
- final IJavaProject jProject = JavaCore.create(project);
- final IPath absolutePath = project.getFullPath().append(path);
- final IClasspathEntry entry = JavaCore.newSourceEntry(absolutePath);
- IClasspathEntry[] cp = jProject.getRawClasspath();
- final List cpList = new ArrayList();
- boolean hasEntry = false;
- for (int i = 0; i < cp.length; i++) {
- final IClasspathEntry cpe = cp[i];
- if (cpe.getEntryKind() == IClasspathEntry.CPE_SOURCE) {
- if (cpe.getPath().equals(absolutePath)) {
- hasEntry = true;
- break;
- }
- }
- cpList.add(cp[i]);
- }
- if (!hasEntry) {
- cpList.add(entry);
- cp = (IClasspathEntry[]) cpList.toArray(new IClasspathEntry[cpList.size()]);
- jProject.setRawClasspath(cp, null);
- waitForComponentRefactoringJobs();
- return true;
- }
- return false;
- }
-
- /**
- * Adds a Java source path
- * @param path project relative path.
- * @throws CoreException
- */
- public static boolean removeJavaSrcPath(final IProject project, final IPath path) throws CoreException {
- final IJavaProject jProject = JavaCore.create(project);
- final IPath absolutePath = project.getFullPath().append(path);
- IClasspathEntry[] cp = jProject.getRawClasspath();
- final List cpList = new ArrayList();
- boolean removedEntry = false;
- for (int i = 0; i < cp.length; i++) {
- final IClasspathEntry cpe = cp[i];
- if (cpe.getEntryKind() != IClasspathEntry.CPE_SOURCE
- || !cpe.getPath().equals(absolutePath)) {
- cpList.add(cp[i]);
- } else {
- removedEntry = true;
- }
- }
- if (removedEntry) {
- cp = (IClasspathEntry[]) cpList.toArray(new IClasspathEntry[cpList.size()]);
- jProject.setRawClasspath(cp, null);
- waitForComponentRefactoringJobs();
- return true;
- }
- return false;
- }
-
- /**
- * Verifies the existence (or absence) of the specified component path mapping.
- * @param project
- * @param projectPath
- * @param runtimePath
- * @param exists
- * @throws CoreException
- */
- public static void verifyComponentMapping(final IProject project, final IPath projectPath, final boolean exists) throws CoreException {
- IPath runtimePath = Path.ROOT;
- if (JavaEEProjectUtilities.isDynamicWebProject(project)) {
- // web projects map to WEB-INF/classes
- runtimePath = new Path(J2EEConstants.WEB_INF_CLASSES);
- }
- verifyComponentMapping(project, projectPath, runtimePath, exists);
-
- }
-
- /**
- * Verifies the existence (or absence) of the specified component path mapping.
- * @param project
- * @param projectPath
- * @param runtimePath
- * @param exists
- * @throws CoreException
- */
- public static void verifyComponentMapping(final IProject project, final IPath projectPath, final IPath runtimePath, final boolean exists) throws CoreException {
- final IVirtualComponent c = ComponentCore.createComponent(project);
- c.create(0, null);
- IVirtualFolder dest = c.getRootFolder();
- if (!runtimePath.equals(Path.ROOT)) {
- dest = dest.getFolder(runtimePath);
- }
- IContainer[] mappedFolders = dest.getUnderlyingFolders();
- boolean hasMapping = false;
- for (int i = 0; i < mappedFolders.length; i++) {
- if (mappedFolders[i].getProjectRelativePath().equals(projectPath)) {
- hasMapping = true;
- break;
- }
- }
- if (exists) {
- Assert.assertTrue("Component mapping from " + projectPath + " to " + dest.toString() + " missing", hasMapping);
- } else {
- Assert.assertFalse("Component mapping from " + projectPath + " to " + dest.toString() + " should not exist", hasMapping);
- }
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/DependencyVerificationUtil.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/DependencyVerificationUtil.java
deleted file mode 100644
index d6b7159e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/DependencyVerificationUtil.java
+++ /dev/null
@@ -1,330 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.dependency.tests.util;
-
-import java.io.IOException;
-import java.util.Set;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.commonarchivecore.internal.helpers.ArchiveManifest;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.jst.j2ee.internal.J2EEConstants;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.project.EarUtilities;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.builder.IDependencyGraph;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualFile;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-
-/**
- * Test utility class that programmatically verifies J2EE dependencies.
- */
-public class DependencyVerificationUtil {
-
- public static final IPath WEB_INF_LIB = new Path("/WEB-INF/lib"); //$NON-NLS-1$
- public static final IPath ROOT = new Path("/"); //$NON-NLS-1$
-
- /**
- * Verifies the presence (or lack) of dependency between two projects as defined by the
- * DependencyManager.
- * @param source Source project
- * @param target Target project
- * @param hasDep True if a dependency should exist; false if not.
- * @throws Exception
- */
- public static void verifyDependency(final IProject source, final IProject target, final boolean hasDep) {
- Set<IProject> referencingComponents = IDependencyGraph.INSTANCE.getReferencingComponents(target);
- boolean dep = false;
- for (IProject project: referencingComponents) {
- if (project.equals(source)) {
- dep= true;
- break;
- }
- }
- if (hasDep) {
- Assert.assertTrue("DependencyGraphManager does not report dependency between " + source + " and " + target, dep);
- } else {
- Assert.assertFalse("DependencyGraphManager incorrectly reporting dependency between " + source + " and " + target, dep);
- }
- }
-
- /**
- * Verifies the presence (or lack) of a component reference between two projects.
- * @param source Source project
- * @param target Target project
- * @param runtimePath Runtime path of target project; null to not check path.
- * @param hasRef True if a component reference should exist; false if not.
- * @throws Exception
- */
- public static void verifyComponentReference(final IProject source, final IProject target, final IPath runtimePath, final boolean hasRef) {
- IVirtualComponent sourceComp = ComponentCore.createComponent(source);
- IVirtualReference[] refs = sourceComp.getReferences();
- boolean ref = false;
- for (int i = 0; i < refs.length; i++) {
- if (refs[i].getReferencedComponent().getProject().equals(target)) {
- if (runtimePath == null || refs[i].getRuntimePath().equals(runtimePath)) {
- ref = true;
- break;
- }
- }
- }
- if (hasRef) {
- Assert.assertTrue("Source project " + source + " missing component reference to " + target, ref);
- } else {
- Assert.assertFalse("Source project " + source + " still has component reference to " + target, ref);
- }
- }
-
- /**
- * Verifies the presence (or lack) or a static project reference between two projects.
- * @param source Source project.
- * @param target Target project.
- * @param hasRef True if a project reference should exist; false if not.
- * @throws Exception
- */
- public static void verifyProjectReference(final IProject source, final IProject target, final boolean hasRef) throws CoreException {
- final IProjectDescription desc = source.getDescription();
- IProject[] refs = desc.getReferencedProjects();
- boolean ref = false;
- for (int i = 0; i < refs.length; i++) {
- if (refs[i].equals(target)) {
- ref = true;
- break;
- }
- }
- if (hasRef) {
- Assert.assertTrue("Source project " + source + " missing project reference to " + target, ref);
- } else {
- Assert.assertFalse("Source project " + source + " still has project reference to " + target, ref);
- }
- }
-
- /**
- * Verifies the presence (or lack) of the specified MANIFEST.MF entry.
- * @param source Source project
- * @param entry Manifest entry.
- * @param hasEntry True if the entry should exist, false if not.
- * @throws Exception
- */
- public static void verifyManifestReference(final IProject source, final String entry, final boolean hasEntry) throws CoreException, IOException {
- final IVirtualComponent sourceComp = ComponentCore.createComponent(source);
- final IVirtualFile vf = sourceComp.getRootFolder().getFile(new Path(J2EEConstants.MANIFEST_URI) );
- final IFile manifestmf = vf.getUnderlyingFile();
- final ArchiveManifest manifest = DependencyCreationUtil.getArchiveManifest(manifestmf);
- String[] cp = manifest.getClassPathTokenized();
- boolean hasManifestRef = false;
- for (int i = 0; i < cp.length; i++) {
- if (cp[i].equals(entry)) {
- hasManifestRef = true;
- }
- }
- if (hasEntry) {
- Assert.assertTrue("Source project " + source + " missing MANIFEST.MF entry " + entry, hasManifestRef);
- } else {
- Assert.assertFalse("Source project " + source + " still has MANIFEST.MF entry " + entry, hasManifestRef);
- }
- }
-
- /**
- * Verifies the presence of an application.xml reference in the specified EAR project for the
- * specified module project.
- * @param earProject The EAR project.
- * @param moduleProject The module project.
- * @param moduleURI Ignored unless hasRef is false.
- * @param hasRef True if there should be a ref, false if not
- * @return Computed module URI or null if one was passed in.
- * @throws Exception
- */
- public static String verifyApplicationXMLReference(final IProject earProject, final IProject moduleProject, final String moduleURI, final boolean hasRef) throws CoreException {
- EARArtifactEdit earEdit = null;
- try {
- earEdit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
- Assert.assertTrue(earEdit != null);
- Application application = earEdit.getApplication();
- if (hasRef) {
- IVirtualComponent moduleComp = ComponentCore.createComponent(moduleProject);
- String computedURI = earEdit.getModuleURI(moduleComp);
- Assert.assertTrue("EAR's application.xml missing module element for " + moduleURI,
- application.getFirstModule(computedURI) != null);
- return computedURI;
- } else {
- Module module = application.getFirstModule(moduleURI);
- Assert.assertTrue("EAR's application.xml should not have a module element for " + moduleURI,
- module == null);
- }
- } finally {
- if (earEdit != null)
- earEdit.dispose();
- }
- return null;
- }
-
- public static void waitForClasspathUpdate() {
- Job [] jobs = Job.getJobManager().find(J2EEComponentClasspathUpdater.MODULE_UPDATE_JOB_NAME);
- if(jobs.length > 0){
- try {
- for (int i = 0; i < jobs.length; i++){
- if(jobs[i].getName().equals(J2EEComponentClasspathUpdater.MODULE_UPDATE_JOB_NAME))
- jobs[i].join();
- }
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }
-
- /**
- * Verifies that the specified target project is visible (or not visible) to the source project via the Java build path
- * @param source Source project.
- * @param target Target project.
- * @param hasRef True if the target project should be on the resolved classpath, false if not.
- * @throws Exception
- */
- public static void verifyClasspathReference(final IProject source, final IProject target, final boolean hasRef) throws CoreException {
- waitForClasspathUpdate();
- boolean onClasspath = hasClasspathReference(source, target);
- if (hasRef) {
- Assert.assertTrue("Project " + target + " missing from resolved classpath of project " + source, onClasspath);
- } else {
- Assert.assertFalse("Project " + target + " should not be on resolved classpath of project " + source, onClasspath);
- }
- }
-
- public static boolean hasClasspathReference(final IProject source, final IProject target) throws CoreException {
- IJavaProject javaProject = JavaCore.create(source);
- IClasspathEntry[] cp = javaProject.getResolvedClasspath(true); // ignore unresolvable entries
- boolean onClasspath = false;
- for (int i = 0; i < cp.length; i++) {
- if (cp[i].getEntryKind() == IClasspathEntry.CPE_PROJECT
- && cp[i].getPath().equals(target.getFullPath())) {
- onClasspath= true;
- break;
- }
- }
- return onClasspath;
- }
-
-
- public static String verifyEARDependency(final IProject earProject, final IProject childProject, final boolean moduleRef) throws CoreException {
- // .project dep
- verifyProjectReference(earProject, childProject, true);
- // .component dep
-
- IPath runtimePath = ROOT;
- if(EarUtilities.isJEEComponent(ComponentCore.createComponent(earProject)) && JavaEEProjectUtilities.isUtilityProject(childProject)){
- runtimePath = new Path("/lib");
- }
-
- verifyComponentReference(earProject, childProject, runtimePath, true);
- // application.xml ref
- String moduleURI = null;
- if (moduleRef) {
- moduleURI = verifyApplicationXMLReference(earProject, childProject, null, true);
- }
- // DependencyGraphManager
- verifyDependency(earProject, childProject, true);
-
- return moduleURI;
- }
-
- public static void verifyEARDependencyChanged(final IProject earProject, final IProject oldChildProject, final IProject newChildProject) throws CoreException {
- verifyEARDependencyChanged(earProject, oldChildProject, null, newChildProject);
- }
-
- public static void verifyEARDependencyChanged(final IProject earProject, final IProject oldChildProject, final String oldModuleURI, final IProject newChildProject) throws CoreException {
- verifyEARDependency(earProject, newChildProject, oldModuleURI != null);
- verifyEARDependencyRemoved(earProject, oldChildProject, oldModuleURI);
- }
-
- public static void verifyEARDependencyRemoved(final IProject earProject, final IProject childProject) throws CoreException {
- verifyEARDependencyRemoved(earProject, childProject, null);
- }
-
- public static void verifyEARDependencyRemoved(final IProject earProject, final IProject childProject, final String oldModuleURI) throws CoreException {
- // .component dep
- verifyComponentReference(earProject, childProject, ROOT, false);
- // application.xml ref
- if (oldModuleURI != null) {
- verifyApplicationXMLReference(earProject, childProject, oldModuleURI, false);
- }
- // DependencyGraphManager
- verifyDependency(earProject, childProject, false);
- // .project dep
- verifyProjectReference(earProject, childProject, false);
- }
-
- public static void verifyModuleDependency(final IProject source, final IProject target) throws CoreException, IOException {
- // verify MANIFEST.MF dep added
- verifyManifestReference(source, target.getName() + ".jar", true); //$NON-NLS-1$
- // verify classpath ref (will be via "EAR Libraries")
- verifyClasspathReference(source, target, true);
- // DependencyGraphManager only tracks references defined by the .settings/org.eclipse.wst.common.component file
- // References defined via manifests will not be mapped in the IDependencyGraph
- //verifyDependency(source, target, true);
- }
-
- public static void verifyModuleDependencyChanged(final IProject source, final IProject oldTarget, final IProject newTarget) throws CoreException, IOException {
- verifyModuleDependency(source, newTarget);
- verifyModuleDependencyRemoved(source, oldTarget);
- }
-
- public static void verifyModuleDependencyRemoved(final IProject source, final IProject target) throws CoreException, IOException {
- // verify MANIFEST.MF dep removed
- verifyManifestReference(source, target.getName()+ ".jar", false);
- // verify classpath ref removed
- verifyClasspathReference(source, target, false);
- // DependencyGraphManager
- verifyDependency(source, target, false);
- }
-
- public static void verifyWebLibDependency(final IProject source, final IProject target) throws CoreException {
- // .project dep
- verifyProjectReference(source, target, true);
- // .component dep
- verifyComponentReference(source, target, WEB_INF_LIB, true);
- // verify classpath ref (will be via "EAR Libraries")
- verifyClasspathReference(source, target, true);
- // DependencyGraphManager
- verifyDependency(source, target, true);
- }
-
- public static void verifyWebLibDependencyChanged(final IProject source, final IProject oldTarget, final IProject newTarget) throws CoreException {
- verifyWebLibDependency(source, newTarget);
- verifyWebLibDependencyRemoved(source, oldTarget);
- }
-
- public static void verifyWebLibDependencyRemoved(final IProject source, final IProject target) throws CoreException {
- // verify changed .project dep
- verifyProjectReference(source, target, false);
- // .component dep
- verifyComponentReference(source, target, WEB_INF_LIB, false);
- // verify classpath ref removed
- verifyClasspathReference(source, target, false);
- // DependencyGraphManager
- verifyDependency(source, target, false);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/ProjectUtil.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/ProjectUtil.java
deleted file mode 100644
index 6e421220..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/dependency/tests/util/ProjectUtil.java
+++ /dev/null
@@ -1,381 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 BEA Systems, Inc 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:
- * BEA Systems, Inc - initial API and implementation
- *******************************************************************************/
-package org.eclipse.jst.j2ee.dependency.tests.util;
-
-import java.util.Map;
-
-import junit.framework.Assert;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.jobs.IJobChangeEvent;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.core.runtime.jobs.JobChangeAdapter;
-import org.eclipse.jst.j2ee.ejb.project.operations.IEjbFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.classpath.J2EEComponentClasspathUpdater;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.jst.j2ee.project.facet.EARFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetConstants;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.project.facet.UtilityProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.tests.OperationTestCase;
-
-/**
- * Test utility class that contains code for manipulating projects.
- * DO NOT verify dependencies between EAR and module projects.
- */
-public class ProjectUtil {
-
- public static final IWorkspace ws = ResourcesPlugin.getWorkspace();
-
- /**
- * Gets the project for the given name. Does not test for existence.
- * @param name
- * @return
- */
- public static IProject getProject(final String name) {
- return ws.getRoot().getProject(name);
- }
-
- /**
- * Deletes the specified project if it exists and waits for all refactoring
- * jobs.
- */
- public static void deleteProject(final IProject project)
- throws CoreException, InterruptedException {
- if (!project.exists()) {
- return;
- }
-
- IWorkspaceRunnable workspaceRunnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor pm) throws CoreException {
- project.delete(true, null);
- }
- };
-
- //waitForValidationJobs();
- ResourcesPlugin.getWorkspace().run(workspaceRunnable, null);
- DependencyUtil.waitForProjectRefactoringJobs();
- ProjectUtil.waitForClasspathUpdate();
- }
-
- /**
- * Renames the specified project if it exists and waits for all refactoring
- * jobs.
- * @param project
- * @param newName
- * @return Renamed project.
- */
- public static IProject renameProject(final IProject project, final String newName)
- throws CoreException, InterruptedException {
- final IProject newProject = getProject(newName);
- Assert.assertFalse("Cannot rename project " + project + ", a project already exists with name " + newName, newProject.exists());
- Assert.assertTrue("Project " + project + " does not exist, cannot rename.", project.exists());
-
- IWorkspaceRunnable workspaceRunnable = new IWorkspaceRunnable() {
- public void run(IProgressMonitor pm) throws CoreException {
- project.move(newProject.getFullPath(), true, null);
- }
- };
-
- //waitForValidationJobs();
- ResourcesPlugin.getWorkspace().run(workspaceRunnable, null);
- DependencyUtil.waitForProjectRefactoringJobs();
- ProjectUtil.waitForClasspathUpdate();
- return newProject;
- }
-
- /**
- * Creates an EAR project.
- * @param name EAR name.
- * @return The EAR project.
- * @throws Exception
- */
- public static IProject createEARProject(final String name) throws Exception {
- return createEARProject(name, false);
- }
-
- /**
- * Creates an EAR project.
- * @param name EAR name.
- * @param waitForBuildToComplete True if the call should wait for the subsequent build to complete.
- * @return The EAR project.
- * @throws Exception
- */
- public static IProject createEARProject(final String name, final boolean waitForBuildToComplete) throws Exception {
- return createEARProject(name, J2EEVersionConstants.J2EE_1_4_ID, waitForBuildToComplete);
- }
-
- /**
- * Creates an EAR project.
- * @param name EAR name.
- * @param waitForBuildToComplete True if the call should wait for the subsequent build to complete.
- * @param
- * @return The EAR project.
- * @throws Exception
- */
- public static IProject createEARProject(final String name, final int facetVersion, final boolean waitForBuildToComplete) throws Exception {
- final IDataModel dataModel = getEARCreationDataModel(name, facetVersion);
- return createAndVerify(dataModel, name, J2EEProjectUtilities.ENTERPRISE_APPLICATION, null, waitForBuildToComplete);
- }
-
- /**
- * Creates a web project with optional EAR association.
- * @param name Web name.
- * @param earName EAR name; null for no EAR association.
- * @return The Web project.
- * @throws Exception
- */
- public static IProject createWebProject(final String name, final String earName) throws Exception {
- return createWebProject(name, earName, false);
- }
-
-
- /**
- * Creates a web project with optional EAR association.
- * @param name Web name.
- * @param earName EAR name; null for no EAR association.
- * @return The Web project.
- * @throws Exception
- */
- public static IProject createWebProject(final String name, final String earName, final boolean waitForBuildToComplete) throws Exception {
- return createWebProject(name, earName, J2EEVersionConstants.SERVLET_2_4, waitForBuildToComplete);
- }
-
- /**
- * Creates a web project with optional EAR association.
- * @param name Web name.
- * @param earName EAR name; null for no EAR association.
- * @param facetVersion The facet version.
- * @return The Web project.
- * @throws Exception
- */
- public static IProject createWebProject(final String name, final String earName, final int facetVersion, final boolean waitForBuildToComplete) throws Exception {
- final IDataModel dataModel = getWebCreationDataModel(name, earName, facetVersion);
- return createAndVerify(dataModel, name, J2EEProjectUtilities.DYNAMIC_WEB, earName, waitForBuildToComplete);
- }
-
- /**
- * Creates a Utility project with optional EAR association.
- * @param name Util name.
- * @param earName EAR name; null for no EAR association.
- * @return The utility project.
- * @throws Exception
- */
- public static IProject createUtilityProject(final String name, final String earName) throws Exception {
- return createUtilityProject(name, earName, false);
- }
-
- /**
- * Creates a Utility project with optional EAR association.
- * @param name Util name.
- * @param earName EAR name; null for no EAR association.
- * @return The utility project.
- * @throws Exception
- */
- public static IProject createUtilityProject(final String name, final String earName, final boolean waitForBuildToComplete) throws Exception {
- final IDataModel dataModel = getUtilityCreationDataModel(name, earName);
- return createAndVerify(dataModel, name, J2EEProjectUtilities.UTILITY, earName, waitForBuildToComplete);
- }
-
- /**
- * Creates an EJB project with optional EAR association.
- * @param name EJB name.
- * @param earName EAR name; null for no EAR association.
- * @return The EJB project.
- * @throws Exception
- */
- public static IProject createEJBProject(final String name, final String earName) throws Exception {
- return createEJBProject(name, earName, false);
- }
-
- /**
- * Creates an EJB project with optional EAR association.
- * @param name EJB name.
- * @param earName EAR name; null for no EAR association.
- * @return The EJB project.
- * @throws Exception
- */
- public static IProject createEJBProject(final String name, final String earName, final boolean waitForBuildToComplete) throws Exception {
- return createEJBProject(name, earName, J2EEVersionConstants.EJB_2_1_ID, waitForBuildToComplete);
- }
-
- /**
- * Creates an EJB project with optional EAR association.
- * @param name EJB name.
- * @param earName EAR name; null for no EAR association.
- * @param facetVersion The facet version.
- * @return The EJB project.
- * @throws Exception
- */
- public static IProject createEJBProject(final String name, final String earName, final int facetVersion, final boolean waitForBuildToComplete) throws Exception {
- final IDataModel dataModel = getEJBCreationDataModel(name, earName, facetVersion);
- return createAndVerify(dataModel, name, J2EEProjectUtilities.EJB, earName, waitForBuildToComplete);
- }
-
- /**
- * Creates an EJB project with optional EAR association.
- *
- * @param name
- * EJB name.
- * @param earName
- * EAR name; null for no EAR association.
- * @param facetModelProperties
- * this properties will be added to the facet model retrieved by
- * <code> FacetDataModelMap facetMap = (FacetDataModelMap) dataModel
- .getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel facetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.EJB);</code>
- * This gives you the opportunity to control the creation of the
- * project without introducing new create* methods.
- * @param facetVersion
- * The facet version.
- * @return The EJB project.
- * @throws Exception
- */
- public static IProject createEJBProject(final String name, final String earName,
- Map<String, Object> facetModelProperties, final int facetVersion, final boolean waitForBuildToComplete)
- throws Exception {
- final IDataModel dataModel = getEJBCreationDataModel(name, earName, facetVersion);
- FacetDataModelMap facetMap = (FacetDataModelMap) dataModel
- .getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel facetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.EJB);
- for (Map.Entry<String, Object> entry : facetModelProperties.entrySet()) {
- facetModel.setProperty(entry.getKey(), entry.getValue());
- }
- return createAndVerify(dataModel, name, J2EEProjectUtilities.EJB, earName, waitForBuildToComplete);
- }
-
- /**
- * Creates an EJB project with optional EAR association.
- * @param name EJB name.
- * @param earName EAR name; null for no EAR association.
- * @param clientName Client name; null for no client.
- * @param facetVersion The facet version.
- * @param waitForBuildToComplete
- * @return The EJB project.
- * @throws Exception
- */
- public static IProject createEJBProject(final String name, final String earName, final String clientName,
- final int facetVersion, final boolean waitForBuildToComplete) throws Exception {
- final IDataModel dataModel = getEJBCreationDataModel(name, earName, facetVersion);
- FacetDataModelMap facetMap = (FacetDataModelMap) dataModel
- .getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel facetModel = facetMap.getFacetDataModel(IJ2EEFacetConstants.EJB);
- facetModel.setBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD, true);
- // only create client if given a client name, and is added to EAR
- if (clientName != null && earName != null) {
- facetModel.setBooleanProperty(IEjbFacetInstallDataModelProperties.CREATE_CLIENT, true);
- facetModel.setStringProperty(IEjbFacetInstallDataModelProperties.CLIENT_NAME, clientName);
- }
- return createAndVerify(dataModel, name, J2EEProjectUtilities.EJB, earName, waitForBuildToComplete);
- }
-
- private static IDataModel getEARCreationDataModel(final String name, final int facetVersion) {
- final IDataModel model = DataModelFactory.createDataModel(new EARFacetProjectCreationDataModelProvider());
- configure(model, name, J2EEProjectUtilities.ENTERPRISE_APPLICATION, null, facetVersion, false);
- return model;
- }
-
- private static IDataModel getWebCreationDataModel(final String name, final String earName, final int facetVersion) {
- final IDataModel model = DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- configure(model, name, J2EEProjectUtilities.DYNAMIC_WEB, earName, facetVersion, facetVersion == J2EEVersionConstants.SERVLET_2_5);
- return model;
- }
-
- private static IDataModel getUtilityCreationDataModel(final String name, final String earName) {
- final IDataModel model = DataModelFactory.createDataModel(new UtilityProjectCreationDataModelProvider());
- configure(model, name, J2EEProjectUtilities.UTILITY, earName, 0, false);
- return model;
- }
-
- private static IDataModel getEJBCreationDataModel(final String name, final String earName, final int facetVersion) {
- final IDataModel model = DataModelFactory.createDataModel(new EjbFacetProjectCreationDataModelProvider());
- configure(model, name, J2EEProjectUtilities.EJB, earName, facetVersion, facetVersion == J2EEVersionConstants.EJB_3_0_ID);
- return model;
- }
-
- private static void configure(final IDataModel model, final String name, final String facet, final String earName, final int facetVersion, final boolean isJEE5) {
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, name);
- final FacetDataModelMap map = (FacetDataModelMap) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel facetDM = map.getFacetDataModel(facet);
- if (earName != null) {
- facetDM.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR, true);
- facetDM.setProperty(IJ2EEModuleFacetInstallDataModelProperties.EAR_PROJECT_NAME, earName);
- }
- if (facetVersion != 0) {
- String versionText = J2EEVersionUtil.convertVersionIntToString(facetVersion);
- facetDM.setStringProperty(IFacetDataModelProperties.FACET_VERSION_STR, versionText);
- }
- if (isJEE5) {
- facetDM = map.getFacetDataModel(J2EEProjectUtilities.JAVA);
- facetDM.setStringProperty(IFacetDataModelProperties.FACET_VERSION_STR, J2EEVersionConstants.VERSION_5_0_TEXT);
- }
- }
-
- private static IProject createAndVerify(final IDataModel model, final String projectName, final String type, final String earName, final boolean waitForBuildToComplete) throws Exception {
- // run the data model operation to create the projects
- OperationTestCase.runAndVerify(model,false,true, waitForBuildToComplete);
- // wait for any classpath update jobs
- ProjectUtil.waitForClasspathUpdate();
- // verify the EAR (if one was created)
- verifyProject(earName, J2EEProjectUtilities.ENTERPRISE_APPLICATION);
- // verify the module project
- return verifyProject(projectName, type);
- }
-
- private static IProject verifyProject(final String projectName, final String type) {
- if (projectName != null) {
- final IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- Assert.assertTrue("Failed to create project " + projectName, project.exists());
- Assert.assertTrue("Project not is of type " + type, JavaEEProjectUtilities.isProjectOfType(project, type));
- return project;
- }
- return null;
- }
-
- public static void waitForClasspathUpdate() {
- DependencyVerificationUtil.waitForClasspathUpdate();
- }
-
- private static ClasspathUpdateJobListener listener = new ClasspathUpdateJobListener();
-
- private static class ClasspathUpdateJobListener extends JobChangeAdapter {
-
- public boolean isDone = false;
-
- public ClasspathUpdateJobListener() {
- super();
- Job.getJobManager().addJobChangeListener(this);
- }
-
- public void done(IJobChangeEvent event) {
- Job job = event.getJob();
- if (job.getName().equals(J2EEComponentClasspathUpdater.MODULE_UPDATE_JOB_NAME)) {
- isDone = true;
- }
- }
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/AppClientArtifactEditFVTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/AppClientArtifactEditFVTest.java
deleted file mode 100644
index 737fdeae..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/AppClientArtifactEditFVTest.java
+++ /dev/null
@@ -1,110 +0,0 @@
-package org.eclipse.jst.j2ee.flexible.project.apitests.artifactedit;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-public class AppClientArtifactEditFVTest extends TestCase {
-
- private IProject appClientProject;
- private String appClientModuleName;
-
-
- public AppClientArtifactEditFVTest() {
- super();
- if (TestWorkspace.init()) {
- appClientProject = TestWorkspace.getTargetProject(TestWorkspace.APP_CLIENT_PROJECT_NAME);
- appClientModuleName = TestWorkspace.APP_CLIENT_MODULE_NAME;
- } else {
- fail();
-
- }
- }
-
- public void testCreationDisposeFunction() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForWrite(appClientProject);
- edit.addListener(new EditModelListener() {
-
- public void editModelChanged(EditModelEvent anEvent) {
- pass();
-
- }
- });
- ApplicationClient client = edit.getApplicationClient();
- updateClient(client);
- edit.save(new NullProgressMonitor());
-
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- private void updateClient(ApplicationClient client) {
- client.setDescription(TestWorkspace.FVT_DESCRIPTION);
- client.setDisplayName(TestWorkspace.FVT_DISPLAY_NAME);
- client.setLargeIcon(TestWorkspace.FVT_LARGE_ICON);
-
- }
-
- private void pass() {
- assertTrue(true);
- }
-
- public void testPersistenceFunction() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForWrite(appClientProject);
- ApplicationClient appClient = edit.getApplicationClient();
- pass(appClient);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- private static void pass(ApplicationClient appClient) {
- boolean pass = appClient.getDescription().equals(TestWorkspace.FVT_DESCRIPTION) && appClient.getDisplayName().equals(TestWorkspace.FVT_DISPLAY_NAME) && appClient.getLargeIcon().equals(TestWorkspace.FVT_LARGE_ICON);
- assertTrue(pass);
- }
-
- private void validateResource() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForWrite(appClientProject);
- //EList resourceList = wbComponent.getResources();
- //for (Iterator iter = resourceList.iterator(); iter.hasNext();) {
- //}
- } finally {
- if (edit != null) {
- edit.dispose();
- }
-
- }
- }
-
- private ComponentResource createResourceComponent() {
- ComponentResource resourceComponent = ComponentcoreFactory.eINSTANCE.createComponentResource();
- File testFile = TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH.toFile();
- if (testFile.exists()) {
- resourceComponent.setRuntimePath(TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH);
- resourceComponent.setSourcePath(TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH);
- } else {
- fail("Missing: TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH");
- }
- return resourceComponent;
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/AppClientArtifactEditTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/AppClientArtifactEditTest.java
deleted file mode 100644
index eb4baa2d..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/AppClientArtifactEditTest.java
+++ /dev/null
@@ -1,580 +0,0 @@
-package org.eclipse.jst.j2ee.flexible.project.apitests.artifactedit;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.applicationclient.componentcore.util.AppClientArtifactEdit;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.internal.operations.IOperationHandler;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-public class AppClientArtifactEditTest extends TestCase {
- private IProject appClientProject;
- private String appClientModuleName;
- public static final String EDIT_MODEL_ID = "jst.app_client"; //$NON-NLS-1$
- private AppClientArtifactEdit artifactEditForRead;
- private ArtifactEditModel artifactEditModelForRead;
- private EditModelListener emListener;
-
-
-
- public class ApplicationArtifactTestSub extends AppClientArtifactEdit {
-
- public ApplicationArtifactTestSub(ArtifactEditModel anArtifactEditModel) {
- super(anArtifactEditModel);
- }
-
- protected void addAppClientIfNecessary(XMLResource aResource) {
- super.addAppClientIfNecessary(aResource);
- }
- }
-
- public void testAddCleint() {
- new ApplicationArtifactTestSub(null);
-
- }
-
- private IOperationHandler handler = new IOperationHandler() {
-
-
- public boolean canContinue(String message) {
- return false;
- }
-
-
- public boolean canContinue(String message, String[] items) {
-
- return false;
- }
-
- public int canContinueWithAllCheck(String message) {
-
- return 0;
- }
-
- public int canContinueWithAllCheckAllowCancel(String message) {
-
- return 0;
- }
-
- public void error(String message) {
-
-
- }
-
- public void inform(String message) {
-
-
- }
-
-
- public Object getContext() {
-
- return null;
- }
- };
-
-
-
- public AppClientArtifactEditTest() {
- super();
-
- if (TestWorkspace.init()) {
- appClientProject = TestWorkspace.getTargetProject(TestWorkspace.APP_CLIENT_PROJECT_NAME);
- appClientModuleName = TestWorkspace.APP_CLIENT_MODULE_NAME;
- } else {
- fail();
-
- }
- }
-
- public void testGetJ2EEVersion() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(appClientProject);
- int version = edit.getJ2EEVersion();
- Integer integer = new Integer(version);
- assertTrue(integer.equals(TestWorkspace.APP_CLIENT_PROJECT_VERSION));
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
-
-
- public void testGetDeploymentDescriptorResource() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(appClientProject);
- String uri = edit.getDeploymentDescriptorResource().getURI().toString();
- assertTrue(uri.equals(TestWorkspace.APP_CLIENT_DD_RESOURCE_URI));
-
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testGetDeploymentDescriptorRoot() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(appClientProject);
- EObject object = edit.getDeploymentDescriptorRoot();
- assertNotNull(object);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
-
- public void testCreateModelRoot() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(appClientProject);
- EObject object = edit.createModelRoot();
- assertNotNull(object);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testCreateModelRootint() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(appClientProject);
- EObject object = edit.createModelRoot(14);
- assertNotNull(object);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testAppClientArtifactEditComponentHandleboolean() {
- AppClientArtifactEdit edit = null;
- try {
- edit = new AppClientArtifactEdit(appClientProject, true);
- assertNotNull(edit);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- /*
- * Class under test for void AppClientArtifactEdit(ArtifactEditModel)
- */
- public void testAppClientArtifactEditArtifactEditModel() {
- AppClientArtifactEdit edit = new AppClientArtifactEdit(getArtifactEditModelforRead());
- assertNotNull(edit);
- edit.dispose();
- }
-
- // /////////////////BUG//////////////
-
- public void testGetApplicationClientXmiResource() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(appClientProject);
- String uri = edit.getApplicationClientXmiResource().getURI().toString();
- // THIS IS A BUG\\ - commmenting out as suggested by DW
- boolean testURI = uri.equals(TestWorkspace.APP_CLIENT_DD_XMI_RESOURCE_URI);
- // assertTrue(uri.equals(TestWorkspace.APP_CLIENT_DD_XMI_RESOURCE_URI));
- } catch (Exception e) {
- // TODO
- }
-
- finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
- public void testAddAppClientIfNecessary() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(appClientProject);
- Resource resource = edit.getDeploymentDescriptorResource();
- AppClientArtifactEdit edit2 = new AppClientArtifactEdit(getArtifactEditModelforRead()) {
- protected void addAppClientIfNecessary(XMLResource aResource) {
- super.addAppClientIfNecessary(aResource);
- }
- };
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- pass(); // protected - not sure if needed
- }
-
- public void testCreateNewModule() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(appClientProject);
- Module module = edit.createNewModule();
- assertNotNull(module);
-
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testGetApplicationClient() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(appClientProject);
- EObject obj = edit.getApplicationClient();
- assertNotNull(obj);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testGetAppClientArtifactEditForReadComponentHandle() {
- StructureEdit moduleCore = null;
- AppClientArtifactEdit edit = null;
- try {
- moduleCore = StructureEdit.getStructureEditForRead(appClientProject);
- WorkbenchComponent wbComponent = moduleCore.getComponent();
- edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(appClientProject);
- assertTrue(edit != null);
-
- } finally {
- if (moduleCore != null) {
- moduleCore.dispose();
- edit.dispose();
- }
-
- }
- }
-
-
- public void testGetAppClientArtifactEditForWriteComponentHandle() {
- StructureEdit moduleCore = null;
- AppClientArtifactEdit edit = null;
- try {
- moduleCore = StructureEdit.getStructureEditForWrite(appClientProject);
- WorkbenchComponent wbComponent = moduleCore.getComponent();
- edit = AppClientArtifactEdit.getAppClientArtifactEditForWrite(appClientProject);
-
- } finally {
- if (moduleCore != null) {
- moduleCore.dispose();
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
-
- public void testGetAppClientArtifactEditForReadWorkbenchComponent() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(appClientProject);
- assertTrue(edit != null);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testGetAppClientArtifactEditForWriteWorkbenchComponent() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForWrite(appClientProject);
- assertTrue(edit != null);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testIsValidApplicationClientModule() {
- IVirtualComponent component = ComponentCore.createComponent(appClientProject, appClientModuleName);
- assertTrue(ArtifactEdit.isValidEditableModule(component));
- }
-
- public void testSave() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForWrite(appClientProject);
- try {
- edit.save(new NullProgressMonitor());
- } catch (Exception e) {
- fail(e.getMessage());
- }
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- assertTrue(true);
- }
-
- public void testSaveIfNecessary() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForWrite(appClientProject);
- try {
- edit.saveIfNecessary(new NullProgressMonitor());
- } catch (Exception e) {
- fail(e.getMessage());
- }
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- assertTrue(true);
- }
-
- public void testSaveIfNecessaryWithPrompt() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForWrite(appClientProject);
- try {
- edit.saveIfNecessaryWithPrompt(new NullProgressMonitor(), handler, true);
- } catch (Exception e) {
- fail(e.getMessage());
- }
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- pass();
- }
- }
-
- public void testDispose() {
- AppClientArtifactEdit edit;
- try {
- edit = new AppClientArtifactEdit(getArtifactEditModelforRead());
- edit.dispose();
- } catch (Exception e) {
- fail(e.getMessage());
- }
- pass();
- }
-
- // //////////BUG////////////////
-
- public void testGetContentModelRoot() {
- AppClientArtifactEdit edit = null;
- try {
- edit = AppClientArtifactEdit.getAppClientArtifactEditForRead(appClientProject);
- // THIS IS A BUG\\ - commmenting out as suggested by DW
- Object object = edit.getContentModelRoot();
- // assertNotNull(object);
- pass();
- } catch (Exception e) {
- e.printStackTrace();
- // fail(e.getMessage());
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testAddListener() {
- AppClientArtifactEdit edit = getArtifactEditForRead();
- try {
- edit.addListener(getEmListener());
- } catch (Exception e) {
- fail(e.getMessage());
- }
- pass();
- edit.dispose();
- }
-
- public EditModelListener getEmListener() {
- if (emListener == null)
- emListener = new EditModelListener() {
- public void editModelChanged(EditModelEvent anEvent) {
- //Default
- }
- };
- return emListener;
- }
-
- public void testRemoveListener() {
- AppClientArtifactEdit edit = getArtifactEditForRead();
- try {
- edit.removeListener(getEmListener());
- } catch (Exception e) {
- fail(e.getMessage());
- }
- edit.dispose();
- pass();
- }
-
- public void testHasEditModel() {
- AppClientArtifactEdit edit = getArtifactEditForRead();
- assertTrue(edit.hasEditModel(artifactEditModelForRead));
- edit.dispose();
- }
-
- public void testGetArtifactEditModel() {
- AppClientArtifactEdit edit = getArtifactEditForRead();
- assertTrue(edit.hasEditModel(artifactEditModelForRead));
- edit.dispose();
- }
-
- public void testObject() {
- pass();
- }
-
- public void testGetClass() {
- AppClientArtifactEdit edit = getArtifactEditForRead();
- assertNotNull(edit.getClass());
- edit.dispose();
- }
-
- public void testHashCode() {
- AppClientArtifactEdit edit = getArtifactEditForRead();
- int y = -999999999;
- int x = edit.hashCode();
- assertTrue(x != y);
- edit.dispose();
- }
-
- public void testEquals() {
- AppClientArtifactEdit edit = getArtifactEditForRead();
- assertTrue(getArtifactEditForRead().equals(artifactEditForRead));
- edit.dispose();
- }
-
- public void testClone() {
- pass();
- }
-
- public void testToString() {
- AppClientArtifactEdit edit = getArtifactEditForRead();
- assertTrue(getArtifactEditForRead().toString() != null);
- edit.dispose();
- }
-
- public void testNotify() {
- try {
- synchronized (getArtifactEditForRead()) {
- artifactEditForRead.notify();
- }
- } catch (Exception e) {
- fail(e.getMessage());
- }
- artifactEditForRead.dispose();
- pass();
- }
-
- public void testNotifyAll() {
- try {
- synchronized (getArtifactEditForRead()) {
- artifactEditForRead.notifyAll();
- }
- } catch (Exception e) {
- fail(e.getMessage());
- } finally {
- artifactEditForRead.dispose();
- }
- pass();
- }
-
-
- public void testWaitlong() {
- long x = 2;
- try {
- synchronized (getArtifactEditForRead()) {
- getArtifactEditForRead().wait(x);
- }
- } catch (Exception e) {
- // fail(e.getMessage());
- } finally {
- artifactEditForRead.dispose();
- }
- pass();
- }
-
-
- public void testWaitlongint() {
- int x = 2;
- try {
- synchronized (getArtifactEditForRead()) {
- getArtifactEditForRead().wait(x);
- }
- } catch (Exception e) {
- // fail(e.getMessage());
- } finally {
- artifactEditForRead.dispose();
- }
- pass();
- }
-
-
- public void testWait() {
- try {
- synchronized (getArtifactEditForRead()) {
- getArtifactEditForRead().wait();
- }
- } catch (Exception e) {
- // fail(e.getMessage());
- } finally {
- artifactEditForRead.dispose();
- }
- pass();
-
- }
-
- public void testFinalize() {
- pass();
- }
-
- public void pass() {
- assertTrue(true);
- }
-
- public ArtifactEditModel getArtifactEditModelforRead() {
- EMFWorkbenchContext context = new EMFWorkbenchContext(appClientProject);
- artifactEditModelForRead = new ArtifactEditModel(EDIT_MODEL_ID, context, true, TestWorkspace.APP_CLIENT_MODULE_URI);
- return artifactEditModelForRead;
- }
-
-
-
- public AppClientArtifactEdit getArtifactEditForRead() {
- artifactEditForRead = new AppClientArtifactEdit(getArtifactEditModelforRead());
- return artifactEditForRead;
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/ConnectorArtifactEditFVTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/ConnectorArtifactEditFVTest.java
deleted file mode 100644
index c0bee8af..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/ConnectorArtifactEditFVTest.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.eclipse.jst.j2ee.flexible.project.apitests.artifactedit;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.jca.Connector;
-import org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-public class ConnectorArtifactEditFVTest extends TestCase {
- private IProject jcaProject;
- private String jcaModuleName;
-
-
- public ConnectorArtifactEditFVTest() {
- super();
-
- if (TestWorkspace.init()) {
- jcaProject = TestWorkspace.getTargetProject(TestWorkspace.JCA_PROJECT_NAME);
- jcaModuleName = TestWorkspace.JCA_MODULE_NAME;
- } else {
- fail();
-
- }
-
- }
-
- public void testCreationDisposeFunction() {
- ConnectorArtifactEdit edit = null;
- try {
- edit = ConnectorArtifactEdit.getConnectorArtifactEditForWrite(jcaProject);
- edit.addListener(new EditModelListener() {
- public void editModelChanged(EditModelEvent anEvent) {
- pass();
- }
- });
- Connector client = edit.getConnector();
- updateClient(client);
- edit.save(new NullProgressMonitor());
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- private void updateClient(Connector client) {
- client.setDescription(TestWorkspace.FVT_DESCRIPTION);
- client.setDisplayName(TestWorkspace.FVT_DISPLAY_NAME);
- client.setLargeIcon(TestWorkspace.FVT_LARGE_ICON);
-
- }
- private static void pass(Connector client) {
- boolean pass = client.getDescription().equals(TestWorkspace.FVT_DESCRIPTION) && client.getDisplayName().equals(TestWorkspace.FVT_DISPLAY_NAME) && client.getLargeIcon().equals(TestWorkspace.FVT_LARGE_ICON);
- assertTrue(pass);
- }
-
- private void pass() {
- assertTrue(true);
- }
-
- public void testPersistenceFunction() {
- ConnectorArtifactEdit edit = null;
- try {
- edit = ConnectorArtifactEdit.getConnectorArtifactEditForWrite(jcaProject);
- Connector jca = edit.getConnector();
- pass(jca);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- private static void pass(ApplicationClient jca) {
- boolean pass = jca.getDescription().equals(TestWorkspace.FVT_DESCRIPTION) && jca.getDisplayName().equals(TestWorkspace.FVT_DISPLAY_NAME) && jca.getLargeIcon().equals(TestWorkspace.FVT_LARGE_ICON);
- assertTrue(pass);
- }
-
- private void validateResource() {
- ConnectorArtifactEdit edit = null;
- try {
- edit = ConnectorArtifactEdit.getConnectorArtifactEditForWrite(jcaProject);
-// EList resourceList = wbComponent.getResources();
-// for (Iterator iter = resourceList.iterator(); iter.hasNext();) {
-// }
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- private ComponentResource createResourceComponent() {
- ComponentResource resourceComponent = ComponentcoreFactory.eINSTANCE.createComponentResource();
- File testFile = TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH.toFile();
- if (testFile.exists()) {
- resourceComponent.setRuntimePath(TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH);
- resourceComponent.setSourcePath(TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH);
- } else {
- fail("Missing: TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH");
- }
- return resourceComponent;
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/ConnectorArtifactEditTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/ConnectorArtifactEditTest.java
deleted file mode 100644
index 3cf9749c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/ConnectorArtifactEditTest.java
+++ /dev/null
@@ -1,243 +0,0 @@
-package org.eclipse.jst.j2ee.flexible.project.apitests.artifactedit;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.jca.modulecore.util.ConnectorArtifactEdit;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-
-public class ConnectorArtifactEditTest extends TestCase {
-
- private IProject jcaProject;
- private String jcaModuleName;
-
-
- public ConnectorArtifactEditTest() {
- super();
-
- if (TestWorkspace.init()) {
- jcaProject = TestWorkspace.getTargetProject(TestWorkspace.JCA_PROJECT_NAME);
- jcaModuleName = TestWorkspace.JCA_MODULE_NAME;
- } else {
- fail();
-
- }
- }
-
- public void testGetJ2EEVersion() {
- IVirtualComponent vc = ComponentCore.createComponent(jcaProject);
- assertTrue(J2EEProjectUtilities.getJ2EEProjectVersion(vc.getProject()).equals(TestWorkspace.JCA_PROJECT_VERSION));
- }
-
- public void testGetDeploymentDescriptorResource() {
- ConnectorArtifactEdit edit = null;
- try {
- edit = ConnectorArtifactEdit.getConnectorArtifactEditForRead(jcaProject);
- String uri = edit.getDeploymentDescriptorResource().getURI().toString();
- assertTrue(uri.equals(TestWorkspace.JCA_DD_RESOURCE_URI));
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
-
- public void testCreateModelRoot() {
- ConnectorArtifactEdit edit = null;
- try {
- edit = ConnectorArtifactEdit.getConnectorArtifactEditForWrite(jcaProject);
- EObject object = edit.createModelRoot();
- assertNotNull(object);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
-
- public void testCreateModelRootint() {
- ConnectorArtifactEdit edit = null;
- try {
- edit = ConnectorArtifactEdit.getConnectorArtifactEditForRead(jcaProject);
- EObject object = edit.createModelRoot(14);
- assertNotNull(object);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
-
- public void testConnectorArtifactEditComponentHandleboolean() {
- StructureEdit moduleCore = null;
- WorkbenchComponent wbComponent = null;
- ConnectorArtifactEdit edit = null;
- try {
- moduleCore = StructureEdit.getStructureEditForWrite(jcaProject);
- wbComponent = moduleCore.getComponent();
- edit = new ConnectorArtifactEdit(jcaProject, true);
- assertNotNull(edit);
- } finally {
- if (moduleCore != null) {
- moduleCore.dispose();
- edit.dispose();
- }
- }
-
- }
-
- public void testConnectorArtifactEditArtifactEditModel() {
- ConnectorArtifactEdit edit = new ConnectorArtifactEdit(getArtifactEditModelforRead());
- assertNotNull(edit);
- edit.dispose();
- }
-
-
- public void testGetConnectorArtifactEditForReadComponentHandle() {
- StructureEdit moduleCore = null;
- ConnectorArtifactEdit edit = null;
- try {
- moduleCore = StructureEdit.getStructureEditForRead(jcaProject);
- WorkbenchComponent wbComponent = moduleCore.getComponent();
- edit = ConnectorArtifactEdit.getConnectorArtifactEditForRead(jcaProject);
- assertTrue(edit != null);
-
- } finally {
- if (moduleCore != null) {
- moduleCore.dispose();
- edit.dispose();
- }
-
- }
- }
-
-
- public void testGetConnectorArtifactEditForWriteComponentHandle() {
- StructureEdit moduleCore = null;
- ConnectorArtifactEdit edit = null;
- try {
- moduleCore = StructureEdit.getStructureEditForWrite(jcaProject);
- WorkbenchComponent wbComponent = moduleCore.getComponent();
- edit = ConnectorArtifactEdit.getConnectorArtifactEditForWrite(jcaProject);
-
- } finally {
- if (moduleCore != null) {
- moduleCore.dispose();
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
-
- public void testGetConnectorArtifactEditForReadWorkbenchComponent() {
- ConnectorArtifactEdit edit = null;
- try {
- edit = ConnectorArtifactEdit.getConnectorArtifactEditForRead(jcaProject);
- assertTrue(edit != null);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testGetConnectorArtifactEditForWriteWorkbenchComponent() {
- ConnectorArtifactEdit edit = null;
- try {
- edit = ConnectorArtifactEdit.getConnectorArtifactEditForWrite(jcaProject);
- assertTrue(edit != null);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testIsValidConnectorModule() {
- IVirtualComponent component = ComponentCore.createComponent(jcaProject);
- assertTrue(ArtifactEdit.isValidEditableModule(component));
- }
-
- public void testGetConnectorXmiResource() {
- ConnectorArtifactEdit edit = null;
- try {
- edit = ConnectorArtifactEdit.getConnectorArtifactEditForRead(jcaProject);
- String uri = edit.getDeploymentDescriptorResource().getURI().toString();
- assertTrue(uri.equals(TestWorkspace.JCA_DD_RESOURCE_URI));
-
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
-
- public void testAddApplicationIfNecessary() {
- pass(); // protected method
- }
-
- public void pass() {
- assertTrue(true);
- }
-
- public ArtifactEditModel getArtifactEditModelforRead() {
- EMFWorkbenchContext context = new EMFWorkbenchContext(jcaProject);
- return new ArtifactEditModel(this.toString(), context, true, TestWorkspace.JCA_MODULE_URI);
- }
-
-
-
- public ConnectorArtifactEdit getArtifactEditForRead() {
- return new ConnectorArtifactEdit(getArtifactEditModelforRead());
- }
-
-
-
- public void testGetDeploymentDescriptorRoot() {
- ConnectorArtifactEdit edit = null;
- try {
- edit = ConnectorArtifactEdit.getConnectorArtifactEditForRead(jcaProject);
- Object obj = edit.getDeploymentDescriptorRoot();
- assertNotNull(obj);
-
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testAddConnectorIfNecessary() {
- pass(); // protected method need to get clarification
- }
-
-
-
- public void testGetConnector() {
- ConnectorArtifactEdit edit = null;
- try {
- edit = ConnectorArtifactEdit.getConnectorArtifactEditForRead(jcaProject);
- Object obj = edit.getConnector();
- assertNotNull(obj);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EARArtifactEditTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EARArtifactEditTest.java
deleted file mode 100644
index 9c079b56..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EARArtifactEditTest.java
+++ /dev/null
@@ -1,347 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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.flexible.project.apitests.artifactedit;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-
-public class EARArtifactEditTest extends TestCase {
-
- private IProject earProject;
- private String earModuleName;
-
- public EARArtifactEditTest() {
- super();
-
- if (TestWorkspace.init()) {
- earProject = TestWorkspace.getTargetProject(TestWorkspace.EAR_PROJECT_NAME);
- earModuleName = TestWorkspace.EAR_MODULE_NAME;
- } else {
- fail();
-
- }
- }
-
- public void testGetJ2EEVersion() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
- int version = edit.getJ2EEVersion();
- Integer integer = new Integer(version);
- assertTrue(integer.equals(TestWorkspace.EAR_PROJECT_VERSION));
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testGetJ2EEModuleReferences() {
- EARArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
- IVirtualReference[] j2eeModuleRefs = edit.getJ2EEModuleReferences();
- assertTrue(j2eeModuleRefs.length>0);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testGetDeploymentDescriptorResource() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
- String uri = edit.getDeploymentDescriptorResource().getURI().toString();
- assertTrue(uri.equals(TestWorkspace.EAR_DD_RESOURCE_URI));
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
- public void testCreateModelRoot() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForWrite(earProject);
- EObject object = edit.createModelRoot();
- assertNotNull(object);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
-
- public void testCreateModelRootint() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
- EObject object = edit.createModelRoot(14);
- assertNotNull(object);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
-
- public void testEARArtifactEditComponentHandleboolean() {
- StructureEdit moduleCore = null;
- WorkbenchComponent wbComponent = null;
- EnterpriseArtifactEdit edit = null;
- try {
- moduleCore = StructureEdit.getStructureEditForWrite(earProject);
- wbComponent = moduleCore.getComponent();
- edit = new EARArtifactEdit(earProject, true);
- assertNotNull(edit);
- } finally {
- if (moduleCore != null) {
- moduleCore.dispose();
- edit.dispose();
- }
- }
-
- }
-
- public void testEARArtifactEditArtifactEditModel() {
- EnterpriseArtifactEdit edit = new EARArtifactEdit(getArtifactEditModelforRead());
- assertNotNull(edit);
- edit.dispose();
- }
-
-
- public void testGetEARArtifactEditForReadComponentHandle() {
- StructureEdit moduleCore = null;
- EnterpriseArtifactEdit edit = null;
- try {
- moduleCore = StructureEdit.getStructureEditForRead(earProject);
- WorkbenchComponent wbComponent = moduleCore.getComponent();
- edit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
- assertTrue(edit != null);
-
- } finally {
- if (moduleCore != null) {
- moduleCore.dispose();
- edit.dispose();
- }
-
- }
- }
-
-
- public void testGetEARArtifactEditForWriteComponentHandle() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForWrite(earProject);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
-
- public void testGetEARArtifactEditForReadWorkbenchComponent() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
- assertTrue(edit != null);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
-
- public void testGetEARArtifactEditForWriteWorkbenchComponent() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForWrite(earProject);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
- public void testIsValidEARModule() {
- IVirtualComponent component = null;
- try {
- component = ComponentCore.createComponent(earProject, earModuleName);
- EARArtifactEdit.isValidEARModule(component);
- } catch (UnresolveableURIException e) {
- e.printStackTrace();
- }
- boolean isValid = ArtifactEdit.isValidEditableModule(component);
- assertTrue(isValid);
- }
-
- public void testIsValidEAREditableModule() {
- IVirtualComponent component = null;
- try {
- component = ComponentCore.createComponent(earProject, earModuleName);
- EARArtifactEdit.isValidEARModule(component);
- } catch (UnresolveableURIException e) {
- e.printStackTrace();
- }
- boolean isValid = ArtifactEdit.isValidEditableModule(component);
- assertTrue(isValid);
- }
-
- public void testGetApplicationXmiResource() {
- EARArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
- String uri = edit.getApplicationXmiResource().getURI().toString();
- assertTrue(uri.equals(TestWorkspace.EAR_DD_RESOURCE_URI));
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
-
- }
- }
-
- public void testGetApplication() {
- EARArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
- edit.createModelRoot();
- EObject obj = edit.getApplication();
- assertNotNull(obj);
-
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
-
- }
- }
-
- public void testAddApplicationIfNecessary() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
-
- // /Bug
- /*
- * assertTrue(edit.uriExists(TestWorkspace.EJB_MODULE_URI.toString()));
- */
- } catch (Exception e) {
- // TODO
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- pass(); // protected method
- }
-
- // ///////////////BUG Workbench Module not initalized\\\\\\\\\\\\\\\\\\\\\\
- public void testUriExists() {
- EARArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
- boolean uriExist = edit.uriExists(TestWorkspace.EJB_MODULE_URI.toString());
- // /Bug
- /*
- * assertTrue(edit.uriExists(TestWorkspace.EJB_MODULE_URI.toString()));
- */
- } catch (Exception e) {
- // TODO
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- // ///////////////////BUG ClassCastException \\\\\\\\\\\\\\\\\\\\
-
- public void testGetWorkbenchUtilModules() {
- EARArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
- edit.getUtilityModuleReferences();
- // //////////////classcast exception
- /*
- * assertNotNull(edit.getWorkbenchUtilModules(wbComponent));
- */
- } catch (Exception e) {
- // TODO
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- // ///////////////////BUG ClassCastException \\\\\\\\\\\\\\\\\\\\
- public void testGetWorkbenchJ2EEModules() {
- EARArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForRead(earProject);
- edit.getJ2EEModuleReferences();
- // classCast
- // assertNotNull(edit.getWorkbenchJ2EEModules(wbComponent));
- } finally {
- if (edit != null) {
- edit.dispose();
- }
-
-
- }
- }
-
- public void pass() {
- assertTrue(true);
- }
-
- public ArtifactEditModel getArtifactEditModelforRead() {
- EMFWorkbenchContext context = new EMFWorkbenchContext(earProject);
- return new ArtifactEditModel(this.toString(), context, true, TestWorkspace.APP_CLIENT_MODULE_URI);
- }
-
-
-
- public EnterpriseArtifactEdit getArtifactEditForRead() {
- return new EARArtifactEdit(getArtifactEditModelforRead());
- }
-
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EJBArtifactEditFVTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EJBArtifactEditFVTest.java
deleted file mode 100644
index 752f429f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EJBArtifactEditFVTest.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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.flexible.project.apitests.artifactedit;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-public class EJBArtifactEditFVTest extends TestCase {
-
- private IProject ejbProject;
- private String ejbModuleName;
-
- public EJBArtifactEditFVTest() {
- super();
-
- if (TestWorkspace.init()) {
- ejbProject = TestWorkspace.getTargetProject(TestWorkspace.EJB_PROJECT_NAME);
- ejbModuleName = TestWorkspace.EJB_MODULE_NAME;
- } else {
- fail();
-
- }
- }
-
- public void testCreationDisposeFunction() {
- EJBArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForWrite(ejbProject);
- edit.addListener(new EditModelListener() {
- public void editModelChanged(EditModelEvent anEvent) {
- pass();
- }
- });
- EJBJar client = edit.getEJBJar();
- updateClient(client);
- edit.save(new NullProgressMonitor());
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- private void updateClient(EJBJar client) {
- client.setDescription(TestWorkspace.FVT_DESCRIPTION);
- client.setDisplayName(TestWorkspace.FVT_DISPLAY_NAME);
- client.setLargeIcon(TestWorkspace.FVT_LARGE_ICON);
-
- }
-
- private void pass() {
- assertTrue(true);
- }
-
- public void testPersistenceFunction() {
- EJBArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForWrite(ejbProject);
- EJBJar ejb = edit.getEJBJar();
- pass(ejb);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- private static void pass(EJBJar ejb) {
- boolean pass = ejb.getDescription().equals(TestWorkspace.FVT_DESCRIPTION) && ejb.getDisplayName().equals(TestWorkspace.FVT_DISPLAY_NAME) && ejb.getLargeIcon().equals(TestWorkspace.FVT_LARGE_ICON);
- assertTrue(pass);
- }
-
- private void validateResource() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForWrite(ejbProject);
-// EList resourceList = wbComponent.getResources();
-// for (Iterator iter = resourceList.iterator(); iter.hasNext();) {
-// }
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- private ComponentResource createResourceComponent() {
- ComponentResource resourceComponent = ComponentcoreFactory.eINSTANCE.createComponentResource();
- File testFile = TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH.toFile();
- if (testFile.exists()) {
- resourceComponent.setRuntimePath(TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH);
- resourceComponent.setSourcePath(TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH);
- } else {
- fail("Missing: TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH");
- }
- return resourceComponent;
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EJBArtifactEditTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EJBArtifactEditTest.java
deleted file mode 100644
index 159a9e72..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EJBArtifactEditTest.java
+++ /dev/null
@@ -1,345 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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.flexible.project.apitests.artifactedit;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.application.Module;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.ejb.EJBJar;
-import org.eclipse.jst.j2ee.ejb.componentcore.util.EJBArtifactEdit;
-import org.eclipse.jst.j2ee.internal.common.XMLResource;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-
-public class EJBArtifactEditTest extends TestCase {
-
- private IProject ejbProject;
- private String ejbModuleName;
-
- public EJBArtifactEditTest() {
- super();
-
- if (TestWorkspace.init()) {
- ejbProject = TestWorkspace.getTargetProject(TestWorkspace.EJB_PROJECT_NAME);
- ejbModuleName = TestWorkspace.EJB_MODULE_NAME;
- } else {
- fail();
-
- }
- }
-
- public void testGetJ2EEVersion() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbProject);
- String version = new Integer(edit.getJ2EEVersion()).toString();
- assertTrue(version.equals(TestWorkspace.EJB_PROJECT_VERSION));
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testGetDeploymentDescriptorResource() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbProject);
- String uri = edit.getDeploymentDescriptorResource().getURI().toString();
- assertTrue(uri.equals(TestWorkspace.EJB_DD_RESOURCE_URI));
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
- // /////BUG in PlatformURL\\\\\\\\\\\
-
- public void testGetDeploymentDescriptorRoot() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbProject);
- edit.getDeploymentDescriptorRoot();
- // /////BUG in PlatformURL\\\\\\\\\\\turning test off////
- /*
- * EObject object = edit.getDeploymentDescriptorRoot(); assertNotNull(object);
- */
- } catch (Exception e) {
- // TODO
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
- // /////////////BUG in PlatformURL\\\\\\\\\\\
-
-
- public void testCreateModelRoot() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForWrite(ejbProject);
- edit.createModelRoot();
- // ////BUG turning off\\\\\\\\\\\\\
- /*
- * EObject object = edit.createModelRoot(); assertNotNull(object);
- */
- } catch (Exception e) {
- // TODO
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
- /*
- * Class under test for EObject createModelRoot(int)
- */
- // ///////////////BUG in PlatformURLModuleConnection
- public void testCreateModelRootint() {
- EnterpriseArtifactEdit edit = null;
- try {
- // ///////BUG in PlatformURLModuleConnection
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbProject);
- edit.createModelRoot(14);
- /*
- * EObject object = edit.createModelRoot(14); assertNotNull(object);
- */
- } catch (Exception e) {
- // TODO
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
- /*
- * Class under test for void EJBArtifactEdit(ComponentHandle, boolean)
- */
- public void testEJBArtifactEditComponentHandleboolean() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = new EJBArtifactEdit(ejbProject, true);
- assertNotNull(edit);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- /*
- * Class under test for void EJBArtifactEdit(ArtifactEditModel)
- */
- public void testEJBArtifactEditArtifactEditModel() {
- EnterpriseArtifactEdit edit = new EJBArtifactEdit(getArtifactEditModelforRead());
- assertNotNull(edit);
- edit.dispose();
- }
-
- public void testGetEJBJarXmiResource() {
- EJBArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbProject);
- String uri = edit.getEJBJarXmiResource().toString();
- // THIS IS A BUG\\ - commmenting out as suggested by DW
- // assertTrue(uri.equals(TestWorkspace.EJB_DD_XMI_RESOURCE_URI));
- } catch (Exception e) {
- // TODO
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
- // //////////////Bug turning test off\\\\\\\\\\\
-
- public void testHasEJBClientJARProject() {
- EJBArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbProject);
- edit.hasEJBClientJARProject();
- // /////BUG\\\\\\\\\\\
- // boolean bool = edit.hasEJBClientJARProject(ejbProject);
- // assertEquals(bool, true);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testCreateNewModule() {
- EJBArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbProject);
- Module module = edit.createNewModule();
- assertNotNull(module);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- // /////////////////bug\\\\\\\\\\\\\
-
- public void testGetEJBClientJarModule() {
- EJBArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbProject);
- edit.getEJBClientJarModule();
- // /////////bug\\\\\\\\
- // WorkbenchComponent comp = edit.getEJBClientJarModule(ejbProject);
- // assertNotNull(comp);
- } catch (Exception e) {
- // TODO
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testGetEJBJar() {
- EJBArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbProject);
- EJBJar jar = edit.getEJBJar();
- assertNotNull(jar);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testGetDeploymenyDescriptorType() {
- EJBArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbProject);
- int type = edit.getDeploymentDescriptorType();
- assertTrue(type >= 0);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testAddEJBJarIfNecessary() {
- EnterpriseArtifactEdit test = new EJBArtifactEdit(getArtifactEditModelforRead()) {
- protected void addEJBJarIfNecessary(XMLResource aResource) {
- // TODO add test
- super.addEJBJarIfNecessary(aResource);
- }
-
- public void test() {
- addEJBJarIfNecessary(null);
- }
- };
-
- }
-
- /*
- * Class under test for EJBArtifactEdit getEJBArtifactEditForRead(ComponentHandle)
- */
- public void testGetEJBArtifactEditForReadComponentHandle() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbProject);
- assertTrue(edit != null);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- /*
- * Class under test for EJBArtifactEdit getEJBArtifactEditForWrite(ComponentHandle)
- */
- public void testGetEJBArtifactEditForWriteComponentHandle() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForWrite(ejbProject);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
- /*
- * Class under test for EJBArtifactEdit getEJBArtifactEditForRead(WorkbenchComponent)
- */
- public void testGetEJBArtifactEditForReadWorkbenchComponent() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForRead(ejbProject);
- assertTrue(edit != null);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- /*
- * Class under test for EJBArtifactEdit getEJBArtifactEditForWrite(WorkbenchComponent)
- */
- public void testGetEJBArtifactEditForWriteWorkbenchComponent() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EJBArtifactEdit.getEJBArtifactEditForWrite(ejbProject);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
- public void testIsValidEJBModule() {
- IVirtualComponent component = ComponentCore.createComponent(ejbProject,ejbModuleName);
- boolean valid = ArtifactEdit.isValidEditableModule(component);
- assertTrue(valid);
- }
-
- public ArtifactEditModel getArtifactEditModelforRead() {
- EMFWorkbenchContext context = new EMFWorkbenchContext(ejbProject);
- return new ArtifactEditModel(this.toString(), context, true, TestWorkspace.APP_CLIENT_MODULE_URI);
- }
-
- public EnterpriseArtifactEdit getArtifactEditForRead() {
- return new EJBArtifactEdit(getArtifactEditModelforRead());
- }
-
- public void pass() {
- assertTrue(true);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EarArtiFactEditFVTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EarArtiFactEditFVTest.java
deleted file mode 100644
index c4b35686..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EarArtiFactEditFVTest.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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.flexible.project.apitests.artifactedit;
-
-import java.io.File;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.client.ApplicationClient;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-public class EarArtiFactEditFVTest extends TestCase {
-
-
-
- private IProject earProject;
- private String earModuleName;
-
- public EarArtiFactEditFVTest() {
- super();
-
- if (TestWorkspace.init()) {
- earProject = TestWorkspace.getTargetProject(TestWorkspace.EAR_PROJECT_NAME);
- earModuleName = TestWorkspace.EAR_MODULE_NAME;
- } else {
- fail();
-
- }
- }
-
- public void testCreationDisposeFunction() {
- EARArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForWrite(earProject);
- edit.addListener(new EditModelListener() {
- public void editModelChanged(EditModelEvent anEvent) {
- pass();
- }
- });
- Application client = edit.getApplication();
- updateClient(client);
- edit.save(new NullProgressMonitor());
-
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- private void updateClient(Application client) {
- client.setDescription(TestWorkspace.FVT_DESCRIPTION);
- client.setDisplayName(TestWorkspace.FVT_DISPLAY_NAME);
- client.setLargeIcon(TestWorkspace.FVT_LARGE_ICON);
-
- }
- private static void pass(Application client) {
- boolean pass = client.getDescription().equals(TestWorkspace.FVT_DESCRIPTION) && client.getDisplayName().equals(TestWorkspace.FVT_DISPLAY_NAME) && client.getLargeIcon().equals(TestWorkspace.FVT_LARGE_ICON);
- assertTrue(pass);
- }
-
- private void pass() {
- assertTrue(true);
- }
-
- public void testPersistenceFunction() {
- EARArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForWrite(earProject);
- Application ear = edit.getApplication();
- pass(ear);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- private static void pass(ApplicationClient ear) {
- boolean pass = ear.getDescription().equals(TestWorkspace.FVT_DESCRIPTION) && ear.getDisplayName().equals(TestWorkspace.FVT_DISPLAY_NAME) && ear.getLargeIcon().equals(TestWorkspace.FVT_LARGE_ICON);
- assertTrue(pass);
- }
-
- private void validateResource() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = EARArtifactEdit.getEARArtifactEditForWrite(earProject);
-// EList resourceList = wbComponent.getResources();
-// for (Iterator iter = resourceList.iterator(); iter.hasNext();) {
-// }
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- private ComponentResource createResourceComponent() {
- ComponentResource resourceComponent = ComponentcoreFactory.eINSTANCE.createComponentResource();
- File testFile = TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH.toFile();
- if (testFile.exists()) {
- resourceComponent.setRuntimePath(TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH);
- resourceComponent.setSourcePath(TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH);
- } else {
- fail("Missing: TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH");
- }
- return resourceComponent;
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EnterpriseArtifactEditTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EnterpriseArtifactEditTest.java
deleted file mode 100644
index 951b53a1..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/EnterpriseArtifactEditTest.java
+++ /dev/null
@@ -1,92 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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.flexible.project.apitests.artifactedit;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.componentcore.EnterpriseArtifactEdit;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-
-public class EnterpriseArtifactEditTest extends TestCase {
-
- private IProject earProject;
- private String earModuleName;
-
- public EnterpriseArtifactEditTest() {
- super();
- if (TestWorkspace.init()) {
- earProject = TestWorkspace.getTargetProject(TestWorkspace.EAR_PROJECT_NAME);
- earModuleName = TestWorkspace.EAR_MODULE_NAME;
- } else {
- fail();
-
- }
- }
-
- public void testEnterpriseArtifactEditComponentHandleboolean() {
- StructureEdit moduleCore = null;
- WorkbenchComponent wbComponent = null;
- EnterpriseArtifactEdit edit = null;
- try {
- moduleCore = StructureEdit.getStructureEditForWrite(earProject);
- wbComponent = moduleCore.getComponent();
- edit = new EARArtifactEdit(earProject, true);
- assertNotNull(edit);
- } finally {
- if (moduleCore != null) {
- moduleCore.dispose();
- edit.dispose();
- }
- }
- }
-
- public void testEnterpriseArtifactEditArtifactEditModel() {
- EnterpriseArtifactEdit edit = new EARArtifactEdit(getArtifactEditModelforRead());
- assertNotNull(edit);
- edit.dispose();
- }
-
-
- //////////BUG
-
- public void testGetDeploymentDescriptorRoot() {
- EnterpriseArtifactEdit edit = null;
- try {
- edit = new EARArtifactEdit(earProject,true);
- edit.getDeploymentDescriptorRoot();
- //////////////////////////BUG\\\\\\\\\\\
- //assertNotNull(edit.getDeploymentDescriptorRoot());
- } catch (Exception e) {
- // TODO fail();
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public ArtifactEditModel getArtifactEditModelforRead() {
- EMFWorkbenchContext context = new EMFWorkbenchContext(earProject);
- return new ArtifactEditModel(this.toString(), context, true, TestWorkspace.APP_CLIENT_MODULE_URI);
- }
-
-
-
- public EnterpriseArtifactEdit getArtifactEditForRead() {
- return new EARArtifactEdit(getArtifactEditModelforRead());
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/J2EEArtifactEditAPIAllTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/J2EEArtifactEditAPIAllTest.java
deleted file mode 100644
index 588c614f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/J2EEArtifactEditAPIAllTest.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.eclipse.jst.j2ee.flexible.project.apitests.artifactedit;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.wst.common.frameworks.artifactedit.tests.ArtifactEditAPITests;
-import org.eclipse.wst.common.tests.SimpleTestSuite;
-
-public class J2EEArtifactEditAPIAllTest extends TestSuite {
-
-
-
- public static Test suite() {
- return new ArtifactEditAPITests();
- }
-
- public J2EEArtifactEditAPIAllTest() {
- super();
- addTest(new SimpleTestSuite(AppClientArtifactEditTest.class));
- //addTest(new SimpleTestSuite(AppClientArtifactEditFVTest.class));
- addTest(new SimpleTestSuite(ConnectorArtifactEditTest.class));
- //addTest(new SimpleTestSuite(ConnectorArtifactEditFVTest.class));
- addTest(new SimpleTestSuite(EARArtifactEditTest.class));
- //addTest(new SimpleTestSuite(EarArtiFactEditFVTest.class));
- addTest(new SimpleTestSuite(WebArtifactEditTest.class));
- //addTest(new SimpleTestSuite(WebArtifactEditFVTest.class));
- addTest(new SimpleTestSuite(EJBArtifactEditTest.class));
- //addTest(new SimpleTestSuite(EJBArtifactEditFVTest.class));
- addTest(new SimpleTestSuite(EnterpriseArtifactEditTest.class));
- addTest(new SimpleTestSuite(WSDDArtifactEditFVTest.class));
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/JaxRPCMapArtifactEditFVTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/JaxRPCMapArtifactEditFVTest.java
deleted file mode 100644
index 68ec6e58..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/JaxRPCMapArtifactEditFVTest.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package org.eclipse.jst.j2ee.flexible.project.apitests.artifactedit;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.internal.webservice.componentcore.util.JaxRPCMapArtifactEdit;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-
-public class JaxRPCMapArtifactEditFVTest extends TestCase {
-
- private IProject webProject;
- private String webModuleName;
- private String serverContextData = TestWorkspace.WEB_SERVER_CONTEXT_ROOT + "Test";
-
- public JaxRPCMapArtifactEditFVTest() {
- super();
- if (TestWorkspace.init()) {
- webProject = TestWorkspace.getTargetProject(TestWorkspace.WEB_PROJECT_NAME);
- webModuleName = TestWorkspace.WEB_MODULE_NAME;
- } else {
- fail();
-
- }
- }
-
- private void updateClient(WebServices client) {
- client.setDescription(TestWorkspace.FVT_DESCRIPTION);
- client.setDisplayName(TestWorkspace.FVT_DISPLAY_NAME);
- client.setLargeIcon(TestWorkspace.FVT_LARGE_ICON);
-
- }
-
- private void pass() {
- assertTrue(true);
- }
-
- public void testPersistenceFunction() {
- JaxRPCMapArtifactEdit jaxedit = null;
- WebArtifactEdit webedit = null;
-
- IVirtualComponent comp = ComponentCore.createComponent(webProject,webModuleName);
-
- jaxedit = JaxRPCMapArtifactEdit.getJaxRPCMapArtifactEditForRead(comp);
- jaxedit.getDeploymentDescriptorRoot("WebArtifactEditTest/WebArtifactEditModule/WebContent/WEB-INF/testmap.xml");
- jaxedit.dispose();
- webedit = WebArtifactEdit.getWebArtifactEditForWrite(comp);
- WebApp webapp = webedit.getWebApp();
- webedit.saveIfNecessary(null);
- webedit.dispose();
- }
-
- private static void pass(WebServices webservice) {
- boolean pass = webservice.getDescription().equals(TestWorkspace.FVT_DESCRIPTION) &&
- webservice.getDisplayName().equals(TestWorkspace.FVT_DISPLAY_NAME) &&
- webservice.getLargeIcon().equals(TestWorkspace.FVT_LARGE_ICON);
- assertTrue(pass);
- }
-
- private void validateResource() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForWrite(webProject);
-// EList resourceList = wbComponent.getResources();
-// for (Iterator iter = resourceList.iterator(); iter.hasNext();) {
-// }
- } finally {
- if (edit != null) {
- edit.dispose();
- }
-
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/TestWorkspace.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/TestWorkspace.java
deleted file mode 100644
index ece9eba2..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/TestWorkspace.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.flexible.project.apitests.artifactedit;
-
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.etools.common.test.apitools.ProjectUnzipUtil;
-import org.eclipse.wtp.j2ee.headless.tests.plugin.HeadlessTestsPlugin;
-
-
-
-public class TestWorkspace {
-
- public static final String EAR_PROJECT_NAME = "EARArtifactEditTest"; //$NON-NLS-1$
- public static final String EAR_MODULE_NAME = "EARArtifactModule";//$NON-NLS-1$
- public static final String EAR_PROJECT_VERSION = "1.4"; //$NON-NLS-1$
- public static final String EAR_DD_RESOURCE_URI = "platform:/resource/EARArtifactModule/EARArtifactModule/META-INF/application.xml"; //$NON-NLS-1$
- public static final String EAR_DD_XMI_RESOURCE_URI = "platform:/resource//EARArtifactEditTest/EARArtifactModule/ejbModule/META-INF/ejb-jar.xmi";//$NON-NLS-1$
- public static final URI EAR_MODULE_URI = URI.createURI("module:/resource/EARArtifactEditTest/EARArtifactModule");
-
- public static final String APP_CLIENT_PROJECT_NAME = "ApplicationClientArtifactEditTest"; //$NON-NLS-1$
- public static final String APP_CLIENT_MODULE_NAME = "ApplicationClientModule"; //$NON-NLS-1$
- public static final String APP_CLIENT_PROJECT_VERSION = "1.4";//$NON-NLS-1$
- public static final String APP_CLIENT_DD_RESOURCE_URI = "platform:/resource/ApplicationClientModule/ApplicationClientModule/appClientModule/META-INF/application-client.xml";//$NON-NLS-1$
- public static final String APP_CLIENT_DD_XMI_RESOURCE_URI = "platform:/resource/ApplicationClientModule/ApplicationClientModule/appClientModule/META-INF/application-client.xmi";//$NON-NLS-1$
- public static final URI APP_CLIENT_MODULE_URI = URI.createURI("module:/resource/ApplicationClientArtifactEditTest/ApplicationClientModule");//$NON-NLS-1$
-
- public static final String EJB_PROJECT_NAME = "EJBArtifactEditTest"; //$NON-NLS-1$
- public static final String EJB_MODULE_NAME = "EJBArtifactEditModule";//$NON-NLS-1$
- public static final String EJB_PROJECT_VERSION = "2.1"; //$NON-NLS-1$
- public static final String EJB_DD_RESOURCE_URI = "platform:/resource/EARArtifactEditTest/EARArtifactModule/META-INF/application.xml";//$NON-NLS-1$
- public static final String EJB_DD_XMI_RESOURCE_URI = "platform:/resource/EARArtifactEditTest/EARArtifactModule/META-INF/application.xmi";//$NON-NLS-1$
- public static final URI EJB_MODULE_URI = URI.createURI("module:/resource/EARArtifactEditTest/EARArtifactModule");
-
- public static final String WEB_PROJECT_NAME = "WebArtifactEditTest"; //$NON-NLS-1$
- public static final String WEB_MODULE_NAME = "WebArtifactEditModule"; //$NON-NLS-1$
- public static final String WEB_PROJECT_VERSION = "2.4";//$NON-NLS-1$
- public static final String WEB_DD_RESOURCE_URI = "platform:/resource/WebArtifactEditModule/WebArtifactEditModule/WebContent/WEB-INF/web.xml";//$NON-NLS-1$
- public static final String WEB_DD_XMI_RESOURCE_URI = "platform:/resource/WebArtifactEditModule/WebArtifactEditModule/WebContent/WEB-INF/web.xmi";//$NON-NLS-1$
- public static final URI WEB_MODULE_URI = URI.createURI("module:/resource/WebArtifactEditTest/WebArtifactEditModule");
- public static final String WEB_SERVER_CONTEXT_ROOT = "WebContent";
-
- public static final String JCA_PROJECT_NAME = "JCAArtifactEditTest"; //$NON-NLS-1$
- public static final String JCA_MODULE_NAME = "JCAArtifactEditTestModule";//$NON-NLS-1$
- public static final String JCA_PROJECT_VERSION = "1.5"; //$NON-NLS-1$
- public static final String JCA_DD_RESOURCE_URI = "platform:/resource/JCAArtifactEditTestModule/JCAArtifactEditTestModule/connectorModule/META-INF/ra.xml";//$NON-NLS-1$
- public static final URI JCA_MODULE_URI = URI.createURI("module:/resource/JCAArtifactEditTest/JCAArtifactEditModule");
-
- public static final String FVT_DESCRIPTION = "FVT Description Test";
- public static final String FVT_DISPLAY_NAME = "FVT DisplayName Test";
- public static final String FVT_LARGE_ICON = "fvtLargeIcon.gif";
- public static IPath workspaceLocation = ResourcesPlugin.getWorkspace().getRoot().getLocation();
- public static String ARTIFACT_EDIT_FVT_RESOURCE_PATH_NAME = "/ArtifactEditFunctionTestResource.txt";
- public static IPath ARTIFACT_EDIT_FVT_RESOURCE_PATH = workspaceLocation.append(ARTIFACT_EDIT_FVT_RESOURCE_PATH_NAME);
-
- private static Path zipFilePath = new Path("/TestData/GenralArtifactTest/J2EEArtifactEditTestProjects.zip");
- private static String[] projectNames = new String[]{EAR_PROJECT_NAME, APP_CLIENT_PROJECT_NAME, EJB_PROJECT_NAME, WEB_PROJECT_NAME, JCA_PROJECT_NAME};
- private boolean isValidWorkspace;
-
-
-
-
- public static final String META_INF = "META-INF"; //$NON-NLS-1$
- public static final String WEB_INF = "WEB-INF"; //$NON-NLS-1$
-
- public static IProject getTargetProject(String projectName) {
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- }
-
- public static boolean createProjects() {
- IPath localZipPath = getLocalPath();
- ProjectUnzipUtil util = new ProjectUnzipUtil(localZipPath, projectNames);
- return util.createProjects();
- }
-
- private static IPath getLocalPath() {
- URL url = HeadlessTestsPlugin.getDefault().find(zipFilePath);
- try {
- url = Platform.asLocalURL(url);
- } catch (IOException e) {
- e.printStackTrace();
- }
- return new Path(url.getPath());
- }
-
- public static boolean init() {
- // revisit
- IProject project = getTargetProject(APP_CLIENT_PROJECT_NAME);
- if (project.exists())
- return true;
- else
- return createProjects();
-
- }
-
- public boolean isValidWorkspace() {
- return isValidWorkspace;
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/WSDDArtifactEditFVTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/WSDDArtifactEditFVTest.java
deleted file mode 100644
index 2975fe86..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/WSDDArtifactEditFVTest.java
+++ /dev/null
@@ -1,95 +0,0 @@
-package org.eclipse.jst.j2ee.flexible.project.apitests.artifactedit;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.internal.webservice.componentcore.util.WSDDArtifactEdit;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webservice.wsdd.WebServices;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-
-public class WSDDArtifactEditFVTest extends TestCase {
-
- private IProject webProject;
- private String webModuleName;
- private String serverContextData = TestWorkspace.WEB_SERVER_CONTEXT_ROOT + "Test";
-
- public WSDDArtifactEditFVTest() {
- super();
- if (TestWorkspace.init()) {
- webProject = TestWorkspace.getTargetProject(TestWorkspace.WEB_PROJECT_NAME);
- webModuleName = TestWorkspace.WEB_MODULE_NAME;
- } else {
- fail();
-
- }
- }
-
- public void testCreationDisposeFunction() {
- WSDDArtifactEdit edit = null;
- try {
- edit = WSDDArtifactEdit.getWSDDArtifactEditForWrite(webProject);
- edit.addListener(new EditModelListener() {
- public void editModelChanged(EditModelEvent anEvent) {
- pass();
- }
- });
- WebServices client = edit.getWebServices();
- updateClient(client);
- edit.save(new NullProgressMonitor());
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- private void updateClient(WebServices client) {
- client.setDescription(TestWorkspace.FVT_DESCRIPTION);
- client.setDisplayName(TestWorkspace.FVT_DISPLAY_NAME);
- client.setLargeIcon(TestWorkspace.FVT_LARGE_ICON);
-
- }
-
- private void pass() {
- assertTrue(true);
- }
-
- public void testPersistenceFunction() {
- WSDDArtifactEdit edit = null;
- try {
- edit = WSDDArtifactEdit.getWSDDArtifactEditForWrite(webProject);
- WebServices web = edit.getWebServices();
- pass(web);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- private static void pass(WebServices webservice) {
- boolean pass = webservice.getDescription().equals(TestWorkspace.FVT_DESCRIPTION) &&
- webservice.getDisplayName().equals(TestWorkspace.FVT_DISPLAY_NAME) &&
- webservice.getLargeIcon().equals(TestWorkspace.FVT_LARGE_ICON);
- assertTrue(pass);
- }
-
- private void validateResource() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForWrite(webProject);
-// EList resourceList = wbComponent.getResources();
-// for (Iterator iter = resourceList.iterator(); iter.hasNext();) {
-// }
- } finally {
- if (edit != null) {
- edit.dispose();
- }
-
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/WebArtifactEditFVTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/WebArtifactEditFVTest.java
deleted file mode 100644
index 295bf365..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/WebArtifactEditFVTest.java
+++ /dev/null
@@ -1,152 +0,0 @@
-package org.eclipse.jst.j2ee.flexible.project.apitests.artifactedit;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.jst.j2ee.common.CommonFactory;
-import org.eclipse.jst.j2ee.common.ParamValue;
-import org.eclipse.jst.j2ee.internal.deployables.J2EEFlexProjDeployable;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.Filter;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.WebapplicationFactory;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelEvent;
-import org.eclipse.wst.common.internal.emfworkbench.integration.EditModelListener;
-import org.eclipse.wst.server.core.model.IModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleResource;
-
-public class WebArtifactEditFVTest extends TestCase {
-
- private IProject webProject;
-// private String serverContextData = TestWorkspace.WEB_SERVER_CONTEXT_ROOT + "Test"; //$NON-NLS-1$
-
- public WebArtifactEditFVTest() {
- super();
- if (TestWorkspace.init()) {
- webProject = TestWorkspace.getTargetProject(TestWorkspace.WEB_PROJECT_NAME);
- } else {
- fail();
-
- }
- }
-
- public void testCreationDisposeFunction() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForWrite(webProject);
- edit.addListener(new EditModelListener() {
- public void editModelChanged(EditModelEvent anEvent) {
- pass();
- }
- });
- WebApp client = edit.getWebApp();
- updateClient(client);
- edit.save(new NullProgressMonitor());
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testDeployableResourceGather() {
- IVirtualComponent webComp = ComponentCore.createComponent(webProject);
- J2EEFlexProjDeployable deployable = new J2EEFlexProjDeployable(webProject, webComp);
- try {
- IModuleResource[] resources = deployable.members();
- assertTrue(resources.length>1);
- int numOfModuleResourceFolders = 0;
- for (int i=0; i<resources.length; i++) {
- if (resources[i] instanceof IModuleFolder)
- numOfModuleResourceFolders++;
- }
- assertTrue(numOfModuleResourceFolders==2);
- } catch (Exception e) {
- fail(e.getMessage());
- }
- }
-
- private void updateClient(WebApp client) {
- client.setDescription(TestWorkspace.FVT_DESCRIPTION);
- client.setDisplayName(TestWorkspace.FVT_DISPLAY_NAME);
- client.setLargeIcon(TestWorkspace.FVT_LARGE_ICON);
- }
-
- private void pass() {
- assertTrue(true);
- }
-
- public void testPersistenceFunction() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForWrite(webProject);
- WebApp web = edit.getWebApp();
-
-
- Filter filter = WebapplicationFactory.eINSTANCE.createFilter();
- filter.setName("WoohooFilter"); //$NON-NLS-1$
- filter.setFilterClassName("wtp.test.WhooHoo"); //$NON-NLS-1$
-
- ParamValue value = CommonFactory.eINSTANCE.createParamValue();
- value.setName("Param1"); //$NON-NLS-1$
- value.setValue("Value1"); //$NON-NLS-1$
- List initParams = new ArrayList();
- initParams.add(value);
-
- if (initParams != null) {
- filter.getInitParamValues().addAll(initParams);
- }
-
- EList filters = web.getFilters();
-
- filters.add(filter);
- edit.saveIfNecessary(null);
-
- pass(web);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- private static void pass(WebApp web) {
- boolean pass = web.getDescription().equals(TestWorkspace.FVT_DESCRIPTION) && web.getDisplayName().equals(TestWorkspace.FVT_DISPLAY_NAME) && web.getLargeIcon().equals(TestWorkspace.FVT_LARGE_ICON);
- assertTrue(pass);
- }
-
-// private void validateResource() {
-// WebArtifactEdit edit = null;
-// try {
-// ComponentHandle handle = ComponentHandle.create(webProject,webModuleName);
-// edit = WebArtifactEdit.getWebArtifactEditForWrite(handle);
-//// EList resourceList = wbComponent.getResources();
-//// for (Iterator iter = resourceList.iterator(); iter.hasNext();) {
-//// }
-// } finally {
-// if (edit != null) {
-// edit.dispose();
-// }
-// }
-// }
-
-// private ComponentResource createResourceComponent() {
-// ComponentResource resourceComponent = ComponentcoreFactory.eINSTANCE.createComponentResource();
-// File testFile = TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH.toFile();
-// if (testFile.exists()) {
-// resourceComponent.setRuntimePath(TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH);
-// resourceComponent.setSourcePath(TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH);
-// } else {
-// fail("Missing: TestWorkspace.ARTIFACT_EDIT_FVT_RESOURCE_PATH"); //$NON-NLS-1$
-// }
-// return resourceComponent;
-// }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/WebArtifactEditTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/WebArtifactEditTest.java
deleted file mode 100644
index c3d3046e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/apitests/artifactedit/WebArtifactEditTest.java
+++ /dev/null
@@ -1,414 +0,0 @@
-package org.eclipse.jst.j2ee.flexible.project.apitests.artifactedit;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.Servlet;
-import org.eclipse.jst.j2ee.webapplication.ServletType;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.jst.j2ee.webapplication.internal.impl.WebapplicationFactoryImpl;
-import org.eclipse.wst.common.componentcore.ArtifactEdit;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.UnresolveableURIException;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
-import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-
-public class WebArtifactEditTest extends TestCase {
-
- private IProject webProject;
- private String webModuleName;
- private String serverContextData = TestWorkspace.WEB_SERVER_CONTEXT_ROOT + "Test";
-
- public WebArtifactEditTest() {
- super();
- if (TestWorkspace.init()) {
- webProject = TestWorkspace.getTargetProject(TestWorkspace.WEB_PROJECT_NAME);
- webModuleName = TestWorkspace.WEB_MODULE_NAME;
- } else {
- fail();
-
- }
- }
-
- public void testGetJ2EEVersion() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForRead(webProject);
- edit.getWebApp().setDescription("test");
- int version = edit.getJ2EEVersion();
- Integer integer = new Integer(version);
- assertTrue(integer.equals(TestWorkspace.WEB_PROJECT_VERSION));
-
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
-
-
- public void testGetDeploymentDescriptorResource() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForRead(webProject);
- String uri = edit.getDeploymentDescriptorResource().getURI().toString();
- // assertTrue(uri.equals(TestWorkspace.WEB_DD_RESOURCE_URI));
- } catch (Exception e) {
- // todo
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testGetDeploymentDescriptorRoot() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForRead(webProject);
- edit.getDeploymentDescriptorRoot();
- // /////BUG in PlatformURL\\\\\\\\\\\turning test off////
- EObject object = edit.getDeploymentDescriptorRoot();
- assertNotNull(object);
- } catch (Exception e) {
- // TODO
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
- /*
- * Class under test for EObject createModelRoot()
- */
- public void testCreateModelRoot() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForWrite(webProject);
- edit.createModelRoot();
- // ////BUG turning off\\\\\\\\\\\\\
- /*
- * EObject object = edit.createModelRoot(); assertNotNull(object);
- */
- } catch (Exception e) {
- // TODO
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
- /*
- * Class under test for EObject createModelRoot(int)
- */
- public void testCreateModelRootint() {
- WebArtifactEdit edit = null;
- try {
- // ///////BUG in PlatformURLModuleConnection
- edit = WebArtifactEdit.getWebArtifactEditForRead(webProject);
- edit.createModelRoot(14);
- /*
- * EObject object = edit.createModelRoot(14); assertNotNull(object);
- */
- } catch (Exception e) {
- // TODO
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
- /*
- * Class under test for void WebArtifactEdit(ComponentHandle, boolean)
- */
- public void testWebArtifactEditComponentHandleboolean() {
- WebArtifactEdit edit = null;
- try {
- edit = new WebArtifactEdit(webProject, true);
- assertNotNull(edit);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
-
- }
-
- /*
- * Class under test for WebArtifactEdit getWebArtifactEditForRead(ComponentHandle)
- */
- public void testGetWebArtifactEditForReadComponentHandle() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForRead(webProject);
- assertTrue(edit != null);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- /*
- * Class under test for ArtifactEdit getWebArtifactEditForWrite(ComponentHandle)
- */
- public void testGetWebArtifactEditForWriteComponentHandle() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForWrite(webProject);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
- /*
- * Class under test for WebArtifactEdit getWebArtifactEditForRead(WorkbenchComponent)
- */
- public void testGetWebArtifactEditForReadWorkbenchComponent() {
- }
-
- /*
- * Class under test for WebArtifactEdit getWebArtifactEditForWrite(WorkbenchComponent)
- */
- public void testGetWebArtifactEditForWriteWorkbenchComponent() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForRead(webProject);
- assertTrue(edit != null);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testIsValidWebModule() {
- IVirtualComponent component = null;
- try {
- component = ComponentCore.createComponent(webProject);
- WebArtifactEdit.isValidWebModule(component);
- } catch (UnresolveableURIException e) {
- fail();
- }
- ArtifactEdit.isValidEditableModule(component);
- assertTrue(ArtifactEdit.isValidEditableModule(component));
- }
-
- public void testIsValidEditModule() {
- IVirtualComponent component = null;
- try {
- component = ComponentCore.createComponent(webProject);
- WebArtifactEdit.isValidWebModule(component);
- } catch (UnresolveableURIException e) {
- fail();
- }
- ArtifactEdit.isValidEditableModule(component);
- assertTrue(ArtifactEdit.isValidEditableModule(component));
- }
-
- /*
- * Class under test for void WebArtifactEdit(ArtifactEditModel)
- */
- public void testWebArtifactEditArtifactEditModel() {
- WebArtifactEdit edit = new WebArtifactEdit(getArtifactEditModelforRead());
- assertNotNull(edit);
- edit.dispose();
- }
-
- /*
- * Class under test for void WebArtifactEdit(ModuleCoreNature, WorkbenchComponent, boolean)
- */
- public void testWebArtifactEditModuleCoreNatureWorkbenchComponentboolean() {
- WebArtifactEdit edit = null;
- try {
- edit = new WebArtifactEdit(webProject, true);
- assertNotNull(edit);
- } catch (Exception e) {
- fail();
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testGetServletVersion() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForRead(webProject);
- assertTrue(edit.getServletVersion() == 24);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testAddWebAppIfNecessary() {
- }
-
- public void testGetJSPVersion() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForRead(webProject);
- assertTrue(edit.getJSPVersion() == 20);
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testGetDeploymentDescriptorPath() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForRead(webProject);
- edit.getDeploymentDescriptorPath();
- assertNotNull(edit.getDeploymentDescriptorPath());
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testGetLibModules() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForRead(webProject);
- edit.getLibModules();
- // //bug module in editmodel never initialized\\\\
- // assertNotNull(edit.getLibModules());
- } catch (Exception e) {
- // TODO
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- // ////////////Bug\\\\\\\\\\\\\\\\\\\\\\\
-
- public void testAddLibModules() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForRead(webProject);
- ReferencedComponent refComp = ComponentcoreFactory.eINSTANCE.createReferencedComponent();
- edit.addLibModules(new ReferencedComponent[]{refComp});
- // ///////////////bug\\\\\\\ owner---WebArtifactEdit -> referenceComponents() != null
- // needs to insure owner
- /*
- * ReferencedComponent refComp =
- * ComponentcoreFactoryImpl.eINSTANCE.createReferencedComponent();
- * edit.addLibModules(new ReferencedComponent[]{refComp});
- * assertTrue(edit.getLibModules().length > 0);
- */
- } catch (Exception e) {
- // TODO
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public void testGetServerContextRoot() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForRead(webProject);
- edit.getServerContextRoot();
- // /////////////////////BUG/////////////////////
- // //edit.getServerContextRoot();
- // assertTrue(edit.getServerContextRoot().equals(TestWorkspace.WEB_SERVER_CONTEXT_ROOT));
- } catch (Exception e) {
- // TODO
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- // ////////////////BUG////////////////////////////////
-
- public void testSetServerContextRoot() {
- WebArtifactEdit edit = null;
- try {
- edit = WebArtifactEdit.getWebArtifactEditForRead(webProject);
- edit.setServerContextRoot(serverContextData);
- // /////////////////////BUG/////////////////////
- // //edit.getServerContextRoot();
- // edit.setServerContextRoot(serverContextData);
- // String testData = edit.getServerContextRoot();
- // assertTrue(testData.equals(serverContextData));
- } catch (Exception e) {
- // TODO
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- }
- }
-
- public ArtifactEditModel getArtifactEditModelforRead() {
- EMFWorkbenchContext context = new EMFWorkbenchContext(webProject);
- return new ArtifactEditModel(this.toString(), context, true, TestWorkspace.APP_CLIENT_MODULE_URI);
- }
-
- public WebArtifactEdit getArtifactEditForRead() {
- return new WebArtifactEdit(getArtifactEditModelforRead());
- }
-
- public void testCreateServlet() {
- WebArtifactEdit edit = null;
- try {
- WebapplicationFactoryImpl factory = new WebapplicationFactoryImpl();
- edit = WebArtifactEdit.getWebArtifactEditForWrite(webProject);
- WebApp webapp = edit.getWebApp();
- Servlet servlet = factory.createServlet();
- ServletType servletType = factory.createServletType();
- servlet.setWebType(servletType);
- servlet.setServletName("servletDescriptor._name");
- servletType.setClassName("servletDescriptor._className");
- // if(servletDescriptor._displayName != null){
- servlet.setDisplayName("servletDescriptor._displayName");
- // }
-
- webapp.getServlets().add(servlet);
- webapp.setDescription("test");
- edit.save(new NullProgressMonitor());
- /*
- * if(servletDescriptor._loadOnStartup != null){
- * servlet.setLoadOnStartup(servletDescriptor._loadOnStartup); }
- * if(servletDescriptor._params != null){ Properties properties =
- * servlet.getParamsAsProperties(); properties.putAll(servletDescriptor._params); }
- */
- } catch (Exception e) {
- e.printStackTrace();
- // TODO
- } finally {
- if (edit != null) {
- edit.dispose();
- }
- assertTrue(edit != null);
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/ArchiveComponentCreationTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/ArchiveComponentCreationTest.java
deleted file mode 100644
index e8c2dfe5..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/ArchiveComponentCreationTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 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.flexible.project.fvtests;
-
-import java.util.ArrayList;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.componentcore.internal.resources.VirtualArchiveComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.componentcore.resources.IVirtualReference;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-public class ArchiveComponentCreationTest extends TestCase {
-
-
- public static Test suite() {
- return new TestSuite(ArchiveComponentCreationTest.class);
- }
-
- public ArchiveComponentCreationTest() {
- super();
- }
-
- public ArchiveComponentCreationTest(String name) {
- super(name);
- }
-
-
- public void testCreateWebComponent() throws Exception {
- createWebComponent(24, "TestWeb" ); //$NON-NLS-1$
- }
-
-
- private void createWebComponent(int j2eeVersion, String aModuleName) throws Exception{
- IDataModel model = DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, aModuleName);
- FacetDataModelMap map = (FacetDataModelMap) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel webModel = map.getFacetDataModel(J2EEProjectUtilities.DYNAMIC_WEB);
- webModel.setIntProperty(IFacetDataModelProperties.FACET_VERSION,j2eeVersion);
- model.getDefaultOperation().execute(new NullProgressMonitor(), null);
-
- IProject project = ProjectUtilities.getProject(aModuleName);
- if( project.exists()){
- IVirtualComponent component = ComponentCore.createComponent(project);
- createArchiveComponent(component);
- }
- }
-
- public void createArchiveComponent(IVirtualComponent component){
-
- IPath path = new Path("JUNIT_HOME/junit.jar"); //$NON-NLS-1$
-
-
- IPath resolvedPath = JavaCore.getResolvedVariablePath(path);
-
- java.io.File file = new java.io.File(resolvedPath.toOSString());
- if( file.isFile() && file.exists()){
- String type = VirtualArchiveComponent.VARARCHIVETYPE + IPath.SEPARATOR;
-
- IVirtualComponent archive = ComponentCore.createArchiveComponent( component.getProject(), type +
- path.toString());
-
- ArrayList vlist = new ArrayList();
- IVirtualReference[] oldrefs = component.getReferences();
- for (int j = 0; j < oldrefs.length; j++) {
- IVirtualReference ref = oldrefs[j];
- vlist.add(ref);
- }
-
- IVirtualReference ref = ComponentCore.createReference( component, archive, new Path("/WEB-INF/lib") ); //$NON-NLS-1$
- vlist.add(ref);
-
- IVirtualReference[] refs = new IVirtualReference[vlist.size()];
- for (int j = 0; j < vlist.size(); j++) {
- IVirtualReference tmpref = (IVirtualReference) vlist.get(j);
- refs[j] = tmpref;
- }
- component.setReferences(refs);
- }
- }
- }
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/EJBArtifactEditFvTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/EJBArtifactEditFvTest.java
deleted file mode 100644
index 5c54d2da..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/EJBArtifactEditFvTest.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package org.eclipse.jst.j2ee.flexible.project.fvtests;
-import junit.framework.TestCase;
-
-public class EJBArtifactEditFvTest extends TestCase {
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/EJBDeployTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/EJBDeployTest.java
deleted file mode 100644
index 076b8c82..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/EJBDeployTest.java
+++ /dev/null
@@ -1,223 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2007 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.flexible.project.fvtests;
-import junit.framework.Test;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IProjectDescription;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.OperationCanceledException;
-import org.eclipse.core.runtime.SubProgressMonitor;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
-import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
-import org.eclipse.jem.util.emf.workbench.ProjectResourceSet;
-import org.eclipse.jem.util.emf.workbench.WorkbenchResourceHelperBase;
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.j2ee.archive.emftests.GeneralEMFPopulationTest;
-import org.eclipse.jst.j2ee.earcreation.IEarFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.internal.operations.NewSessionBeanClassDataModelProvider;
-import org.eclipse.jst.j2ee.ejb.project.operations.IEjbFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.common.J2EEVersionUtil;
-import org.eclipse.jst.j2ee.internal.common.operations.INewJavaClassDataModelProperties;
-import org.eclipse.jst.j2ee.internal.deployables.J2EEFlexProjDeployable;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPlugin;
-import org.eclipse.jst.j2ee.internal.plugin.J2EEPreferences;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetInstallDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.componentcore.internal.impl.WTPResourceFactoryRegistry;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.project.facet.core.IProjectFacet;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.tests.SimpleTestSuite;
-import org.eclipse.wst.server.core.model.IModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleResource;
-
-public class EJBDeployTest extends GeneralEMFPopulationTest {
-
- private static final String PROJECTNAME = "TestNewModels";
- public static final String PACKAGE = "test"; //$NON-NLS-1$
- public static final String SESSION_BEAN_NAME = "TestSessionBean"; //$NON-NLS-1$
- public EJBDeployTest(String name) {
- super(name);
- }
-
-
- public static Test suite() {
- return new SimpleTestSuite(EJBDeployTest.class);
- }
-
-
-
-
- private void createProject(IProjectDescription description,
- IProject projectHandle, IProgressMonitor monitor)
- throws CoreException, OperationCanceledException {
- try {
- monitor.beginTask("", 2000); //$NON-NLS-1$
-
- projectHandle.create(description, new SubProgressMonitor(monitor,
- 1000));
-
- if (monitor.isCanceled())
- throw new OperationCanceledException();
-
- projectHandle.open(new SubProgressMonitor(monitor, 1000));
-
- } finally {
- monitor.done();
- }
- }
-
-
-public void testEJBDeployment() throws Exception {
-
- String projName = "TestEE5EjbProject";//$NON-NLS-1$
- createEjbProject(projName);
-
- IProject project = getProject(projName);
- // Create Session bean
- createSessionBean(projName);
-
-
- boolean found = false;
- IVirtualComponent component = ComponentCore.createComponent(project);
- J2EEFlexProjDeployable deployable = new J2EEFlexProjDeployable(project, component);
- try {
- if (deployable.isSingleRootStructure()) {
- IModuleResource[] members = deployable.members();
- for (int i=0; i<members.length; i++) {
- IModuleResource packageFolder = members[i];
- String name = packageFolder.getName();
- if (name.equals(PACKAGE)) {
- IModuleResource[] javaMembers = ((IModuleFolder)packageFolder).members();
- for (int j = 0; j < javaMembers.length; j++) {
- IModuleResource javaResource = javaMembers[j];
- if (javaMembers[j].getName().equals("TestSessionBean.class"))
- found = true;
- }
- }
- }
- }
- assertTrue("Can't find class files in ejb deployment",found);
-
- }catch (CoreException e) {
- fail(e.getMessage());
- }
-
-
-
-
-}
-
-
-private void createSessionBean(String projName) throws ExecutionException {
- IDataModel dm = DataModelFactory.createDataModel(NewSessionBeanClassDataModelProvider.class);
- dm.setProperty(INewJavaClassDataModelProperties.PROJECT_NAME, projName);
- dm.setProperty(INewJavaClassDataModelProperties.JAVA_PACKAGE, PACKAGE);
- dm.setProperty(INewJavaClassDataModelProperties.CLASS_NAME, SESSION_BEAN_NAME);
- IStatus operationStatus = dm.getDefaultOperation().execute(new NullProgressMonitor(), null);
- try {
- Job.getJobManager().join(ResourcesPlugin.FAMILY_AUTO_BUILD,null);
- } catch (OperationCanceledException e) {
- e.printStackTrace();
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
-}
-private ProjectResourceSet getResourceSet(String projName) {
- IProject proj = getProject(projName);
- return (ProjectResourceSet)WorkbenchResourceHelperBase.getResourceSet(proj);
- }
-
-
- private IProject createEjbProject(String projName) throws ExecutionException {
- IDataModel dataModel = DataModelFactory.createDataModel(IEjbFacetInstallDataModelProperties.class);
- String versionString = J2EEVersionUtil.convertVersionIntToString(J2EEVersionConstants.EJB_3_0_ID);
- IProjectFacet facet = ProjectFacetsManager.getProjectFacet(IEjbFacetInstallDataModelProperties.EJB);
- IProjectFacetVersion facetVersion = facet.getVersion(versionString); //$NON-NLS-1$
- addVersionProperties(dataModel, projName, facetVersion,IJ2EEFacetInstallDataModelProperties.EJB);
- dataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, projName);
- FacetDataModelMap map = (FacetDataModelMap) dataModel
- .getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- map.add(setupJavaInstallAction(projName,J2EEPlugin.getDefault().getJ2EEPreferences().getString(J2EEPreferences.Keys.EJB_CONTENT_FOLDER)));
- dataModel.getDefaultOperation().execute( new NullProgressMonitor(), null);
- IProject webProj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- return webProj;
- }
- private IProject createEarProject(String projName) throws ExecutionException {
- IDataModel dataModel = DataModelFactory.createDataModel(IEarFacetInstallDataModelProperties.class);
- String versionString = J2EEVersionUtil.convertVersionIntToString(J2EEVersionConstants.JEE_5_0_ID);
- IProjectFacet facet = ProjectFacetsManager.getProjectFacet(IEarFacetInstallDataModelProperties.ENTERPRISE_APPLICATION);
- IProjectFacetVersion facetVersion = facet.getVersion(versionString); //$NON-NLS-1$
- addVersionProperties(dataModel, projName, facetVersion,IJ2EEFacetInstallDataModelProperties.ENTERPRISE_APPLICATION);
- dataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, projName);
- dataModel.getDefaultOperation().execute( new NullProgressMonitor(), null);
- IProject webProj = ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- return webProj;
- }
- protected IDataModel setupJavaInstallAction(String aProjectName, String srcFolder) {
- IDataModel dm = DataModelFactory.createDataModel(new JavaFacetInstallDataModelProvider());
- dm.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, aProjectName);
- String jVersion = "5.0";
- dm.setProperty(IFacetDataModelProperties.FACET_VERSION_STR, jVersion); //$NON-NLS-1$
- dm.setStringProperty(IJavaFacetInstallDataModelProperties.SOURCE_FOLDER_NAME, srcFolder); //$NON-NLS-1$
- return dm;
- }
- private void addVersionProperties(IDataModel dataModel, String projName, IProjectFacetVersion fv, String facetString){
-
- dataModel.setProperty(IFacetDataModelProperties.FACET_PROJECT_NAME, projName);
- FacetDataModelMap map = (FacetDataModelMap) dataModel
- .getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel model = (IDataModel) map.get(facetString);
- model.setBooleanProperty(IJ2EEFacetInstallDataModelProperties.GENERATE_DD, true);
- model.setProperty(IFacetInstallDataModelProperties.FACET_VERSION, fv);
-
- }
-
-
- public IProject getProject() {
- return ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECTNAME);
- }
- public IProject getProject(String projName) {
- return ResourcesPlugin.getWorkspace().getRoot().getProject(projName);
- }
-
-
- private void registerFactory(URI uri, ResourceSet resSet, Resource.Factory factory) {
- WTPResourceFactoryRegistry registry = (WTPResourceFactoryRegistry) resSet.getResourceFactoryRegistry();
- registry.registerLastFileSegment(uri.lastSegment(), factory);
- }
- private ResourceSet getResourceSet() {
- ResourceSet set = new ResourceSetImpl();
- set.setResourceFactoryRegistry(WTPResourceFactoryRegistry.INSTANCE);
- return set;
- }
-
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/J2EEFlexProjDeployablePerfTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/J2EEFlexProjDeployablePerfTest.java
deleted file mode 100644
index d3187c7e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/J2EEFlexProjDeployablePerfTest.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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.flexible.project.fvtests;
-
-import java.io.IOException;
-import java.net.URL;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.etools.common.test.apitools.ProjectUnzipUtil;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.deployables.J2EEFlexProjDeployable;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.server.core.util.ModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wtp.j2ee.headless.tests.plugin.HeadlessTestsPlugin;
-
-public class J2EEFlexProjDeployablePerfTest extends TestCase {
-
- private static String[] projectNames = new String[]{"war"}; //$NON-NLS-1$;
- private static Path zipFilePath = new Path("/TestData/GenralArtifactTest/perfWAR.zip"); //$NON-NLS-1$
-
- public static Test suite() {
- return new TestSuite(J2EEFlexProjDeployablePerfTest.class);
- }
- public void testMembersPerformance() {
- ProjectUnzipUtil util = new ProjectUnzipUtil(getLocalPath(), projectNames);
- util.createProjects();
- IProject project = ProjectUtilities.getProject(projectNames[0]);
- IVirtualComponent component = ComponentCore.createComponent(project);
- J2EEFlexProjDeployable deployable = new J2EEFlexProjDeployable(project, component);
- try {
- IModuleResource[] members = deployable.members();
- assertTrue(members.length==3);
- int verified = 0;
- for (int i=0; i<members.length; i++) {
- String name = members[i].getName();
- if (name.equals("META-INF")) {
- IModuleResource manifest = ((ModuleFolder)members[i]).members()[0];
- assertTrue(manifest.getModuleRelativePath().toString().equals("META-INF"));
- assertTrue(manifest.getName().equals("MANIFEST.MF"));
- verified++;
- } else if (name.equals("WEB-INF")) {
- IModuleResource[] webInf = ((ModuleFolder)members[i]).members();
- assertTrue(webInf.length==2);
- for (int j=0; j<webInf.length; j++) {
- IModuleResource webResource = webInf[j];
- assertTrue(webResource.getModuleRelativePath().toString().equals("WEB-INF"));
- assertTrue(webResource.getName().equals("web.xml") || webResource.getName().equals("classes"));
- }
- verified++;
- } else if (name.equals("pkg0")) {
- assertTrue(((ModuleFolder)members[i]).members().length>0);
- verified++;
- }
- }
- assertTrue(verified==3);
- } catch (CoreException e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
- }
-
- private static IPath getLocalPath() {
- URL url = HeadlessTestsPlugin.getDefault().find(zipFilePath);
- try {
- url = Platform.asLocalURL(url);
- } catch (IOException e) {
- e.printStackTrace();
- }
- return new Path(url.getPath());
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/PortedComponentCreationTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/PortedComponentCreationTest.java
deleted file mode 100644
index 1fc76ef7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/PortedComponentCreationTest.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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.flexible.project.fvtests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.applicationclient.internal.creation.AppClientFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.project.J2EEProjectUtilities;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.jca.project.facet.ConnectorFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.EARFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEModuleFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.web.project.facet.IWebFacetInstallDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties.FacetDataModelMap;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-
-public class PortedComponentCreationTest extends TestCase {
-
- public static String DEFAULT_PROJECT_NAME = "Flexible";
-
- public static Test suite() {
- return new TestSuite(PortedComponentCreationTest.class);
- }
-
- public PortedComponentCreationTest() {
- super();
- }
-
- public PortedComponentCreationTest(String name) {
- super(name);
- }
-
- /*
- public void testCreateFlexibleProject() throws Exception {
- IDataModel dataModel = DataModelFactory.createDataModel(new FlexibleProjectCreationDataModelProvider());
- dataModel.setProperty(IFlexibleProjectCreationDataModelProperties.PROJECT_NAME, DEFAULT_PROJECT_NAME + "_");
- dataModel.getDefaultOperation().execute(new NullProgressMonitor(), null);
- }
- */
-
-
-// public void testCreateJavaUtiltyComponent() throws Exception {
-// //createFlexibleJavaProject(DEFAULT_PROJECT_NAME + "_JavaUtil");
-// createJavaUtilComponent(DEFAULT_PROJECT_NAME + "_JavaUtil", DEFAULT_PROJECT_NAME + "_JavaUtil");
-// }
-//
-// public void testCreateConnectorComponent() throws Exception {
-// // createFlexibleJavaProject(DEFAULT_PROJECT_NAME + "_ConnectorProject");
-// createConnectorComponent(15, "TestConnector", DEFAULT_PROJECT_NAME + "_ConnectorProject");
-// }
-//
-//
-// public void testCreateWebComponent() throws Exception {
-// // createFlexibleJavaProject(DEFAULT_PROJECT_NAME+"_WebProject");
-// createWebComponent(24, "TestWeb", DEFAULT_PROJECT_NAME+"_WebProject");
-// }
-//
-// public void testCreateAppClientComponent() throws Exception {
-// // createFlexibleJavaProject(DEFAULT_PROJECT_NAME+"_AppClientProject");
-// createAppClientComponent(14, "TestAppClient", DEFAULT_PROJECT_NAME+"_AppClientProject");
-// }
-//
-// public void testCreateEjbComponent() throws Exception {
-// // createFlexibleJavaProject(DEFAULT_PROJECT_NAME+"_EJBProject");
-// createEjbComponent(21, "TestEJB", DEFAULT_PROJECT_NAME+"_EJBProject");
-// }
-//
-// public void testCreateEARComponent() throws Exception {
-// // createFlexibleJavaProject(DEFAULT_PROJECT_NAME+"_EARProject");
-// createEARComponent(14, "TestEAR", DEFAULT_PROJECT_NAME+"_EARProject");
-// }
-
- private void createConnectorComponent(int j2eeVersion, String aModuleName, String projectName) throws Exception{
- IDataModel model = DataModelFactory.createDataModel(new ConnectorFacetProjectCreationDataModelProvider());
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
- FacetDataModelMap map = (FacetDataModelMap) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel jcaModel = map.getFacetDataModel(J2EEProjectUtilities.JCA);
- jcaModel.setIntProperty(IFacetDataModelProperties.FACET_VERSION,j2eeVersion);
- model.getDefaultOperation().execute(new NullProgressMonitor(), null);
- }
-
- private void createWebComponent(int j2eeVersion, String aModuleName, String projectName) throws Exception{
- IDataModel model = DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
- FacetDataModelMap map = (FacetDataModelMap) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel webModel = map.getFacetDataModel(J2EEProjectUtilities.DYNAMIC_WEB);
- webModel.setIntProperty(IFacetDataModelProperties.FACET_VERSION,j2eeVersion);
- model.getDefaultOperation().execute(new NullProgressMonitor(), null);
- }
-
- private void createAppClientComponent(int j2eeVersion, String aModuleName, String projectName) throws Exception{
- IDataModel model = DataModelFactory.createDataModel(new AppClientFacetProjectCreationDataModelProvider());
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
- FacetDataModelMap map = (FacetDataModelMap) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel appClientModel = map.getFacetDataModel(J2EEProjectUtilities.APPLICATION_CLIENT);
- appClientModel.setIntProperty(IFacetDataModelProperties.FACET_VERSION,j2eeVersion);
- model.getDefaultOperation().execute(new NullProgressMonitor(), null);
- }
-
- private void createEjbComponent(int j2eeVersion, String aModuleName, String projectName) throws Exception{
- IDataModel model = DataModelFactory.createDataModel(new EjbFacetProjectCreationDataModelProvider());
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
- FacetDataModelMap map = (FacetDataModelMap) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel ejbModel = map.getFacetDataModel(J2EEProjectUtilities.EJB);
- ejbModel.setIntProperty(IFacetDataModelProperties.FACET_VERSION,j2eeVersion);
- model.getDefaultOperation().execute(new NullProgressMonitor(), null);
- }
-
- private void createEARComponent(int j2eeVersion, String aModuleName, String projectName) throws Exception{
- IDataModel model = DataModelFactory.createDataModel(new EARFacetProjectCreationDataModelProvider());
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, projectName);
- FacetDataModelMap map = (FacetDataModelMap) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel earModel = map.getFacetDataModel(J2EEProjectUtilities.ENTERPRISE_APPLICATION);
- earModel.setIntProperty(IFacetDataModelProperties.FACET_VERSION,j2eeVersion);
- model.getDefaultOperation().execute(new NullProgressMonitor(), null);
- }
-
- public void testCreateWebComponentWithUserDefinedFolders() throws Exception {
- IDataModel model = DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, "TestWeb24"); //$NON-NLS-1$
- FacetDataModelMap map = (FacetDataModelMap) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel webModel = map.getFacetDataModel(J2EEProjectUtilities.DYNAMIC_WEB);
- webModel.setIntProperty(IFacetDataModelProperties.FACET_VERSION,24);
- webModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR,false);
- webModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER,"web"); //$NON-NLS-1$
- webModel.setStringProperty(IWebFacetInstallDataModelProperties.SOURCE_FOLDER, "src"); //$NON-NLS-1$
- model.getDefaultOperation().execute(new NullProgressMonitor(), null);
- }
-
- public void testCreateAppClientComponentWithUserDefinedFolders() throws Exception{
- IDataModel model = DataModelFactory.createDataModel(new AppClientFacetProjectCreationDataModelProvider());
- model.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, "TestApp15"); //$NON-NLS-1$
- FacetDataModelMap map = (FacetDataModelMap) model.getProperty(IFacetProjectCreationDataModelProperties.FACET_DM_MAP);
- IDataModel appClientModel = map.getFacetDataModel(J2EEProjectUtilities.APPLICATION_CLIENT);
- appClientModel.setIntProperty(IFacetDataModelProperties.FACET_VERSION,14);
- appClientModel.setStringProperty(IJ2EEModuleFacetInstallDataModelProperties.CONFIG_FOLDER, "src"); //$NON-NLS-1$
- appClientModel.setBooleanProperty(IJ2EEModuleFacetInstallDataModelProperties.ADD_TO_EAR, false);
- model.getDefaultOperation().execute(new NullProgressMonitor(), null);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/WebDeployTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/WebDeployTest.java
deleted file mode 100644
index 53d56e23..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/fvtests/WebDeployTest.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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.flexible.project.fvtests;
-
-import java.io.IOException;
-import java.net.URL;
-import java.util.Arrays;
-import java.util.List;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.etools.common.test.apitools.ProjectUnzipUtil;
-import org.eclipse.jem.util.emf.workbench.ProjectUtilities;
-import org.eclipse.jst.j2ee.internal.deployables.J2EEFlexProjDeployable;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.server.core.IModule;
-import org.eclipse.wst.server.core.model.IModuleFolder;
-import org.eclipse.wst.server.core.model.IModuleResource;
-import org.eclipse.wtp.j2ee.headless.tests.plugin.HeadlessTestsPlugin;
-
-public class WebDeployTest extends TestCase {
-
- private static String[] projectNames = new String[]{"TestDeploy","TestDeployUtil","TestDeployWeb","TestWebLibProject","TestExternalJar"}; //$NON-NLS-1$;
- private static Path zipFilePath = new Path("/TestData/WebDeployTests/WebDeployTest.zip"); //$NON-NLS-1$
-
- public static Test suite() {
- return new TestSuite(WebDeployTest.class);
- }
- public void testMembersDeployment() {
- ProjectUnzipUtil util = new ProjectUnzipUtil(getLocalPath(), projectNames);
- util.createProjects();
-
- //hari: we're getting the web project here
- IProject project = ProjectUtilities.getProject(projectNames[2]);
- IVirtualComponent component = ComponentCore.createComponent(project);
- J2EEFlexProjDeployable deployable = new J2EEFlexProjDeployable(project, component);
- try {
- IModuleResource[] members = deployable.members();
- assertTrue(members.length==2);
-
- for (int i=0; i<members.length; i++) {
- String name = members[i].getName();
- if (name.equals("META-INF")) {
- IModuleResource manifest = ((IModuleFolder)members[i]).members()[0];
- assertTrue(manifest.getModuleRelativePath().toString().equals("META-INF"));
- assertTrue(manifest.getName().equals("MANIFEST.MF"));
-
- } else if (name.equals("WEB-INF")) {
- IModuleResource[] webInf = ((IModuleFolder)members[i]).members();
- assertTrue(webInf.length==3);
- for (int j=0; j<webInf.length; j++) {
- IModuleResource webResource = webInf[j];
- assertTrue(webResource.getModuleRelativePath().toString().equals("WEB-INF"));
- if (webResource.getName().equals("lib")){
- IModuleResource[] webresMembers = ((IModuleFolder)webResource).members();
- {
- //finds only smokeEJB.jar here...
- assertTrue(webresMembers.length==0);
-// //Check that the names match the 3 names we expect
-// for (int k = 0; k < webresMembers.length; k++){
-// String localName = webresMembers[k].getName();
-// assertTrue (localName.equals("SmokeEJB.jar") || localName.equals("AutoWorldEJB512.jar"));
-// }
- }
- }
- }
- }
- }
-
- // get child modules on the deployable should return the utility modules which are not
- // on the manifest but are web lib projects
- IModule[] childModules = deployable.getChildModules();
- assertEquals(3, childModules.length);
- List childURIs = Arrays.asList(new String[] {
- "WEB-INF/lib/SmokeEJB.jar",
- "WEB-INF/lib/TestWebLibProject.jar",
- "WEB-INF/lib/AutoWorldEJB512.jar",
- });
-
- for (int l = 0; l < childModules.length; l++){
- String uri = deployable.getURI(childModules[l]);
- if( !childURIs.contains(uri))
- fail("URI " + uri + " is not an expected child module uri result");
- }
-
- } catch (CoreException e) {
- e.printStackTrace();
- fail(e.getMessage());
- }
-
-
-
- }
-
- private static IPath getLocalPath() {
- URL url = HeadlessTestsPlugin.getDefault().find(zipFilePath);
- try {
- url = Platform.asLocalURL(url);
- } catch (IOException e) {
- e.printStackTrace();
- }
- return new Path(url.getPath());
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/tests/FlexibleProjectEditTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/tests/FlexibleProjectEditTest.java
deleted file mode 100644
index 95579fc3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/flexible/project/tests/FlexibleProjectEditTest.java
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Created on Feb 14, 2005
- */
-package org.eclipse.jst.j2ee.flexible.project.tests;
-
-import junit.framework.TestCase;
-
-/**
- * @author vijayb
- */
-public class FlexibleProjectEditTest extends TestCase {
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/project/facet/tests/EjbProjectFacetCreationTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/project/facet/tests/EjbProjectFacetCreationTest.java
deleted file mode 100644
index cf64d67f..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/project/facet/tests/EjbProjectFacetCreationTest.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.eclipse.jst.j2ee.project.facet.tests;
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.jst.j2ee.internal.ejb.project.operations.EjbFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.tests.SimpleTestSuite;
-
-public class EjbProjectFacetCreationTest extends TestCase {
-
-
- public EjbProjectFacetCreationTest(String name) {
- super(name);
- }
-
- public EjbProjectFacetCreationTest() {
- super();
- }
- public static Test suite() {
- return new SimpleTestSuite(EjbProjectFacetCreationTest.class);
- }
-
- public void testEjbCreation() throws Exception {
-
- IDataModel dm = DataModelFactory.createDataModel( new EjbFacetProjectCreationDataModelProvider());
- dm.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, "TestEJBFacet"); //$NON-NLS-1$
- dm.getDefaultOperation().execute(null, null);
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/project/facet/tests/ProjectFacetCreationTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/project/facet/tests/ProjectFacetCreationTest.java
deleted file mode 100644
index 544159df..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/project/facet/tests/ProjectFacetCreationTest.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package org.eclipse.jst.j2ee.project.facet.tests;
-import java.util.HashSet;
-import java.util.Set;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.project.JavaEEProjectUtilities;
-import org.eclipse.wst.common.componentcore.ComponentCore;
-import org.eclipse.wst.common.componentcore.resources.IVirtualComponent;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject.Action;
-import org.eclipse.wst.common.project.facet.core.runtime.IRuntime;
-import org.eclipse.wst.common.project.facet.core.runtime.RuntimeManager;
-import org.eclipse.wst.common.tests.SimpleTestSuite;
-
-public class ProjectFacetCreationTest extends TestCase {
-
-
- public ProjectFacetCreationTest(String name) {
- super(name);
- }
-
- public ProjectFacetCreationTest() {
- super();
- }
- public static Test suite() {
- return new SimpleTestSuite(ProjectFacetCreationTest.class);
- }
-
- public void testWebCreation() throws Exception {
- IFacetedProject facetProj = ProjectFacetsManager.create("SampleWebProject",null,new NullProgressMonitor());
- // Set runtime if available
- setRuntime(facetProj);
-
- Set actions = new HashSet();
-
- //Setting up the java and web install action
- actions.add(setupJavaInstallAction());
- actions.add(setupWebInstallAction());
-
-
- facetProj.modify( actions,null);
-
- IVirtualComponent comp = ComponentCore.createComponent(facetProj.getProject());
- assertTrue(JavaEEProjectUtilities.isDynamicWebProject(comp.getProject()));
-
- }
-
- private IFacetedProject.Action setupWebInstallAction() {
- IProjectFacetVersion webfacetversion = ProjectFacetsManager.getProjectFacet( "jst.web" ).getVersion( "2.4" );
-
- IFacetedProject.Action action = new IFacetedProject.Action( Action.Type.INSTALL, webfacetversion, null );
- return action;
- }
-
- private IFacetedProject.Action setupJavaInstallAction() {
- IProjectFacetVersion webfacetversion = ProjectFacetsManager.getProjectFacet( "jst.java" ).getVersion( "1.4" );
- IFacetedProject.Action action = new IFacetedProject.Action( Action.Type.INSTALL, webfacetversion, null );
- return action;
- }
-
- protected void setRuntime(IFacetedProject facetProj) throws CoreException {
- //Setting the runtime
-// RuntimeManager.bridge();
- try {
- IRuntime runtime = RuntimeManager.getRuntime("org.eclipse.jst.server.tomcat");
- facetProj.setRuntime(runtime,null);
- } catch (IllegalArgumentException ex) {
- System.out.println("Runtime not found: org.eclipse.jst.server.tomcat");
- }
-
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/AutomatedBVT.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/AutomatedBVT.java
deleted file mode 100644
index eaa08c64..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/AutomatedBVT.java
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Created on Apr 1, 2003
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-package org.eclipse.jst.j2ee.tests.bvt;
-
-import java.net.URL;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-import junit.textui.TestRunner;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.wtp.j2ee.headless.tests.plugin.AllPluginTests;
-
-
-/**
- * @author jsholl
- *
- * To change this generated comment go to
- * Window>Preferences>Java>Code Generation>Code and Comments
- */
-public class AutomatedBVT extends TestSuite {
-
- public static String baseDirectory = System.getProperty("user.dir") + java.io.File.separatorChar + "TestData" + java.io.File.separatorChar;
-
- static {
- try {
- IPluginDescriptor pluginDescriptor = Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.jst.j2ee.tests");
- URL url = pluginDescriptor.getInstallURL();
- AutomatedBVT.baseDirectory = Platform.asLocalURL(url).getFile() + "TestData"+ java.io.File.separatorChar;
- } catch (Exception e) {
- System.err.println("Using working directory since a workspace URL could not be located.");
- }
- }
-
- public static int unimplementedMethods;
-
- public static void main(String[] args) {
- unimplementedMethods = 0;
- TestRunner.run(suite());
- if (unimplementedMethods > 0) {
- System.out.println("\nCalls to warnUnimpl: " + unimplementedMethods);
- }
- }
-
- public AutomatedBVT() {
- super();
- TestSuite suite = (TestSuite) AutomatedBVT.suite();
- for (int i = 0; i < suite.testCount(); i++) {
- addTest(suite.testAt(i));
- }
- }
-
- public static Test suite() {
- TestSuite suite = new TestSuite("Test for org.eclipse.jst.j2ee.test.bvt");
- suite.addTest(AllPluginTests.suite());
- return suite;
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/AutomatedBVTEclipse.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/AutomatedBVTEclipse.java
deleted file mode 100644
index 28536333..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/bvt/AutomatedBVTEclipse.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Created on Mar 25, 2004
- *
- * To change the template for this generated file go to
- * Window - Preferences - Java - Code Generation - Code and Comments
- */
-package org.eclipse.jst.j2ee.tests.bvt;
-
-import java.io.IOException;
-import java.net.URL;
-
-import org.eclipse.core.runtime.IPluginDescriptor;
-import org.eclipse.core.runtime.Platform;
-
-/**
- * @author jsholl
- */
-public class AutomatedBVTEclipse extends AutomatedBVT {
-
- public AutomatedBVTEclipse(){
- super();
- IPluginDescriptor pluginDescriptor = Platform.getPluginRegistry().getPluginDescriptor("org.eclipse.jst.j2ee.tests");
- URL url = pluginDescriptor.getInstallURL();
- try {
- AutomatedBVT.baseDirectory = Platform.asLocalURL(url).getFile() + "TestData"+ java.io.File.separatorChar;
- } catch (IOException e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/modulecore/AllTests.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/modulecore/AllTests.java
deleted file mode 100644
index e0cc1db9..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/modulecore/AllTests.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2005, 2006 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
- *******************************************************************************/
-/*
- * Created on Feb 18, 2005
- */
-package org.eclipse.jst.j2ee.tests.modulecore;
-
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.project.facet.tests.EjbProjectFacetCreationTest;
-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.ServerCore;
-
-public class AllTests extends TestSuite {
-
- public static IRuntime JONAS_TOMCAT_RUNTIME = createJONASRuntime();
-
- public static Test suite(){
- return new AllTests();
- }
-
- public AllTests(){
- super("ModuleCore Tests");
- //addTest(ProjectFacetCreationTest.suite());
- addTest(EjbProjectFacetCreationTest.suite());
- }
- public static IRuntime createJONASRuntime() {
- String s = "D:/JOnAS-4.3.2/lib";
- if (s == null || s.length() == 0)
- return null;
- try {
- IRuntimeType rt = ServerCore.findRuntimeType("org.eclipse.jst.server.core.runtimeType");
- IRuntimeWorkingCopy wc = rt.createRuntime(null, null);
- wc.setLocation(new Path(s));
- return wc.save(true, null);
- } catch (Exception e) {
- e.printStackTrace();
- return null;
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/modulecore/FlexibleProjectBuilderTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/modulecore/FlexibleProjectBuilderTest.java
deleted file mode 100644
index c76bd466..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/modulecore/FlexibleProjectBuilderTest.java
+++ /dev/null
@@ -1,259 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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.tests.modulecore;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceDescription;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
-import org.eclipse.wst.common.componentcore.internal.ProjectComponents;
-import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-
-public class FlexibleProjectBuilderTest extends TestCase {
- public static final String MODULE__RESOURCE_URI_PROTOCOL = "module:/resource/";
- private IProject project;
- private EMFWorkbenchContext emfContext;
-
- public FlexibleProjectBuilderTest(String name) {
- super(name);
- }
-
- public static Test suite() {
- // return new TestSuite(ModuleEditModelTest.class);
- TestSuite suite = new TestSuite();
- suite.addTest(new FlexibleProjectBuilderTest("testFlexibleProjectBuilderOutput"));
- return suite;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see junit.framework.TestCase#setUp()
- */
- public void setUp() throws Exception {
- IWorkspaceDescription desc = ResourcesPlugin.getWorkspace().getDescription();
- desc.setAutoBuilding(false);
- ResourcesPlugin.getWorkspace().setDescription(desc);
- getProjectForWebModuleAndLocalWebLib().delete(true, null);
- getProjectForRemoteWebLib().delete(true, null);
- super.setUp();
- }
-
- /**
- *
- */
- public void testFlexibleProjectBuilderOutput() throws Exception {
- setupContent();
- buildProjects();
- }
-
-
- /**
- *
- */
- private void buildProjects() {
- try {
- ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, null);
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-
- public void setupContent() throws Exception {
- StructureEdit localModuleCore = null;
- try {
- getProjectForWebModuleAndLocalWebLib();
-
- IProject containingProject = StructureEdit.getContainingProject(getWebModuleURI());
- localModuleCore = StructureEdit.getStructureEditForWrite(containingProject);
-
- createLocalModules(localModuleCore);
-
- // will setup and handle creating the modules model
- getProjectForRemoteWebLib();
-
- WorkbenchComponent webModule = localModuleCore.getComponent();
-
- addDependentModule(webModule, new Path("WEB-INF/lib"), getLocalWebLibraryModuleURI());
- addDependentModule(webModule, new Path("WEB-INF/lib"), getRemoteWebLibraryModuleURI());
-
- localModuleCore.saveIfNecessary(null);
-
- } finally {
- if (localModuleCore != null)
- localModuleCore.dispose();
- }
-
- }
-
- public IProject getProjectForWebModuleAndLocalWebLib() throws Exception {
- return getWebProject(getWebModuleAndLocalWebLibModuleProjectName());
- }
-
- public IProject getProjectForRemoteWebLib() throws Exception {
- return getJavaProject(getRemoteWebLibModuleProjectName());
- }
-
- public String getWebModuleAndLocalWebLibModuleProjectName() {
- return "MyModulesProject"; //$NON-NLS-1$
- }
-
- public String getRemoteWebLibModuleProjectName() {
- return "RemoteWebLibProject"; //$NON-NLS-1$
- }
-
- public IProject getWebProject(String aProjectName) throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(aProjectName);
- if (!project.exists())
- project = createWebProject(aProjectName);
- return project;
- }
-
- public IProject getJavaProject(String aProjectName) throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(aProjectName);
- if (!project.exists()) {
- // createJavaProject(aProjectName);
- }
- return project;
- }
-
- public IProject createWebProject(String aProjectName) throws Exception {
-
- project = ResourcesPlugin.getWorkspace().getRoot().getProject(aProjectName);
- if (!project.exists()) {
- IDataModel dataModel = DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- dataModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, aProjectName);
- dataModel.getDefaultOperation().execute(new NullProgressMonitor(), null);
- }
- return ResourcesPlugin.getWorkspace().getRoot().getProject(aProjectName);
- }
-
- // public IProject createJavaProject(String aProjectName) throws Exception {
- //
- // project = ResourcesPlugin.getWorkspace().getRoot().getProject(aProjectName);
- // if (!project.exists()) {
- // IDataModel dataModel = DataModelFactory.createDataModel(new
- // TestJavaProjectCreationDataModelProvider());
- // dataModel.setProperty(ITestJavaProjectCreationProperties.PROJECT_NAME, aProjectName);
- // dataModel.getDefaultOperation().execute(new NullProgressMonitor(),null);
- // project = ResourcesPlugin.getWorkspace().getRoot().getProject(aProjectName);
- // ModuleCoreNature.addModuleCoreNatureIfNecessary(project, null);
- //
- // ModuleStructuralModel structuralModel = null;
- // try {
- // structuralModel =
- // ModuleCoreNature.getModuleCoreNature(project).getModuleStructuralModelForWrite(this);
- // structuralModel.prepareProjectModulesIfNecessary();
- // StructureEdit moduleCore = (StructureEdit)
- // structuralModel.getAdapter(StructureEdit.ADAPTER_TYPE);
- // String deployedName = aProjectName + ".jar";
- // URI moduleURI = URI.createURI(MODULE__RESOURCE_URI_PROTOCOL + aProjectName + IPath.SEPARATOR
- // + deployedName);
- // WorkbenchComponent utilityModule = addWorkbenchModule(moduleCore.getComponentModelRoot(),
- // deployedName, moduleURI);
- // IResource sourceFolder = project.getFolder("src");
- // addResource(utilityModule, sourceFolder, "/"); //$NON-NLS-1$
- // structuralModel.saveIfNecessary(this);
- // } finally {
- // if (structuralModel != null)
- // structuralModel.releaseAccess(this);
- // }
- // }
- // return ResourcesPlugin.getWorkspace().getRoot().getProject(aProjectName);
- // }
-
- public void addResource(WorkbenchComponent aModule, IResource aSourceFile, String aDeployPath) {
- ComponentResource resource = ComponentcoreFactory.eINSTANCE.createComponentResource();
- resource.setSourcePath(aSourceFile.getFullPath());
- resource.setRuntimePath(new Path(aDeployPath));
- aModule.getResources().add(resource);
- }
-
- public WorkbenchComponent addWorkbenchModule(ProjectComponents theModules, String aDeployedName, URI aHandle) {
- WorkbenchComponent module = ComponentcoreFactory.eINSTANCE.createWorkbenchComponent();
- module.setName(aDeployedName);
- theModules.getComponents().add(module);
- return module;
- }
-
- public void addDependentModule(WorkbenchComponent aModule, IPath aDeployedPath, URI aHandle) {
- ReferencedComponent aClasspathDependentModule = ComponentcoreFactory.eINSTANCE.createReferencedComponent();
- aClasspathDependentModule.setRuntimePath(aDeployedPath);
- aClasspathDependentModule.setHandle(aHandle);
- aModule.getReferencedComponents().add(aClasspathDependentModule);
- }
-
- public void createLocalModules(StructureEdit moduleCore) throws Exception {
-
- ProjectComponents projectModules = moduleCore.getComponentModelRoot();
-
- WorkbenchComponent webLibraryModule = addWorkbenchModule(projectModules, getLocalWebLibraryDeployedName(), getLocalWebLibraryModuleURI());
- IFolder localWebLibrary = getProjectForWebModuleAndLocalWebLib().getFolder(getLocalWebLibraryFolderName());
- if (!localWebLibrary.exists())
- localWebLibrary.create(true, true, null);
- addResource(webLibraryModule, localWebLibrary, "/");
- }
-
- public URI getWebModuleURI() {
- return URI.createURI(MODULE__RESOURCE_URI_PROTOCOL + getWebModuleAndLocalWebLibModuleProjectName() + IPath.SEPARATOR + getWebModuleDeployedName());
- }
-
- public URI getLocalWebLibraryModuleURI() {
- return URI.createURI(MODULE__RESOURCE_URI_PROTOCOL + getWebModuleAndLocalWebLibModuleProjectName() + IPath.SEPARATOR + getLocalWebLibraryDeployedName());
- }
-
- public URI getRemoteWebLibraryModuleURI() {
- return URI.createURI(MODULE__RESOURCE_URI_PROTOCOL + getRemoteWebLibModuleProjectName() + IPath.SEPARATOR + getRemoteWebLibraryDeployedName());
- }
-
- public String getWebModuleDeployedName() {
- return getWebModuleAndLocalWebLibModuleProjectName() + ".war"; //$NON-NLS-1$
- }
-
- public String getLocalWebLibraryDeployedName() {
- return "LocalWebLibrary.jar"; //$NON-NLS-1$
- }
-
- public String getRemoteWebLibraryDeployedName() {
- return getRemoteWebLibModuleProjectName() + ".jar"; //$NON-NLS-1$
- }
-
- public String getModulesFolder() {
- return "MyWebModule"; //$NON-NLS-1$
- }
-
- public String getTestResourcePath() {
- return "WEB-INF/web.xml"; //$NON-NLS-1$
- }
-
- public String getLocalWebLibraryFolderName() {
- return "WebLibraryContents";
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/modulecore/ModuleStructuralModelTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/modulecore/ModuleStructuralModelTest.java
deleted file mode 100644
index 1152d78c..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/j2ee/tests/modulecore/ModuleStructuralModelTest.java
+++ /dev/null
@@ -1,409 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2003, 2006 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.tests.modulecore;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.jst.j2ee.internal.web.archive.operations.WebFacetProjectCreationDataModelProvider;
-import org.eclipse.jst.j2ee.web.componentcore.util.WebArtifactEdit;
-import org.eclipse.jst.j2ee.webapplication.WebApp;
-import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.datamodel.properties.IFacetProjectCreationDataModelProperties;
-import org.eclipse.wst.common.componentcore.internal.ArtifactEditModel;
-import org.eclipse.wst.common.componentcore.internal.ComponentResource;
-import org.eclipse.wst.common.componentcore.internal.ComponentcoreFactory;
-import org.eclipse.wst.common.componentcore.internal.ProjectComponents;
-import org.eclipse.wst.common.componentcore.internal.ReferencedComponent;
-import org.eclipse.wst.common.componentcore.internal.StructureEdit;
-import org.eclipse.wst.common.componentcore.internal.WorkbenchComponent;
-import org.eclipse.wst.common.componentcore.internal.impl.ArtifactEditModelFactory;
-import org.eclipse.wst.common.componentcore.internal.impl.PlatformURLModuleConnection;
-import org.eclipse.wst.common.componentcore.internal.impl.ResourceTreeRoot;
-import org.eclipse.wst.common.componentcore.internal.util.SourcePathProvider;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-import org.eclipse.wst.common.internal.emfworkbench.EMFWorkbenchContext;
-
-/**
- * <p>
- * The following class is experimental until fully documented.
- * </p>
- */
-public class ModuleStructuralModelTest extends TestCase {
-
- public static final String MODULE__RESOURCE_URI_PROTOCOL = "module:/resource/";
- private IProject project;
- private EMFWorkbenchContext emfContext;
-
- public interface IModuleTypesConstants {
- String MODULE_TYPE_WEB = "org.eclipse.jst.modules.web"; //$NON-NLS-1$
- }
-
-
- public ModuleStructuralModelTest(String name) {
- super(name);
- }
-
- public static Test suite() {
- // return new TestSuite(ModuleEditModelTest.class);
- TestSuite suite = new TestSuite();
- suite.addTest(new ModuleStructuralModelTest("testResolveDependentModule"));
- return suite;
- }
-
- /*
- * (non-Javadoc)
- *
- * @see junit.framework.TestCase#setUp()
- */
- public void setUp() throws Exception {
- getProjectForWebModuleAndLocalWebLib().delete(true, null);
- getProjectForRemoteWebLib().delete(true, null);
- setupContent();
- super.setUp();
- }
-
- /**
- *
- */
- public void testResourceTree() throws Exception {
- StructureEdit moduleCore = null;
- try {
- /* We need to find the project */
- moduleCore = StructureEdit.getStructureEditForRead(StructureEdit.getContainingProject(getWebModuleURI()));
-
- WorkbenchComponent module = moduleCore.getWorkbenchModules()[0];
- ResourceTreeRoot sourceRoot = new ResourceTreeRoot(module, SourcePathProvider.INSTANCE);
- ComponentResource[] resources = sourceRoot.findModuleResources(URI.createURI("/WebContent/WEB-INF/web.xml"));
- System.out.println(resources[0] != null ? resources[0].getSourcePath().toString() : "NOT FOUND");
-
- } finally {
- if (moduleCore != null)
- moduleCore.dispose();
- }
-
- }
-
- public void testResolveDependentModule() throws Exception {
-
- StructureEdit moduleCore = null;
- try {
- IProject containingProject = StructureEdit.getContainingProject(getWebModuleURI());
- moduleCore = StructureEdit.getStructureEditForRead(containingProject);
- WorkbenchComponent[] modules = moduleCore.getWorkbenchModules();
- ProjectComponents pm = moduleCore.getComponentModelRoot();
- Class clazz = moduleCore.getClass();
- String name = StructureEdit.getDeployedName(getWebModuleURI());
- List dependentModules = null;
- for (int i = 0; i < modules.length; i++) {
- System.out.println("Module: " + modules[i].getName());
- List list = modules[i].getResources();
- for (int j = 0; j < list.size(); j++) {
- ComponentResource wmr = (ComponentResource) list.get(j);
- IResource er = StructureEdit.getEclipseResource(wmr);
- }
- // test modulecore API
- dependentModules = modules[i].getReferencedComponents();
- for (int dependentIndex = 0; dependentIndex < dependentModules.size(); dependentIndex++) {
- ReferencedComponent dependentModule = (ReferencedComponent) dependentModules.get(dependentIndex);
- WorkbenchComponent resolvedModule = moduleCore.findComponentByURI(dependentModule.getHandle());
- System.out.println("\tDependentModule: " + resolvedModule.getName() + " in " + resolvedModule.getHandle());
- boolean b = moduleCore.isLocalDependency(dependentModule);
- }
- }
- } finally {
- if (moduleCore != null)
- moduleCore.dispose();
- }
- }
-
- public void testLoadResource() throws Exception {
-
- ArtifactEditModel artifactModel = null;
- try {
- URI moduleURI = URI.createURI(MODULE__RESOURCE_URI_PROTOCOL + getWebModuleAndLocalWebLibModuleProjectName() + "/" + getWebModuleAndLocalWebLibModuleProjectName() + ".war");
- artifactModel = getNature(getProjectForWebModuleAndLocalWebLib()).getArtifactEditModelForRead(moduleURI, this);
- WebArtifactEdit editUtility = (WebArtifactEdit) artifactModel.getAdapter(WebArtifactEdit.ADAPTER_TYPE);
-
- WebApp webApp = (WebApp) editUtility.getDeploymentDescriptorRoot();
- if (webApp == null)
- System.out.println("Read failed.");
- else
- System.out.println("Found WebApp: " + webApp.getDisplayName());
- } finally {
- if (artifactModel != null)
- artifactModel.releaseAccess(this);
- }
- }
-
- public void testURIAPI() throws Exception {
- URI uri = URI.createURI(MODULE__RESOURCE_URI_PROTOCOL + getWebModuleAndLocalWebLibModuleProjectName() + IPath.SEPARATOR + getWebModuleDeployedName() + ".war" + IPath.SEPARATOR + getTestResourcePath());
- System.out.println("URI : \"" + uri.toString() + "\"" + " with scheme \"" + uri.scheme() + "\" has " + uri.segmentCount() + " segments. They are ...");
- String[] segments = uri.segments();
- for (int i = 0; i < segments.length; i++)
- System.out.println("[" + i + "]: " + segments[i]);
-
-
- /* Determine if the URI is for a resource or binary module */
-
- if (PlatformURLModuleConnection.RESOURCE_MODULE.equals(segments[0])) {
- StructureEdit moduleCore = null;
- try {
- moduleCore = StructureEdit.getStructureEditForRead(StructureEdit.getContainingProject(uri));
- ComponentResource[] resource = moduleCore.findResourcesByRuntimePath(uri);
- System.out.println(resource != null ? resource[0].getSourcePath().toString() : "NOT FOUND");
- } finally {
- if (moduleCore != null)
- moduleCore.dispose();
- }
- } else if (PlatformURLModuleConnection.BINARY_MODULE.equals(segments[0])) {
-
- }
- }
-
- public void testLoadingDocument() throws Exception {
- ArtifactEditModelFactory factory = new ArtifactEditModelFactory();
-
- URI moduleURI = URI.createURI(PlatformURLModuleConnection.MODULE_PROTOCOL + IPath.SEPARATOR + getWebModuleAndLocalWebLibModuleProjectName() + IPath.SEPARATOR + getWebModuleDeployedName());
- URI ddURI = URI.createURI(IPath.SEPARATOR + "WEB-INF" + IPath.SEPARATOR + "web.xml");
-
- Map params = new HashMap();
- params.put(ArtifactEditModelFactory.PARAM_MODULE_URI, moduleURI);
- EMFWorkbenchContext context = createEMFWorkbenchContext();
- ArtifactEditModel editModel = (ArtifactEditModel) factory.createEditModelForWrite(IModuleTypesConstants.MODULE_TYPE_WEB, context, params);
- Resource ddResource = editModel.getResource(ddURI);
- EObject rootObject = (EObject) ddResource.getContents().get(0);
- if (rootObject == null)
- System.out.println("Read failed.");
- else
- System.out.println("Found WebApp: " + ((WebApp) rootObject).getDisplayName());
-
- }
-
- public void setupContent() throws Exception {
- StructureEdit localModuleCore = null;
- try {
- getProjectForWebModuleAndLocalWebLib();
-
- IProject containingProject = StructureEdit.getContainingProject(getWebModuleURI());
- localModuleCore = StructureEdit.getStructureEditForWrite(containingProject);
-
- createLocalModules(localModuleCore);
-
- // will setup and handle creating the modules model
- getProjectForRemoteWebLib();
-
- WorkbenchComponent webModule = localModuleCore.getComponent();
-
- addDependentModule(webModule, new Path("WEB-INF/lib"), getLocalWebLibraryModuleURI());
- addDependentModule(webModule, new Path("WEB-INF/lib"), getRemoteWebLibraryModuleURI());
-
- localModuleCore.saveIfNecessary(null);
-
- } finally {
- if (localModuleCore != null)
- localModuleCore.dispose();
- }
-
- }
-
- public void createLocalModules(StructureEdit moduleCore) throws Exception {
-
- ProjectComponents projectModules = moduleCore.getComponentModelRoot();
-
- WorkbenchComponent webLibraryModule = addWorkbenchModule(projectModules, getLocalWebLibraryDeployedName(), getLocalWebLibraryModuleURI());
- IFolder localWebLibrary = getProjectForWebModuleAndLocalWebLib().getFolder(getLocalWebLibraryFolderName());
- if (!localWebLibrary.exists())
- localWebLibrary.create(true, true, null);
- addResource(webLibraryModule, localWebLibrary, "/");
- }
-
- public IFile getModuleRelativeFile(String aModuleRelativePath) throws Exception {
- return getProjectForWebModuleAndLocalWebLib().getFile(new Path(getModulesFolder() + IPath.SEPARATOR + aModuleRelativePath));
- }
-
- public void addResource(WorkbenchComponent aModule, IResource aSourceFile, String aDeployPath) {
- ComponentResource resource = ComponentcoreFactory.eINSTANCE.createComponentResource();
- resource.setSourcePath(aSourceFile.getFullPath());
- resource.setRuntimePath(new Path(aDeployPath));
- aModule.getResources().add(resource);
- }
-
- public WorkbenchComponent addWorkbenchModule(ProjectComponents theModules, String aDeployedName, URI aHandle) {
- WorkbenchComponent module = ComponentcoreFactory.eINSTANCE.createWorkbenchComponent();
- module.setName(aDeployedName);
- theModules.getComponents().add(module);
- return module;
- }
-
- public void addDependentModule(WorkbenchComponent aModule, IPath aDeployedPath, URI aHandle) {
- ReferencedComponent aClasspathDependentModule = ComponentcoreFactory.eINSTANCE.createReferencedComponent();
- aClasspathDependentModule.setRuntimePath(aDeployedPath);
- aClasspathDependentModule.setHandle(aHandle);
- aModule.getReferencedComponents().add(aClasspathDependentModule);
- }
-
-
- public EMFWorkbenchContext createEMFWorkbenchContext() throws Exception {
- if (emfContext == null)
- emfContext = new EMFWorkbenchContext(getProjectForWebModuleAndLocalWebLib());
- return emfContext;
- }
-
- public IProject getProjectForWebModuleAndLocalWebLib() throws Exception {
- return getWebProject(getWebModuleAndLocalWebLibModuleProjectName());
- }
-
- public IProject getProjectForRemoteWebLib() throws Exception {
- return getJavaProject(getRemoteWebLibModuleProjectName());
- }
-
- public IProject getWebProject(String aProjectName) throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(aProjectName);
- if (!project.exists())
- project = createWebProject(aProjectName);
- return project;
- }
-
- public IProject getJavaProject(String aProjectName) throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(aProjectName);
- if (!project.exists()) {
- // createJavaProject(aProjectName);
- }
- return project;
- }
-
- public IProject createWebProject(String aProjectName) throws Exception {
-
- project = ResourcesPlugin.getWorkspace().getRoot().getProject(aProjectName);
- if (!project.exists()) {
- IDataModel dataModel = DataModelFactory.createDataModel(new WebFacetProjectCreationDataModelProvider());
- dataModel.setProperty(IFacetProjectCreationDataModelProperties.FACET_PROJECT_NAME, aProjectName);
- // dataModel.setProperty(WebComponentCreationDataModel.IS_FLEXIBLE_PROJECT,
- // Boolean.TRUE);
- // dataModel.setProperty(IWebComponentCreationDataModelProperties.ADD_TO_EAR,
- // Boolean.FALSE);
- // dataModel.setProperty(WebComponentCreationDataModel.ADD_SERVER_TARGET,
- // Boolean.FALSE);
- // dataModel.setProperty(WebModuleCreationDataModel.SERVER_TARGET_ID,
- // AllPluginTests.JONAS_SERVER.getId());
- dataModel.getDefaultOperation().execute(new NullProgressMonitor(), null);
- }
- return ResourcesPlugin.getWorkspace().getRoot().getProject(aProjectName);
- }
-
- // public IProject createJavaProject(String aProjectName) throws Exception {
- //
- // project = ResourcesPlugin.getWorkspace().getRoot().getProject(aProjectName);
- // if (!project.exists()) {
- // IDataModel dataModel = DataModelFactory.createDataModel(new
- // TestJavaProjectCreationDataModelProvider());
- // dataModel.setProperty(ITestJavaProjectCreationProperties.PROJECT_NAME, aProjectName);
- // dataModel.getDefaultOperation().execute(new NullProgressMonitor(), null);
- // project = ResourcesPlugin.getWorkspace().getRoot().getProject(aProjectName);
- // ModuleCoreNature.addModuleCoreNatureIfNecessary(project, null);
- //
- // ModuleStructuralModel structuralModel = null;
- // try {
- // structuralModel =
- // ModuleCoreNature.getModuleCoreNature(project).getModuleStructuralModelForWrite(this);
- // structuralModel.prepareProjectModulesIfNecessary();
- // StructureEdit moduleCore = (StructureEdit)
- // structuralModel.getAdapter(StructureEdit.ADAPTER_TYPE);
- // String deployedName = aProjectName + ".jar";
- // URI moduleURI = URI.createURI(MODULE__RESOURCE_URI_PROTOCOL + aProjectName + IPath.SEPARATOR
- // + deployedName);
- // WorkbenchComponent utilityModule = addWorkbenchModule(moduleCore.getComponentModelRoot(),
- // deployedName, moduleURI);
- // IResource sourceFolder = project.getFolder("src");
- // addResource(utilityModule, sourceFolder, "/"); //$NON-NLS-1$
- // structuralModel.saveIfNecessary(this);
- // } finally {
- // if (structuralModel != null)
- // structuralModel.releaseAccess(this);
- // }
- // }
- // return ResourcesPlugin.getWorkspace().getRoot().getProject(aProjectName);
- // }
-
- public ModuleCoreNature getNature(IProject aProject) {
- try {
- return (ModuleCoreNature) aProject.getNature(ModuleCoreNature.MODULE_NATURE_ID);
- } catch (CoreException e) {
- e.printStackTrace();
- }
- return null;
- }
-
- public URI getWebModuleURI() {
- return URI.createURI(MODULE__RESOURCE_URI_PROTOCOL + getWebModuleAndLocalWebLibModuleProjectName() + IPath.SEPARATOR + getWebModuleDeployedName());
- }
-
- public URI getLocalWebLibraryModuleURI() {
- return URI.createURI(MODULE__RESOURCE_URI_PROTOCOL + getWebModuleAndLocalWebLibModuleProjectName() + IPath.SEPARATOR + getLocalWebLibraryDeployedName());
- }
-
- public URI getRemoteWebLibraryModuleURI() {
- return URI.createURI(MODULE__RESOURCE_URI_PROTOCOL + getRemoteWebLibModuleProjectName() + IPath.SEPARATOR + getRemoteWebLibraryDeployedName());
- }
-
- public String getWebModuleAndLocalWebLibModuleProjectName() {
- return "MyModulesProject"; //$NON-NLS-1$
- }
-
- public String getRemoteWebLibModuleProjectName() {
- return "RemoteWebLibProject"; //$NON-NLS-1$
- }
-
- public String getWebModuleDeployedName() {
- return getWebModuleAndLocalWebLibModuleProjectName() + ".war"; //$NON-NLS-1$
- }
-
- public String getLocalWebLibraryDeployedName() {
- return "LocalWebLibrary.jar"; //$NON-NLS-1$
- }
-
- public String getRemoteWebLibraryDeployedName() {
- return getRemoteWebLibModuleProjectName() + ".jar"; //$NON-NLS-1$
- }
-
- public String getModulesFolder() {
- return "MyWebModule"; //$NON-NLS-1$
- }
-
- public String getTestResourcePath() {
- return "WEB-INF/web.xml"; //$NON-NLS-1$
- }
-
- public String getLocalWebLibraryFolderName() {
- return "WebLibraryContents";
- }
-
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/CreateModelFromXmlTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/CreateModelFromXmlTest.java
deleted file mode 100644
index 63441777..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/CreateModelFromXmlTest.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.ejb.tests;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.model.tests.AbstractTest;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class CreateModelFromXmlTest extends TestCase {
-
- private static IFacetedProject facetedProject;
- private EJBJar fixture;
-
- public static TestSuite suite() throws Exception {
- TestSuite suite = new TestSuite();
- setUpProject();
- suite.addTestSuite(CreateModelFromXmlTest.class);
- return suite;
- }
-
- // @BeforeClass
- public static void setUpProject() throws Exception {
- facetedProject = AbstractTest.createEjbProject(CreateModelFromXmlTest.class.getSimpleName());
- createProjectContent();
- }
-
- // @AfterClass
- public static void tearDownAfterClass() throws InterruptedException {
- AbstractTest.deleteProject(CreateModelFromXmlTest.class.getSimpleName());
- }
-
- private static void createProjectContent() throws Exception {
- setEjbJarXmlContent();
- }
-
- private static void setEjbJarXmlContent() throws IOException, CoreException {
- IFile file = facetedProject.getProject().getFile(new Path("ejbModule/META-INF/ejb-jar.xml"));
- String content = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- + "<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\">"
- + "<enterprise-beans>" + " <session>" + " <ejb-name>com.sap.SessionBean</ejb-name>"
- + " <ejb-class>com.sap.SessionBean</ejb-class>" + " <session-type>Stateless</session-type>"
- + " </session>" + " </enterprise-beans>" + "</ejb-jar>";
-
- ByteArrayOutputStream stream = new ByteArrayOutputStream();
- stream.write(content.getBytes());
- file.setContents(new ByteArrayInputStream(stream.toByteArray()), IResource.FORCE, new NullProgressMonitor());
- }
-
- /**
- * @throws java.lang.Exception
- */
- // @Before
- public void setUp() throws Exception {
- IModelProvider provider = ModelProviderManager.getModelProvider(facetedProject.getProject());
- fixture = (EJBJar) provider.getModelObject();
- }
-
- // @Test
- public void testGetBeans() {
- assertEquals(new Integer(1), new Integer(fixture.getEnterpriseBeans().getSessionBeans().size()));
- }
-
- // @Test
- public void testSessionBean() {
- SessionBean bean = (SessionBean) fixture.getEnterpriseBeans().getSessionBeans().get(0);
- assertEquals("com.sap.SessionBean", bean.getEjbName());
- assertEquals("com.sap.SessionBean", bean.getEjbClass());
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/DeleteProjectTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/DeleteProjectTest.java
deleted file mode 100644
index c81847f4..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/DeleteProjectTest.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.ejb.tests;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.jee.model.tests.AbstractTest;
-import org.eclipse.jst.jee.model.tests.SynchronousModelChangedListener;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * This is a test for deleting a project and updating the model providers.
- *
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class DeleteProjectTest extends TestCase {
-
- public static TestSuite suite() {
- TestSuite suite = new TestSuite(DeleteProjectTest.class);
- return suite;
- }
-
- private static void createProjectContent(IFacetedProject facetedProject) throws CoreException {
- IJavaProject javaProject = JavaCore.create(facetedProject.getProject());
- IFolder comFolder = javaProject.getProject().getFolder("ejbModule/com");
- comFolder.create(true, true, new NullProgressMonitor());
- IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(comFolder);
- IPackageFragment fragment = root.createPackageFragment("sap", true, new NullProgressMonitor());
- createSessionBean(fragment);
- createSessionBeanLocal(fragment);
- createBeanWithName(fragment);
- }
-
- private static void createBeanWithName(IPackageFragment fragment) throws JavaModelException {
- String content = String.format("package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless(name=\"%s\") public class BeanWithName implements SessionBeanLocal {}", "beanWithName");
- fragment.createCompilationUnit("BeanWithName.java", content, true, null);
- }
-
- private static void createSessionBeanLocal(IPackageFragment fragment) throws JavaModelException {
- fragment.createCompilationUnit("SessionBeanLocal.java", "package com.sap;" + "import javax.ejb.Local;"
- + "@Local public interface SessionBeanLocal {}", true, null);
- }
-
- private static void createSessionBean(IPackageFragment fragment) throws JavaModelException {
- fragment.createCompilationUnit("SessionBean.java", "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class SessionBean implements SessionBeanLocal {}", true, null);
- }
-
- /**
- * The same instance of the model provider is preserved during deleting the
- * project. After the project is deleted the instance of the IModelProvider
- * must return <code>null</code> for model object
- *
- * @throws Exception
- */
- // @Test
- public void testDeleteProjectSameProvider() throws Exception {
- IProject project = ProjectUtil.createEJBProject(DeleteProjectTest.class.getSimpleName()
- + "testDeleteProjectSameProvider", null, J2EEVersionConstants.EJB_3_0_ID, true);
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- createProjectContent(facetedProject);
- IModelProvider provider = ModelProviderManager.getModelProvider(facetedProject.getProject());
- EJBJar firstModel = (EJBJar) provider.getModelObject();
- assertNotNull(firstModel);
- assertEquals(firstModel, provider.getModelObject());
-
- SynchronousModelChangedListener listener = new SynchronousModelChangedListener(1);
- provider.addListener(listener);
- AbstractTest.deleteProject(facetedProject.getProject().getName());
- assertTrue(listener.waitForEvents());
- provider.removeListener(listener);
-
- try {
- EJBJar secondModel = (EJBJar) provider.getModelObject();
- fail("IllegalStateException expected because the project is deleted and can not be accessed.");
- } catch (IllegalStateException e) {
- }
- }
-
- // @Test(expected = IllegalArgumentException.class)
- public void testProviderForNonExistingProject() {
- try {
- IProject nonExistingProject = ResourcesPlugin.getWorkspace().getRoot().getProject(
- "testProviderForNonExistingProject");
- assertFalse(nonExistingProject.exists());
- ModelProviderManager.getModelProvider(nonExistingProject);
- fail("IllgalArgumentException expected");
- } catch (IllegalArgumentException e) {
-
- }
- }
-
- /**
- * Get the model for a project. Close the project. Get the model from the
- * same model provider. The model should be null because the project is
- * closed.
- *
- * @throws Exception
- */
- // @Test
- public void testCloseProjectSameProvider() throws Exception {
- IProject project = ProjectUtil.createEJBProject(DeleteProjectTest.class.getSimpleName() + "testClose", null,
- J2EEVersionConstants.EJB_3_0_ID, true);
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- createProjectContent(facetedProject);
- IModelProvider provider = ModelProviderManager.getModelProvider(facetedProject.getProject());
- EJBJar firstModel = (EJBJar) provider.getModelObject();
- assertNotNull(firstModel);
- assertEquals(firstModel, provider.getModelObject());
-
- SynchronousModelChangedListener listener = new SynchronousModelChangedListener(1);
- provider.addListener(listener);
- AbstractTest.closeProject(facetedProject.getProject().getName());
- assertTrue(listener.waitForEvents());
- provider.removeListener(listener);
- try {
- EJBJar secondModel = (EJBJar) provider.getModelObject();
- fail("IllegalStateExceptino expected because the project is deleted and can not be accessed.");
- } catch (IllegalStateException e) {
- }
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EJB3MergedModelProviderFactoryTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EJB3MergedModelProviderFactoryTest.java
deleted file mode 100644
index 199b6cef..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EJB3MergedModelProviderFactoryTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.ejb.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.jee.model.internal.Ejb3MergedModelProviderFactory;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class EJB3MergedModelProviderFactoryTest extends TestCase {
-
- private Ejb3MergedModelProviderFactory fixture;
-
- public static Test suite() {
- TestSuite suite = new TestSuite(EJB3MergedModelProviderFactoryTest.class);
- return suite;
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- fixture = new Ejb3MergedModelProviderFactory();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
- public void testCreateForProject() {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- this.getClass().getSimpleName() + this.getName());
- IModelProvider provider = fixture.create(project);
- assertNotNull(provider);
- }
-
- public void testSameProjectDisposedProvider() {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- this.getClass().getSimpleName() + this.getName());
- IModelProvider provider = fixture.create(project);
- assertFalse(provider.equals(fixture.create(project)));
- assertNotSame(provider, fixture.create(project));
- }
-
- /**
- * Same provider must be returned for the same project.
- *
- * @throws Exception
- */
- public void testSameProject() throws Exception {
- IProject project = ProjectUtil.createEJBProject(this.getClass().getSimpleName() + this.getName(), null,
- J2EEVersionConstants.EJB_3_0_ID, true);
- IModelProvider provider = fixture.create(project);
- provider.getModelObject();
- IModelProvider secondProvider = fixture.create(project);
- assertEquals(provider.getModelObject(), secondProvider.getModelObject());
- assertEquals(provider, secondProvider);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EJB3MergedModelProviderTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EJB3MergedModelProviderTest.java
deleted file mode 100644
index 5cfda8a0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EJB3MergedModelProviderTest.java
+++ /dev/null
@@ -1,338 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.ejb.tests;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.jst.j2ee.ejb.internal.operations.AddSessionBeanOperation;
-import org.eclipse.jst.j2ee.ejb.internal.operations.INewSessionBeanClassDataModelProperties;
-import org.eclipse.jst.j2ee.ejb.internal.operations.NewSessionBeanClassDataModelProvider;
-import org.eclipse.jst.j2ee.ejb.internal.operations.StateType;
-import org.eclipse.jst.j2ee.ejb.project.operations.IEjbFacetInstallDataModelProperties;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.EjbClientJarCreationDataModelProvider;
-import org.eclipse.jst.j2ee.internal.ejb.archiveoperations.IEjbClientJarCreationDataModelProperties;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.j2ee.project.facet.IJ2EEFacetInstallDataModelProperties;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.jee.model.internal.Ejb3ModelProvider;
-import org.eclipse.jst.jee.model.tests.AbstractAnnotationModelTest;
-import org.eclipse.jst.jee.model.tests.AbstractTest;
-import org.eclipse.jst.jee.model.tests.SynchronousModelChangedListener;
-import org.eclipse.jst.jee.model.tests.TestUtils;
-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.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class EJB3MergedModelProviderTest extends AbstractAnnotationModelTest {
-
- private static final String EJB_PROJECT_NAME = EJB3MergedModelProviderTest.class.getSimpleName();
- private static final String EAR_PROJECT_NAME = EJB_PROJECT_NAME + "ear";
- private static final String CLIENT_NAME = EJB_PROJECT_NAME + "Client";
-
- public static TestSuite suite() throws Exception {
- TestSuite suite = new TestSuite(EJB3MergedModelProviderTest.class);
- setUpProject();
- return suite;
- }
-
- // @BeforeClass
- public static void setUpProject() throws Exception {
- ProjectUtil.createEARProject(EAR_PROJECT_NAME);
- IProject project = ProjectUtil.createEJBProject(EJB_PROJECT_NAME, EAR_PROJECT_NAME, CLIENT_NAME,
- J2EEVersionConstants.EJB_3_0_ID, true);
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- IProject clientProject = ResourcesPlugin.getWorkspace().getRoot().getProject(CLIENT_NAME);
- createProjectContent(facetedProject.getProject());
- createClientProjectContent(clientProject);
- }
-
- private static void createClientProjectContent(IProject clientProject) throws Exception {
- IJavaProject javaProject = JavaCore.create(clientProject);
- IFolder comFolder = javaProject.getProject().getFolder("ejbModule/com");
- comFolder.create(true, true, new NullProgressMonitor());
- comFolder.getFolder("sap").create(true, true, null);
- IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(comFolder);
- IPackageFragment fragment = root.createPackageFragment("sap", true, new NullProgressMonitor());
- createSessionBeanLocal(fragment);
- }
-
- // @AfterClass
- public static void tearDownAfterClass() throws InterruptedException {
- AbstractTest.deleteProject(EJB3MergedModelProviderTest.class.getSimpleName());
- }
-
- private static void createProjectContent(IProject project) throws Exception {
- IJavaProject javaProject = JavaCore.create(project);
- IFolder comFolder = javaProject.getProject().getFolder("ejbModule/com");
- comFolder.create(true, true, new NullProgressMonitor());
- comFolder.getFolder("sap").create(true, true, null);
- IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(comFolder);
- IPackageFragment fragment = root.createPackageFragment("sap", true, new NullProgressMonitor());
- createSessionBean(fragment);
- }
-
- // @Before
- public void setUp() throws Exception {
- super.setUp();
- if (facetedProject == null)
- return;
- fixture = ModelProviderManager.getModelProvider(facetedProject.getProject());
- clientProject = ResourcesPlugin.getWorkspace().getRoot().getProject(CLIENT_NAME);
- }
-
- // @After
- public void tearDown() throws Exception {
- }
-
- // @Test
- public void testAddBeanWithOperation() throws Exception {
- final String ejbProjectName = this.getClass().getSimpleName() + this.getName();
- final String clientName = ejbProjectName + "Client";
- IProject project = ProjectUtil.createEJBProject(ejbProjectName, ejbProjectName + "ear", clientName,
- J2EEVersionConstants.EJB_3_0_ID, true);
- IDataModelOperation operation = createBeanOperation("testAddBeanWithOperation", "com.sap", project.getName());
- IModelProvider provider = ModelProviderManager.getModelProvider(project);
-
- EJBJar result = (EJBJar) provider.getModelObject();
- assertEquals(new Integer(0), new Integer(result.getEnterpriseBeans().getSessionBeans().size()));
- executeAndWait(operation, provider);
-
- result = (EJBJar) provider.getModelObject();
- assertEquals(new Integer(1), new Integer(result.getEnterpriseBeans().getSessionBeans().size()));
- assertNotNull(TestUtils.getSessionBean(result, "testAddBeanWithOperation"));
- }
-
- // @Test
- public void testAddBeanWithOperationPreserveListeners() throws Exception {
- final String ejbProjectName = this.getClass().getSimpleName() + this.getName();
- IProject project = ProjectUtil.createEJBProject(ejbProjectName, null, J2EEVersionConstants.EJB_3_0_ID, true);
- IModelProvider provider = ModelProviderManager.getModelProvider(project);
- IDataModelOperation operation = createBeanOperation("testAddBeanWithOperationPreserveListeners1", "com.sap",
- project.getName());
- SynchronousModelChangedListener preservedListener = new SynchronousModelChangedListener(2);
- provider.addListener(preservedListener);
- executeAndWait(operation, provider);
- assertNotNull(TestUtils.getSessionBean((EJBJar) provider.getModelObject(),
- "testAddBeanWithOperationPreserveListeners1"));
-
- int oldReceivedEvents = preservedListener.getReceivedEvents().size();
- operation = createBeanOperation("testAddBeanWithOperationPreserveListeners2", "com.sap", project.getName());
- executeAndWait(operation, provider);
- assertNotNull(TestUtils.getSessionBean((EJBJar) provider.getModelObject(),
- "testAddBeanWithOperationPreserveListeners2"));
- assertTrue(preservedListener.getReceivedEvents().size() > oldReceivedEvents);
- }
-
- // /**
- // * Execute an operation on the model. Change the dd. The listeners should
- // * not be removed. https://bugs.eclipse.org/bugs/show_bug.cgi?id=241496
- // *
- // * @throws Exception
- // */
- // public void testPreserveListenersChangeDD() throws Exception {
- // final String ejbProjectName = this.getClass().getSimpleName() +
- // this.getName();
- // final IProject project = createEjbProjectWithoutClient(ejbProjectName,
- // ejbProjectName + "ear");
- // final IDataModel model = createModelEjbProjectWithClient(ejbProjectName);
- // SynchronousModelChangedListener preserveListener = new
- // SynchronousModelChangedListener(2);
- //
- // IModelProvider provider = ModelProviderManager.getModelProvider(project);
- // provider.addListener(preserveListener);
- // IFile ejbJarXml = project.getFile("ejbModule/META-INF/ejb-jar.xml");
- // String content = TestUtils.getFileContent(ejbJarXml);
- // executeAndWait(model.getDefaultOperation(), provider);
- // assertNotNull(((EJBJar) provider.getModelObject()).getEjbClientJar());
- //
- // int oldEventsSize = preserveListener.getReceivedEvents().size();
- // AbstractTest.saveFile(ejbJarXml, content);
- // assertTrue(preserveListener.waitForEvents());
- // assertTrue(preserveListener.getReceivedEvents().size() > oldEventsSize);
- // assertNull(((EJBJar) provider.getModelObject()).getEjbClientJar());
- // provider.removeListener(preserveListener);
- // }
-
- private IDataModel createModelEjbProjectWithClient(final String ejbProjectName) {
- final IDataModel model = DataModelFactory.createDataModel(new EjbClientJarCreationDataModelProvider());
- model.setProperty(IEjbClientJarCreationDataModelProperties.EJB_PROJECT_NAME, ejbProjectName);
- model.setProperty(IEjbClientJarCreationDataModelProperties.PROJECT_NAME, CLIENT_NAME + "newName");
- return model;
- }
-
- private IProject createEjbProjectWithoutClient(final String ejbProjectName, final String earProjectName)
- throws Exception {
- Map<String, Object> facetModelProperties = new HashMap<String, Object>();
- facetModelProperties.put(IEjbFacetInstallDataModelProperties.CREATE_CLIENT, false);
- facetModelProperties.put(IJ2EEFacetInstallDataModelProperties.GENERATE_DD, true);
- final IProject project = ProjectUtil.createEJBProject(ejbProjectName, earProjectName, facetModelProperties,
- J2EEVersionConstants.EJB_3_0_ID, true);
- return project;
- }
-
- public void testCreateClientProjectWithOperation() throws Exception {
- final String ejbProjectName = this.getClass().getSimpleName() + this.getName();
- final IProject project = createEjbProjectWithoutClient(ejbProjectName, ejbProjectName + "ear");
- final IModelProvider provider = new Ejb3ModelProvider(project);
- provider.getModelObject();
- final IDataModel model = createModelEjbProjectWithClient(ejbProjectName);
-
- executeAndWait(model.getDefaultOperation(), provider);
-
- EJBJar result = (EJBJar) provider.getModelObject();
- assertEquals(CLIENT_NAME + "newNameClient" + ".jar", result.getEjbClientJar());
- }
-
- private void executeAndWait(IDataModelOperation operation, IModelProvider provider) throws InterruptedException,
- ExecutionException {
- SynchronousModelChangedListener listener = new SynchronousModelChangedListener(1);
- provider.addListener(listener);
- operation.execute(null, null);
- assertTrue(listener.waitForEvents());
- provider.removeListener(listener);
- }
-
- // @Test
- // public void testChangeClientProject() throws Exception {
- // final String ejbProjectName = this.getClass().getSimpleName() +
- // this.getName();
- // final String clientName = ejbProjectName + "Client";
- // IProject project = ProjectUtil.createEJBProject(ejbProjectName,
- // ejbProjectName + "ear", clientName,
- // J2EEVersionConstants.EJB_3_0_ID, true);
- //
- // IFile dd =
- // facetedProject.getProject().getFile("ejbModule/META-INF/ejb-jar.xml");
- // final String ddWithClient = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- // +
- // "<ejb-jar xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:ejb=\"http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd\" version=\"3.0\">"
- // + "<ejb-client-jar>" + clientName + ".jar</ejb-client-jar></ejb-jar>";
- // final String ddNoClient = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- // +
- // "<ejb-jar xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns=\"http://java.sun.com/xml/ns/javaee\" xmlns:ejb=\"http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd\" xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd\" version=\"3.0\">"
- // + "</ejb-jar>";
- // // load the model
- // IModelProvider provider = ModelProviderManager.getModelProvider(project);
- //
- // EJBJar result = (EJBJar) provider.getModelObject();
- // /*
- // * From now on the model provider should not listener for changes in
- // * the client project since it is not described in the deployment
- // * descriptor.
- // */
- // saveFileAndUpdate(dd, ddNoClient, provider);
- //
- // /*
- // * Change the interface. The model should not be updated.
- // */
- // final String remoteInterface = "package com.sap;" +
- // "import javax.ejb.Remote;"
- // + "@Remote public interface SessionBeanLocal {}";
- // IFile interfaceFile =
- // clientProject.getFile("ejbModule/com/sap/SessionBeanLocal.java");
- // SynchronousModelChangedListener listener = new
- // SynchronousModelChangedListener(1);
- // provider.addListener(listener);
- // AbstractTest.saveFile(interfaceFile, remoteInterface);
- // assertFalse(listener.waitForEvents());
- // provider.removeListener(listener);
- // result = (EJBJar) provider.getModelObject();
- // SessionBean bean = TestUtils.getSessionBean(result, "SessionBean");
- // assertEquals(new Integer(1), new
- // Integer(bean.getBusinessLocals().size()));
- // assertTrue(bean.getBusinessRemotes().isEmpty());
- //
- // /*
- // * The deployment descriptor is changed. The bean should now contain the
- // * interface in the remotes list
- // */
- // saveFileAndUpdate(dd, ddWithClient, provider);
- // bean = TestUtils.getSessionBean(result, "SessionBean");
- // assertEquals(new Integer(1), new
- // Integer(bean.getBusinessRemotes().size()));
- // assertTrue(bean.getBusinessLocals().isEmpty());
- //
- // // revet the changes
- // saveFileAndUpdate(facetedProject.getProject().getFile("ejbModule/com/sap/SessionBean.java"),
- // beanContent);
- // saveFileAndUpdate(interfaceFile, localInterfaceContent);
- // }
-
-// /**
-// * Create an ejb project with a client project. Add a session bean to the
-// * project. After creating the ejb project a client project is created. The
-// * modify method of the provider is called passing a runnable for setting
-// * the ejbClient. This is the current implementation of how a client is
-// * create.
-// *
-// * The test doing exactly this. Create an ear project. Create and ejb
-// * project with a client project. Check that the model nows about the
-// * ejbClient project. Then add a session bean to the ejb project. The
-// * listener must be notified.
-// *
-// * @throws Exception
-// */
-// public void testAddSessionBean() throws Exception {
-// final String ejbProjectName = this.getClass().getSimpleName() + this.getName();
-//
-// // create the project
-// ProjectUtil.createEARProject(ejbProjectName + "ear", true);
-// IProject project = ProjectUtil.createEJBProject(ejbProjectName, ejbProjectName + "ear", ejbProjectName
-// + "client", J2EEVersionConstants.EJB_3_0_ID, true);
-// IFolder comFolder = project.getFolder("ejbModule/com");
-// comFolder.create(true, true, null);
-// comFolder.getFolder("sap").create(true, true, null);
-//
-// // get the model provider
-// IModelProvider provider = ModelProviderManager.getModelProvider(project);
-// EJBJar result = (EJBJar) provider.getModelObject();
-// assertEquals(ejbProjectName + "Client.jar", result.getEjbClientJar());
-// IDataModelOperation operation = createBeanOperation("testAddSessionBeanClientExists", "com.sap", project
-// .getName());
-// executeAndWait(operation, provider);
-//
-// result = (EJBJar) provider.getModelObject();
-// assertNotNull(TestUtils.getSessionBean(result, "testAddSessionBeanClientExists"));
-// }
-
- protected IDataModelOperation createBeanOperation(String className, String javaPackage, String projectName) {
- NewSessionBeanClassDataModelProvider dataProvider = new NewSessionBeanClassDataModelProvider();
- IDataModel dataModel = DataModelFactory.createDataModel(dataProvider);
- dataModel.setStringProperty(INewSessionBeanClassDataModelProperties.CLASS_NAME, className);
- dataModel.setStringProperty(INewSessionBeanClassDataModelProperties.STATE_TYPE, StateType.STATELESS.toString());
- dataModel.setStringProperty(INewSessionBeanClassDataModelProperties.EJB_NAME, className);
- dataModel.setStringProperty(INewSessionBeanClassDataModelProperties.JAVA_PACKAGE, javaPackage);
- dataModel.setStringProperty(INewSessionBeanClassDataModelProperties.PROJECT_NAME, projectName);
- AddSessionBeanOperation operation = new AddSessionBeanOperation(dataModel);
- return operation;
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EJBAnnotationReaderWithClientTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EJBAnnotationReaderWithClientTest.java
deleted file mode 100644
index 6acd8fef..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EJBAnnotationReaderWithClientTest.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.ejb.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.model.internal.EJBAnnotationReader;
-import org.eclipse.jst.jee.model.internal.common.AbstractAnnotationModelProvider;
-import org.eclipse.jst.jee.model.tests.AbstractAnnotationModelTest;
-import org.eclipse.jst.jee.model.tests.AbstractTest;
-import org.eclipse.jst.jee.model.tests.TestUtils;
-
-/**
- * Test the cases for an EJBProject that has a client project connected with it.
- * The test is for EJBAnnotationReader.
- *
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class EJBAnnotationReaderWithClientTest extends AbstractAnnotationModelTest {
-
- private static final String ejbProjectName = EJBAnnotationReaderWithClientTest.class.getSimpleName();
- private static final String earProjectName = ejbProjectName + "ear";
- private static final String clientName = ejbProjectName + "Client";
-
- public static TestSuite suite() throws Exception {
- TestSuite suite = new TestSuite(EJBAnnotationReaderWithClientTest.class);
- return suite;
- }
-
- // @BeforeClass
- public static void setUpProject() throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(ejbProjectName);
- if (!project.exists())
- {
- ProjectUtil.createEARProject(ejbProjectName + "ear", true);
- project = ProjectUtil.createEJBProject(ejbProjectName, earProjectName, clientName,
- J2EEVersionConstants.EJB_3_0_ID, true);
- IProject clientProject = ResourcesPlugin.getWorkspace().getRoot().getProject(clientName);
- createProjectContent(project);
- createClientProjectContent(clientProject);
- }
- }
-
- private static void createClientProjectContent(IProject clientProject) throws Exception {
- IJavaProject javaProject = JavaCore.create(clientProject);
- IFolder comFolder = javaProject.getProject().getFolder("ejbModule/com");
- comFolder.create(true, true, new NullProgressMonitor());
- comFolder.getFolder("sap").create(true, true, null);
- IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(comFolder);
- root.createPackageFragment("sap", true, new NullProgressMonitor());
- }
-
- // @AfterClass
- public static void tearDownAfterClass() throws InterruptedException {
- AbstractTest.deleteProject(EjbAnnotationReaderTest.class.getSimpleName());
- }
-
- private static void createProjectContent(IProject project) throws Exception {
- IJavaProject javaProject = JavaCore.create(project);
- IFolder comFolder = javaProject.getProject().getFolder("ejbModule/com");
- comFolder.create(true, true, new NullProgressMonitor());
- comFolder.getFolder("sap").create(true, true, null);
- IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(comFolder);
- root.createPackageFragment("sap", true, new NullProgressMonitor());
- }
-
- // @Before
- @Override
- protected void setUp() throws Exception {
- setUpProject();
- super.setUp();
- clientProject = ResourcesPlugin.getWorkspace().getRoot().getProject(clientName);
- fixture = new EJBAnnotationReader(facetedProject, clientProject);
- }
-
- // @After
- @Override
- protected void tearDown() throws Exception {
- ((AbstractAnnotationModelProvider) fixture).dispose();
- }
-
- // @Test
- public void testLocalInterfaceInClient() throws Exception {
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testLocalInterfaceInClient.java");
- IFile interfaceFile = clientProject.getProject().getFile("ejbModule/com/sap/InterfaceForAddedBean.java");
-
- final String beanContent = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testLocalInterfaceInClient implements InterfaceForAddedBean {}";
- final String interfaceContent = "package com.sap;" + "public interface InterfaceForAddedBean {} ";
-
- // add the bean
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testLocalInterfaceInClient");
- assertNotNull(result);
- assertEquals("InterfaceForAddedBean", result.getBusinessLocals().get(0));
-
- // add interface. The bean should now resolve the interface
- saveFileAndUpdate(interfaceFile, interfaceContent);
- result = TestUtils.getSessionBean(getEJBJar(), "testLocalInterfaceInClient");
- assertNotNull(result);
- assertEquals("com.sap.InterfaceForAddedBean", result.getBusinessLocals().get(0));
-
- // revert the change
- deleteFileAndUpdate(beanFile);
- // the bean is delete. Not update will occur on the annotation reader
- AbstractTest.deleteFile(interfaceFile);
- }
-
- /**
- * The two beans are in the ejb project. The interface is in the client
- * project. Change this interface to remote.
- *
- * @throws Exception
- */
- // @Test
- public void testLocalToRemoteInterfaceInClient() throws Exception {
- IFile bean1File = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testLocalToRemoteInterfaceInClient1.java");
- IFile bean2File = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testLocalToRemoteInterfaceInClient2.java");
- IFile interfaceFile = clientProject.getProject().getFile("ejbModule/com/sap/InterfaceForAddedBean.java");
-
- final String bean1Content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testLocalToRemoteInterfaceInClient1 implements InterfaceForAddedBean {}";
- final String bean2Content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testLocalToRemoteInterfaceInClient2 implements InterfaceForAddedBean {}";
- // add the bean. The interface is in the local list.
- saveFileAndUpdate(bean1File, bean1Content);
- saveFileAndUpdate(bean2File, bean2Content);
- SessionBean result1 = TestUtils.getSessionBean(getEJBJar(), "testLocalToRemoteInterfaceInClient1");
- assertEquals("InterfaceForAddedBean", result1.getBusinessLocals().get(0));
- SessionBean result2 = TestUtils.getSessionBean(getEJBJar(), "testLocalToRemoteInterfaceInClient2");
- assertEquals("InterfaceForAddedBean", result2.getBusinessLocals().get(0));
-
- // add interface. The bean should now resolve the interface and add it
- // to local interfaces.
- final String interfaceContent = "package com.sap;" + "public interface InterfaceForAddedBean {} ";
- saveFileAndUpdate(interfaceFile, interfaceContent);
-
- // change the interface to remote
- final String interfaceContentRemote = "package com.sap;" + "import javax.ejb.Remote"
- + "@Remote public interface InterfaceForAddedBean {} ";
- saveFileAndUpdate(interfaceFile, interfaceContentRemote);
- result1 = TestUtils.getSessionBean(getEJBJar(), "testLocalToRemoteInterfaceInClient1");
- assertEquals("com.sap.InterfaceForAddedBean", result1.getBusinessRemotes().get(0));
- result2 = TestUtils.getSessionBean(getEJBJar(), "testLocalToRemoteInterfaceInClient2");
- assertEquals("com.sap.InterfaceForAddedBean", result2.getBusinessRemotes().get(0));
- assertTrue(result1.getBusinessLocals().isEmpty());
- assertTrue(result2.getBusinessLocals().isEmpty());
-
- // revert the change
- deleteFileAndUpdate(bean1File);
- deleteFileAndUpdate(bean2File);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testLocalToRemoteInterfaceInClient1"));
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testLocalToRemoteInterfaceInClient2"));
- AbstractTest.deleteFile(interfaceFile);
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/Ejb3ModelProviderTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/Ejb3ModelProviderTest.java
deleted file mode 100644
index f1391782..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/Ejb3ModelProviderTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.ejb.tests;
-
-import java.util.Collection;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.model.IModelProviderEvent;
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.jee.model.internal.Ejb3ModelProvider;
-import org.eclipse.jst.jee.model.tests.SynchronousModelChangedListener;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class Ejb3ModelProviderTest extends TestCase {
-
- private static final String EAR_PROJECT_NAME = "earProject";
- private static final String EJB_PROJECT_NAME = "ejbProject";
-
- public static TestSuite suite() throws Exception {
- TestSuite suite = new TestSuite(Ejb3ModelProviderTest.class);
- return suite;
- }
-
- // @BeforeClass
- public static void setUpProject() throws Exception {
- }
-
- /**
- * A notification should be send after a modification on the model.
- * @throws Exception
- */
- public void testModifyOnlyModelWithOperation() throws Exception {
- ProjectUtil.createEARProject(EAR_PROJECT_NAME);
- IProject project = ProjectUtil.createEJBProject(EJB_PROJECT_NAME, EAR_PROJECT_NAME,
- J2EEVersionConstants.EJB_3_0_ID, true);
- IFacetedProject facetedProject = ProjectFacetsManager.create(project);
- SynchronousModelChangedListener listener = new SynchronousModelChangedListener(1);
- final Ejb3ModelProvider modelProvider = new Ejb3ModelProvider(facetedProject.getProject());
- assertNotNull(modelProvider.getModelObject());
- modelProvider.addListener(listener);
- modelProvider.modify(new Runnable() {
- public void run() {
- EJBJar modelObject = (EJBJar) modelProvider.getModelObject();
- changeModelObject(modelObject);
- }
-
- private void changeModelObject(EJBJar modelObject) {
- Description description = JavaeeFactory.eINSTANCE.createDescription();
- modelObject.getDescriptions().add(description);
- }
- }, null);
- assertTrue(listener.waitForEvents());
- Collection<IModelProviderEvent> events = listener.getReceivedEvents();
- assertEquals(1, events.size());
- modelProvider.removeListener(listener);
- }
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- setUpProject();
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EjbAnnotationFactoryTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EjbAnnotationFactoryTest.java
deleted file mode 100644
index 4474d022..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EjbAnnotationFactoryTest.java
+++ /dev/null
@@ -1,303 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.ejb.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.javaee.core.EjbLocalRef;
-import org.eclipse.jst.javaee.core.InjectionTarget;
-import org.eclipse.jst.javaee.core.ResourceRef;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.RemoveMethodType;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.javaee.ejb.SessionType;
-import org.eclipse.jst.javaee.ejb.TransactionType;
-import org.eclipse.jst.jee.model.internal.EjbAnnotationFactory;
-import org.eclipse.jst.jee.model.internal.common.Result;
-import org.eclipse.jst.jee.model.tests.AbstractAnnotationFactoryTest;
-import org.eclipse.jst.jee.model.tests.TestUtils;
-
-/**
- * Contains tests for {@link EjbAnnotationFactory}. This class includes test
- * that do not depend on resolving types. Negative tests are also included here.
- *
- * @author Kiril Mitov k.mitov@sap.com
- */
-public class EjbAnnotationFactoryTest extends AbstractAnnotationFactoryTest {
-
- public static TestSuite suite() {
- TestSuite suite = new TestSuite(EjbAnnotationFactoryTest.class);
- return suite;
- }
-
- /**
- * The content of the annotation is not valid.It should be an array.
- *
- * @throws JavaModelException
- */
- // @Test
- public void testNotArrayLocal() throws JavaModelException {
- final String beanContent = "package com.sap; "
- + "@Stateless @Local(value = java.util.List.class) public class testNotArrayLocal {}";
- IType type = createCompilationUnit("testNotArrayLocal", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean bean = (SessionBean) result.getMainObject();
- assertTrue(bean.getBusinessLocals().isEmpty());
- }
-
- /**
- * The content of the annotation is not valid.It should be an array.
- *
- * @throws JavaModelException
- */
- // @Test
- public void testNotArrayRemote() throws JavaModelException {
- final String beanContent = "package com.sap; "
- + "@Stateless @Remote(value = java.util.List.class) public class testNotArrayRemote {}";
- IType type = createCompilationUnit("testNotArrayRemote", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean bean = (SessionBean) result.getMainObject();
- assertTrue(bean.getBusinessRemotes().isEmpty());
- }
-
- // @Test
- public void testNotArrayEjbs() throws JavaModelException {
- final String beanContent = "package com.sap; "
- + "@Stateless @EJBs(value = @EJB()) public class testNotArrayEjbs {}";
- IType type = createCompilationUnit("testNotArrayEjbs", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean bean = (SessionBean) result.getMainObject();
- assertTrue(bean.getEjbLocalRefs().isEmpty());
- }
-
- // @Test
- public void testNotArrayResources() throws JavaModelException {
- final String beanContent = "package com.sap; "
- + "@Stateless @Resources(value = @Resource(type = \"java.lang.Comparable\")) public class testNotArrayResources {}";
- IType type = createCompilationUnit("testNotArrayResources", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean bean = (SessionBean) result.getMainObject();
- assertTrue(bean.getResourceRefs().isEmpty());
- }
-
- // @Test
- public void testNotArrayDeclareRoles() throws JavaModelException {
- final String beanContent = "package com.sap; "
- + "@Stateless @DeclareRoles(value = \"role1\") public class testNotArrayDeclareRoles {}";
- IType type = createCompilationUnit("testNotArrayDeclareRoles", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean bean = (SessionBean) result.getMainObject();
- assertTrue(bean.getSecurityRoleRefs().isEmpty());
- }
-
- // @Test
- public void testNotArrayActivationConfig() throws JavaModelException {
- final String beanContent = "package com.sap; "
- + "@MessageDriven(activationConfig = "
- + "@ActivationConfigProperty(propertyName = \"name1\", propertyValue = \"value1\"),"
- + "@ActivationConfigProperty(propertyName = \"name2\", propertyValue = \"value2\")) public class testNotArrayActivationConfig {}";
- IType type = createCompilationUnit("testNotArrayActivationConfig", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- MessageDrivenBean bean = (MessageDrivenBean) result.getMainObject();
- assertNull(bean.getActivationConfig());
- }
-
- // @Test
- public void testTimeout() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateless public class testTimeout implements SessionBeanLocal{"
- + "@Timeout public void timeoutMethod1(javax.ejb.Timer timer) {}"
- + "@Timeout public void timeoutMethod2(javax.ejb.Timer timer) {}"
- + "@Timeout public void timeoutMethod3() {}" + "}";
- IType type = createCompilationUnit("testTimeout", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean sessionBean = (SessionBean) result.getMainObject();
- assertNotNull(sessionBean.getTimeoutMethod());
- assertEquals("timeoutMethod2", sessionBean.getTimeoutMethod().getMethodName());
- assertEquals("javax.ejb.Timer", sessionBean.getTimeoutMethod().getMethodParams().getMethodParams().get(0));
- }
-
- // @Test
- public void testTimeoutStateful() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateful public class testTimeoutStateful implements SessionBeanLocal{"
- + "@Timeout public void timeoutMethod(javax.ejb.Timer timer) {}" + "}";
- IType type = createCompilationUnit("testTimeoutStateful", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean sessionBean = (SessionBean) result.getMainObject();
- assertNotNull(sessionBean);
- assertNull(sessionBean.getTimeoutMethod());
- }
-
- // @Test
- public void testSingleton() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Singleton public class testSingleton implements SessionBeanLocal{}";
- IType type = createCompilationUnit("testSingleton", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean sessionBean = (SessionBean) result.getMainObject();
- assertNotNull(sessionBean);
- assertTrue(sessionBean.getSessionType() == SessionType.SINGLETON_LITERAL);
- }
-
- // @Test
- public void testTransactionManagementBean() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateful @TransactionManagement(value = TransactionManagementType.BEAN) "
- + "public class testTransactionManagementBean implements SessionBeanLocal{" + "}";
- IType type = createCompilationUnit("testTransactionManagementBean", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean sessionBean = (SessionBean) result.getMainObject();
- assertNotNull(sessionBean);
- assertEquals(TransactionType.BEAN_LITERAL, sessionBean.getTransactionType());
-
- }
-
- // @Test
- public void testTransactionManagementContainer() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateful @TransactionManagement(value = TransactionManagementType.CONTAINER) "
- + "public class testTransactionManagementContainer implements SessionBeanLocal{" + "}";
- IType type = createCompilationUnit("testTransactionManagementContainer", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean sessionBean = (SessionBean) result.getMainObject();
- assertNotNull(sessionBean);
- assertEquals(TransactionType.CONTAINER_LITERAL, sessionBean.getTransactionType());
- }
-
- // @Test
- public void testTransactionManagementContainerMDB() throws Exception {
- final String beanContent = "package com.sap;"
- + "@MessageDriven @TransactionManagement(value = TransactionManagementType.CONTAINER) "
- + "public class testTransactionManagementContainerMDB {" + "}";
- IType type = createCompilationUnit("testTransactionManagementContainerMDB", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- MessageDrivenBean messageBean = (MessageDrivenBean) result.getMainObject();
- assertNotNull(messageBean);
- assertEquals(TransactionType.CONTAINER_LITERAL, messageBean.getTransactionType());
- }
-
- // @Test
- public void testTransactionManagementStaticImportContainer() throws Exception {
- final String beanContent = "package com.sap; " + "import static TransactionManagementType.CONTAINER;"
- + "@Stateful @TransactionManagement(value = CONTAINER) "
- + "public class testTransactionManagementStaticImportContainer implements SessionBeanLocal{" + "}";
- IType type = createCompilationUnit("testTransactionManagementStaticImportContainer", beanContent)
- .findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean sessionBean = (SessionBean) result.getMainObject();
- assertEquals(TransactionType.CONTAINER_LITERAL, sessionBean.getTransactionType());
- }
-
- // @Test
- public void testRemoveMethod() throws Exception {
- final String beanContent = "package com.sap"
- + "@Stateful public class testRemoveMethod implements SessionBeanLocal {"
- + "@Remove public void removeMethod1() {}"
- + "@Remove(retainIfException = true) public void removeMethod2() {}"
- + "@Remove(retainIfException = true) public void removeMethodParam(java.lang.String str) {}" + "}";
- IType type = createCompilationUnit("testRemoveMethod", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean sessionBean = (SessionBean) result.getMainObject();
- RemoveMethodType method1 = TestUtils.findRemoveMethodByName(sessionBean, "removeMethod1");
- RemoveMethodType method2 = TestUtils.findRemoveMethodByName(sessionBean, "removeMethod2");
- assertNotNull(method1);
- assertNotNull(method2);
- assertFalse(method1.isRetainIfException());
- assertTrue(method2.isRetainIfException());
- assertEquals(new Integer(2), new Integer(sessionBean.getRemoveMethods().size()));
- }
-
- // @Test
- public void testRemoveMethodOnStateless() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateless public class testRemoveMethodOnStateless implements SessionBeanLocal {"
- + "@Remove public void removeMethod1() {}" + "}";
- IType type = createCompilationUnit("testRemoveMethodOnStateless", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean sessionBean = (SessionBean) result.getMainObject();
- assertNotNull(sessionBean);
- assertTrue(sessionBean.getRemoveMethods().isEmpty());
- }
-
- // @Test
- public void testDeclareRolesOnMessageDrivenBean() throws Exception {
- final String beanContent = "package com.sap;" + "@DeclareRoles(value = {\"role1\", \"role2\"}) "
- + "@MessageDriven public class testDeclareRolesOnMessageDrivenBean implements SessionBeanLocal {}";
- IType type = createCompilationUnit("testDeclareRolesOnMessageDrivenBean", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- MessageDrivenBean bean = (MessageDrivenBean) result.getMainObject();
- assertNotNull(bean);
- }
-
- public void testEjbRefName() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateless public class testEjbRefName implements SessionBeanLocal {"
- + "@EJB(name=\"refName\") private SessionBeanLocal field;" + "}";
- IType type = createCompilationUnit("testEjbRefName", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean sessionBean = (SessionBean) result.getMainObject();
- assertNotNull(sessionBean);
- assertEquals(1, sessionBean.getEjbLocalRefs().size());
- EjbLocalRef ref = (EjbLocalRef) sessionBean.getEjbLocalRefs().get(0);
- assertEquals(1, ref.getInjectionTargets().size());
- assertInjectionTarget("refName", "", (InjectionTarget) ref.getInjectionTargets().get(0));
- }
-
- public void testEjbRefNameWithSlash() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateless public class testEjbRefNameWithSlash implements SessionBeanLocal {"
- + "@EJB(name=\"refClass/refName\") private SessionBeanLocal field;" + "}";
- IType type = createCompilationUnit("testEjbRefNameWithSlash", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean sessionBean = (SessionBean) result.getMainObject();
- assertNotNull(sessionBean);
- assertEquals(1, sessionBean.getEjbLocalRefs().size());
- EjbLocalRef ref = (EjbLocalRef) sessionBean.getEjbLocalRefs().get(0);
- assertEquals(1, ref.getInjectionTargets().size());
- assertInjectionTarget("refName", "refClass", (InjectionTarget) ref.getInjectionTargets().get(0));
- }
-
- public void testResourceRefName() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateless public class testResourceRefName implements SessionBeanLocal {"
- + "@Resource(name=\"refName\") private SessionBeanLocal field;" + "}";
- IType type = createCompilationUnit("testResourceRefName", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean sessionBean = (SessionBean) result.getMainObject();
- assertNotNull(sessionBean);
- assertEquals(1, sessionBean.getResourceRefs().size());
- ResourceRef ref = (ResourceRef) sessionBean.getResourceRefs().get(0);
- assertEquals(1, ref.getInjectionTargets().size());
- assertInjectionTarget("refName", "", (InjectionTarget) ref.getInjectionTargets().get(0));
- }
-
- public void testResourceRefNameWithSlash() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateless public class testResourceRefNameWithSlash implements SessionBeanLocal {"
- + "@Resource(name=\"refClass/refName\") private SessionBeanLocal field;" + "}";
- IType type = createCompilationUnit("testResourceRefNameWithSlash", beanContent).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean sessionBean = (SessionBean) result.getMainObject();
- assertNotNull(sessionBean);
- assertEquals(1, sessionBean.getResourceRefs().size());
- ResourceRef ref = (ResourceRef) sessionBean.getResourceRefs().get(0);
- assertEquals(1, ref.getInjectionTargets().size());
- assertInjectionTarget("refName", "refClass", (InjectionTarget) ref.getInjectionTargets().get(0));
- }
-
- private void assertInjectionTarget(String targetName, String targetClass, InjectionTarget target) {
- assertEquals(targetClass, target.getInjectionTargetClass());
- assertEquals(targetName, target.getInjectionTargetName());
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EjbAnnotationReaderTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EjbAnnotationReaderTest.java
deleted file mode 100644
index 420878c4..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EjbAnnotationReaderTest.java
+++ /dev/null
@@ -1,930 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2007 by SAP AG, Walldorf. http://www.sap.com All rights
- * reserved.
- *
- * This software is the confidential and proprietary information of SAP AG,
- * Walldorf. You shall not disclose such Confidential Information and shall use
- * it only in accordance with the terms of the license agreement you entered
- * into with SAP.
- *
- * $Id: EjbAnnotationReaderTest.java,v 1.6 2009/08/07 19:43:09 canderson Exp $
- ***********************************************************************/
-package org.eclipse.jst.jee.model.ejb.tests;
-
-import java.util.List;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-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.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.javaee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EnterpriseBeans;
-import org.eclipse.jst.javaee.ejb.InitMethodType;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.RemoveMethodType;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.model.internal.EJBAnnotationReader;
-import org.eclipse.jst.jee.model.internal.common.AbstractAnnotationModelProvider;
-import org.eclipse.jst.jee.model.tests.AbstractAnnotationModelTest;
-import org.eclipse.jst.jee.model.tests.AbstractTest;
-import org.eclipse.jst.jee.model.tests.SynchronousModelChangedListener;
-import org.eclipse.jst.jee.model.tests.TestUtils;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class EjbAnnotationReaderTest extends AbstractAnnotationModelTest {
-
- private static String BEAN_WITH_NAME = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless(name=\"%s\") public class BeanWithName implements SessionBeanLocal {}";
-
- public static TestSuite suite() throws Exception {
- TestSuite suite = new TestSuite(EjbAnnotationReaderTest.class);
- return suite;
- }
-
- public static void setUpProject() throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(
- EjbAnnotationReaderTest.class.getSimpleName());
- if (!project.exists()) {
- project = ProjectUtil.createEJBProject(EjbAnnotationReaderTest.class.getSimpleName(), null,
- J2EEVersionConstants.EJB_3_0_ID, true);
- createProjectContent(project);
- }
- }
-
- public static void tearDownAfterClass() throws InterruptedException {
- AbstractTest.deleteProject(EjbAnnotationReaderTest.class.getSimpleName());
- }
-
- private static void createProjectContent(IProject project) throws Exception {
- IJavaProject javaProject = JavaCore.create(project);
- IFolder comFolder = javaProject.getProject().getFolder("ejbModule/com");
- comFolder.create(true, true, new NullProgressMonitor());
- IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(comFolder);
- IPackageFragment fragment = root.createPackageFragment("sap", true, new NullProgressMonitor());
- createSessionBean(fragment);
- createSessionBeanLocal(fragment);
- createBeanWithName(fragment);
- createMessageDrivenBean(fragment);
- createInvalidCompilationUnit(fragment);
- }
-
- private static void createBeanWithName(IPackageFragment fragment) throws JavaModelException {
- String content = String.format(BEAN_WITH_NAME, "beanWithName");
- fragment.createCompilationUnit("BeanWithName.java", content, true, null);
- }
-
- /**
- * The word "class" is missed and the compilation unit does not contain a
- * valid type.
- *
- * @param fragment
- * @throws Exception
- */
- private static void createInvalidCompilationUnit(IPackageFragment fragment) throws Exception {
- final String content = "package com.sap;"
- + "@Stateless public InvalidCompilationUnit implements SessionBeanLocal {}";
- IFile file = ((IContainer) fragment.getResource()).getFile(new Path("InvalidCompilationUnit.java"));
- AbstractTest.saveFile(file, content);
- }
-
- private static void createMessageDrivenBean(IPackageFragment fragment) throws Exception {
- final String content = "package com.sap;" + "import javax.ejb.MessageDriven;"
- + "@MessageDriven public class MessageDrivenBean {}";
- IFile file = ((IContainer) fragment.getResource()).getFile(new Path("MessageDrivenBean.java"));
- AbstractTest.saveFile(file, content);
- }
-
- @Override
- protected void setUp() throws Exception {
- setUpProject();
- super.setUp();
- fixture = new EJBAnnotationReader(facetedProject, clientProject);
- }
-
- @Override
- protected void tearDown() throws Exception {
- ((AbstractAnnotationModelProvider) fixture).dispose();
- }
-
- // @Test(expected = IllegalArgumentException.class)
- public void testCerateReaderWithNullProject() {
- try {
- new EJBAnnotationReader(null, null);
- fail("IllegalArgumentException expected");
- } catch (IllegalArgumentException e) {
- }
- }
-
- public void testLoadForEmptyProject() throws Exception {
- String projectName = EjbAnnotationReaderTest.class.getSimpleName() + "testLoadForEmptyProject";
- IProject emptyProject = ProjectUtil.createEJBProject(projectName, null, J2EEVersionConstants.EJB_3_0_ID, true);
- IModelProvider provider = new EJBAnnotationReader(ProjectFacetsManager.create(emptyProject), null);
- EJBJar ejbJar = (EJBJar) provider.getModelObject();
- assertNull(ejbJar.getEnterpriseBeans());
- AbstractTest.deleteProject(projectName);
- }
-
- public void testNullEnterpriseBeanAfterDelete() throws Exception {
- final String projectName = EjbAnnotationReaderTest.class.getSimpleName() + "testNullEnterpriseBeanAfterDelete";
- IProject oneBeanProject = ProjectUtil
- .createEJBProject(projectName, null, J2EEVersionConstants.EJB_3_0_ID, true);
- facetedProject = ProjectFacetsManager.create(oneBeanProject);
- fixture = new EJBAnnotationReader(facetedProject, clientProject);
-
- IFile beanFile = oneBeanProject.getFile("ejbModule/testNullEnterpriseBeanAfterDelete.java");
- assertFalse(beanFile.exists());
- final String content = "import javax.ejb.Stateless;"
- + "@Stateless public class testNullEnterpriseBeanAfterDelete implements SessionBeanLocal {}";
- // add the file
- saveFileAndUpdate(beanFile, content);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testNullEnterpriseBeanAfterDelete");
- assertNotNull(result);
- // delete the file
- deleteFileAndUpdate(beanFile);
- assertNull(getEJBJar().getEnterpriseBeans());
- AbstractTest.deleteProject(projectName);
- }
-
- // @Test
- public void testGetSessionBeans() {
- EnterpriseBeans beans = getEJBJar().getEnterpriseBeans();
- assertNotNull(beans);
- assertEquals(new Integer(2), new Integer(beans.getSessionBeans().size()));
- assertEquals(new Integer(1), new Integer(getEJBJar().getEnterpriseBeans().getMessageDrivenBeans().size()));
- }
-
- // @Test
- public void testSessionBeanName() {
- List<SessionBean> beans = getEJBJar().getEnterpriseBeans().getSessionBeans();
- SessionBean bean = TestUtils.getSessionBean(getEJBJar(), "SessionBean");
- assertEquals("com.sap.SessionBean", bean.getEjbClass());
- assertEquals("SessionBean", bean.getEjbName());
- }
-
- // @Test
- public void testMessageDrivenBean() {
- MessageDrivenBean bean = TestUtils.getMessageDrivenBean(getEJBJar(), "MessageDrivenBean");
- assertNotNull(bean);
- assertEquals("com.sap.MessageDrivenBean", bean.getEjbClass());
- assertEquals("MessageDrivenBean", bean.getEjbName());
- }
-
- // @Test
- public void testBeanWithName() {
- SessionBean bean = TestUtils.getSessionBean(getEJBJar(), "beanWithName");
- assertNotNull(bean);
- assertEquals("com.sap.BeanWithName", bean.getEjbClass());
- assertEquals("beanWithName", bean.getEjbName());
- }
-
- // @Test
- public void testChange() throws Exception {
- IFile file = facetedProject.getProject().getFile("ejbModule/com/sap/BeanWithName.java");
- final String newContent = String.format(BEAN_WITH_NAME, "newBeanName");
-
- saveFileAndUpdate(file, newContent);
-
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "newBeanName");
- assertNotNull(result);
-
- // revert the change
- final String oldContent = String.format(BEAN_WITH_NAME, "beanWithName");
- saveFileAndUpdate(file, oldContent);
- assertNotNull(TestUtils.getSessionBean(getEJBJar(), "beanWithName"));
- }
-
- // @Test
- public void testDeleteBean() throws Exception {
- IFile file = facetedProject.getProject().getFile("ejbModule/com/sap/BeanWithName.java");
- deleteFileAndUpdate(file);
- assertEquals(new Integer(1), new Integer(getEJBJar().getEnterpriseBeans().getSessionBeans().size()));
- assertNull(TestUtils.getSessionBean(getEJBJar(), "beanWithName"));
-
- // revert the change
- final String content = String.format(BEAN_WITH_NAME, "beanWithName");
- saveFileAndUpdate(file, content);
- assertNotNull(TestUtils.getSessionBean(getEJBJar(), "beanWithName"));
- }
-
- // @Test
- public void testAddDeleteSessionBean() throws Exception {
- int oldSize = getEJBJar().getEnterpriseBeans().getSessionBeans().size();
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testAddDeleteSessionBean.java");
- assertFalse(beanFile.exists());
- final String content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testAddDeleteSessionBean implements SessionBeanLocal {}";
- // add the file
- saveFileAndUpdate(beanFile, content);
- assertEquals(new Integer(oldSize + 1), new Integer(getEJBJar().getEnterpriseBeans().getSessionBeans().size()));
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testAddDeleteSessionBean");
- assertNotNull(result);
-
- // delete the file
- deleteFileAndUpdate(beanFile);
- assertEquals(new Integer(oldSize), new Integer(getEJBJar().getEnterpriseBeans().getSessionBeans().size()));
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAddDeleteSessionBean"));
- }
-
- // @Test
- public void testEventsNumber1() throws Exception {
- final String content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testEventsNumber1 implements SessionBeanLocal {}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testEventsNumber1.java");
- SynchronousModelChangedListener listener = new SynchronousModelChangedListener(1);
- getFixture().addListener(listener);
- saveFileAndUpdate(beanFile, content);
- assertTrue(listener.waitForEvents());
- getFixture().removeListener(listener);
- assertEquals(new Integer(1), new Integer(listener.getReceivedEvents().size()));
- }
-
- // @Test
- public void testEventsNumber2() throws Exception {
- final String content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testEventsNumber2 implements SessionBeanLocal {}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testEventsNumber2.java");
- SynchronousModelChangedListener listener = new SynchronousModelChangedListener(2);
- getFixture().addListener(listener);
- saveFileAndUpdate(beanFile, content);
- assertFalse(listener.waitForEvents());
- getFixture().removeListener(listener);
- assertEquals(new Integer(1), new Integer(listener.getReceivedEvents().size()));
-
- }
-
- // @Test
- public void testDispose() throws Exception {
- AbstractAnnotationModelProvider reader = new EJBAnnotationReader(facetedProject, null);
- SynchronousModelChangedListener listener = new SynchronousModelChangedListener(1);
- reader.addListener(listener);
- reader.dispose();
- assertTrue(listener.waitForEvents());
- }
-
- // @Test
- public void testAddBeanThenInterface() throws Exception {
- int oldSize = getEJBJar().getEnterpriseBeans().getSessionBeans().size();
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testAddBeanThenInterface.java");
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/InterfaceForAddedBean.java");
-
- final String beanContent = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testAddBeanThenInterface implements InterfaceForAddedBean {}";
- final String interfaceContent = "package com.sap;" + "public interface InterfaceForAddedBean {} ";
-
- // add the bean
- saveFileAndUpdate(beanFile, beanContent);
- assertEquals(new Integer(oldSize + 1), new Integer(getEJBJar().getEnterpriseBeans().getSessionBeans().size()));
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testAddBeanThenInterface");
- assertNotNull(result);
- assertEquals("InterfaceForAddedBean", result.getBusinessLocals().get(0));
-
- // add interface. The bean should now resolve the interface
- saveFileAndUpdate(interfaceFile, interfaceContent);
- assertEquals(new Integer(oldSize + 1), new Integer(getEJBJar().getEnterpriseBeans().getSessionBeans().size()));
- result = TestUtils.getSessionBean(getEJBJar(), "testAddBeanThenInterface");
- assertNotNull(result);
- assertEquals("com.sap.InterfaceForAddedBean", result.getBusinessLocals().get(0));
-
- // revert the change
- deleteFileAndUpdate(beanFile);
- // the bean is delete. Not update will occur on the annotation reader
- AbstractTest.deleteFile(interfaceFile);
- }
-
- // @Test
- public void testAddBeanThenInterfaceThenRemote() throws Exception {
- int oldSize = getEJBJar().getEnterpriseBeans().getSessionBeans().size();
- IFile beanFile = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testAddBeanThenInterfaceThenRemote.java");
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/InterfaceForAddedBean.java");
-
- final String beanContent = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testAddBeanThenInterfaceThenRemote implements InterfaceForAddedBean {}";
-
- // add the bean. The interface is in the local list.
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testAddBeanThenInterfaceThenRemote");
- assertNotNull(result);
- assertEquals(new Integer(oldSize + 1), new Integer(getEJBJar().getEnterpriseBeans().getSessionBeans().size()));
- assertEquals("InterfaceForAddedBean", result.getBusinessLocals().get(0));
-
- // add interface. The bean should now resolve the interface and add it
- // to local interfaces.
- final String interfaceContent = "package com.sap;" + "public interface InterfaceForAddedBean {} ";
- saveFileAndUpdate(interfaceFile, interfaceContent);
- result = TestUtils.getSessionBean(getEJBJar(), "testAddBeanThenInterfaceThenRemote");
- assertNotNull(result);
- assertEquals(new Integer(oldSize + 1), new Integer(getEJBJar().getEnterpriseBeans().getSessionBeans().size()));
- assertEquals("com.sap.InterfaceForAddedBean", result.getBusinessLocals().get(0));
- assertTrue(result.getBusinessRemotes().isEmpty());
-
- // change the interface to remote
- final String interfaceContentRemote = "package com.sap;" + "import javax.ejb.Remote"
- + "@Remote public interface InterfaceForAddedBean {} ";
- saveFileAndUpdate(interfaceFile, interfaceContentRemote);
- result = TestUtils.getSessionBean(getEJBJar(), "testAddBeanThenInterfaceThenRemote");
- assertNotNull(result);
- assertEquals(new Integer(oldSize + 1), new Integer(getEJBJar().getEnterpriseBeans().getSessionBeans().size()));
- assertEquals("com.sap.InterfaceForAddedBean", result.getBusinessRemotes().get(0));
- assertTrue(result.getBusinessLocals().isEmpty());
-
- // revert the change
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAddBeanThenInterfaceThenRemote"));
- AbstractTest.deleteFile(interfaceFile);
- }
-
- // @Test
- public void testAddBeanThenRemoteThenLocal() throws Exception {
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testAddBeanThenRemoteThenLocal.java");
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/InterfaceForAddedBean.java");
-
- final String beanContent = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testAddBeanThenRemoteThenLocal implements InterfaceForAddedBean {}";
-
- // add the bean. The interface is in the local list.
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testAddBeanThenRemoteThenLocal");
- assertNotNull(result);
- assertEquals("InterfaceForAddedBean", result.getBusinessLocals().get(0));
-
- // add interface. The bean should now resolve the interface and add it
- // to remote interfaces.
- final String interfaceContent = "package com.sap;" + "@Remote public interface InterfaceForAddedBean {} ";
- saveFileAndUpdate(interfaceFile, interfaceContent);
- result = TestUtils.getSessionBean(getEJBJar(), "testAddBeanThenRemoteThenLocal");
- assertNotNull(result);
- assertEquals("com.sap.InterfaceForAddedBean", result.getBusinessRemotes().get(0));
- assertTrue(result.getBusinessLocals().isEmpty());
-
- // change the interface to local
- final String interfaceContentRemote = "package com.sap;" + "import javax.ejb.Remote"
- + "@Local public interface InterfaceForAddedBean {} ";
- saveFileAndUpdate(interfaceFile, interfaceContentRemote);
- result = TestUtils.getSessionBean(getEJBJar(), "testAddBeanThenRemoteThenLocal");
- assertNotNull(result);
- assertEquals("com.sap.InterfaceForAddedBean", result.getBusinessLocals().get(0));
- assertTrue(result.getBusinessRemotes().isEmpty());
-
- // revert the change
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAddBeanThenRemoteThenLocal"));
- AbstractTest.deleteFile(interfaceFile);
- }
-
- /**
- * Add a bean. Then add a local interface. The interface has a local
- * annotation. Change the annotation of the interface to remote. The two
- * beans should be rebuilded and the interface should now be in the remote
- * business interfaces.
- *
- * @throws Exception
- * @throws InterruptedException
- */
- // @Test
- public void testAdd2BeansThenInterfaceThenRemote() throws InterruptedException, Exception {
- IFile bean1File = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testAdd2BeansThenInterfaceThenRemote1.java");
- IFile bean2File = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testAdd2BeansThenInterfaceThenRemote2.java");
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/InterfaceForAddedBean.java");
-
- final String bean1Content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testAdd2BeansThenInterfaceThenRemote1 implements InterfaceForAddedBean {}";
- final String bean2Content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testAdd2BeansThenInterfaceThenRemote2 implements InterfaceForAddedBean {}";
- // add the bean. The interface is in the local list.
- saveFileAndUpdate(bean1File, bean1Content);
- saveFileAndUpdate(bean2File, bean2Content);
- SessionBean result1 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1");
- assertEquals("InterfaceForAddedBean", result1.getBusinessLocals().get(0));
- SessionBean result2 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote2");
- assertEquals("InterfaceForAddedBean", result2.getBusinessLocals().get(0));
-
- // add interface. The bean should now resolve the interface and add it
- // to local interfaces.
- final String interfaceContent = "package com.sap;" + "public interface InterfaceForAddedBean {} ";
- saveFileAndUpdate(interfaceFile, interfaceContent);
-
- // change the interface to remote
- final String interfaceContentRemote = "package com.sap;" + "import javax.ejb.Remote"
- + "@Remote public interface InterfaceForAddedBean {} ";
- saveFileAndUpdate(interfaceFile, interfaceContentRemote);
- result1 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1");
- assertEquals("com.sap.InterfaceForAddedBean", result1.getBusinessRemotes().get(0));
- result2 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote2");
- assertEquals("com.sap.InterfaceForAddedBean", result2.getBusinessRemotes().get(0));
- assertTrue(result1.getBusinessLocals().isEmpty());
- assertTrue(result2.getBusinessLocals().isEmpty());
-
- // revert the change
- deleteFileAndUpdate(bean1File);
- deleteFileAndUpdate(bean2File);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1"));
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote2"));
- AbstractTest.deleteFile(interfaceFile);
- }
-
- // @Test
- public void testBeanWithSourceAndBinaryInterface() throws Exception {
- final String beanContent = "package com.sap; "
- + "@Stateless @Local({java.util.List.class, SessionBeanLocal.class}) public class testBeanWithSourceAndBinaryInterface {}";
- IFile beanFile = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testBeanWithSourceAndBinaryInterface.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testBeanWithSourceAndBinaryInterface");
- assertNotNull(result);
-
- assertTrue(result.getBusinessLocals().contains("com.sap.SessionBeanLocal"));
- assertTrue(result.getBusinessLocals().contains("java.util.List"));
-
- // revert the change
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testBeanWithSourceAndBinaryInterface"));
- }
-
- // @Test
- public void testAddDeleteMessageBean() throws Exception {
- int oldSize = getEJBJar().getEnterpriseBeans().getMessageDrivenBeans().size();
- SynchronousModelChangedListener listener = new SynchronousModelChangedListener(1);
- IFile file = facetedProject.getProject().getFile("ejbModule/com/sap/AddedMessageBean.java");
- assertFalse(file.exists());
- final String content = "package com.sap;" + "import javax.ejb.MessageDriven;"
- + "@MessageDriven public class AddedMessageBean {}";
- getFixture().addListener(listener);
-
- // add the file
- AbstractTest.saveFile(file, content);
- assertTrue(listener.waitForEvents());
- getFixture().removeListener(listener);
-
- assertEquals(new Integer(oldSize + 1), new Integer(getEJBJar().getEnterpriseBeans().getMessageDrivenBeans()
- .size()));
- MessageDrivenBean result = TestUtils.getMessageDrivenBean(getEJBJar(), "AddedMessageBean");
- assertNotNull(result);
-
- // delete the file
- listener = new SynchronousModelChangedListener(1);
- getFixture().addListener(listener);
- AbstractTest.deleteFile(file);
- assertTrue(listener.waitForEvents());
- getFixture().removeListener(listener);
-
- assertEquals(new Integer(oldSize), new Integer(getEJBJar().getEnterpriseBeans().getMessageDrivenBeans().size()));
- assertNull(TestUtils.getMessageDrivenBean(getEJBJar(), "AddedMessageBean"));
- }
-
- // @Test
- public void testAddDeleteLocalHome() throws Exception {
- final String beanContent = "package com.sap; "
- + "@Stateless @LocalHome(value = LocalHomeInterface.class) public class testAddDeleteLocalHome {}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testAddDeleteLocalHome.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testAddDeleteLocalHome");
- assertNotNull(result);
- assertEquals("LocalHomeInterface", result.getLocalHome());
-
- final String interfaceContent = "package com.sap; " + "public interface LocalHomeInterface {}";
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/LocalHomeInterface.java");
- saveFileAndUpdate(interfaceFile, interfaceContent);
- result = TestUtils.getSessionBean(getEJBJar(), "testAddDeleteLocalHome");
- assertNotNull(result);
- assertEquals("com.sap.LocalHomeInterface", result.getLocalHome());
-
- // revert the change
- deleteFileAndUpdate(interfaceFile);
- result = TestUtils.getSessionBean(getEJBJar(), "testAddDeleteLocalHome");
- assertNotNull(result);
- assertEquals("LocalHomeInterface", result.getLocalHome());
- deleteFileAndUpdate(beanFile);
-
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAddDeleteLocalHome"));
- }
-
- // @Test
- public void testAddDeleteHome() throws Exception {
- final String beanContent = "package com.sap; import javax.ejb.RemoteHome;"
- + "@Stateless @RemoteHome(value = HomeInterface.class) public class testAddDeleteHome {}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testAddDeleteHome.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testAddDeleteHome");
- assertNotNull(result);
- assertEquals("HomeInterface", result.getHome());
-
- final String interfaceContent = "package com.sap; " + "public interface HomeInterface {}";
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/HomeInterface.java");
- saveFileAndUpdate(interfaceFile, interfaceContent);
- result = TestUtils.getSessionBean(getEJBJar(), "testAddDeleteHome");
- assertNotNull(result);
- assertEquals("com.sap.HomeInterface", result.getHome());
-
- // revert the change
- deleteFileAndUpdate(interfaceFile);
- result = TestUtils.getSessionBean(getEJBJar(), "testAddDeleteHome");
- assertNotNull(result);
- assertEquals("HomeInterface", result.getHome());
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAddDeleteHome"));
- }
-
- // @Test
- public void testRemoveMethod() throws Exception {
- final String beanContent = "package com.sap"
- + "@Stateful public class testRemoveMethod implements SessionBeanLocal {"
- + "@Remove public void removeMethod1() {}"
- + "@Remove(retainIfException = true) public void removeMethod2() {}"
- + "@Remove(retainIfException = true) public void removeMethodParam(java.lang.String str) {}" + "}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testRemoveMethod.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testRemoveMethod");
- assertNotNull(result);
- RemoveMethodType method1 = TestUtils.findRemoveMethodByName(result, "removeMethod1");
- RemoveMethodType method2 = TestUtils.findRemoveMethodByName(result, "removeMethod2");
- assertNotNull(method1);
- assertNotNull(method2);
- assertFalse(method1.isRetainIfException());
- assertTrue(method2.isRetainIfException());
- assertEquals(new Integer(2), new Integer(result.getRemoveMethods().size()));
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testRemoveMethod"));
- }
-
- // @Test
- public void testRemoveMethodOnStateless() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateless public class testRemoveMethodOnStateless implements SessionBeanLocal {"
- + "@Remove public void removeMethod1() {}" + "}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testRemoveMethodOnStateless.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testRemoveMethodOnStateless");
- assertNotNull(result);
- assertTrue(result.getRemoveMethods().isEmpty());
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testRemoveMethodOnStateless"));
- }
-
- // @Test
- public void testInitMetod() throws Exception {
- final String beanContent = "package com.sap"
- + "@Stateful @RemoteHome(value = java.lang.Comparable.class) public class testInitMetod implements SessionBeanLocal {"
- + "@Init public void createMethod1() {}" + "@Init public void createMethod2(String arg0) {}" + "}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testInitMetod.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testInitMetod");
- assertNotNull(result);
- InitMethodType method1 = TestUtils.findInitMethodByName(result, "createMethod1");
- assertNotNull(method1);
- InitMethodType method2 = TestUtils.findInitMethodByName(result, "createMethod2");
- assertNotNull(method2);
- assertEquals(new Integer(1), new Integer(method2.getBeanMethod().getMethodParams().getMethodParams().size()));
- assertEquals("String", method2.getBeanMethod().getMethodParams().getMethodParams().get(0).toString());
- assertEquals(new Integer(2), new Integer(result.getInitMethods().size()));
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testInitMethod"));
- }
-
- // @Test
- public void testInitMetodStateless() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateless @RemoteHome(value = java.lang.Comparable.class) public class testInitMetodStateless implements SessionBeanLocal {"
- + "@Init public void createMethod1() {}" + "@Init public void createMethod2(String arg0) {}" + "}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testInitMetodStateless.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testInitMetodStateless");
- assertNotNull(result);
- assertEquals(new Integer(0), new Integer(result.getInitMethods().size()));
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testInitMetodStateless"));
- }
-
- // @Test
- public void testActivationConfigProperty() throws Exception {
- final String beanContent = "package com.sap;" + "@MessageDriven(activationConfig = { "
- + "@ActivationConfigProperty(propertyName = \"name1\", propertyValue = \"value1\"),"
- + "@ActivationConfigProperty(propertyName = \"name2\", propertyValue = \"value2\") })"
- + "public class testActivationConfigProperty {}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testActivationConfigProperty.java");
- saveFileAndUpdate(beanFile, beanContent);
- MessageDrivenBean result = TestUtils.getMessageDrivenBean(getEJBJar(), "testActivationConfigProperty");
- assertNotNull(result);
- ActivationConfigProperty property1 = TestUtils.findActivationConfigProperty(result, "name1");
- ActivationConfigProperty property2 = TestUtils.findActivationConfigProperty(result, "name2");
- assertEquals("value1", property1.getActivationConfigPropertyValue());
- assertEquals("value2", property2.getActivationConfigPropertyValue());
- assertEquals(new Integer(2), new Integer(result.getActivationConfig().getActivationConfigProperties().size()));
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testActivationConfigProperty"));
- }
-
- // @Test
- public void testMoveBeanFile() throws Exception {
- IFile file = facetedProject.getProject().getFile("ejbModule/com/sap/testMoveBeanFile.java");
- final String content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testMoveBeanFile implements SessionBeanLocal {}";
-
- // add the file
- saveFileAndUpdate(file, content);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testMoveBeanFile");
- assertNotNull(result);
-
- // move the file to a place out of the classpath
- SynchronousModelChangedListener listener = new SynchronousModelChangedListener(1);
- getFixture().addListener(listener);
- file.move(facetedProject.getProject().getFullPath().append("testMoveBeanFile.java"), true,
- new NullProgressMonitor());
- assertTrue(listener.waitForEvents());
- getFixture().removeListener(listener);
-
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testMoveBeanFile"));
-
- // rever the change
- AbstractTest.deleteFile(facetedProject.getProject().getFile("testMoveBeanFile.java"));
- }
-
- // @Test
- public void testMoveBeanFileToMetainf() throws Exception {
- IFile file = facetedProject.getProject().getFile("ejbModule/com/sap/testMoveBeanFileToMetainf.java");
- final String content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testMoveBeanFileToMetainf implements SessionBeanLocal {}";
-
- // add the file
- saveFileAndUpdate(file, content);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testMoveBeanFileToMetainf");
- assertNotNull(result);
-
- // move the file to a place out of the classpath
- SynchronousModelChangedListener listener = new SynchronousModelChangedListener(1);
- getFixture().addListener(listener);
- IFolder metainfFolder = facetedProject.getProject().getFolder("ejbModule/META-INF");
- file
- .move(metainfFolder.getFullPath().append("testMoveBeanFileToMetainf.java"), true,
- new NullProgressMonitor());
- assertTrue(listener.waitForEvents());
- getFixture().removeListener(listener);
-
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testMoveBeanFileToMetainf"));
-
- // revert the change
- AbstractTest.deleteFile(facetedProject.getProject()
- .getFile("ejbModule/META-INF/testMoveBeanFileToMetainf.java"));
- }
-
- /**
- * Add a bean. Then add a local interface. The interface has a local
- * annotation. Change the annotation of the interface to remote. The two
- * beans should be rebuilded and the interface should now be in the remote
- * business interfaces.
- *
- * @throws Exception
- * @throws InterruptedException
- */
- // @Test
- public void testAdd2BeansThenInterfaceThenRemoteThenOverrideWithLocal() throws InterruptedException, Exception {
- IFile bean1File = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testAdd2BeansThenInterfaceThenRemote1.java");
- IFile bean2File = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testAdd2BeansThenInterfaceThenRemote2.java");
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/InterfaceForAddedBean.java");
-
- final String bean1Content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testAdd2BeansThenInterfaceThenRemote1 implements InterfaceForAddedBean {}";
-
- final String bean1Content2 = "package com.sap;"
- + "import javax.ejb.Stateless;"
- + "@Stateless @Local({InterfaceForAddedBean.class}) public class testAdd2BeansThenInterfaceThenRemote1 implements InterfaceForAddedBean {}";
-
- final String bean2Content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testAdd2BeansThenInterfaceThenRemote2 implements InterfaceForAddedBean {}";
- // add the bean. The interface is in the local list.
- saveFileAndUpdate(bean1File, bean1Content);
- saveFileAndUpdate(bean2File, bean2Content);
- SessionBean result1 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1");
- assertEquals("InterfaceForAddedBean", result1.getBusinessLocals().get(0));
- SessionBean result2 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote2");
- assertEquals("InterfaceForAddedBean", result2.getBusinessLocals().get(0));
-
- // add interface. The bean should now resolve the interface and add it
- // to local interfaces.
- final String interfaceContent = "package com.sap;" + "public interface InterfaceForAddedBean {} ";
- saveFileAndUpdate(interfaceFile, interfaceContent);
-
- // change the interface to remote
- final String interfaceContentRemote = "package com.sap;" + "import javax.ejb.Remote"
- + "@Remote public interface InterfaceForAddedBean {} ";
- saveFileAndUpdate(interfaceFile, interfaceContentRemote);
- result1 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1");
- assertEquals("com.sap.InterfaceForAddedBean", result1.getBusinessRemotes().get(0));
- result2 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote2");
- assertEquals("com.sap.InterfaceForAddedBean", result2.getBusinessRemotes().get(0));
- assertTrue(result1.getBusinessLocals().isEmpty());
- assertTrue(result2.getBusinessLocals().isEmpty());
-
- saveFileAndUpdate(bean1File, bean1Content2);
- result1 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1");
- assertEquals("com.sap.InterfaceForAddedBean", result1.getBusinessLocals().get(0));
- assertTrue(result1.getBusinessRemotes().isEmpty());
-
- // revert the change
- deleteFileAndUpdate(bean1File);
- deleteFileAndUpdate(bean2File);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1"));
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote2"));
- AbstractTest.deleteFile(interfaceFile);
- }
-
- /**
- * Add a bean. Then add a local interface. The interface has a local
- * annotation. Change the annotation of the interface to remote. The two
- * beans should be rebuilded and the interface should now be in the remote
- * business interfaces.
- *
- * @throws Exception
- * @throws InterruptedException
- */
- // @Test
- public void testAdd2BeansThenInterfaceThenLocalThenOverrideWithRemote() throws InterruptedException, Exception {
- IFile bean1File = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testAdd2BeansThenInterfaceThenRemote1.java");
- IFile bean2File = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testAdd2BeansThenInterfaceThenRemote2.java");
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/InterfaceForAddedBean.java");
-
- final String bean1Content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testAdd2BeansThenInterfaceThenRemote1 implements InterfaceForAddedBean {}";
-
- final String bean1Content2 = "package com.sap;"
- + "import javax.ejb.Stateless;"
- + "@Stateless @Remote({InterfaceForAddedBean.class}) public class testAdd2BeansThenInterfaceThenRemote1 implements InterfaceForAddedBean {}";
-
- final String bean2Content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testAdd2BeansThenInterfaceThenRemote2 implements InterfaceForAddedBean {}";
- // add the bean. The interface is in the local list.
- saveFileAndUpdate(bean1File, bean1Content);
- saveFileAndUpdate(bean2File, bean2Content);
- SessionBean result1 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1");
- assertEquals("InterfaceForAddedBean", result1.getBusinessLocals().get(0));
- SessionBean result2 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote2");
- assertEquals("InterfaceForAddedBean", result2.getBusinessLocals().get(0));
-
- // add interface. The bean should now resolve the interface and add it
- // to local interfaces.
- final String interfaceContent = "package com.sap;" + "public interface InterfaceForAddedBean {} ";
- saveFileAndUpdate(interfaceFile, interfaceContent);
-
- // change the interface to remote
-
- saveFileAndUpdate(bean1File, bean1Content2);
- result1 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1");
- assertEquals("com.sap.InterfaceForAddedBean", result1.getBusinessRemotes().get(0));
- assertTrue(result1.getBusinessLocals().isEmpty());
-
- // revert the change
- deleteFileAndUpdate(bean1File);
- deleteFileAndUpdate(bean2File);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1"));
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote2"));
- AbstractTest.deleteFile(interfaceFile);
- }
-
- /**
- * Add a bean. Then add a local interface. The interface has a local
- * annotation. Change the annotation of the interface to remote. The two
- * beans should be rebuilded and the interface should now be in the remote
- * business interfaces.
- *
- * @throws Exception
- * @throws InterruptedException
- */
- // @Test
- public void testAdd2BeansThenInterfaceThenLocalThenOverrideWithLocal() throws InterruptedException, Exception {
- IFile bean1File = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testAdd2BeansThenInterfaceThenRemote1.java");
- IFile bean2File = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testAdd2BeansThenInterfaceThenRemote2.java");
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/InterfaceForAddedBean.java");
-
- final String bean1Content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testAdd2BeansThenInterfaceThenRemote1 implements InterfaceForAddedBean {}";
-
- final String bean1Content2 = "package com.sap;"
- + "import javax.ejb.Stateless;"
- + "@Stateless @Local({InterfaceForAddedBean.class}) public class testAdd2BeansThenInterfaceThenRemote1 implements InterfaceForAddedBean {}";
-
- final String bean2Content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testAdd2BeansThenInterfaceThenRemote2 implements InterfaceForAddedBean {}";
- // add the bean. The interface is in the local list.
- saveFileAndUpdate(bean1File, bean1Content);
- saveFileAndUpdate(bean2File, bean2Content);
- SessionBean result1 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1");
- assertEquals("InterfaceForAddedBean", result1.getBusinessLocals().get(0));
- SessionBean result2 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote2");
- assertEquals("InterfaceForAddedBean", result2.getBusinessLocals().get(0));
-
- // add interface. The bean should now resolve the interface and add it
- // to local interfaces.
- final String interfaceContent = "package com.sap;" + "public interface InterfaceForAddedBean {} ";
- saveFileAndUpdate(interfaceFile, interfaceContent);
-
- // change the interface to remote
-
- saveFileAndUpdate(bean1File, bean1Content2);
- result1 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1");
- assertEquals("com.sap.InterfaceForAddedBean", result1.getBusinessLocals().get(0));
- assertTrue(result1.getBusinessRemotes().isEmpty());
-
- // revert the change
- deleteFileAndUpdate(bean1File);
- deleteFileAndUpdate(bean2File);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1"));
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote2"));
- AbstractTest.deleteFile(interfaceFile);
- }
-
- /**
- * Add a bean. Then add a local interface. The interface has a local
- * annotation. Change the annotation of the interface to remote. The two
- * beans should be rebuilded and the interface should now be in the remote
- * business interfaces.
- *
- * @throws Exception
- * @throws InterruptedException
- */
- // @Test
- public void testAdd2BeansThenInterfaceThenRemoteThenOverrideWithRemote() throws InterruptedException, Exception {
- IFile bean1File = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testAdd2BeansThenInterfaceThenRemote1.java");
- IFile bean2File = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testAdd2BeansThenInterfaceThenRemote2.java");
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/InterfaceForAddedBean.java");
-
- final String bean1Content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testAdd2BeansThenInterfaceThenRemote1 implements InterfaceForAddedBean {}";
-
- final String bean1Content2 = "package com.sap;"
- + "import javax.ejb.Stateless;"
- + "@Stateless @Remote({InterfaceForAddedBean.class}) public class testAdd2BeansThenInterfaceThenRemote1 implements InterfaceForAddedBean {}";
-
- final String bean2Content = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class testAdd2BeansThenInterfaceThenRemote2 implements InterfaceForAddedBean {}";
- // add the bean. The interface is in the local list.
- saveFileAndUpdate(bean1File, bean1Content);
- saveFileAndUpdate(bean2File, bean2Content);
- SessionBean result1 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1");
- assertEquals("InterfaceForAddedBean", result1.getBusinessLocals().get(0));
- SessionBean result2 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote2");
- assertEquals("InterfaceForAddedBean", result2.getBusinessLocals().get(0));
-
- // add interface. The bean should now resolve the interface and add it
- // to local interfaces.
- final String interfaceContent = "package com.sap;" + "public interface InterfaceForAddedBean {} ";
- saveFileAndUpdate(interfaceFile, interfaceContent);
-
- // change the interface to remote
- final String interfaceContentRemote = "package com.sap;" + "import javax.ejb.Remote"
- + "@Remote public interface InterfaceForAddedBean {} ";
- saveFileAndUpdate(interfaceFile, interfaceContentRemote);
- result1 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1");
- assertEquals("com.sap.InterfaceForAddedBean", result1.getBusinessRemotes().get(0));
- result2 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote2");
- assertEquals("com.sap.InterfaceForAddedBean", result2.getBusinessRemotes().get(0));
- assertTrue(result1.getBusinessLocals().isEmpty());
- assertTrue(result2.getBusinessLocals().isEmpty());
-
- saveFileAndUpdate(bean1File, bean1Content2);
- result1 = TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1");
- assertEquals("com.sap.InterfaceForAddedBean", result1.getBusinessRemotes().get(0));
- assertTrue(result1.getBusinessLocals().isEmpty());
-
- // revert the change
- deleteFileAndUpdate(bean1File);
- deleteFileAndUpdate(bean2File);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote1"));
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAdd2BeansThenInterfaceThenRemote2"));
- AbstractTest.deleteFile(interfaceFile);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EjbReferenceTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EjbReferenceTest.java
deleted file mode 100644
index 301db9d5..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/EjbReferenceTest.java
+++ /dev/null
@@ -1,371 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.ejb.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.javaee.core.EjbLocalRef;
-import org.eclipse.jst.javaee.core.InjectionTarget;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.model.internal.EJBAnnotationReader;
-import org.eclipse.jst.jee.model.internal.common.AbstractAnnotationModelProvider;
-import org.eclipse.jst.jee.model.tests.AbstractAnnotationModelTest;
-import org.eclipse.jst.jee.model.tests.AbstractTest;
-import org.eclipse.jst.jee.model.tests.TestUtils;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class EjbReferenceTest extends AbstractAnnotationModelTest {
-
- public static TestSuite suite() throws Exception {
- TestSuite suite = new TestSuite(EjbReferenceTest.class);
- return suite;
- }
-
- // @BeforeClass
- public static void setUpProject() throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(EjbReferenceTest.class.getSimpleName());
- if (!project.exists())
- {
- project = ProjectUtil.createEJBProject(EjbReferenceTest.class.getSimpleName(), null,
- J2EEVersionConstants.EJB_3_0_ID, true);
- createProjectContent(project);
- }
- }
-
- private static void createProjectContent(IProject project) throws Exception {
- IJavaProject javaProject = JavaCore.create(project);
- IFolder comFolder = javaProject.getProject().getFolder("ejbModule/com");
- comFolder.create(true, true, new NullProgressMonitor());
- IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(comFolder);
- root.createPackageFragment("sap", true, new NullProgressMonitor());
- }
-
- // @AfterClass
- public static void tearDownAfterClass() throws InterruptedException {
- AbstractTest.deleteProject(EjbReferenceTest.class.getSimpleName());
- }
-
- // @Before
- @Override
- protected void setUp() throws Exception {
- setUpProject();
- super.setUp();
- fixture = new EJBAnnotationReader(facetedProject, clientProject);
- }
-
- // @After
- @Override
- protected void tearDown() throws Exception {
- ((AbstractAnnotationModelProvider) fixture).dispose();
- }
-
- // @Test
- public void testAddDeleteInterfaceEjbOnFieldAnnotation() throws Exception {
- final String beanContent = "package com.sap;" + "@Stateless " + " public class AddedBean {"
- + "@EJB(beanInterface = InjectionInterface.class) " + "private InjectionInterface bean1;" + "}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/AddedBean.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "AddedBean");
- assertNotNull(result);
- assertEquals(new Integer(1), new Integer(result.getEjbLocalRefs().size()));
- EjbLocalRef ref = (EjbLocalRef) result.getEjbLocalRefs().get(0);
- assertEquals("InjectionInterface", ref.getLocal());
- assertEquals(new Integer(1), new Integer(ref.getInjectionTargets().size()));
- InjectionTarget injectionTarget = (InjectionTarget) ref.getInjectionTargets().get(0);
- assertEquals("com.sap.AddedBean", injectionTarget.getInjectionTargetClass());
- assertEquals("bean1", injectionTarget.getInjectionTargetName());
-
- final String interfaceContent = "package com.sap;" + "public interface InjectionInterface {}";
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/InjectionInterface.java");
- saveFileAndUpdate(interfaceFile, interfaceContent);
- result = TestUtils.getSessionBean(getEJBJar(), "AddedBean");
- ref = (EjbLocalRef) result.getEjbLocalRefs().get(0);
- assertEquals("com.sap.InjectionInterface", ref.getLocal());
-
- // revert the change
- deleteFileAndUpdate(interfaceFile);
- result = TestUtils.getSessionBean(getEJBJar(), "AddedBean");
- ref = (EjbLocalRef) result.getEjbLocalRefs().get(0);
- assertEquals("InjectionInterface", ref.getLocal());
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "AddedBean"));
- }
-
- // @Test
- public void testManyEjbFields() throws Exception {
- final String beanContent = "package com.sap;" + "@Stateless " + " public class testManyEjbFields {"
- + "@EJB(beanInterface = InjectionInterface.class) private InjectionInterface bean1;"
- + "@EJB() private InjectionInterface bean2;"
- + "@EJB(beanInterface = Collection.class) private String invalideBean;"
- + "@EJB(beanInterface = Collection.class) private int simpelType;" + "}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testManyEjbFields.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testManyEjbFields");
- assertNotNull(result);
- assertEquals(new Integer(2), new Integer(result.getEjbLocalRefs().size()));
- EjbLocalRef bean1Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(),
- "com.sap.testManyEjbFields/bean1");
- assertNotNull(bean1Reference);
- assertEquals("InjectionInterface", bean1Reference.getLocal());
- assertEquals("InjectionInterface", bean1Reference.getLocalHome());
- EjbLocalRef bean2Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(),
- "com.sap.testManyEjbFields/bean2");
- assertNotNull(bean2Reference);
- assertEquals("InjectionInterface", bean2Reference.getLocalHome());
- assertEquals("InjectionInterface", bean2Reference.getLocal());
-
- // add the interface
- final String interfaceContent = "package com.sap;" + "public interface InjectionInterface {}";
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/InjectionInterface.java");
- saveFileAndUpdate(interfaceFile, interfaceContent);
- result = TestUtils.getSessionBean(getEJBJar(), "testManyEjbFields");
- assertNotNull(result);
- bean1Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(), "com.sap.testManyEjbFields/bean1");
- bean2Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(), "com.sap.testManyEjbFields/bean2");
- assertEquals("com.sap.InjectionInterface", bean1Reference.getLocal());
- assertEquals("com.sap.InjectionInterface", bean1Reference.getLocalHome());
- assertEquals("com.sap.InjectionInterface", bean2Reference.getLocalHome());
-
- // revert the change
- deleteFileAndUpdate(interfaceFile);
- result = TestUtils.getSessionBean(getEJBJar(), "testManyEjbFields");
- bean1Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(), "com.sap.testManyEjbFields/bean1");
- bean2Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(), "com.sap.testManyEjbFields/bean2");
- assertEquals("InjectionInterface", bean1Reference.getLocal());
- assertEquals("InjectionInterface", bean1Reference.getLocalHome());
- assertEquals("InjectionInterface", bean2Reference.getLocalHome());
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testManyEjbFields"));
- }
-
- // @Test
- public void testAddDeleteInterfaceEjbOnMethodAnnotation() throws Exception {
- final String beanContent = "package com.sap;" + "@Stateless "
- + " public class testAddDeleteInterfaceEjbOnMethodAnnotation {"
- + "@EJB(beanInterface = InjectionInterface.class) public void setBean1(InjectionInterface inter) {}"
- + "private InjectionInterface bean1;" + "}";
- IFile beanFile = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testAddDeleteInterfaceEjbOnMethodAnnotation.java");
- // add the bean file
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testAddDeleteInterfaceEjbOnMethodAnnotation");
- assertNotNull(result);
- assertEquals(new Integer(1), new Integer(result.getEjbLocalRefs().size()));
- EjbLocalRef ref = (EjbLocalRef) result.getEjbLocalRefs().get(0);
- assertEquals("InjectionInterface", ref.getLocal());
- assertEquals(new Integer(1), new Integer(ref.getInjectionTargets().size()));
- InjectionTarget injectionTarget = (InjectionTarget) ref.getInjectionTargets().get(0);
- assertEquals("com.sap.testAddDeleteInterfaceEjbOnMethodAnnotation", injectionTarget.getInjectionTargetClass());
- assertEquals("bean1", injectionTarget.getInjectionTargetName());
-
- // add interface
- final String interfaceContent = "package com.sap;" + "public interface InjectionInterface {}";
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/InjectionInterface.java");
- saveFileAndUpdate(interfaceFile, interfaceContent);
- result = TestUtils.getSessionBean(getEJBJar(), "testAddDeleteInterfaceEjbOnMethodAnnotation");
- ref = (EjbLocalRef) result.getEjbLocalRefs().get(0);
- assertEquals("com.sap.InjectionInterface", ref.getLocal());
-
- // revert the change
- deleteFileAndUpdate(interfaceFile);
- result = TestUtils.getSessionBean(getEJBJar(), "testAddDeleteInterfaceEjbOnMethodAnnotation");
- ref = (EjbLocalRef) result.getEjbLocalRefs().get(0);
- assertEquals("InjectionInterface", ref.getLocal());
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAddDeleteInterfaceEjbOnMethodAnnotation"));
- }
-
- // @Test
- public void testManyEjbMethods() throws Exception {
- final String beanContent = "package com.sap;" + "@Stateless " + " public class testManyEjbMethods {"
- + "@EJB(beanInterface = InjectionInterface.class) public void setBean1(InjectionInterface bean1){};"
- + "@EJB() public void setBean2(InjectionInterface bean2){};"
- + "@EJB(beanInterface = Collection.class) public void setInvalideBean(String invalideBean) {};" + "}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testManyEjbMethods.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testManyEjbMethods");
- assertNotNull(result);
- assertEquals(new Integer(2), new Integer(result.getEjbLocalRefs().size()));
- EjbLocalRef bean1Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(),
- "com.sap.testManyEjbMethods/bean1");
- assertNotNull(bean1Reference);
- assertEquals("InjectionInterface", bean1Reference.getLocal());
- assertEquals("InjectionInterface", bean1Reference.getLocalHome());
- EjbLocalRef bean2Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(),
- "com.sap.testManyEjbMethods/bean2");
- assertNotNull(bean2Reference);
- assertEquals("InjectionInterface", bean2Reference.getLocalHome());
- assertEquals("InjectionInterface", bean2Reference.getLocal());
-
- // add the interface
- final String interfaceContent = "package com.sap;" + "public interface InjectionInterface {}";
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/InjectionInterface.java");
- saveFileAndUpdate(interfaceFile, interfaceContent);
- result = TestUtils.getSessionBean(getEJBJar(), "testManyEjbMethods");
- assertNotNull(result);
- bean1Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(), "com.sap.testManyEjbMethods/bean1");
- bean2Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(), "com.sap.testManyEjbMethods/bean2");
- assertEquals("com.sap.InjectionInterface", bean1Reference.getLocal());
- assertEquals("com.sap.InjectionInterface", bean1Reference.getLocalHome());
- assertEquals("com.sap.InjectionInterface", bean2Reference.getLocalHome());
-
- // revert the change
- deleteFileAndUpdate(interfaceFile);
- result = TestUtils.getSessionBean(getEJBJar(), "testManyEjbMethods");
- bean1Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(), "com.sap.testManyEjbMethods/bean1");
- bean2Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(), "com.sap.testManyEjbMethods/bean2");
- assertEquals("InjectionInterface", bean1Reference.getLocal());
- assertEquals("InjectionInterface", bean1Reference.getLocalHome());
- assertEquals("InjectionInterface", bean2Reference.getLocalHome());
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testManyEjbMethods"));
- }
-
- // @Test
- public void testEjbOnMethodAndFieldsOfMessageBean() throws Exception {
- final String beanContent = "package com.sap;" + "@MessageDriven "
- + " public class testEjbOnMethodAndFieldsOfMessageBean {"
- + "@EJB(beanInterface = InjectionInterface.class) public void setBean1(InjectionInterface bean1){};"
- + "@EJB() public InjectionInterface bean2;" + "}";
- IFile beanFile = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testEjbOnMethodAndFieldsOfMessageBean.java");
- saveFileAndUpdate(beanFile, beanContent);
- MessageDrivenBean result = TestUtils.getMessageDrivenBean(getEJBJar(), "testEjbOnMethodAndFieldsOfMessageBean");
- assertNotNull(result);
- assertEquals(new Integer(2), new Integer(result.getEjbLocalRefs().size()));
- EjbLocalRef bean1Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(),
- "com.sap.testEjbOnMethodAndFieldsOfMessageBean/bean1");
- assertNotNull(bean1Reference);
- assertEquals("InjectionInterface", bean1Reference.getLocal());
- assertEquals("InjectionInterface", bean1Reference.getLocalHome());
- EjbLocalRef bean2Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(),
- "com.sap.testEjbOnMethodAndFieldsOfMessageBean/bean2");
- assertNotNull(bean2Reference);
- assertEquals("InjectionInterface", bean2Reference.getLocalHome());
- assertEquals("InjectionInterface", bean2Reference.getLocal());
-
- // add the interface
- final String interfaceContent = "package com.sap;" + "public interface InjectionInterface {}";
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/InjectionInterface.java");
- saveFileAndUpdate(interfaceFile, interfaceContent);
- result = TestUtils.getMessageDrivenBean(getEJBJar(), "testEjbOnMethodAndFieldsOfMessageBean");
- assertNotNull(result);
- bean1Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(),
- "com.sap.testEjbOnMethodAndFieldsOfMessageBean/bean1");
- bean2Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(),
- "com.sap.testEjbOnMethodAndFieldsOfMessageBean/bean2");
- assertEquals("com.sap.InjectionInterface", bean1Reference.getLocal());
- assertEquals("com.sap.InjectionInterface", bean1Reference.getLocalHome());
- assertEquals("com.sap.InjectionInterface", bean2Reference.getLocalHome());
-
- // revert the change
- deleteFileAndUpdate(interfaceFile);
- result = TestUtils.getMessageDrivenBean(getEJBJar(), "testEjbOnMethodAndFieldsOfMessageBean");
- bean1Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(),
- "com.sap.testEjbOnMethodAndFieldsOfMessageBean/bean1");
- bean2Reference = TestUtils.findLocalRefByName(result.getEjbLocalRefs(),
- "com.sap.testEjbOnMethodAndFieldsOfMessageBean/bean2");
- assertEquals("InjectionInterface", bean1Reference.getLocal());
- assertEquals("InjectionInterface", bean1Reference.getLocalHome());
- assertEquals("InjectionInterface", bean2Reference.getLocalHome());
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testEjbOnMethodAndFieldsOfMessageBean"));
- }
-
- // @Test
- public void testAddDeleteBeanInterfaceOnEjbAnnotation() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateless @EJB(name=\"refName\", beanInterface = BeanInterface.class, "
- + "beanName=\"beanName\", mappedName=\"mappedName\")"
- + " public class testAddDeleteBeanInterfaceOnEjbAnnotation {}";
- IFile beanFile = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testAddDeleteBeanInterfaceOnEjbAnnotation.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testAddDeleteBeanInterfaceOnEjbAnnotation");
- assertNotNull(result);
- assertEquals(new Integer(1), new Integer(result.getEjbLocalRefs().size()));
- EjbLocalRef ref = (EjbLocalRef) result.getEjbLocalRefs().get(0);
- assertEquals("BeanInterface", ref.getLocal());
-
- final String interfaceContent = "package com.sap;" + "public interface BeanInterface {}";
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/BeanInterface.java");
- saveFileAndUpdate(interfaceFile, interfaceContent);
- result = TestUtils.getSessionBean(getEJBJar(), "testAddDeleteBeanInterfaceOnEjbAnnotation");
- ref = (EjbLocalRef) result.getEjbLocalRefs().get(0);
- assertEquals("com.sap.BeanInterface", ref.getLocal());
-
- // revert the change
- deleteFileAndUpdate(interfaceFile);
- result = TestUtils.getSessionBean(getEJBJar(), "testAddDeleteBeanInterfaceOnEjbAnnotation");
- ref = (EjbLocalRef) result.getEjbLocalRefs().get(0);
- assertEquals("BeanInterface", ref.getLocal());
-
- deleteFileAndUpdate(beanFile);
- assertFalse(beanFile.exists());
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAddDeleteBeanInterfaceOnEjbAnnotation"));
- }
-
- // @Test
- public void testAddDeleteInterfaceOnEjbsAnnotation() throws Exception {
- final String beanContent = "package com.sap;" + "@Stateless " + "@EJBs(value = { "
- + "@EJB(name=\"comparable\", beanInterface = java.lang.Comparable.class, beanName = \"beanName\"), "
- + "@EJB(name=\"nonResolved\", beanInterface = BeanInterface.class) }) "
- + " public class testAddDeleteInterfaceOnEjbsAnnotation {}";
- IFile beanFile = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testAddDeleteInterfaceOnEjbsAnnotation.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testAddDeleteInterfaceOnEjbsAnnotation");
- assertNotNull(result);
- EjbLocalRef comparable = TestUtils.findLocalRefByName(result.getEjbLocalRefs(), "comparable");
- assertNotNull(comparable);
- assertEquals("java.lang.Comparable", comparable.getLocal());
- EjbLocalRef nonResolved = TestUtils.findLocalRefByName(result.getEjbLocalRefs(), "nonResolved");
- assertNotNull(nonResolved);
- assertEquals("BeanInterface", nonResolved.getLocal());
- assertEquals(new Integer(2), new Integer(result.getEjbLocalRefs().size()));
-
- final String interfaceContent = "package com.sap;" + "public interface BeanInterface {}";
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/BeanInterface.java");
- saveFileAndUpdate(interfaceFile, interfaceContent);
- result = TestUtils.getSessionBean(getEJBJar(), "testAddDeleteInterfaceOnEjbsAnnotation");
- nonResolved = TestUtils.findLocalRefByName(result.getEjbLocalRefs(), "nonResolved");
- assertEquals("com.sap.BeanInterface", nonResolved.getLocal());
-
- // revert the change
- deleteFileAndUpdate(interfaceFile);
- result = TestUtils.getSessionBean(getEJBJar(), "testAddDeleteInterfaceOnEjbsAnnotation");
- nonResolved = TestUtils.findLocalRefByName(result.getEjbLocalRefs(), "nonResolved");
- assertEquals("BeanInterface", nonResolved.getLocal());
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testAddDeleteInterfaceOnEjbsAnnotation"));
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/GenerateDDTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/GenerateDDTest.java
deleted file mode 100644
index c117ef6e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/GenerateDDTest.java
+++ /dev/null
@@ -1,84 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.ejb.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.jee.model.tests.SynchronousModelChangedListener;
-import org.eclipse.jst.jee.project.facet.ICreateDeploymentFilesDataModelProperties;
-import org.eclipse.jst.jee.project.facet.IEJBCreateDeploymentFilesDataModelProperties;
-import org.eclipse.wst.common.frameworks.datamodel.DataModelFactory;
-import org.eclipse.wst.common.frameworks.datamodel.IDataModel;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class GenerateDDTest extends TestCase {
-
- private static final String EJB_JAR_CONTENT = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>"
- + "<ejb-jar xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" "
- + "xmlns=\"http://java.sun.com/xml/ns/javaee\" "
- + "xmlns:ejb=\"http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd\" "
- + "xsi:schemaLocation=\"http://java.sun.com/xml/ns/javaee "
- + "http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd\" version=\"3.0\">" + "<enterprise-beans>"
- + " <session>" + " <ejb-name>NMTOKEN</ejb-name>" + " </session>" + " </enterprise-beans></ejb-jar>";
-
- private IModelProvider fixture = null;
-
- private IProject project = null;
-
- public static Test suite() {
- TestSuite suite = new TestSuite(GenerateDDTest.class);
- return suite;
- }
-
- protected void setUp() throws Exception {
- super.setUp();
- project = ProjectUtil.createEJBProject(GenerateDDTest.class.getSimpleName(), null,
- J2EEVersionConstants.EJB_3_0_ID, true);
- fixture = ModelProviderManager.getModelProvider(project);
- }
-
- protected void tearDown() throws Exception {
- ProjectUtil.deleteProject(project);
- super.tearDown();
- }
-
- /**
- * Generated the deployment descriptor.
- *
- * @throws InterruptedException
- */
- public void testGenerateDD() throws Exception {
- IFile file = project.getFile("ejbModule/META-INF/ejb-jar.xml");
- assertFalse(file.exists());
- SynchronousModelChangedListener listener = new SynchronousModelChangedListener(1);
- fixture.addListener(listener);
-
- IDataModel dataModel = DataModelFactory.createDataModel(IEJBCreateDeploymentFilesDataModelProperties.class);
- dataModel.setProperty(ICreateDeploymentFilesDataModelProperties.TARGET_PROJECT, project);
- dataModel.getDefaultOperation().execute(new NullProgressMonitor(), null);
-
- listener.waitForEvents();
- fixture.removeListener(listener);
- assertEquals(new Integer(1), new Integer(listener.getReceivedEvents().size()));
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/LifecycleAnnotationsTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/LifecycleAnnotationsTest.java
deleted file mode 100644
index ee917ac0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/LifecycleAnnotationsTest.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.ejb.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.javaee.core.LifecycleCallback;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.model.internal.common.Result;
-import org.eclipse.jst.jee.model.tests.AbstractAnnotationFactoryTest;
-import org.eclipse.jst.jee.model.tests.AbstractTest;
-import org.eclipse.jst.jee.model.tests.TestUtils;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class LifecycleAnnotationsTest extends AbstractAnnotationFactoryTest {
-
- private IFacetedProject facetedProject;
-
- public static TestSuite suite() throws Exception {
- TestSuite suite = new TestSuite(LifecycleAnnotationsTest.class);
- return suite;
- }
-
- @Override
- protected void setUp() throws Exception {
- setUpProject();
- super.setUp();
- facetedProject =ProjectFacetsManager.create(ResourcesPlugin.getWorkspace().getRoot().getProject(this.getClass().getSimpleName()));
- }
-
- // @BeforeClass
- public static void setUpProject() throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(LifecycleAnnotationsTest.class.getSimpleName());
- if (!project.exists())
- {
- project = ProjectUtil.createEJBProject(LifecycleAnnotationsTest.class.getSimpleName(), null,
- J2EEVersionConstants.EJB_3_0_ID, true);
- createProjectContent(project);
- }
- }
-
- // @AfterClass
- public static void tearDownAfterClass() throws InterruptedException {
- AbstractTest.deleteProject(LifecycleAnnotationsTest.class.getSimpleName());
- }
-
- private static void createProjectContent(IProject project) throws Exception {
- IJavaProject javaProject = JavaCore.create(project);
- IFolder comFolder = javaProject.getProject().getFolder("ejbModule/com");
- comFolder.create(true, true, new NullProgressMonitor());
- IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(comFolder);
- root.createPackageFragment("sap", true, new NullProgressMonitor());
- }
-
- // @Test
- public void testPostActivate() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateful public class testPostActivate implements SessionBeanLocal{"
- + "@PostActivate public void postActivateMethod() {}"
- + "@PostActivate protected void protectedMethod() {}" + "@PostActivate void defaultMethod() {}"
- + "@PostActivate private void privateMethod() {}"
- + "@PostActivate public String returnTypeMethod() {return null;}"
- + "@PostActivate public void paramMethod(String param) {}"
- + "@PostActivate public void exceptionMethod() throws Exception {}"
- + "@PostActivate public final void finalMethod() {}" + "}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testPostActivate.java");
- AbstractTest.saveFile(beanFile, beanContent);
- IType type = JavaCore.createCompilationUnitFrom(beanFile).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean sessionBean = (SessionBean) result.getMainObject();
- assertNotNull(sessionBean);
- assertEquals("testPostActivate", sessionBean.getEjbName());
- LifecycleCallback postActivateMethod = TestUtils.findLifecycleMethod(sessionBean.getPostActivates(),
- "postActivateMethod");
- assertEquals("com.sap.testPostActivate", postActivateMethod.getLifecycleCallbackClass());
- LifecycleCallback protectedMethod = TestUtils.findLifecycleMethod(sessionBean.getPostActivates(),
- "protectedMethod");
- assertEquals("com.sap.testPostActivate", protectedMethod.getLifecycleCallbackClass());
- LifecycleCallback defaultMethod = TestUtils
- .findLifecycleMethod(sessionBean.getPostActivates(), "defaultMethod");
- assertEquals("com.sap.testPostActivate", defaultMethod.getLifecycleCallbackClass());
- LifecycleCallback privateMethod = TestUtils
- .findLifecycleMethod(sessionBean.getPostActivates(), "privateMethod");
- assertEquals("com.sap.testPostActivate", privateMethod.getLifecycleCallbackClass());
- assertEquals(new Integer(4), new Integer(sessionBean.getPostActivates().size()));
-
- }
-
- // @Test
- public void testPrePassivate() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateful public class testPrePassivate implements SessionBeanLocal{"
- + "@PrePassivate public void prePassivateMethod() {}"
- + "@PrePassivate protected void protectedMethod() {}" + "@PrePassivate void defaultMethod() {}"
- + "@PrePassivate private void privateMethod() {}"
- + "@PrePassivate public String returnTypeMethod() {return null;}"
- + "@PrePassivate public void paramMethod(String param) {}"
- + "@PrePassivate public void exceptionMethod() throws Exception {}"
- + "@PrePassivate public final void finalMethod() {}" + "}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testPrePassivate.java");
- AbstractTest.saveFile(beanFile, beanContent);
- IType type = JavaCore.createCompilationUnitFrom(beanFile).findPrimaryType();
-
- Result result = fixture.createJavaeeObject(type);
- SessionBean sessionBean = (SessionBean) result.getMainObject();
- assertNotNull(sessionBean);
- LifecycleCallback postActivateMethod = TestUtils.findLifecycleMethod(sessionBean.getPrePassivates(),
- "prePassivateMethod");
- assertEquals("com.sap.testPrePassivate", postActivateMethod.getLifecycleCallbackClass());
- LifecycleCallback protectedMethod = TestUtils.findLifecycleMethod(sessionBean.getPrePassivates(),
- "protectedMethod");
- assertEquals("com.sap.testPrePassivate", protectedMethod.getLifecycleCallbackClass());
- LifecycleCallback defaultMethod = TestUtils
- .findLifecycleMethod(sessionBean.getPrePassivates(), "defaultMethod");
- assertEquals("com.sap.testPrePassivate", defaultMethod.getLifecycleCallbackClass());
- LifecycleCallback privateMethod = TestUtils
- .findLifecycleMethod(sessionBean.getPrePassivates(), "privateMethod");
- assertEquals("com.sap.testPrePassivate", privateMethod.getLifecycleCallbackClass());
- assertEquals(new Integer(4), new Integer(sessionBean.getPrePassivates().size()));
- }
-
- // @Test
- public void testPostConstruct() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateless public class testPostConstruct implements SessionBeanLocal {"
- + "@PostConstruct public void publicMethod() {}"
- + "@PostConstruct public static void staticMethod() {}"
- + "@PostConstruct public final void finalMethod(){}" + "@PostConstruct public String returnType() {}"
- + "@PostConstruct public void paramMethod(String param) {}"
- + "@PostConstruct public void throwExpception() throws Exception {};" + "}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testPostConstruct.java");
- AbstractTest.saveFile(beanFile, beanContent);
- IType type = JavaCore.createCompilationUnitFrom(beanFile).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean sessionBean = (SessionBean) result.getMainObject();
- assertNotNull(sessionBean);
- assertEquals("testPostConstruct", sessionBean.getEjbName());
- LifecycleCallback callback = TestUtils.findLifecycleMethod(sessionBean.getPostConstructs(), "publicMethod");
- assertEquals("com.sap.testPostConstruct", callback.getLifecycleCallbackClass());
- assertEquals(new Integer(1), new Integer(sessionBean.getPostConstructs().size()));
-
- }
-
- // @Test
- public void testPreDestroy() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateless public class testPreDestroy implements SessionBeanLocal {"
- + "@PreDestroy public void publicMethod() {}" + "@PreDestroy public static void staticMethod() {}"
- + "@PreDestroy public final void finalMethod(){}" + "@PreDestroy public String returnType() {}"
- + "@PreDestroy public void paramMethod(String param) {}"
- + "@PreDestroy public void throwExpception() throws Exception {};" + "}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testPreDestroy.java");
- AbstractTest.saveFile(beanFile, beanContent);
- IType type = JavaCore.createCompilationUnitFrom(beanFile).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- SessionBean sessionBean = (SessionBean) result.getMainObject();
- assertNotNull(sessionBean);
- LifecycleCallback callback = TestUtils.findLifecycleMethod(sessionBean.getPreDestroys(), "publicMethod");
- assertEquals("com.sap.testPreDestroy", callback.getLifecycleCallbackClass());
- assertEquals(new Integer(1), new Integer(sessionBean.getPreDestroys().size()));
- }
-
- // @Test
- public void testLifecycleOnMessageDriven() throws Exception {
- final String beanContent = "package com.sap;"
- + "@MessageDriven public class testLifecycleOnMessageDriven implements SessionBeanLocal {"
- + "@PostConstruct public void postConstructMethod() {}"
- + "@PreDestroy public void preDestroyMethod() {}" + "}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testLifecycleOnMessageDriven.java");
- AbstractTest.saveFile(beanFile, beanContent);
- IType type = JavaCore.createCompilationUnitFrom(beanFile).findPrimaryType();
- Result result = fixture.createJavaeeObject(type);
- MessageDrivenBean mdb = (MessageDrivenBean) result.getMainObject();
- assertNotNull(mdb);
- LifecycleCallback callback1 = TestUtils.findLifecycleMethod(mdb.getPostConstructs(), "postConstructMethod");
- assertNotNull(callback1);
- assertEquals("com.sap.testLifecycleOnMessageDriven", callback1.getLifecycleCallbackClass());
- LifecycleCallback callback2 = TestUtils.findLifecycleMethod(mdb.getPreDestroys(), "preDestroyMethod");
- assertNotNull(callback2);
- assertEquals("com.sap.testLifecycleOnMessageDriven", callback2.getLifecycleCallbackClass());
- assertEquals(new Integer(1), new Integer(mdb.getPreDestroys().size()));
- assertEquals(new Integer(1), new Integer(mdb.getPostConstructs().size()));
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/NotifyCloseProjectTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/NotifyCloseProjectTest.java
deleted file mode 100644
index 117c7ba0..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/NotifyCloseProjectTest.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.ejb.tests;
-
-import junit.framework.Test;
-import junit.framework.TestCase;
-import junit.framework.TestSuite;
-
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.j2ee.model.IModelProviderEvent;
-import org.eclipse.jst.j2ee.model.ModelProviderManager;
-import org.eclipse.jst.jee.model.tests.AbstractTest;
-import org.eclipse.jst.jee.model.tests.SynchronousModelChangedListener;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class NotifyCloseProjectTest extends TestCase {
-
- public static Test suite() {
- TestSuite suite = new TestSuite(NotifyCloseProjectTest.class);
- return suite;
- }
-
- /**
- * Get the model for a project. Close the project. Get the model from the
- * same model provider. The model should be null because the project is
- * closed.
- *
- * @throws Exception
- */
- // @Test
- public void testCloseEjbProject() throws Exception {
- IFacetedProject facetedProject = AbstractTest.createEjbProject(NotifyCloseProjectTest.class.getSimpleName()
- + "testCloseEjbProject");
- IModelProvider provider = ModelProviderManager.getModelProvider(facetedProject.getProject());
- provider.getModelObject();
-
- SynchronousModelChangedListener listener = new SynchronousModelChangedListener(1);
- provider.addListener(listener);
- AbstractTest.closeProject(facetedProject.getProject().getName());
- assertTrue(listener.waitForEvents());
- provider.removeListener(listener);
- assertEquals(new Integer(1), new Integer(listener.getReceivedEvents().size()));
- IModelProviderEvent event = listener.getReceivedEvents().iterator().next();
- assertTrue(event.getEventCode() == IModelProviderEvent.UNLOADED_RESOURCE);
- }
-
- /**
- * Get the model for a project. Close the project. Get the model from the
- * same model provider. The model should be null because the project is
- * closed.
- *
- * @throws Exception
- */
- // @Test
- public void testCloseWebProject() throws Exception {
- IFacetedProject facetedProject = AbstractTest.createWebProject(NotifyCloseProjectTest.class.getSimpleName()
- + "testCloseWebProject");
- IModelProvider provider = ModelProviderManager.getModelProvider(facetedProject.getProject());
- provider.getModelObject();
-
- SynchronousModelChangedListener listener = new SynchronousModelChangedListener(1);
- provider.addListener(listener);
- AbstractTest.closeProject(facetedProject.getProject().getName());
- assertTrue(listener.waitForEvents());
- provider.removeListener(listener);
- assertEquals(new Integer(1), new Integer(listener.getReceivedEvents().size()));
- IModelProviderEvent event = listener.getReceivedEvents().iterator().next();
- assertTrue(event.getEventCode() == IModelProviderEvent.UNLOADED_RESOURCE);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/ResourceReferenceTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/ResourceReferenceTest.java
deleted file mode 100644
index bab4154b..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/ResourceReferenceTest.java
+++ /dev/null
@@ -1,278 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.ejb.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.javaee.core.Description;
-import org.eclipse.jst.javaee.core.ResAuthType;
-import org.eclipse.jst.javaee.core.ResSharingScopeType;
-import org.eclipse.jst.javaee.core.ResourceRef;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.model.internal.EJBAnnotationReader;
-import org.eclipse.jst.jee.model.internal.common.AbstractAnnotationModelProvider;
-import org.eclipse.jst.jee.model.tests.AbstractAnnotationModelTest;
-import org.eclipse.jst.jee.model.tests.AbstractTest;
-import org.eclipse.jst.jee.model.tests.TestUtils;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class ResourceReferenceTest extends AbstractAnnotationModelTest {
-
- public static TestSuite suite() throws Exception {
- TestSuite suite = new TestSuite(ResourceReferenceTest.class);
- return suite;
- }
-
- // @BeforeClass
- public static void setUpProject() throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(ResourceReferenceTest.class.getSimpleName());
- if (!project.exists())
- {
- IFacetedProject facetedProject = AbstractTest.createEjbProject(ResourceReferenceTest.class.getSimpleName());
- createProjectContent(facetedProject.getProject());
- }
- }
-
- private static void createProjectContent(IProject project) throws Exception {
- IJavaProject javaProject = JavaCore.create(project);
- IFolder comFolder = javaProject.getProject().getFolder("ejbModule/com");
- comFolder.create(true, true, new NullProgressMonitor());
- IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(comFolder);
- root.createPackageFragment("sap", true, new NullProgressMonitor());
- }
-
- // @AfterClass
- public static void tearDownAfterClass() throws InterruptedException {
-// AbstractTest.deleteProject(facetedProject.getProject().getName());
- }
-
- // @Before
- @Override
- protected void setUp() throws Exception {
- setUpProject();
- super.setUp();
- fixture = new EJBAnnotationReader(facetedProject, clientProject);
- }
-
- // @After
- public void tearDown() throws Exception {
- ((AbstractAnnotationModelProvider) fixture).dispose();
- }
-
- //@Test
- public void testResource() throws Exception {
- final String beanContent = "package com.sap;" + "@Stateless "
- + "@Resource(name =\"withNotDefaults\", mappedName = \"mappedName\", shareable = false, "
- + "type = java.lang.Comparable.class, "
- + "authenticationType = AuthenticationType.CONTAINER, description = \"description\")"
- + "public class testResource implements SessionBeanLocal{}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testResource.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testResource");
- assertNotNull(result);
- ResourceRef ref = TestUtils.findResourceRefByName(result.getResourceRefs(), "withNotDefaults");
- assertNotNull(ref);
- assertEquals("description", ((Description) ref.getDescriptions().get(0)).getValue());
- assertEquals("mappedName", ref.getMappedName());
- assertEquals(ResSharingScopeType.UNSHAREABLE_LITERAL, ref.getResSharingScope());
- assertEquals(ResAuthType.CONTAINER_LITERAL, ref.getResAuth());
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testResource"));
- }
-
- //@Test
- public void testResourcesDefaults() throws Exception {
- final String beanContent = "package com.sap;" + "@Stateless "
- + "@Resource(name =\"withDefaults\", mappedName = \"mappedName\","
- + "type = java.lang.Comparable.class, " + "description = \"description\")"
- + "public class testResourcesDefaults implements SessionBeanLocal{}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testResourcesDefaults.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testResourcesDefaults");
- assertNotNull(result);
- ResourceRef ref = TestUtils.findResourceRefByName(result.getResourceRefs(), "withDefaults");
- assertNotNull(ref);
- assertEquals("description", ((Description) ref.getDescriptions().get(0)).getValue());
- assertEquals("mappedName", ref.getMappedName());
- assertEquals("java.lang.Comparable", ref.getResType());
- assertEquals(ResSharingScopeType.SHAREABLE_LITERAL, ref.getResSharingScope());
- assertEquals(ResAuthType.APPLICATION_LITERAL, ref.getResAuth());
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testResourcesDefaults"));
- }
-
- //@Test
- public void testResources() throws Exception {
- final String beanContent = "package com.sap;"
- + "@Stateless "
- + "@Resources(value = {"
- + "@Resource(name = \"withNotDefaults\", mappedName = \"mappedName\", "
- + " shareable = false, type = java.lang.Comparable.class, "
- + " authenticationType = AuthenticationType.APPLICATION, description = \"description\"),"
- + "@Resource(name = \"withDefaults\", type = java.lang.Comparable.class), @Resource(name = \"invalidNoType\") })"
- + "public class testResources implements SessionBeanLocal{}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testResources.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testResources");
- assertNotNull(result);
- assertNotNull(TestUtils.findResourceRefByName(result.getResourceRefs(), "withNotDefaults"));
- assertNotNull(TestUtils.findResourceRefByName(result.getResourceRefs(), "withDefaults"));
- assertEquals(new Integer(2), new Integer(result.getResourceRefs().size()));
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testResources"));
- }
-
- //@Test
- public void testResourceUnresolved() throws Exception {
- final String beanContent = "package com.sap;" + "@Stateless " + "@Resource(name =\"withNotDefaults\","
- + "type = ResourceInterface.class)"
- + "public class testResourceUnresolved implements SessionBeanLocal{}";
- // add the bean.
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testResourceUnresolved.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testResourceUnresolved");
- assertNotNull(result);
- ResourceRef ref = TestUtils.findResourceRefByName(result.getResourceRefs(), "withNotDefaults");
- assertNotNull(ref);
- assertEquals("ResourceInterface", ref.getResType());
-
- // add the interface. The name should be resolved
- final String interfaceContent = "package com.sap;" + "public interface ResourceInterface {}";
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/ResourceInterface.java");
- saveFileAndUpdate(interfaceFile, interfaceContent);
- result = TestUtils.getSessionBean(getEJBJar(), "testResourceUnresolved");
- assertNotNull(result);
- ref = TestUtils.findResourceRefByName(result.getResourceRefs(), "withNotDefaults");
- assertNotNull(ref);
- assertEquals("com.sap.ResourceInterface", ref.getResType());
-
- // delete the file. The name is now not resolved.
- deleteFileAndUpdate(interfaceFile);
- result = TestUtils.getSessionBean(getEJBJar(), "testResourceUnresolved");
- assertNotNull(result);
- ref = TestUtils.findResourceRefByName(result.getResourceRefs(), "withNotDefaults");
- assertNotNull(ref);
- assertEquals("ResourceInterface", ref.getResType());
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testResourceUnresolved"));
- }
-
- //@Test
- public void testResourceOnField() throws Exception {
- final String beanContent = "package com.sap;" + "@Stateless "
- + "public class testResourceOnField implements SessionBeanLocal{"
- + "@Resource(type = java.lang.Comparable.class) private java.lang.Comparable valid;"
- + "@Resource(type = java.lang.Comparable.class) private int simpleType;"
- + "@Resource private java.lang.Comparable validButWithoutType;}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testResourceOnField.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testResourceOnField");
- assertNotNull(result);
- ResourceRef ref1 = TestUtils.findResourceRefByName(result.getResourceRefs(),
- "com.sap.testResourceOnField/valid");
- assertNotNull(ref1);
- assertEquals("java.lang.Comparable", ref1.getResType());
- ResourceRef ref2 = TestUtils.findResourceRefByName(result.getResourceRefs(),
- "com.sap.testResourceOnField/validButWithoutType");
- assertNotNull(ref2);
- assertEquals("java.lang.Comparable", ref2.getResType());
- assertEquals(new Integer(2), new Integer(result.getResourceRefs().size()));
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testResourceOnField"));
- }
-
- //@Test
- public void testResourceOnMethod() throws Exception {
- final String beanContent = "package com.sap;" + "@Stateless "
- + "public class testResourceOnMethod implements SessionBeanLocal{"
- + "@Resource(type = java.lang.Comparable.class) public void validMethod(Comparable arg0){};"
- + "@Resource(type = java.lang.Comparable.class) private void simpleType(int arg0) {};"
- + "@Resource public void validButWithoutType(Comparable arg0){};"
- + "@Resource public void twoParams(Comparable arg0, Comparable arg1} {};}";
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testResourceOnMethod.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testResourceOnMethod");
- assertNotNull(result);
- ResourceRef ref1 = TestUtils.findResourceRefByName(result.getResourceRefs(),
- "com.sap.testResourceOnMethod/validMethod");
- assertNotNull(ref1);
- ResourceRef ref2 = TestUtils.findResourceRefByName(result.getResourceRefs(),
- "com.sap.testResourceOnMethod/validButWithoutType");
- assertNotNull(ref2);
- assertEquals(new Integer(2), new Integer(result.getResourceRefs().size()));
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testResourceOnMethod"));
- }
-
- //@Test
- public void testResourceOnMethodAndFieldUnresolved() throws Exception {
- final String beanContent = "package com.sap;" + "@Stateless "
- + "public class testResourceOnMethodAndFieldUnresolved implements SessionBeanLocal{"
- + "@Resource(type = ResourceInterface.class) public void validMethod(ResourceInterface arg0){};"
- + "@Resource private ResourceInterface valid;}";
- IFile beanFile = facetedProject.getProject().getFile(
- "ejbModule/com/sap/testResourceOnMethodAndFieldUnresolved.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testResourceOnMethodAndFieldUnresolved");
- assertNotNull(result);
- ResourceRef ref1 = TestUtils.findResourceRefByName(result.getResourceRefs(),
- "com.sap.testResourceOnMethodAndFieldUnresolved/validMethod");
- assertEquals("ResourceInterface", ref1.getResType());
- ResourceRef ref2 = TestUtils.findResourceRefByName(result.getResourceRefs(),
- "com.sap.testResourceOnMethodAndFieldUnresolved/valid");
- assertEquals("ResourceInterface", ref2.getResType());
-
- // add the interface. The name should be resolved
- final String interfaceContent = "package com.sap;" + "public interface ResourceInterface {}";
- IFile interfaceFile = facetedProject.getProject().getFile("ejbModule/com/sap/ResourceInterface.java");
- saveFileAndUpdate(interfaceFile, interfaceContent);
- result = TestUtils.getSessionBean(getEJBJar(), "testResourceOnMethodAndFieldUnresolved");
- assertNotNull(result);
- ref1 = TestUtils.findResourceRefByName(result.getResourceRefs(),
- "com.sap.testResourceOnMethodAndFieldUnresolved/validMethod");
- ref2 = TestUtils.findResourceRefByName(result.getResourceRefs(),
- "com.sap.testResourceOnMethodAndFieldUnresolved/valid");
- assertEquals("com.sap.ResourceInterface", ref1.getResType());
- assertEquals("com.sap.ResourceInterface", ref1.getResType());
-
- // delete the file. The name is now not resolved.
- deleteFileAndUpdate(interfaceFile);
- result = TestUtils.getSessionBean(getEJBJar(), "testResourceOnMethodAndFieldUnresolved");
- ref1 = TestUtils.findResourceRefByName(result.getResourceRefs(),
- "com.sap.testResourceOnMethodAndFieldUnresolved/validMethod");
- ref2 = TestUtils.findResourceRefByName(result.getResourceRefs(),
- "com.sap.testResourceOnMethodAndFieldUnresolved/valid");
- assertEquals("ResourceInterface", ref1.getResType());
- assertEquals("ResourceInterface", ref2.getResType());
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testResourceOnMethodAndFieldUnresolved"));
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/SecurityRolesTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/SecurityRolesTest.java
deleted file mode 100644
index c0f07b69..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/ejb/tests/SecurityRolesTest.java
+++ /dev/null
@@ -1,175 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.ejb.tests;
-
-import junit.framework.TestSuite;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.IPackageFragmentRoot;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
-import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
-import org.eclipse.jst.javaee.core.RunAs;
-import org.eclipse.jst.javaee.core.SecurityRole;
-import org.eclipse.jst.javaee.core.SecurityRoleRef;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.SecurityIdentityType;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.model.internal.EJBAnnotationReader;
-import org.eclipse.jst.jee.model.internal.common.AbstractAnnotationModelProvider;
-import org.eclipse.jst.jee.model.tests.AbstractAnnotationModelTest;
-import org.eclipse.jst.jee.model.tests.AbstractTest;
-import org.eclipse.jst.jee.model.tests.TestUtils;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class SecurityRolesTest extends AbstractAnnotationModelTest {
-
- public static TestSuite suite() throws Exception {
- TestSuite suite = new TestSuite(SecurityRolesTest.class);
- return suite;
- }
-
- // @BeforeClass
- public static void setUpProject() throws Exception {
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(SecurityRolesTest.class.getSimpleName());
- if (!project.exists())
- {
- project = ProjectUtil.createEJBProject(SecurityRolesTest.class.getSimpleName(), null, J2EEVersionConstants.EJB_3_0_ID, true);
- createProjectContent(project);
- }
- }
-
- // @AfterClass
- public static void tearDownAfterClass() throws InterruptedException {
- AbstractTest.deleteProject(SecurityRolesTest.class.getSimpleName());
- }
-
- private static void createProjectContent(IProject project) throws Exception {
- IJavaProject javaProject = JavaCore.create(project);
- IFolder comFolder = javaProject.getProject().getFolder("ejbModule/com");
- comFolder.create(true, true, new NullProgressMonitor());
- IPackageFragmentRoot root = javaProject.getPackageFragmentRoot(comFolder);
- root.createPackageFragment("sap", true, new NullProgressMonitor());
- }
-
- // @Before
- @Override
- protected void setUp() throws Exception {
- setUpProject();
- super.setUp();
- fixture = new EJBAnnotationReader(facetedProject, clientProject);
- }
-
- // @After
- @Override
- protected void tearDown() throws Exception {
- ((AbstractAnnotationModelProvider) fixture).dispose();
- }
-
- // @Test
- public void testDeclareRoles() throws Exception {
- final String beanContent = "package com.sap;" + "@DeclareRoles(value = {\"role1\", \"role2\"}) "
- + "@Stateless public class testDeclareRoles implements SessionBeanLocal {}";
-
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testDeclareRoles.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testDeclareRoles");
- SecurityRole role1 = TestUtils
- .findSecurityRole(getEJBJar().getAssemblyDescriptor().getSecurityRoles(), "role1");
- SecurityRole role2 = TestUtils
- .findSecurityRole(getEJBJar().getAssemblyDescriptor().getSecurityRoles(), "role2");
- assertNotNull(role1);
- assertNotNull(role2);
- SecurityRoleRef role1Ref = TestUtils.findSecurityRoleRef(result.getSecurityRoleRefs(), "role1");
- assertNotNull(role1Ref);
- SecurityRoleRef role2Ref = TestUtils.findSecurityRoleRef(result.getSecurityRoleRefs(), "role2");
- assertNotNull(role2Ref);
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getSessionBean(getEJBJar(), "testDeclareRoles"));
- assertNull(TestUtils.findSecurityRole(getEJBJar().getAssemblyDescriptor().getSecurityRoles(), "role1"));
- assertNull(TestUtils.findSecurityRole(getEJBJar().getAssemblyDescriptor().getSecurityRoles(), "role2"));
- }
-
- // @Test
- public void testDeclareRoleOnManyBeans() throws Exception {
- final String bean1Content = "package com.sap;" + "@DeclareRoles(value = {\"role1\"}) "
- + "@Stateless public class testDeclareRoleOnManyBeans1 implements SessionBeanLocal {}";
- final String bean2Content = "package com.sap;" + "@DeclareRoles(value = {\"role1\"}) "
- + "@Stateless public class testDeclareRoleOnManyBeans2 implements SessionBeanLocal {}";
-
- IFile bean1File = facetedProject.getProject().getFile("ejbModule/com/sap/testDeclareRoleOnManyBeans1.java");
- IFile bean2File = facetedProject.getProject().getFile("ejbModule/com/sap/testDeclareRoleOnManyBeans2.java");
- saveFileAndUpdate(bean1File, bean1Content);
- saveFileAndUpdate(bean2File, bean2Content);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testDeclareRoleOnManyBeans1");
- SecurityRole role1 = TestUtils
- .findSecurityRole(getEJBJar().getAssemblyDescriptor().getSecurityRoles(), "role1");
- assertNotNull(role1);
- SecurityRoleRef role1Ref = TestUtils.findSecurityRoleRef(result.getSecurityRoleRefs(), "role1");
- assertNotNull(role1Ref);
-
- deleteFileAndUpdate(bean1File);
- assertNotNull(TestUtils.findSecurityRole(getEJBJar().getAssemblyDescriptor().getSecurityRoles(), "role1"));
- deleteFileAndUpdate(bean2File);
- assertNull(TestUtils.findSecurityRole(getEJBJar().getAssemblyDescriptor().getSecurityRoles(), "role1"));
- }
-
- // @Test
- public void testRunAs() throws Exception {
- final String beanContent = "package com.sap;" + "@DeclareRoles(value = {\"role1\"}) @RunAs(value = \"role1\") "
- + "@Stateless public class testRunAs implements SessionBeanLocal {}";
-
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testRunAs.java");
- saveFileAndUpdate(beanFile, beanContent);
- SessionBean result = TestUtils.getSessionBean(getEJBJar(), "testRunAs");
- SecurityRole role1 = TestUtils
- .findSecurityRole(getEJBJar().getAssemblyDescriptor().getSecurityRoles(), "role1");
- assertNotNull(role1);
- SecurityRoleRef role1Ref = TestUtils.findSecurityRoleRef(result.getSecurityRoleRefs(), "role1");
- assertNotNull(role1Ref);
- SecurityIdentityType identity = (SecurityIdentityType) result.getSecurityIdentities();
- assertNotNull(identity);
- RunAs runAs = identity.getRunAs();
- assertNotNull(runAs);
- assertEquals("role1", runAs.getRoleName());
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.findSecurityRole(getEJBJar().getAssemblyDescriptor().getSecurityRoles(), "role1"));
- }
-
- // @Test
- public void testRunAsMessageBean() throws Exception {
- final String beanContent = "package com.sap;" + "@RunAs(value = \"role1\") "
- + "@MessageDriven public class testRunAsMessageBean implements SessionBeanLocal {}";
-
- IFile beanFile = facetedProject.getProject().getFile("ejbModule/com/sap/testRunAsMessageBean.java");
- saveFileAndUpdate(beanFile, beanContent);
- MessageDrivenBean result = TestUtils.getMessageDrivenBean(getEJBJar(), "testRunAsMessageBean");
- SecurityIdentityType identity = (SecurityIdentityType) result.getSecurityIdentity();
- assertNotNull(identity);
- RunAs runAs = identity.getRunAs();
- assertNotNull(runAs);
- assertEquals("role1", runAs.getRoleName());
-
- deleteFileAndUpdate(beanFile);
- assertNull(TestUtils.getMessageDrivenBean(getEJBJar(), "testRunAsMessageBean"));
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/AssemblyDescriptorMergerTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/AssemblyDescriptorMergerTest.java
deleted file mode 100644
index 5e1f1238..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/AssemblyDescriptorMergerTest.java
+++ /dev/null
@@ -1,232 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.mergers.tests;
-
-import java.util.List;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.SecurityRole;
-import org.eclipse.jst.javaee.ejb.AssemblyDescriptor;
-import org.eclipse.jst.javaee.ejb.EjbFactory;
-import org.eclipse.jst.jee.model.internal.mergers.AssemblyDescriptorMerger;
-import org.eclipse.jst.jee.model.internal.mergers.ModelException;
-
-
-/**
- * Tests Assembly descriptor merger.
- *
- * @author Dimitar Giormov
- *
- */
-public class AssemblyDescriptorMergerTest extends TestCase{
-
- /**
- * Tests the merger with empty list of security roles.
- *
- * @throws ModelException
- */
-// @Test
- public void testEmptySecurityRoleCase() throws ModelException{
- AssemblyDescriptor descriptorBase = EjbFactory.eINSTANCE.createAssemblyDescriptor();
- AssemblyDescriptor descriptorToMerge = EjbFactory.eINSTANCE.createAssemblyDescriptor();
- AssemblyDescriptorMerger result = new AssemblyDescriptorMerger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(descriptorBase.getSecurityRoles());
- Assert.assertTrue(descriptorBase.getSecurityRoles().size() == 0);
- Assert.assertTrue(descriptorToMerge.getSecurityRoles().size() == 0);
- }
-
- /**
- * Tests the merger with Base security role only.
- * No merge is necessary
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleSecurityRoleCaseBase() throws ModelException{
- AssemblyDescriptor descriptorBase = EjbFactory.eINSTANCE.createAssemblyDescriptor();
- SecurityRole role = JavaeeFactory.eINSTANCE.createSecurityRole();
- role.setRoleName("test1");
-
- descriptorBase.getSecurityRoles().add(role);
- AssemblyDescriptor descriptorToMerge = EjbFactory.eINSTANCE.createAssemblyDescriptor();
- AssemblyDescriptorMerger result = new AssemblyDescriptorMerger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(descriptorBase.getSecurityRoles());
- Assert.assertTrue(descriptorBase.getSecurityRoles().size() == 1);
- Assert.assertTrue(descriptorToMerge.getSecurityRoles().size() == 0);
- Assert.assertTrue(((SecurityRole)descriptorBase.getSecurityRoles().get(0)).getRoleName().equals("test1"));
- }
-
- /**
- * Tests the merger with toMerge security role only.
- * The role should be copied in base.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleSecurityRoleCaseToMerge() throws ModelException{
- AssemblyDescriptor descriptorBase = EjbFactory.eINSTANCE.createAssemblyDescriptor();
- AssemblyDescriptor descriptorToMerge = EjbFactory.eINSTANCE.createAssemblyDescriptor();
- SecurityRole role = JavaeeFactory.eINSTANCE.createSecurityRole();
- role.setRoleName("test1");
-
- descriptorToMerge.getSecurityRoles().add(role);
-
- AssemblyDescriptorMerger result = new AssemblyDescriptorMerger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(descriptorBase.getSecurityRoles());
- Assert.assertTrue(descriptorBase.getSecurityRoles().size() == 1);
- Assert.assertTrue(descriptorToMerge.getSecurityRoles().size() == 1);
- Assert.assertTrue(((SecurityRole)descriptorBase.getSecurityRoles().get(0)).getRoleName().equals("test1"));
- }
-
- /**
- * Tests the merger with one and the same security role.
- * The result should be non merged 1 security role.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleSecurityRoleCaseSameRole() throws ModelException{
- AssemblyDescriptor descriptorBase = EjbFactory.eINSTANCE.createAssemblyDescriptor();
- AssemblyDescriptor descriptorToMerge = EjbFactory.eINSTANCE.createAssemblyDescriptor();
- SecurityRole role = JavaeeFactory.eINSTANCE.createSecurityRole();
- role.setRoleName("test1");
- descriptorBase.getSecurityRoles().add(role);
- descriptorToMerge.getSecurityRoles().add(role);
-
- AssemblyDescriptorMerger result = new AssemblyDescriptorMerger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(descriptorBase.getSecurityRoles());
- Assert.assertTrue(descriptorBase.getSecurityRoles().size() == 1);
- Assert.assertTrue(descriptorToMerge.getSecurityRoles().size() == 1);
- Assert.assertTrue(((SecurityRole)descriptorBase.getSecurityRoles().get(0)).getRoleName().equals("test1"));
- }
-
- /**
- * Tests the merger with variety of security roles.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleSecurityRoleCaseComplex() throws ModelException{
- AssemblyDescriptor descriptorBase = EjbFactory.eINSTANCE.createAssemblyDescriptor();
- AssemblyDescriptor descriptorToMerge = EjbFactory.eINSTANCE.createAssemblyDescriptor();
- SecurityRole role0 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role1 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role2 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role3 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role4 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role5 = JavaeeFactory.eINSTANCE.createSecurityRole();
- role0.setRoleName("test1");
- role1.setRoleName("test2");
- role2.setRoleName("test3");
- role3.setRoleName("test4");
- role4.setRoleName("test5");
- role5.setRoleName("test6");
-
-
-
- descriptorBase.getSecurityRoles().add(role1);
- descriptorBase.getSecurityRoles().add(role3);
- descriptorBase.getSecurityRoles().add(role4);
- descriptorBase.getSecurityRoles().add(role5);
-
-
- descriptorToMerge.getSecurityRoles().add(role0);
- descriptorToMerge.getSecurityRoles().add(role1);
- descriptorToMerge.getSecurityRoles().add(role2);
-
-
-
-
- AssemblyDescriptorMerger result = new AssemblyDescriptorMerger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(descriptorBase.getSecurityRoles());
- Assert.assertTrue(descriptorBase.getSecurityRoles().size() == 6);
- Assert.assertTrue(descriptorToMerge.getSecurityRoles().size() == 3);
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role0.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role1.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role2.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role3.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role4.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role5.getRoleName()));
- }
-
- private boolean containsSecRole(List list, String roleName) {
-
-
- for (Object object : list) {
- SecurityRole role = (SecurityRole) object;
- if(roleName == null){
- if(roleName == role.getRoleName()){
- return true;
- }
- } else if(roleName.equals(role.getRoleName())){
- return true;
- }
- }
- return false;
- }
-
- /**
- * Tests the merger with variety of security roles. In addition one of the roles has no name.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleSecurityRoleCaseComplexWithoutName() throws ModelException{
- AssemblyDescriptor descriptorBase = EjbFactory.eINSTANCE.createAssemblyDescriptor();
- AssemblyDescriptor descriptorToMerge = EjbFactory.eINSTANCE.createAssemblyDescriptor();
- SecurityRole role0 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role1 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role2 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role3 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role4 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role5 = JavaeeFactory.eINSTANCE.createSecurityRole();
- role0.setRoleName("test1");
- role2.setRoleName("test3");
- role3.setRoleName("test4");
- role4.setRoleName("test5");
- role5.setRoleName("test6");
-
-
-
- descriptorBase.getSecurityRoles().add(role1);
- descriptorBase.getSecurityRoles().add(role3);
- descriptorBase.getSecurityRoles().add(role4);
- descriptorBase.getSecurityRoles().add(role5);
-
-
- descriptorToMerge.getSecurityRoles().add(role0);
- descriptorToMerge.getSecurityRoles().add(role1);
- descriptorToMerge.getSecurityRoles().add(role2);
-
-
-
-
- AssemblyDescriptorMerger result = new AssemblyDescriptorMerger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(descriptorBase.getSecurityRoles());
- Assert.assertTrue(descriptorBase.getSecurityRoles().size() == 6);
- Assert.assertTrue(descriptorToMerge.getSecurityRoles().size() == 3);
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role0.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), null));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role2.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role3.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role4.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role5.getRoleName()));
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/EjbJarMergerTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/EjbJarMergerTest.java
deleted file mode 100644
index 163292f7..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/EjbJarMergerTest.java
+++ /dev/null
@@ -1,630 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.mergers.tests;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.jst.javaee.ejb.EJBRelation;
-import org.eclipse.jst.javaee.ejb.EJBRelationshipRole;
-import org.eclipse.jst.javaee.ejb.EjbFactory;
-import org.eclipse.jst.javaee.ejb.EntityBean;
-import org.eclipse.jst.javaee.ejb.InterceptorType;
-import org.eclipse.jst.javaee.ejb.InterceptorsType;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.RelationshipRoleSourceType;
-import org.eclipse.jst.javaee.ejb.Relationships;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.model.internal.mergers.EjbJarMerger;
-import org.eclipse.jst.jee.model.internal.mergers.ModelException;
-
-/**
- * Tester class for EjbJar artifact.
- *
- * Base suffix means that the base object has some info and toMerge is empty:
- * nothing should be merged
- *
- * ToMerge suffix means that the base is empty object and toMerge has some info:
- * all from merge should be present in base.
- *
- * Same suffix means that the information in merge and base is one and the same:
- * no merge should occurred and additional checks for doubling of the elements
- * are present.
- *
- * Complex suffix means variety of information is present in base and to merge:
- * consistent information combined by base and toMerge should be available at
- * the end.
- *
- * ComplexOverlapped suffix means variety of information is present in base and
- * to merge: consistent information combined by base and toMerge should be
- * available at the end. There are artifacts with one and the same name and
- * different values: values should be merged into base.
- *
- *
- * @author Dimitar Giormov
- *
- */
-public class EjbJarMergerTest extends TestCase {
-
- /**
- * Empty Ejb Jars test without enterprise beans tag
- *
- * @throws ModelException
- */
- // @Test
- public void testZeroMerge() throws ModelException {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- (new EjbJarMerger(base, merge, 0)).process();
- assertNull(base.getEnterpriseBeans());
- assertNull(merge.getEnterpriseBeans());
- }
-
- /**
- * Empty Ejb Jars test with enterprise beans tag on toMerge
- *
- * @throws ModelException
- */
- // @Test
- public void testZeroMerge2() throws ModelException {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- merge.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNotNull(merge.getEnterpriseBeans());
- }
-
- /**
- * Empty Ejb Jars test with enterprise beans tag on base
- *
- * @throws ModelException
- */
- // @Test
- public void testZeroMerge3() throws ModelException {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- base.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNull(merge.getEnterpriseBeans());
- }
-
- /**
- * Base suffix means that the base object has some info and toMerge is
- * empty: nothing should be merged
- *
- * @throws ModelException
- */
- // @Test
- public void testSesionBeansBase() throws ModelException {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- base.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- SessionBean sessionBean = EjbFactory.eINSTANCE.createSessionBean();
- sessionBean.setEjbName("name");
- base.getEnterpriseBeans().getSessionBeans().add(sessionBean);
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNull(merge.getEnterpriseBeans());
- assertEquals(1, base.getEnterpriseBeans().getSessionBeans().size());
-
- }
-
- /**
- * ToMerge suffix means that the base is empty object and toMerge has some
- * info: all from merge should be present in base.
- *
- * @throws ModelException
- */
- // @Test
- public void testSesionBeansMerge() throws ModelException {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- base.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- merge.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- SessionBean sessionBean = EjbFactory.eINSTANCE.createSessionBean();
- sessionBean.setEjbName("name");
- merge.getEnterpriseBeans().getSessionBeans().add(sessionBean);
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNotNull(merge.getEnterpriseBeans());
- assertEquals(1, base.getEnterpriseBeans().getSessionBeans().size());
- assertEquals(1, merge.getEnterpriseBeans().getSessionBeans().size());
-
- }
-
- /**
- * Same suffix means that the information in merge and base is one and the
- * same: no merge should occurred and additional checks for doubling of the
- * elements are present.
- *
- * @throws ModelException
- */
- // @Test
- public void testSesionBeansMergeSameBean() throws ModelException {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- base.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- merge.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- SessionBean sessionBean = EjbFactory.eINSTANCE.createSessionBean();
- sessionBean.setEjbName("name");
- base.getEnterpriseBeans().getSessionBeans().add(sessionBean);
- merge.getEnterpriseBeans().getSessionBeans().add(sessionBean);
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNotNull(merge.getEnterpriseBeans());
- assertEquals(1, base.getEnterpriseBeans().getSessionBeans().size());
- assertEquals(1, merge.getEnterpriseBeans().getSessionBeans().size());
- assertNotNull(getSessionBean("name", base.getEnterpriseBeans().getSessionBeans()));
-
- }
-
- private SessionBean getSessionBean(String name, List enterpriseBeans) {
- for (Object bean : enterpriseBeans) {
- SessionBean sBean = (SessionBean) bean;
- if (sBean.getEjbName().equals(name)) {
- return sBean;
- }
-
- }
- return null;
- }
-
- /**
- * Complex suffix means variety of information is present in base and to
- * merge: consistent information combined by base and toMerge should be
- * available at the end.
- *
- * @throws Exception
- */
- public void testSessionBeanComplex() throws Exception {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- base.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- merge.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- SessionBean sessionBean = EjbFactory.eINSTANCE.createSessionBean();
- sessionBean.setEjbName("name");
- SessionBean sessionBean1 = EjbFactory.eINSTANCE.createSessionBean();
- sessionBean1.setEjbName("name1");
- SessionBean sessionBean2 = EjbFactory.eINSTANCE.createSessionBean();
- sessionBean2.setEjbName("name2");
- SessionBean sessionBean3 = EjbFactory.eINSTANCE.createSessionBean();
- sessionBean3.setEjbName("name3");
- base.getEnterpriseBeans().getSessionBeans().add(sessionBean);
- base.getEnterpriseBeans().getSessionBeans().add(sessionBean1);
- base.getEnterpriseBeans().getSessionBeans().add(sessionBean3);
-
- merge.getEnterpriseBeans().getSessionBeans().add(sessionBean);
- merge.getEnterpriseBeans().getSessionBeans().add(sessionBean2);
-
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNotNull(merge.getEnterpriseBeans());
- assertEquals(4, base.getEnterpriseBeans().getSessionBeans().size());
- assertEquals(2, merge.getEnterpriseBeans().getSessionBeans().size());
- assertNotNull(getSessionBean("name", base.getEnterpriseBeans().getSessionBeans()));
- assertNotNull(getSessionBean("name1", base.getEnterpriseBeans().getSessionBeans()));
- assertNotNull(getSessionBean("name2", base.getEnterpriseBeans().getSessionBeans()));
- assertNotNull(getSessionBean("name3", base.getEnterpriseBeans().getSessionBeans()));
- }
-
- // MDB
-
- /**
- * Base suffix means that the base object has some info and toMerge is
- * empty: nothing should be merged
- *
- * @throws ModelException
- */
- // @Test
- public void testMdbBeansBase() throws ModelException {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- base.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- MessageDrivenBean sessionBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- sessionBean.setEjbName("name");
- base.getEnterpriseBeans().getMessageDrivenBeans().add(sessionBean);
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNull(merge.getEnterpriseBeans());
- assertEquals(1, base.getEnterpriseBeans().getMessageDrivenBeans().size());
-
- }
-
- /**
- * @throws ModelException
- */
- // @Test
- public void tesMdbBeansMerge() throws ModelException {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- base.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- merge.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- MessageDrivenBean sessionBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- sessionBean.setEjbName("name");
- merge.getEnterpriseBeans().getMessageDrivenBeans().add(sessionBean);
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNotNull(merge.getEnterpriseBeans());
- assertEquals(1, base.getEnterpriseBeans().getMessageDrivenBeans().size());
- assertEquals(1, merge.getEnterpriseBeans().getMessageDrivenBeans().size());
-
- }
-
- /**
- * Same suffix means that the information in merge and base is one and the
- * same: no merge should occurred and additional checks for doubling of the
- * elements are present.
- *
- * @throws ModelException
- */
- // @Test
- public void testMdbBeansMergeSameBean() throws ModelException {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- base.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- merge.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- MessageDrivenBean sessionBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- sessionBean.setEjbName("name");
- base.getEnterpriseBeans().getMessageDrivenBeans().add(sessionBean);
- merge.getEnterpriseBeans().getMessageDrivenBeans().add(sessionBean);
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNotNull(merge.getEnterpriseBeans());
- assertEquals(1, base.getEnterpriseBeans().getMessageDrivenBeans().size());
- assertEquals(1, merge.getEnterpriseBeans().getMessageDrivenBeans().size());
- assertNotNull(getMdbBean("name", base.getEnterpriseBeans().getMessageDrivenBeans()));
-
- }
-
- private MessageDrivenBean getMdbBean(String name, List enterpriseBeans) {
- for (Object bean : enterpriseBeans) {
- MessageDrivenBean sBean = (MessageDrivenBean) bean;
- if (sBean.getEjbName().equals(name)) {
- return sBean;
- }
-
- }
- return null;
- }
-
- /**
- * Complex suffix means variety of information is present in base and to
- * merge: consistent information combined by base and toMerge should be
- * available at the end.
- *
- * @throws Exception
- */
- public void testMdbBeanComplex() throws Exception {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- base.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- merge.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- MessageDrivenBean messageBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- messageBean.setEjbName("name");
- MessageDrivenBean messageBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- messageBean1.setEjbName("name1");
- MessageDrivenBean messageBean2 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- messageBean2.setEjbName("name2");
- MessageDrivenBean messageBean3 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- messageBean3.setEjbName("name3");
- base.getEnterpriseBeans().getMessageDrivenBeans().add(messageBean);
- base.getEnterpriseBeans().getMessageDrivenBeans().add(messageBean1);
- base.getEnterpriseBeans().getMessageDrivenBeans().add(messageBean3);
-
- merge.getEnterpriseBeans().getMessageDrivenBeans().add(messageBean);
- merge.getEnterpriseBeans().getMessageDrivenBeans().add(messageBean2);
-
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNotNull(merge.getEnterpriseBeans());
- assertEquals(4, base.getEnterpriseBeans().getMessageDrivenBeans().size());
- assertEquals(2, merge.getEnterpriseBeans().getMessageDrivenBeans().size());
- assertNotNull(getMdbBean("name", base.getEnterpriseBeans().getMessageDrivenBeans()));
- assertNotNull(getMdbBean("name1", base.getEnterpriseBeans().getMessageDrivenBeans()));
- assertNotNull(getMdbBean("name2", base.getEnterpriseBeans().getMessageDrivenBeans()));
- assertNotNull(getMdbBean("name3", base.getEnterpriseBeans().getMessageDrivenBeans()));
- }
-
- // Entities
-
- /**
- * Base suffix means that the base object has some info and toMerge is
- * empty: nothing should be merged
- *
- * @throws ModelException
- */
- // @Test
- public void testEntityBeansBase() throws ModelException {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- base.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- EntityBean sessionBean = EjbFactory.eINSTANCE.createEntityBean();
- sessionBean.setEjbName("name");
- base.getEnterpriseBeans().getEntityBeans().add(sessionBean);
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNull(merge.getEnterpriseBeans());
- assertEquals(1, base.getEnterpriseBeans().getEntityBeans().size());
-
- }
-
- /**
- * * ToMerge suffix means that the base is empty object and toMerge has some
- * info: all from merge should be present in base.
- *
- * @throws ModelException
- */
- // @Test
- public void testEntityBeansMerge() throws ModelException {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- base.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- merge.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- EntityBean sessionBean = EjbFactory.eINSTANCE.createEntityBean();
- sessionBean.setEjbName("name");
- merge.getEnterpriseBeans().getEntityBeans().add(sessionBean);
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNotNull(merge.getEnterpriseBeans());
- assertEquals(1, base.getEnterpriseBeans().getEntityBeans().size());
- assertEquals(1, merge.getEnterpriseBeans().getEntityBeans().size());
-
- }
-
- /**
- * Same suffix means that the information in merge and base is one and the
- * same: no merge should occurred and additional checks for doubling of the
- * elements are present.
- *
- * @throws ModelException
- */
- // @Test
- public void testEntityBeansMergeSameBean() throws ModelException {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- base.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- merge.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- EntityBean sessionBean = EjbFactory.eINSTANCE.createEntityBean();
- sessionBean.setEjbName("name");
- base.getEnterpriseBeans().getEntityBeans().add(sessionBean);
- merge.getEnterpriseBeans().getEntityBeans().add(sessionBean);
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNotNull(merge.getEnterpriseBeans());
- assertEquals(1, base.getEnterpriseBeans().getEntityBeans().size());
- assertEquals(1, merge.getEnterpriseBeans().getEntityBeans().size());
- assertNotNull(getEntityBean("name", base.getEnterpriseBeans().getEntityBeans()));
-
- }
-
- private EntityBean getEntityBean(String name, List enterpriseBeans) {
- for (Object bean : enterpriseBeans) {
- EntityBean sBean = (EntityBean) bean;
- if (sBean.getEjbName().equals(name)) {
- return sBean;
- }
-
- }
- return null;
- }
-
- /**
- *
- * Complex suffix means variety of information is present in base and to
- * merge: consistent information combined by base and toMerge should be
- * available at the end.
- *
- * @throws Exception
- */
- public void testEntityBeanComplex() throws Exception {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- base.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- merge.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- EntityBean entityBean = EjbFactory.eINSTANCE.createEntityBean();
- entityBean.setEjbName("name");
- EntityBean entityBean1 = EjbFactory.eINSTANCE.createEntityBean();
- entityBean1.setEjbName("name1");
- EntityBean entityBean2 = EjbFactory.eINSTANCE.createEntityBean();
- entityBean2.setEjbName("name2");
- EntityBean entityBean3 = EjbFactory.eINSTANCE.createEntityBean();
- entityBean3.setEjbName("name3");
- base.getEnterpriseBeans().getEntityBeans().add(entityBean);
- base.getEnterpriseBeans().getEntityBeans().add(entityBean1);
- base.getEnterpriseBeans().getEntityBeans().add(entityBean3);
-
- merge.getEnterpriseBeans().getEntityBeans().add(entityBean);
- merge.getEnterpriseBeans().getEntityBeans().add(entityBean2);
-
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNotNull(merge.getEnterpriseBeans());
- assertEquals(4, base.getEnterpriseBeans().getEntityBeans().size());
- assertEquals(2, merge.getEnterpriseBeans().getEntityBeans().size());
- assertNotNull(getEntityBean("name", base.getEnterpriseBeans().getEntityBeans()));
- assertNotNull(getEntityBean("name1", base.getEnterpriseBeans().getEntityBeans()));
- assertNotNull(getEntityBean("name2", base.getEnterpriseBeans().getEntityBeans()));
- assertNotNull(getEntityBean("name3", base.getEnterpriseBeans().getEntityBeans()));
- }
-
- // @Test
- public void testGenericCopyBase() throws Exception {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- // Interceptors
- InterceptorsType interceptorsType = EjbFactory.eINSTANCE.createInterceptorsType();
- InterceptorType type = EjbFactory.eINSTANCE.createInterceptorType();
- interceptorsType.getInterceptors().add(type);
- type.setInterceptorClass("test");
- base.setInterceptors(interceptorsType);
-
- // Relationships
- Relationships relationships = EjbFactory.eINSTANCE.createRelationships();
- EJBRelation relation = EjbFactory.eINSTANCE.createEJBRelation();
- EJBRelationshipRole relationshipRole = EjbFactory.eINSTANCE.createEJBRelationshipRole();
- RelationshipRoleSourceType roleSourceType = EjbFactory.eINSTANCE.createRelationshipRoleSourceType();
- roleSourceType.setEjbName("testEjbName");
- String roleName = "RelationshpiRoleName";
- relationshipRole.setEjbRelationshipRoleName("nm");
- relationshipRole.setRelationshipRoleSource(roleSourceType);
- relation.getEjbRelationshipRoles().add(relationshipRole);
- relation.setEjbRelationName(roleName);
- relationships.getEjbRelations().add(relation);
- base.setRelationships(relationships);
- // Client jar
- String clientJar = "ejbClientJar";
- base.setEjbClientJar(clientJar);
-
- // version
- String version = "99";
- base.setVersion(version);
-
- (new EjbJarMerger(base, merge, 0)).process();
- // Interceptors
- assertNotNull(base.getInterceptors());
- assertNotNull(base.getInterceptors().getInterceptors());
- assertEquals(1, base.getInterceptors().getInterceptors().size());
- assertEquals("test", ((InterceptorType) base.getInterceptors().getInterceptors().get(0)).getInterceptorClass());
-
- // Relationships
- assertNotNull(base.getRelationships());
- assertNotNull(base.getRelationships().getEjbRelations());
- assertEquals(1, base.getRelationships().getEjbRelations().size());
- assertEquals(roleName, ((EJBRelation) base.getRelationships().getEjbRelations().get(0)).getEjbRelationName());
- // Client jar
- assertEquals(clientJar, base.getEjbClientJar());
-
- }
-
- // @Test
- public void testGenericCopyMerge() throws Exception {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
-
- // Interceptors
- InterceptorsType interceptorsType = EjbFactory.eINSTANCE.createInterceptorsType();
- InterceptorType type = EjbFactory.eINSTANCE.createInterceptorType();
- interceptorsType.getInterceptors().add(type);
- type.setInterceptorClass("test");
- merge.setInterceptors(interceptorsType);
-
- // Relationships
- Relationships relationships = EjbFactory.eINSTANCE.createRelationships();
- EJBRelation relation = EjbFactory.eINSTANCE.createEJBRelation();
- EJBRelationshipRole relationshipRole = EjbFactory.eINSTANCE.createEJBRelationshipRole();
- RelationshipRoleSourceType roleSourceType = EjbFactory.eINSTANCE.createRelationshipRoleSourceType();
- roleSourceType.setEjbName("testEjbName");
- String roleName = "RelationshpiRoleName";
- relationshipRole.setEjbRelationshipRoleName("nm");
- relationshipRole.setRelationshipRoleSource(roleSourceType);
- relation.getEjbRelationshipRoles().add(relationshipRole);
- relation.setEjbRelationName(roleName);
- relationships.getEjbRelations().add(relation);
- merge.setRelationships(relationships);
- // Client jar
- String clientJar = "ejbClientJar";
- merge.setEjbClientJar(clientJar);
-
- (new EjbJarMerger(base, merge, 0)).process();
-
- // Interceptors
- assertNotNull(base.getInterceptors());
- assertNotNull(base.getInterceptors().getInterceptors());
- assertEquals(1, base.getInterceptors().getInterceptors().size());
- assertEquals("test", ((InterceptorType) base.getInterceptors().getInterceptors().get(0)).getInterceptorClass());
- // Relationships
- assertNotNull(base.getRelationships());
- assertNotNull(base.getRelationships().getEjbRelations());
- assertEquals(1, base.getRelationships().getEjbRelations().size());
- assertEquals(roleName, ((EJBRelation) base.getRelationships().getEjbRelations().get(0)).getEjbRelationName());
- // Client jar
- assertEquals(clientJar, base.getEjbClientJar());
-
- }
-
-
- /**
- * Tests weather the merger will ignore incorrect bean (ejbName is missing)
- * Session beans
- *
- * @throws ModelException
- */
- // @Test
- public void testSesionBeansNullNameMerge() throws ModelException {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- base.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- merge.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- SessionBean sessionBean = EjbFactory.eINSTANCE.createSessionBean();
- base.getEnterpriseBeans().getSessionBeans().add(sessionBean);
- merge.getEnterpriseBeans().getSessionBeans().add(sessionBean);
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNotNull(merge.getEnterpriseBeans());
- assertEquals(0, base.getEnterpriseBeans().getSessionBeans().size());
- assertEquals(1, merge.getEnterpriseBeans().getSessionBeans().size());
-
- }
-
-
-
- /**
- * Tests weather the merger will ignore incorrect bean (ejbName is missing)
- * For MdBeans
- *
- * @throws ModelException
- */
- // @Test
- public void testMdBeansNullNameMergeSameBean() throws ModelException {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- base.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- merge.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- MessageDrivenBean mdb = EjbFactory.eINSTANCE.createMessageDrivenBean();
- base.getEnterpriseBeans().getMessageDrivenBeans().add(mdb);
- merge.getEnterpriseBeans().getMessageDrivenBeans().add(mdb);
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNotNull(merge.getEnterpriseBeans());
- assertEquals(0, base.getEnterpriseBeans().getMessageDrivenBeans().size());
- assertEquals(1, merge.getEnterpriseBeans().getMessageDrivenBeans().size());
-
- }
-
-
-
- /**
- * Tests weather the merger will ignore incorrect bean (ejbName is missing)
- * EntityBeans
- *
- * @throws ModelException
- */
- // @Test
- public void testEntityBeansNullNameMerge() throws ModelException {
- EJBJar base = EjbFactory.eINSTANCE.createEJBJar();
- EJBJar merge = EjbFactory.eINSTANCE.createEJBJar();
- base.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- merge.setEnterpriseBeans(EjbFactory.eINSTANCE.createEnterpriseBeans());
- EntityBean entity = EjbFactory.eINSTANCE.createEntityBean();
- base.getEnterpriseBeans().getEntityBeans().add(entity);
- merge.getEnterpriseBeans().getEntityBeans().add(entity);
- (new EjbJarMerger(base, merge, 0)).process();
- assertNotNull(base.getEnterpriseBeans());
- assertNotNull(merge.getEnterpriseBeans());
- assertEquals(0, base.getEnterpriseBeans().getEntityBeans().size());
- assertEquals(1, merge.getEnterpriseBeans().getEntityBeans().size());
-
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/JndiRefsTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/JndiRefsTest.java
deleted file mode 100644
index 1571f842..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/JndiRefsTest.java
+++ /dev/null
@@ -1,2068 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.mergers.tests;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.javaee.core.EjbLocalRef;
-import org.eclipse.jst.javaee.core.EjbRef;
-import org.eclipse.jst.javaee.core.EjbRefType;
-import org.eclipse.jst.javaee.core.EnvEntry;
-import org.eclipse.jst.javaee.core.EnvEntryType;
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.MessageDestinationRef;
-import org.eclipse.jst.javaee.core.MessageDestinationUsageType;
-import org.eclipse.jst.javaee.core.PersistenceContextRef;
-import org.eclipse.jst.javaee.core.PersistenceContextType;
-import org.eclipse.jst.javaee.core.PersistenceUnitRef;
-import org.eclipse.jst.javaee.core.ResAuthType;
-import org.eclipse.jst.javaee.core.ResSharingScopeType;
-import org.eclipse.jst.javaee.core.ResourceEnvRef;
-import org.eclipse.jst.javaee.core.ResourceRef;
-import org.eclipse.jst.javaee.core.ServiceRef;
-import org.eclipse.jst.javaee.ejb.EjbFactory;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.jee.model.internal.mergers.JNDIRefsMerger;
-
-/**
- * Tester class for JNDI references artifacts.
- *
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- *
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- *
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- *
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- *
- * ComplexOverlapped suffix means variety of information is present
- * in base and to merge: consistent information combined by base and toMerge
- * should be available at the end. There are artifacts with one and the same
- * name and different values: values should be merged into base.
- *
- *
- * @author Dimitar Giormov
- *
- */
-public class JndiRefsTest extends TestCase{
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws Exception
- */
- //@Test
- public void testResourceEnvRefsBase() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- ResourceEnvRef envRefBase = JavaeeFactory.eINSTANCE.createResourceEnvRef();
- envRefBase.setMappedName("mapped1");
- envRefBase.setResourceEnvRefName("refName1");
- envRefBase.setResourceEnvRefType("type1");
-
- ResourceEnvRef envRefToMerge = JavaeeFactory.eINSTANCE.createResourceEnvRef();
- envRefToMerge.setMappedName("mapped2");
- envRefToMerge.setResourceEnvRefName("refName2");
- envRefToMerge.setResourceEnvRefType("type2");
-
- beanBase.getResourceEnvRefs().add(envRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getResourceEnvRefs().size());
- assertEquals("mapped1", ((ResourceEnvRef)beanBase.getResourceEnvRefs().get(0)).getMappedName());
- assertEquals("refName1", ((ResourceEnvRef)beanBase.getResourceEnvRefs().get(0)).getResourceEnvRefName());
- assertEquals("type1", ((ResourceEnvRef)beanBase.getResourceEnvRefs().get(0)).getResourceEnvRefType());
-
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws Exception
- */
- //@Test
- public void testResourceEnvRefsMerge() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- ResourceEnvRef envRefBase = JavaeeFactory.eINSTANCE.createResourceEnvRef();
- envRefBase.setMappedName("mapped1");
- envRefBase.setResourceEnvRefName("refName1");
- envRefBase.setResourceEnvRefType("type1");
-
- ResourceEnvRef envRefToMerge = JavaeeFactory.eINSTANCE.createResourceEnvRef();
- envRefToMerge.setMappedName("mapped2");
- envRefToMerge.setResourceEnvRefName("refName2");
- envRefToMerge.setResourceEnvRefType("type2");
-
- beanToMerge.getResourceEnvRefs().add(envRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getResourceEnvRefs().size());
- assertEquals("mapped1", ((ResourceEnvRef)beanBase.getResourceEnvRefs().get(0)).getMappedName());
- assertEquals("refName1", ((ResourceEnvRef)beanBase.getResourceEnvRefs().get(0)).getResourceEnvRefName());
- assertEquals("type1", ((ResourceEnvRef)beanBase.getResourceEnvRefs().get(0)).getResourceEnvRefType());
-
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws Exception
- */
- //@Test
- public void testResourceEnvRefsSame() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- ResourceEnvRef envRefBase = JavaeeFactory.eINSTANCE.createResourceEnvRef();
- envRefBase.setMappedName("mapped1");
- envRefBase.setResourceEnvRefName("refName1");
- envRefBase.setResourceEnvRefType("type1");
-
- ResourceEnvRef envRefToMerge = JavaeeFactory.eINSTANCE.createResourceEnvRef();
- envRefToMerge.setMappedName("mapped2");
- envRefToMerge.setResourceEnvRefName("refName2");
- envRefToMerge.setResourceEnvRefType("type2");
-
- beanBase.getResourceEnvRefs().add(envRefBase);
- beanToMerge.getResourceEnvRefs().add(envRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getResourceEnvRefs().size());
- assertEquals("mapped1", ((ResourceEnvRef)beanBase.getResourceEnvRefs().get(0)).getMappedName());
- assertEquals("refName1", ((ResourceEnvRef)beanBase.getResourceEnvRefs().get(0)).getResourceEnvRefName());
- assertEquals("type1", ((ResourceEnvRef)beanBase.getResourceEnvRefs().get(0)).getResourceEnvRefType());
-
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws Exception
- */
- //@Test
- public void testResourceEnvRefsComplex() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- ResourceEnvRef envRefBase = JavaeeFactory.eINSTANCE.createResourceEnvRef();
- envRefBase.setMappedName("mapped1");
- envRefBase.setResourceEnvRefName("refName1");
- envRefBase.setResourceEnvRefType("type1");
-
- ResourceEnvRef envRefToMerge = JavaeeFactory.eINSTANCE.createResourceEnvRef();
- envRefToMerge.setMappedName("mapped2");
- envRefToMerge.setResourceEnvRefName("refName2");
- envRefToMerge.setResourceEnvRefType("type2");
-
- beanBase.getResourceEnvRefs().add(envRefBase);
- beanToMerge.getResourceEnvRefs().add(envRefBase);
- beanToMerge.getResourceEnvRefs().add(envRefToMerge);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(2, beanBase.getResourceEnvRefs().size());
-
- ResourceEnvRef test = getResEnvRef(beanBase.getResourceEnvRefs(), "refName1");
- ResourceEnvRef test2 = getResEnvRef(beanBase.getResourceEnvRefs(), "refName2");
- assertEquals("mapped1", test.getMappedName());
- assertEquals("type1", test.getResourceEnvRefType());
-
- assertEquals("mapped2", test2.getMappedName());
- assertEquals("type2", test2.getResourceEnvRefType());
-
- }
-
- /**
- * ComplexOverlapped suffix means variety of information is present
- * in base and to merge: consistent information combined by base and toMerge
- * should be available at the end. There are artifacts with one and the same
- * name and different values: values should be merged into base.
- * @throws Exception
- */
- //@Test
- public void testResourceEnvRefsComplexOverlapped() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- ResourceEnvRef envRefBase = JavaeeFactory.eINSTANCE.createResourceEnvRef();
- envRefBase.setResourceEnvRefName("refName1");
-
- ResourceEnvRef envRefToMerge = JavaeeFactory.eINSTANCE.createResourceEnvRef();
- envRefToMerge.setMappedName("mapped2");
- envRefToMerge.setResourceEnvRefName("refName1");
- envRefToMerge.setResourceEnvRefType("type2");
-
- beanBase.getResourceEnvRefs().add(envRefBase);
- beanToMerge.getResourceEnvRefs().add(envRefBase);
- beanToMerge.getResourceEnvRefs().add(envRefToMerge);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getResourceEnvRefs().size());
-
- ResourceEnvRef test = getResEnvRef(beanBase.getResourceEnvRefs(), "refName1");
- assertEquals("type2", test.getResourceEnvRefType());
- assertEquals("mapped2", test.getMappedName());
-
- }
-
- private ResourceEnvRef getResEnvRef(List refs, String name){
- if (name == null){
- return null;
- }
- for (Object object : refs) {
- ResourceEnvRef ref = (ResourceEnvRef) object;
- if(name.equals(ref.getResourceEnvRefName())){
- return ref;
- }
- }
- return null;
- }
-
-
-
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws Exception
- */
- //@Test
- public void testResourceRefsBase() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- ResourceRef resRefBase = JavaeeFactory.eINSTANCE.createResourceRef();
- resRefBase.setMappedName("mapped1");
- resRefBase.setResRefName("refName1");
- resRefBase.setResType("type1");
- resRefBase.setResAuth(ResAuthType.APPLICATION_LITERAL);
- resRefBase.setResSharingScope(ResSharingScopeType.SHAREABLE_LITERAL);
-
-
- ResourceRef resRefToMerge = JavaeeFactory.eINSTANCE.createResourceRef();
- resRefToMerge.setMappedName("mapped2");
- resRefToMerge.setResRefName("refName2");
- resRefToMerge.setResType("type2");
- resRefToMerge.setResAuth(ResAuthType.CONTAINER_LITERAL);
- resRefToMerge.setResSharingScope(ResSharingScopeType.UNSHAREABLE_LITERAL);
-
- beanBase.getResourceRefs().add(resRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getResourceRefs().size());
- assertEquals("mapped1", ((ResourceRef)beanBase.getResourceRefs().get(0)).getMappedName());
- assertEquals("refName1", ((ResourceRef)beanBase.getResourceRefs().get(0)).getResRefName());
- assertEquals("type1", ((ResourceRef)beanBase.getResourceRefs().get(0)).getResType());
- assertEquals(ResAuthType.APPLICATION_LITERAL, ((ResourceRef)beanBase.getResourceRefs().get(0)).getResAuth());
- assertEquals(ResSharingScopeType.SHAREABLE_LITERAL, ((ResourceRef)beanBase.getResourceRefs().get(0)).getResSharingScope());
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws Exception
- */
- //@Test
- public void testResourceRefsMerge() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- ResourceRef resRefBase = JavaeeFactory.eINSTANCE.createResourceRef();
- resRefBase.setMappedName("mapped1");
- resRefBase.setResRefName("refName1");
- resRefBase.setResType("type1");
- resRefBase.setResAuth(ResAuthType.APPLICATION_LITERAL);
- resRefBase.setResSharingScope(ResSharingScopeType.SHAREABLE_LITERAL);
-
- ResourceRef resRefToMerge = JavaeeFactory.eINSTANCE.createResourceRef();
- resRefToMerge.setMappedName("mapped2");
- resRefToMerge.setResRefName("refName2");
- resRefToMerge.setResType("type2");
- resRefToMerge.setResAuth(ResAuthType.CONTAINER_LITERAL);
- resRefToMerge.setResSharingScope(ResSharingScopeType.UNSHAREABLE_LITERAL);
-
- beanToMerge.getResourceRefs().add(resRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getResourceRefs().size());
- assertEquals("mapped1", ((ResourceRef)beanBase.getResourceRefs().get(0)).getMappedName());
- assertEquals("refName1", ((ResourceRef)beanBase.getResourceRefs().get(0)).getResRefName());
- assertEquals("type1", ((ResourceRef)beanBase.getResourceRefs().get(0)).getResType());
- assertEquals(ResAuthType.APPLICATION_LITERAL, ((ResourceRef)beanBase.getResourceRefs().get(0)).getResAuth());
- assertEquals(ResSharingScopeType.SHAREABLE_LITERAL, ((ResourceRef)beanBase.getResourceRefs().get(0)).getResSharingScope());
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws Exception
- */
- //@Test
- public void testResourceRefsSame() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- ResourceRef resRefBase = JavaeeFactory.eINSTANCE.createResourceRef();
- resRefBase.setMappedName("mapped1");
- resRefBase.setResRefName("refName1");
- resRefBase.setResType("type1");
- resRefBase.setResAuth(ResAuthType.APPLICATION_LITERAL);
- resRefBase.setResSharingScope(ResSharingScopeType.SHAREABLE_LITERAL);
-
-
- ResourceRef resRefToMerge = JavaeeFactory.eINSTANCE.createResourceRef();
- resRefToMerge.setMappedName("mapped2");
- resRefToMerge.setResRefName("refName2");
- resRefToMerge.setResType("type2");
- resRefToMerge.setResAuth(ResAuthType.CONTAINER_LITERAL);
- resRefToMerge.setResSharingScope(ResSharingScopeType.UNSHAREABLE_LITERAL);
-
- beanBase.getResourceRefs().add(resRefBase);
- beanToMerge.getResourceRefs().add(resRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getResourceRefs().size());
- assertEquals("mapped1", ((ResourceRef)beanBase.getResourceRefs().get(0)).getMappedName());
- assertEquals("refName1", ((ResourceRef)beanBase.getResourceRefs().get(0)).getResRefName());
- assertEquals("type1", ((ResourceRef)beanBase.getResourceRefs().get(0)).getResType());
- assertEquals(ResAuthType.APPLICATION_LITERAL, ((ResourceRef)beanBase.getResourceRefs().get(0)).getResAuth());
- assertEquals(ResSharingScopeType.SHAREABLE_LITERAL, ((ResourceRef)beanBase.getResourceRefs().get(0)).getResSharingScope());
-
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws Exception
- */
- //@Test
- public void testResourceRefsComplex() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- ResourceRef resRefBase = JavaeeFactory.eINSTANCE.createResourceRef();
- resRefBase.setMappedName("mapped1");
- resRefBase.setResRefName("refName1");
- resRefBase.setResType("type1");
- resRefBase.setResAuth(ResAuthType.APPLICATION_LITERAL);
- resRefBase.setResSharingScope(ResSharingScopeType.SHAREABLE_LITERAL);
-
- ResourceRef resRefToMerge = JavaeeFactory.eINSTANCE.createResourceRef();
- resRefToMerge.setMappedName("mapped2");
- resRefToMerge.setResRefName("refName2");
- resRefToMerge.setResType("type2");
- resRefToMerge.setResAuth(ResAuthType.CONTAINER_LITERAL);
- resRefToMerge.setResSharingScope(ResSharingScopeType.UNSHAREABLE_LITERAL);
-
- beanBase.getResourceRefs().add(resRefBase);
- beanToMerge.getResourceRefs().add(resRefBase);
- beanToMerge.getResourceRefs().add(resRefToMerge);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(2, beanBase.getResourceRefs().size());
-
- ResourceRef test = getResRef(beanBase.getResourceRefs(), "refName1");
- ResourceRef test2 = getResRef(beanBase.getResourceRefs(), "refName2");
- assertEquals("mapped1", test.getMappedName());
- assertEquals("type1", test.getResType());
- assertEquals(ResAuthType.APPLICATION_LITERAL, test.getResAuth());
- assertEquals(ResSharingScopeType.SHAREABLE_LITERAL, test.getResSharingScope());
-
- assertEquals("mapped2", test2.getMappedName());
- assertEquals("type2", test2.getResType());
- assertEquals(ResAuthType.CONTAINER_LITERAL, test2.getResAuth());
- assertEquals(ResSharingScopeType.UNSHAREABLE_LITERAL, test2.getResSharingScope());
-
- }
-
- /**
- * ComplexOverlapped suffix means variety of information is present
- * in base and to merge: consistent information combined by base and toMerge
- * should be available at the end. There are artifacts with one and the same
- * name and different values: values should be merged into base.
- * @throws Exception
- */
- //@Test
- public void testResourceRefsComplexOverlapped() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- ResourceRef envRefBase = JavaeeFactory.eINSTANCE.createResourceRef();
- envRefBase.setResRefName("refName1");
-
- ResourceRef resRefToMerge = JavaeeFactory.eINSTANCE.createResourceRef();
- resRefToMerge.setMappedName("mapped2");
- resRefToMerge.setResRefName("refName1");
- resRefToMerge.setResType("type2");
- resRefToMerge.setResAuth(ResAuthType.CONTAINER_LITERAL);
- resRefToMerge.setResSharingScope(ResSharingScopeType.UNSHAREABLE_LITERAL);
-
- beanBase.getResourceRefs().add(envRefBase);
- beanToMerge.getResourceRefs().add(envRefBase);
- beanToMerge.getResourceRefs().add(resRefToMerge);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getResourceRefs().size());
-
- ResourceRef test = getResRef(beanBase.getResourceRefs(), "refName1");
- assertEquals("type2", test.getResType());
- assertEquals("mapped2", test.getMappedName());
- assertEquals(ResAuthType.CONTAINER_LITERAL, test.getResAuth());
- assertEquals(ResSharingScopeType.UNSHAREABLE_LITERAL, test.getResSharingScope());
-
- }
-
- private ResourceRef getResRef(List refs, String name){
- if (name == null){
- return null;
- }
- for (Object object : refs) {
- ResourceRef ref = (ResourceRef) object;
- if(name.equals(ref.getResRefName())){
- return ref;
- }
- }
- return null;
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws Exception
- */
- //@Test
- public void testServiceRefBase() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- ServiceRef serviceRefBase = JavaeeFactory.eINSTANCE.createServiceRef();
- serviceRefBase.setMappedName("mapped1");
- serviceRefBase.setServiceRefName("refName1");
- // ServiceRefHandlerChains chains = JavaeeFactory.eINSTANCE.createServiceRefHandlerChains();
- // ServiceRefHandlerChain chain = JavaeeFactory.eINSTANCE.createServiceRefHandlerChain();
- // chains.getHandlerChains().add(chain);
- // chain.
- // resRefBase.setHandlerChains(chains);
- serviceRefBase.setServiceInterface("interface1");
- serviceRefBase.setWsdlFile("file1");
-
-
- ServiceRef serviceRefMerge = JavaeeFactory.eINSTANCE.createServiceRef();
- serviceRefMerge.setMappedName("mapped2");
- serviceRefMerge.setServiceRefName("refName2");
- serviceRefMerge.setServiceInterface("interface2");
- serviceRefMerge.setWsdlFile("file2");
-
- beanBase.getServiceRefs().add(serviceRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getServiceRefs().size());
- assertEquals("mapped1", ((ServiceRef)beanBase.getServiceRefs().get(0)).getMappedName());
- assertEquals("refName1", ((ServiceRef)beanBase.getServiceRefs().get(0)).getServiceRefName());
- assertEquals("interface1", ((ServiceRef)beanBase.getServiceRefs().get(0)).getServiceInterface());
- assertEquals("file1", ((ServiceRef)beanBase.getServiceRefs().get(0)).getWsdlFile());
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws Exception
- */
- //@Test
- public void testServiceRefsMerge() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- ServiceRef serviceRefBase = JavaeeFactory.eINSTANCE.createServiceRef();
- serviceRefBase.setMappedName("mapped1");
- serviceRefBase.setServiceRefName("refName1");
- serviceRefBase.setServiceInterface("interface1");
- serviceRefBase.setWsdlFile("file1");
-
- ServiceRef serviceRefMerge = JavaeeFactory.eINSTANCE.createServiceRef();
- serviceRefMerge.setMappedName("mapped2");
- serviceRefMerge.setServiceRefName("refName2");
- serviceRefMerge.setServiceInterface("interface2");
- serviceRefMerge.setWsdlFile("file2");
-
- beanToMerge.getServiceRefs().add(serviceRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getServiceRefs().size());
- assertEquals("mapped1", ((ServiceRef)beanBase.getServiceRefs().get(0)).getMappedName());
- assertEquals("refName1", ((ServiceRef)beanBase.getServiceRefs().get(0)).getServiceRefName());
- assertEquals("interface1", ((ServiceRef)beanBase.getServiceRefs().get(0)).getServiceInterface());
- assertEquals("file1", ((ServiceRef)beanBase.getServiceRefs().get(0)).getWsdlFile());
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws Exception
- */
- //@Test
- public void testServiceRefsSame() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- ServiceRef serviceRefBase = JavaeeFactory.eINSTANCE.createServiceRef();
- serviceRefBase.setMappedName("mapped1");
- serviceRefBase.setServiceRefName("refName1");
- serviceRefBase.setServiceInterface("interface1");
- serviceRefBase.setWsdlFile("file1");
-
-
- ServiceRef resRefToMerge = JavaeeFactory.eINSTANCE.createServiceRef();
- resRefToMerge.setMappedName("mapped2");
- resRefToMerge.setServiceRefName("refName2");
- resRefToMerge.setServiceInterface("interface2");
- resRefToMerge.setWsdlFile("file2");
-
- beanBase.getServiceRefs().add(serviceRefBase);
- beanToMerge.getServiceRefs().add(serviceRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getServiceRefs().size());
- assertEquals("mapped1", ((ServiceRef)beanBase.getServiceRefs().get(0)).getMappedName());
- assertEquals("refName1", ((ServiceRef)beanBase.getServiceRefs().get(0)).getServiceRefName());
- assertEquals("interface1", ((ServiceRef)beanBase.getServiceRefs().get(0)).getServiceInterface());
- assertEquals("file1", ((ServiceRef)beanBase.getServiceRefs().get(0)).getWsdlFile());
-
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws Exception
- */
- //@Test
- public void testServiceRefsComplex() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- ServiceRef serviceRefBase = JavaeeFactory.eINSTANCE.createServiceRef();
- serviceRefBase.setMappedName("mapped1");
- serviceRefBase.setServiceRefName("refName1");
- serviceRefBase.setServiceInterface("interface1");
- serviceRefBase.setWsdlFile("file1");
-
- ServiceRef serviceRefMerge = JavaeeFactory.eINSTANCE.createServiceRef();
- serviceRefMerge.setMappedName("mapped2");
- serviceRefMerge.setServiceRefName("refName2");
- serviceRefMerge.setServiceInterface("interface2");
- serviceRefMerge.setWsdlFile("file2");
-
- beanBase.getServiceRefs().add(serviceRefBase);
- beanToMerge.getServiceRefs().add(serviceRefBase);
- beanToMerge.getServiceRefs().add(serviceRefMerge);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(2, beanBase.getServiceRefs().size());
-
- ServiceRef test = getServiceRef(beanBase.getServiceRefs(), "refName1");
- ServiceRef test2 = getServiceRef(beanBase.getServiceRefs(), "refName2");
- assertEquals("mapped1", test.getMappedName());
- assertEquals("interface1", test.getServiceInterface());
- assertEquals("file1", test.getWsdlFile());
-
- assertEquals("mapped2", test2.getMappedName());
- assertEquals("interface2", test2.getServiceInterface());
- assertEquals("file2", test2.getWsdlFile());
-
- }
-
- /**
- * ComplexOverlapped suffix means variety of information is present
- * in base and to merge: consistent information combined by base and toMerge
- * should be available at the end. There are artifacts with one and the same
- * name and different values: values should be merged into base.
- * @throws Exception
- */
- //@Test
- public void testServiceRefsComplexOverlapped() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- ServiceRef serviceRefBase = JavaeeFactory.eINSTANCE.createServiceRef();
- serviceRefBase.setServiceRefName("refName1");
-
- ServiceRef serviceRefMerge = JavaeeFactory.eINSTANCE.createServiceRef();
- serviceRefMerge.setMappedName("mapped2");
- serviceRefMerge.setServiceRefName("refName1");
- serviceRefMerge.setServiceInterface("interface2");
- serviceRefMerge.setWsdlFile("file2");
-
- beanBase.getServiceRefs().add(serviceRefBase);
- beanToMerge.getServiceRefs().add(serviceRefBase);
- beanToMerge.getServiceRefs().add(serviceRefMerge);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getServiceRefs().size());
-
- ServiceRef test = getServiceRef(beanBase.getServiceRefs(), "refName1");
- assertEquals("interface2", test.getServiceInterface());
- assertEquals("mapped2", test.getMappedName());
- assertEquals("file2", test.getWsdlFile());
-
- }
-
- private ServiceRef getServiceRef(List refs, String name){
- if (name == null){
- return null;
- }
- for (Object object : refs) {
- ServiceRef ref = (ServiceRef) object;
- if(name.equals(ref.getServiceRefName())){
- return ref;
- }
- }
- return null;
- }
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws Exception
- */
- //@Test
- public void testPersistenceUnitRefsBase() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- PersistenceUnitRef persistenceUnitRefBase = JavaeeFactory.eINSTANCE.createPersistenceUnitRef();
- persistenceUnitRefBase.setMappedName("mapped1");
- persistenceUnitRefBase.setPersistenceUnitRefName("refName1");
- persistenceUnitRefBase.setPersistenceUnitName("type1");
-
-
- PersistenceUnitRef persistenceUnitRefMerge = JavaeeFactory.eINSTANCE.createPersistenceUnitRef();
- persistenceUnitRefMerge.setMappedName("mapped2");
- persistenceUnitRefMerge.setPersistenceUnitRefName("refName2");
- persistenceUnitRefMerge.setPersistenceUnitName("type2");
-
- beanBase.getPersistenceUnitRefs().add(persistenceUnitRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getPersistenceUnitRefs().size());
- assertEquals("mapped1", ((PersistenceUnitRef)beanBase.getPersistenceUnitRefs().get(0)).getMappedName());
- assertEquals("refName1", ((PersistenceUnitRef)beanBase.getPersistenceUnitRefs().get(0)).getPersistenceUnitRefName());
- assertEquals("type1", ((PersistenceUnitRef)beanBase.getPersistenceUnitRefs().get(0)).getPersistenceUnitName());
-
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws Exception
- */
- //@Test
- public void testPersistenceUnitRefsMerge() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- PersistenceUnitRef persistenceUnitRefBase = JavaeeFactory.eINSTANCE.createPersistenceUnitRef();
- persistenceUnitRefBase.setMappedName("mapped1");
- persistenceUnitRefBase.setPersistenceUnitRefName("refName1");
- persistenceUnitRefBase.setPersistenceUnitName("type1");
-
- PersistenceUnitRef persistenceUnitRefMerge = JavaeeFactory.eINSTANCE.createPersistenceUnitRef();
- persistenceUnitRefMerge.setMappedName("mapped2");
- persistenceUnitRefMerge.setPersistenceUnitRefName("refName2");
- persistenceUnitRefMerge.setPersistenceUnitName("type2");
-
- beanToMerge.getPersistenceUnitRefs().add(persistenceUnitRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getPersistenceUnitRefs().size());
- assertEquals("mapped1", ((PersistenceUnitRef)beanBase.getPersistenceUnitRefs().get(0)).getMappedName());
- assertEquals("refName1", ((PersistenceUnitRef)beanBase.getPersistenceUnitRefs().get(0)).getPersistenceUnitRefName());
- assertEquals("type1", ((PersistenceUnitRef)beanBase.getPersistenceUnitRefs().get(0)).getPersistenceUnitName());
-
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws Exception
- */
- //@Test
- public void testPersistenceUnitRefsSame() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- PersistenceUnitRef persistenceUnitRefBase = JavaeeFactory.eINSTANCE.createPersistenceUnitRef();
- persistenceUnitRefBase.setMappedName("mapped1");
- persistenceUnitRefBase.setPersistenceUnitRefName("refName1");
- persistenceUnitRefBase.setPersistenceUnitName("type1");
-
- PersistenceUnitRef persistenceUnitRefMerge = JavaeeFactory.eINSTANCE.createPersistenceUnitRef();
- persistenceUnitRefMerge.setMappedName("mapped2");
- persistenceUnitRefMerge.setPersistenceUnitRefName("refName2");
- persistenceUnitRefMerge.setPersistenceUnitName("type2");
-
- beanBase.getPersistenceUnitRefs().add(persistenceUnitRefBase);
- beanToMerge.getPersistenceUnitRefs().add(persistenceUnitRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getPersistenceUnitRefs().size());
- assertEquals("mapped1", ((PersistenceUnitRef)beanBase.getPersistenceUnitRefs().get(0)).getMappedName());
- assertEquals("refName1", ((PersistenceUnitRef)beanBase.getPersistenceUnitRefs().get(0)).getPersistenceUnitRefName());
- assertEquals("type1", ((PersistenceUnitRef)beanBase.getPersistenceUnitRefs().get(0)).getPersistenceUnitName());
-
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws Exception
- */
- //@Test
- public void testPersistenceUnitRefsComplex() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- PersistenceUnitRef persistenceUnitRefBase = JavaeeFactory.eINSTANCE.createPersistenceUnitRef();
- persistenceUnitRefBase.setMappedName("mapped1");
- persistenceUnitRefBase.setPersistenceUnitRefName("refName1");
- persistenceUnitRefBase.setPersistenceUnitName("type1");
-
- PersistenceUnitRef persistenceUnitRefMerge = JavaeeFactory.eINSTANCE.createPersistenceUnitRef();
- persistenceUnitRefMerge.setMappedName("mapped2");
- persistenceUnitRefMerge.setPersistenceUnitRefName("refName2");
- persistenceUnitRefMerge.setPersistenceUnitName("type2");
-
- beanBase.getPersistenceUnitRefs().add(persistenceUnitRefBase);
- beanToMerge.getPersistenceUnitRefs().add(persistenceUnitRefBase);
- beanToMerge.getPersistenceUnitRefs().add(persistenceUnitRefMerge);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(2, beanBase.getPersistenceUnitRefs().size());
-
- PersistenceUnitRef test = getPersistUnitRef(beanBase.getPersistenceUnitRefs(), "refName1");
- PersistenceUnitRef test2 = getPersistUnitRef(beanBase.getPersistenceUnitRefs(), "refName2");
- assertEquals("mapped1", test.getMappedName());
- assertEquals("type1", test.getPersistenceUnitName());
-
- assertEquals("mapped2", test2.getMappedName());
- assertEquals("type2", test2.getPersistenceUnitName());
-
- }
-
- /**
- * ComplexOverlapped suffix means variety of information is present
- * in base and to merge: consistent information combined by base and toMerge
- * should be available at the end. There are artifacts with one and the same
- * name and different values: values should be merged into base.
- * @throws Exception
- */
- //@Test
- public void testPersistenceUnitRefsComplexOverlapped() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- PersistenceUnitRef persistenceUnitRefBase = JavaeeFactory.eINSTANCE.createPersistenceUnitRef();
- persistenceUnitRefBase.setPersistenceUnitRefName("refName1");
-
- PersistenceUnitRef persistenceUnitRefMerge = JavaeeFactory.eINSTANCE.createPersistenceUnitRef();
- persistenceUnitRefMerge.setMappedName("mapped2");
- persistenceUnitRefMerge.setPersistenceUnitRefName("refName1");
- persistenceUnitRefMerge.setPersistenceUnitName("type2");
-
- beanBase.getPersistenceUnitRefs().add(persistenceUnitRefBase);
- beanToMerge.getPersistenceUnitRefs().add(persistenceUnitRefBase);
- beanToMerge.getPersistenceUnitRefs().add(persistenceUnitRefMerge);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getPersistenceUnitRefs().size());
-
- PersistenceUnitRef test = getPersistUnitRef(beanBase.getPersistenceUnitRefs(), "refName1");
- assertEquals("type2", test.getPersistenceUnitName());
- assertEquals("mapped2", test.getMappedName());
-
- }
-
- private PersistenceUnitRef getPersistUnitRef(List refs, String name){
- if (name == null){
- return null;
- }
- for (Object object : refs) {
- PersistenceUnitRef ref = (PersistenceUnitRef) object;
- if(name.equals(ref.getPersistenceUnitRefName())){
- return ref;
- }
- }
- return null;
- }
-
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws Exception
- */
- //@Test
- public void testPersistenceContextRefsBase() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- PersistenceContextRef persistenceContextRefBase = JavaeeFactory.eINSTANCE.createPersistenceContextRef();
- persistenceContextRefBase.setMappedName("mapped1");
- persistenceContextRefBase.setPersistenceContextRefName("refName1");
- persistenceContextRefBase.setPersistenceContextType(PersistenceContextType.EXTENDED_LITERAL);
-
- PersistenceContextRef persistenceContextRefMerge = JavaeeFactory.eINSTANCE.createPersistenceContextRef();
- persistenceContextRefMerge.setMappedName("mapped2");
- persistenceContextRefMerge.setPersistenceContextRefName("refName2");
- persistenceContextRefMerge.setPersistenceContextType(PersistenceContextType.TRANSACTION_LITERAL);
-
- beanBase.getPersistenceContextRefs().add(persistenceContextRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getPersistenceContextRefs().size());
- assertEquals("mapped1", ((PersistenceContextRef)beanBase.getPersistenceContextRefs().get(0)).getMappedName());
- assertEquals("refName1", ((PersistenceContextRef)beanBase.getPersistenceContextRefs().get(0)).getPersistenceContextRefName());
- assertEquals(PersistenceContextType.EXTENDED_LITERAL, ((PersistenceContextRef)beanBase.getPersistenceContextRefs().get(0)).getPersistenceContextType());
-
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws Exception
- */
- //@Test
- public void testPersistenceContextRefsMerge() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- PersistenceContextRef persistenceContextRefBase = JavaeeFactory.eINSTANCE.createPersistenceContextRef();
- persistenceContextRefBase.setMappedName("mapped1");
- persistenceContextRefBase.setPersistenceContextRefName("refName1");
- persistenceContextRefBase.setPersistenceContextType(PersistenceContextType.EXTENDED_LITERAL);
-
- PersistenceContextRef persistenceContextRefMerge = JavaeeFactory.eINSTANCE.createPersistenceContextRef();
- persistenceContextRefMerge.setMappedName("mapped2");
- persistenceContextRefMerge.setPersistenceContextRefName("refName2");
- persistenceContextRefMerge.setPersistenceContextType(PersistenceContextType.TRANSACTION_LITERAL);
-
- beanToMerge.getPersistenceContextRefs().add(persistenceContextRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getPersistenceContextRefs().size());
- assertEquals("mapped1", ((PersistenceContextRef)beanBase.getPersistenceContextRefs().get(0)).getMappedName());
- assertEquals("refName1", ((PersistenceContextRef)beanBase.getPersistenceContextRefs().get(0)).getPersistenceContextRefName());
- assertEquals(PersistenceContextType.EXTENDED_LITERAL, ((PersistenceContextRef)beanBase.getPersistenceContextRefs().get(0)).getPersistenceContextType());
-
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws Exception
- */
- //@Test
- public void testPersistenceContextRefsSame() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- PersistenceContextRef persistenceContextRefBase = JavaeeFactory.eINSTANCE.createPersistenceContextRef();
- persistenceContextRefBase.setMappedName("mapped1");
- persistenceContextRefBase.setPersistenceContextRefName("refName1");
- persistenceContextRefBase.setPersistenceContextType(PersistenceContextType.EXTENDED_LITERAL);
-
- PersistenceContextRef persistenceContextRefMerge = JavaeeFactory.eINSTANCE.createPersistenceContextRef();
- persistenceContextRefMerge.setMappedName("mapped2");
- persistenceContextRefMerge.setPersistenceContextRefName("refName2");
- persistenceContextRefMerge.setPersistenceContextType(PersistenceContextType.TRANSACTION_LITERAL);
-
- beanBase.getPersistenceContextRefs().add(persistenceContextRefBase);
- beanToMerge.getPersistenceContextRefs().add(persistenceContextRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getPersistenceContextRefs().size());
- assertEquals("mapped1", ((PersistenceContextRef)beanBase.getPersistenceContextRefs().get(0)).getMappedName());
- assertEquals("refName1", ((PersistenceContextRef)beanBase.getPersistenceContextRefs().get(0)).getPersistenceContextRefName());
- assertEquals(PersistenceContextType.EXTENDED_LITERAL, ((PersistenceContextRef)beanBase.getPersistenceContextRefs().get(0)).getPersistenceContextType());
-
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws Exception
- */
- //@Test
- public void testPersistenceContextRefsComplex() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- PersistenceContextRef persistenceContextRefBase = JavaeeFactory.eINSTANCE.createPersistenceContextRef();
- persistenceContextRefBase.setMappedName("mapped1");
- persistenceContextRefBase.setPersistenceContextRefName("refName1");
- persistenceContextRefBase.setPersistenceContextType(PersistenceContextType.EXTENDED_LITERAL);
-
- PersistenceContextRef persistenceContextRefMerge = JavaeeFactory.eINSTANCE.createPersistenceContextRef();
- persistenceContextRefMerge.setMappedName("mapped2");
- persistenceContextRefMerge.setPersistenceContextRefName("refName2");
- persistenceContextRefMerge.setPersistenceContextType(PersistenceContextType.TRANSACTION_LITERAL);
-
- beanBase.getPersistenceContextRefs().add(persistenceContextRefBase);
- beanToMerge.getPersistenceContextRefs().add(persistenceContextRefBase);
- beanToMerge.getPersistenceContextRefs().add(persistenceContextRefMerge);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(2, beanBase.getPersistenceContextRefs().size());
-
- PersistenceContextRef test = getPersistenceCintextRef(beanBase.getPersistenceContextRefs(), "refName1");
- PersistenceContextRef test2 = getPersistenceCintextRef(beanBase.getPersistenceContextRefs(), "refName2");
- assertEquals("mapped1", test.getMappedName());
- assertEquals(PersistenceContextType.EXTENDED_LITERAL, test.getPersistenceContextType());
-
- assertEquals("mapped2", test2.getMappedName());
- assertEquals(PersistenceContextType.TRANSACTION_LITERAL, test2.getPersistenceContextType());
-
- }
-
- /**
- * ComplexOverlapped suffix means variety of information is present
- * in base and to merge: consistent information combined by base and toMerge
- * should be available at the end. There are artifacts with one and the same
- * name and different values: values should be merged into base.
- * @throws Exception
- */
- //@Test
- public void testPersistenceContextRefsComplexOverlapped() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- PersistenceContextRef persistenceContextRefBase = JavaeeFactory.eINSTANCE.createPersistenceContextRef();
- persistenceContextRefBase.setPersistenceContextRefName("refName1");
-
- PersistenceContextRef persistenceContextRefMerge = JavaeeFactory.eINSTANCE.createPersistenceContextRef();
- persistenceContextRefMerge.setMappedName("mapped2");
- persistenceContextRefMerge.setPersistenceContextRefName("refName1");
- persistenceContextRefMerge.setPersistenceContextType(PersistenceContextType.TRANSACTION_LITERAL);
-
- beanBase.getPersistenceContextRefs().add(persistenceContextRefBase);
- beanToMerge.getPersistenceContextRefs().add(persistenceContextRefBase);
- beanToMerge.getPersistenceContextRefs().add(persistenceContextRefMerge);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getPersistenceContextRefs().size());
-
- PersistenceContextRef test = getPersistenceCintextRef(beanBase.getPersistenceContextRefs(), "refName1");
- assertEquals(PersistenceContextType.TRANSACTION_LITERAL, test.getPersistenceContextType());
- assertEquals("mapped2", test.getMappedName());
-
- }
-
- private PersistenceContextRef getPersistenceCintextRef(List refs, String name){
- if (name == null){
- return null;
- }
- for (Object object : refs) {
- PersistenceContextRef ref = (PersistenceContextRef) object;
- if(name.equals(ref.getPersistenceContextRefName())){
- return ref;
- }
- }
- return null;
- }
-
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws Exception
- */
- //@Test
- public void testMessageDestinationRefsBase() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- MessageDestinationRef messageDestRefBase = JavaeeFactory.eINSTANCE.createMessageDestinationRef();
- messageDestRefBase.setMappedName("mapped1");
- messageDestRefBase.setMessageDestinationRefName("refName1");
- messageDestRefBase.setMessageDestinationType("type1");
- messageDestRefBase.setMessageDestinationLink("link1");
- messageDestRefBase.setMessageDestinationUsage(MessageDestinationUsageType.CONSUMES_LITERAL);
-
- MessageDestinationRef messageDestRefMerge = JavaeeFactory.eINSTANCE.createMessageDestinationRef();
- messageDestRefMerge.setMappedName("mapped2");
- messageDestRefMerge.setMessageDestinationRefName("refName2");
- messageDestRefMerge.setMessageDestinationType("type2");
- messageDestRefMerge.setMessageDestinationLink("link2");
- messageDestRefMerge.setMessageDestinationUsage(MessageDestinationUsageType.CONSUMES_PRODUCES_LITERAL);
-
- beanBase.getMessageDestinationRefs().add(messageDestRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getMessageDestinationRefs().size());
- assertEquals("mapped1", ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMappedName());
- assertEquals("refName1", ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMessageDestinationRefName());
- assertEquals("type1", ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMessageDestinationType());
- assertEquals("link1", ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMessageDestinationLink());
- assertEquals(MessageDestinationUsageType.CONSUMES_LITERAL, ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMessageDestinationUsage());
-
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws Exception
- */
- //@Test
- public void testMessageDestinationRefsMerge() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- MessageDestinationRef messageDestRefBase = JavaeeFactory.eINSTANCE.createMessageDestinationRef();
- messageDestRefBase.setMappedName("mapped1");
- messageDestRefBase.setMessageDestinationRefName("refName1");
- messageDestRefBase.setMessageDestinationType("type1");
- messageDestRefBase.setMessageDestinationLink("link1");
- messageDestRefBase.setMessageDestinationUsage(MessageDestinationUsageType.CONSUMES_LITERAL);
-
- MessageDestinationRef messageDestRefMerge = JavaeeFactory.eINSTANCE.createMessageDestinationRef();
- messageDestRefMerge.setMappedName("mapped2");
- messageDestRefMerge.setMessageDestinationRefName("refName2");
- messageDestRefMerge.setMessageDestinationType("type2");
- messageDestRefMerge.setMessageDestinationLink("link2");
- messageDestRefMerge.setMessageDestinationUsage(MessageDestinationUsageType.CONSUMES_PRODUCES_LITERAL);
-
-
- beanToMerge.getMessageDestinationRefs().add(messageDestRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getMessageDestinationRefs().size());
- assertEquals("mapped1", ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMappedName());
- assertEquals("refName1", ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMessageDestinationRefName());
- assertEquals("type1", ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMessageDestinationType());
- assertEquals("link1", ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMessageDestinationLink());
- assertEquals(MessageDestinationUsageType.CONSUMES_LITERAL, ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMessageDestinationUsage());
-
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws Exception
- */
- //@Test
- public void testMessageDestinationRefsSame() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- MessageDestinationRef messageDestRefBase = JavaeeFactory.eINSTANCE.createMessageDestinationRef();
- messageDestRefBase.setMappedName("mapped1");
- messageDestRefBase.setMessageDestinationRefName("refName1");
- messageDestRefBase.setMessageDestinationType("type1");
- messageDestRefBase.setMessageDestinationLink("link1");
- messageDestRefBase.setMessageDestinationUsage(MessageDestinationUsageType.CONSUMES_LITERAL);
-
- MessageDestinationRef messageDestRefMerge = JavaeeFactory.eINSTANCE.createMessageDestinationRef();
- messageDestRefMerge.setMappedName("mapped2");
- messageDestRefMerge.setMessageDestinationRefName("refName2");
- messageDestRefMerge.setMessageDestinationType("type2");
- messageDestRefMerge.setMessageDestinationLink("link2");
- messageDestRefMerge.setMessageDestinationUsage(MessageDestinationUsageType.CONSUMES_PRODUCES_LITERAL);
-
-
- beanBase.getMessageDestinationRefs().add(messageDestRefBase);
- beanToMerge.getMessageDestinationRefs().add(messageDestRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getMessageDestinationRefs().size());
- assertEquals("mapped1", ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMappedName());
- assertEquals("refName1", ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMessageDestinationRefName());
- assertEquals("type1", ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMessageDestinationType());
- assertEquals("link1", ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMessageDestinationLink());
- assertEquals(MessageDestinationUsageType.CONSUMES_LITERAL, ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMessageDestinationUsage());
-
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws Exception
- */
- //@Test
- public void testMessageDestinationRefsComplex() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- MessageDestinationRef messageDestRefBase = JavaeeFactory.eINSTANCE.createMessageDestinationRef();
- messageDestRefBase.setMappedName("mapped1");
- messageDestRefBase.setMessageDestinationRefName("refName1");
- messageDestRefBase.setMessageDestinationType("type1");
- messageDestRefBase.setMessageDestinationLink("link1");
- messageDestRefBase.setMessageDestinationUsage(MessageDestinationUsageType.CONSUMES_LITERAL);
-
- MessageDestinationRef messageDestRefMerge = JavaeeFactory.eINSTANCE.createMessageDestinationRef();
- messageDestRefMerge.setMappedName("mapped2");
- messageDestRefMerge.setMessageDestinationRefName("refName2");
- messageDestRefMerge.setMessageDestinationType("type2");
- messageDestRefMerge.setMessageDestinationLink("link2");
- messageDestRefMerge.setMessageDestinationUsage(MessageDestinationUsageType.CONSUMES_PRODUCES_LITERAL);
-
-
- beanBase.getMessageDestinationRefs().add(messageDestRefBase);
- beanToMerge.getMessageDestinationRefs().add(messageDestRefBase);
- beanToMerge.getMessageDestinationRefs().add(messageDestRefMerge);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(2, beanBase.getMessageDestinationRefs().size());
-
- MessageDestinationRef test = getMessageRef(beanBase.getMessageDestinationRefs(), "refName1");
- MessageDestinationRef test2 = getMessageRef(beanBase.getMessageDestinationRefs(), "refName2");
- assertEquals("mapped1", test.getMappedName());
- assertEquals("type1", test.getMessageDestinationType());
- assertEquals("link1", ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMessageDestinationLink());
- assertEquals(MessageDestinationUsageType.CONSUMES_LITERAL, ((MessageDestinationRef)beanBase.getMessageDestinationRefs().get(0)).getMessageDestinationUsage());
-
- assertEquals("mapped2", test2.getMappedName());
- assertEquals("type2", test2.getMessageDestinationType());
- assertEquals("link2", test2.getMessageDestinationLink());
- assertEquals(MessageDestinationUsageType.CONSUMES_PRODUCES_LITERAL, test2.getMessageDestinationUsage());
-
- }
-
- /**
- * ComplexOverlapped suffix means variety of information is present
- * in base and to merge: consistent information combined by base and toMerge
- * should be available at the end. There are artifacts with one and the same
- * name and different values: values should be merged into base.
- * @throws Exception
- */
- //@Test
- public void testMessageDestinationRefsComplexOverlapped() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- MessageDestinationRef messageDestRefBase = JavaeeFactory.eINSTANCE.createMessageDestinationRef();
- messageDestRefBase.setMessageDestinationRefName("refName1");
-
- MessageDestinationRef messageDestRefMerge = JavaeeFactory.eINSTANCE.createMessageDestinationRef();
- messageDestRefMerge.setMappedName("mapped2");
- messageDestRefMerge.setMessageDestinationRefName("refName1");
- messageDestRefMerge.setMessageDestinationType("type2");
- messageDestRefMerge.setMessageDestinationLink("link2");
- messageDestRefMerge.setMessageDestinationUsage(MessageDestinationUsageType.CONSUMES_PRODUCES_LITERAL);
-
-
- beanBase.getMessageDestinationRefs().add(messageDestRefBase);
- beanToMerge.getMessageDestinationRefs().add(messageDestRefBase);
- beanToMerge.getMessageDestinationRefs().add(messageDestRefMerge);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getMessageDestinationRefs().size());
-
- MessageDestinationRef test = getMessageRef(beanBase.getMessageDestinationRefs(), "refName1");
- assertEquals("type2", test.getMessageDestinationType());
- assertEquals("mapped2", test.getMappedName());
- assertEquals("link2", test.getMessageDestinationLink());
- assertEquals(MessageDestinationUsageType.CONSUMES_PRODUCES_LITERAL, test.getMessageDestinationUsage());
-
- }
-
- private MessageDestinationRef getMessageRef(List refs, String name){
- if (name == null){
- return null;
- }
- for (Object object : refs) {
- MessageDestinationRef ref = (MessageDestinationRef) object;
- if(name.equals(ref.getMessageDestinationRefName())){
- return ref;
- }
- }
- return null;
- }
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws Exception
- */
- //@Test
- public void testEjbRefsBase() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- EjbRef ejbRefBase = JavaeeFactory.eINSTANCE.createEjbRef();
- ejbRefBase.setMappedName("mapped1");
- ejbRefBase.setEjbRefName("refName1");
- ejbRefBase.setEjbRefType(EjbRefType.SESSION_LITERAL);
- ejbRefBase.setEjbLink("link1");
- ejbRefBase.setHome("home1");
- ejbRefBase.setRemote("remote1");
-
- EjbRef ejbRefToMerge = JavaeeFactory.eINSTANCE.createEjbRef();
- ejbRefToMerge.setMappedName("mapped2");
- ejbRefToMerge.setEjbRefName("refName2");
- ejbRefToMerge.setEjbRefType(EjbRefType.ENTITY_LITERAL);
- ejbRefToMerge.setEjbLink("link2");
- ejbRefToMerge.setHome("home2");
- ejbRefToMerge.setRemote("remote2");
-
- beanBase.getEjbRefs().add(ejbRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getEjbRefs().size());
- assertEquals("mapped1", ((EjbRef)beanBase.getEjbRefs().get(0)).getMappedName());
- assertEquals("refName1", ((EjbRef)beanBase.getEjbRefs().get(0)).getEjbRefName());
- assertEquals(EjbRefType.SESSION_LITERAL, ((EjbRef)beanBase.getEjbRefs().get(0)).getEjbRefType());
- assertEquals("link1", ((EjbRef)beanBase.getEjbRefs().get(0)).getEjbLink());
- assertEquals("home1", ((EjbRef)beanBase.getEjbRefs().get(0)).getHome());
- assertEquals("remote1", ((EjbRef)beanBase.getEjbRefs().get(0)).getRemote());
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws Exception
- */
- //@Test
- public void testEjbRefsMerge() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- EjbRef ejbRefBase = JavaeeFactory.eINSTANCE.createEjbRef();
- ejbRefBase.setMappedName("mapped1");
- ejbRefBase.setEjbRefName("refName1");
- ejbRefBase.setEjbRefType(EjbRefType.SESSION_LITERAL);
- ejbRefBase.setEjbLink("link1");
- ejbRefBase.setHome("home1");
- ejbRefBase.setRemote("remote1");
-
- EjbRef ejbRefToMerge = JavaeeFactory.eINSTANCE.createEjbRef();
- ejbRefToMerge.setMappedName("mapped2");
- ejbRefToMerge.setEjbRefName("refName2");
- ejbRefToMerge.setEjbRefType(EjbRefType.ENTITY_LITERAL);
- ejbRefToMerge.setEjbLink("link2");
- ejbRefToMerge.setHome("home2");
- ejbRefToMerge.setRemote("remote2");
-
-
- beanToMerge.getEjbRefs().add(ejbRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getEjbRefs().size());
- assertEquals("mapped1", ((EjbRef)beanBase.getEjbRefs().get(0)).getMappedName());
- assertEquals("refName1", ((EjbRef)beanBase.getEjbRefs().get(0)).getEjbRefName());
- assertEquals(EjbRefType.SESSION_LITERAL, ((EjbRef)beanBase.getEjbRefs().get(0)).getEjbRefType());
- assertEquals("link1", ((EjbRef)beanBase.getEjbRefs().get(0)).getEjbLink());
- assertEquals("home1", ((EjbRef)beanBase.getEjbRefs().get(0)).getHome());
- assertEquals("remote1", ((EjbRef)beanBase.getEjbRefs().get(0)).getRemote());
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws Exception
- */
- //@Test
- public void testEjbRefsSame() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- EjbRef ejbRefBase = JavaeeFactory.eINSTANCE.createEjbRef();
- ejbRefBase.setMappedName("mapped1");
- ejbRefBase.setEjbRefName("refName1");
- ejbRefBase.setEjbRefType(EjbRefType.SESSION_LITERAL);
- ejbRefBase.setEjbLink("link1");
- ejbRefBase.setHome("home1");
- ejbRefBase.setRemote("remote1");
-
- EjbRef ejbRefToMerge = JavaeeFactory.eINSTANCE.createEjbRef();
- ejbRefToMerge.setMappedName("mapped2");
- ejbRefToMerge.setEjbRefName("refName2");
- ejbRefToMerge.setEjbRefType(EjbRefType.ENTITY_LITERAL);
- ejbRefToMerge.setEjbLink("link2");
- ejbRefToMerge.setHome("home2");
- ejbRefToMerge.setRemote("remote2");
-
-
- beanBase.getEjbRefs().add(ejbRefBase);
- beanToMerge.getEjbRefs().add(ejbRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getEjbRefs().size());
- assertEquals("mapped1", ((EjbRef)beanBase.getEjbRefs().get(0)).getMappedName());
- assertEquals("refName1", ((EjbRef)beanBase.getEjbRefs().get(0)).getEjbRefName());
- assertEquals(EjbRefType.SESSION_LITERAL, ((EjbRef)beanBase.getEjbRefs().get(0)).getEjbRefType());
- assertEquals("link1", ((EjbRef)beanBase.getEjbRefs().get(0)).getEjbLink());
- assertEquals("home1", ((EjbRef)beanBase.getEjbRefs().get(0)).getHome());
- assertEquals("remote1", ((EjbRef)beanBase.getEjbRefs().get(0)).getRemote());
-
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws Exception
- */
- //@Test
- public void testEjbRefsComplex() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- EjbRef ejbRefBase = JavaeeFactory.eINSTANCE.createEjbRef();
- ejbRefBase.setMappedName("mapped1");
- ejbRefBase.setEjbRefName("refName1");
- ejbRefBase.setEjbRefType(EjbRefType.SESSION_LITERAL);
- ejbRefBase.setEjbLink("link1");
- ejbRefBase.setHome("home1");
- ejbRefBase.setRemote("remote1");
-
- EjbRef ejbRefToMerge = JavaeeFactory.eINSTANCE.createEjbRef();
- ejbRefToMerge.setMappedName("mapped2");
- ejbRefToMerge.setEjbRefName("refName2");
- ejbRefToMerge.setEjbRefType(EjbRefType.ENTITY_LITERAL);
- ejbRefToMerge.setEjbLink("link2");
- ejbRefToMerge.setHome("home2");
- ejbRefToMerge.setRemote("remote2");
-
-
- beanBase.getEjbRefs().add(ejbRefBase);
- beanToMerge.getEjbRefs().add(ejbRefBase);
- beanToMerge.getEjbRefs().add(ejbRefToMerge);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(2, beanBase.getEjbRefs().size());
-
- EjbRef test = getEjbRef(beanBase.getEjbRefs(), "refName1");
- EjbRef test2 = getEjbRef(beanBase.getEjbRefs(), "refName2");
- assertEquals("mapped1", test.getMappedName());
- assertEquals(EjbRefType.SESSION_LITERAL, test.getEjbRefType());
- assertEquals("link1", ((EjbRef)beanBase.getEjbRefs().get(0)).getEjbLink());
- assertEquals("home1", test.getHome());
- assertEquals("remote1", test.getRemote());
-
- assertEquals("mapped2", test2.getMappedName());
- assertEquals(EjbRefType.ENTITY_LITERAL, test2.getEjbRefType());
- assertEquals("link2", test2.getEjbLink());
- assertEquals("home2", test2.getHome());
- assertEquals("remote2", test2.getRemote());
-
- }
-
- /**
- * ComplexOverlapped suffix means variety of information is present
- * in base and to merge: consistent information combined by base and toMerge
- * should be available at the end. There are artifacts with one and the same
- * name and different values: values should be merged into base.
- * @throws Exception
- */
- //@Test
- public void testEjbRefsComplexOverlapped() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- SessionBean beanToLink = EjbFactory.eINSTANCE.createSessionBean();
-
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
- beanToLink.setEjbName("name");
-
- EjbRef ejbRefBase = JavaeeFactory.eINSTANCE.createEjbRef();
- ejbRefBase.setEjbRefName("refName1");
-
- EjbRef ejbRefToMerge = JavaeeFactory.eINSTANCE.createEjbRef();
- ejbRefToMerge.setMappedName("mapped2");
- ejbRefToMerge.setEjbRefName("refName1");
- ejbRefToMerge.setEjbRefType(EjbRefType.SESSION_LITERAL);
- ejbRefToMerge.setEjbLink("link2");
- ejbRefToMerge.setHome("home2");
- ejbRefToMerge.setRemote("remote2");
-
-
- EjbRef ejbRefToLink = JavaeeFactory.eINSTANCE.createEjbRef();
- ejbRefToLink.setEjbRefName("refName199");
- ejbRefToLink.setEjbLink("link2");
-
-
- beanBase.getEjbRefs().add(ejbRefBase);
- beanToMerge.getEjbRefs().add(ejbRefBase);
- beanToMerge.getEjbRefs().add(ejbRefToMerge);
- beanToLink.getEjbRefs().add(ejbRefToLink);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getEjbRefs().size());
-
- EjbRef test = getEjbRef(beanBase.getEjbRefs(), "refName1");
- assertEquals(EjbRefType.SESSION_LITERAL, test.getEjbRefType());
- assertEquals("mapped2", test.getMappedName());
- assertEquals("link2", test.getEjbLink());
- assertEquals("home2", test.getHome());
- assertEquals("remote2", test.getRemote());
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- }
-
- private EjbRef getEjbRef(List refs, String name){
- if (name == null){
- return null;
- }
- for (Object object : refs) {
- EjbRef ref = (EjbRef) object;
- if(name.equals(ref.getEjbRefName())){
- return ref;
- }
- }
- return null;
- }
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws Exception
- */
- //@Test
- public void testEjbLocalRefsBase() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- EjbLocalRef ejbLocalRefBase = JavaeeFactory.eINSTANCE.createEjbLocalRef();
- ejbLocalRefBase.setMappedName("mapped1");
- ejbLocalRefBase.setEjbRefName("refName1");
- ejbLocalRefBase.setEjbRefType(EjbRefType.SESSION_LITERAL);
- ejbLocalRefBase.setEjbLink("link1");
- ejbLocalRefBase.setLocalHome("home1");
- ejbLocalRefBase.setLocal("remote1");
-
- EjbLocalRef ejbLocalRefToMerge = JavaeeFactory.eINSTANCE.createEjbLocalRef();
- ejbLocalRefToMerge.setMappedName("mapped2");
- ejbLocalRefToMerge.setEjbRefName("refName2");
- ejbLocalRefToMerge.setEjbRefType(EjbRefType.ENTITY_LITERAL);
- ejbLocalRefToMerge.setEjbLink("link2");
- ejbLocalRefToMerge.setLocalHome("home2");
- ejbLocalRefToMerge.setLocal("remote2");
-
- beanBase.getEjbLocalRefs().add(ejbLocalRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getEjbLocalRefs().size());
- assertEquals("mapped1", ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getMappedName());
- assertEquals("refName1", ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getEjbRefName());
- assertEquals(EjbRefType.SESSION_LITERAL, ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getEjbRefType());
- assertEquals("link1", ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getEjbLink());
- assertEquals("home1", ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getLocalHome());
- assertEquals("remote1", ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getLocal());
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws Exception
- */
- //@Test
- public void testEjbLocalRefsMerge() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- EjbLocalRef envRefBase = JavaeeFactory.eINSTANCE.createEjbLocalRef();
- envRefBase.setMappedName("mapped1");
- envRefBase.setEjbRefName("refName1");
- envRefBase.setEjbRefType(EjbRefType.SESSION_LITERAL);
- envRefBase.setEjbLink("link1");
- envRefBase.setLocalHome("home1");
- envRefBase.setLocal("remote1");
-
- EjbLocalRef ejbLocalRefToMerge = JavaeeFactory.eINSTANCE.createEjbLocalRef();
- ejbLocalRefToMerge.setMappedName("mapped2");
- ejbLocalRefToMerge.setEjbRefName("refName2");
- ejbLocalRefToMerge.setEjbRefType(EjbRefType.ENTITY_LITERAL);
- ejbLocalRefToMerge.setEjbLink("link2");
- ejbLocalRefToMerge.setLocalHome("home2");
- ejbLocalRefToMerge.setLocal("remote2");
-
-
- beanToMerge.getEjbLocalRefs().add(envRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getEjbLocalRefs().size());
- assertEquals("mapped1", ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getMappedName());
- assertEquals("refName1", ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getEjbRefName());
- assertEquals(EjbRefType.SESSION_LITERAL, ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getEjbRefType());
- assertEquals("link1", ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getEjbLink());
- assertEquals("home1", ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getLocalHome());
- assertEquals("remote1", ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getLocal());
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws Exception
- */
- //@Test
- public void testEjbLocalRefsSame() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- EjbLocalRef ejbLocalRefBase = JavaeeFactory.eINSTANCE.createEjbLocalRef();
- ejbLocalRefBase.setMappedName("mapped1");
- ejbLocalRefBase.setEjbRefName("refName1");
- ejbLocalRefBase.setEjbRefType(EjbRefType.SESSION_LITERAL);
- ejbLocalRefBase.setEjbLink("link1");
- ejbLocalRefBase.setLocalHome("home1");
- ejbLocalRefBase.setLocal("remote1");
-
- EjbLocalRef ejbLocalRefToMerge = JavaeeFactory.eINSTANCE.createEjbLocalRef();
- ejbLocalRefToMerge.setMappedName("mapped2");
- ejbLocalRefToMerge.setEjbRefName("refName2");
- ejbLocalRefToMerge.setEjbRefType(EjbRefType.ENTITY_LITERAL);
- ejbLocalRefToMerge.setEjbLink("link2");
- ejbLocalRefToMerge.setLocalHome("home2");
- ejbLocalRefToMerge.setLocal("remote2");
-
-
- beanBase.getEjbLocalRefs().add(ejbLocalRefBase);
- beanToMerge.getEjbLocalRefs().add(ejbLocalRefBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getEjbLocalRefs().size());
- assertEquals("mapped1", ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getMappedName());
- assertEquals("refName1", ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getEjbRefName());
- assertEquals(EjbRefType.SESSION_LITERAL, ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getEjbRefType());
- assertEquals("link1", ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getEjbLink());
- assertEquals("home1", ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getLocalHome());
- assertEquals("remote1", ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getLocal());
-
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws Exception
- */
- //@Test
- public void testEjbLocalRefsComplex() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- EjbLocalRef ejbLocalRefBase = JavaeeFactory.eINSTANCE.createEjbLocalRef();
- ejbLocalRefBase.setMappedName("mapped1");
- ejbLocalRefBase.setEjbRefName("refName1");
- ejbLocalRefBase.setEjbRefType(EjbRefType.SESSION_LITERAL);
- ejbLocalRefBase.setEjbLink("link1");
- ejbLocalRefBase.setLocalHome("home1");
- ejbLocalRefBase.setLocal("remote1");
-
- EjbLocalRef ejbLocalRefToMerge = JavaeeFactory.eINSTANCE.createEjbLocalRef();
- ejbLocalRefToMerge.setMappedName("mapped2");
- ejbLocalRefToMerge.setEjbRefName("refName2");
- ejbLocalRefToMerge.setEjbRefType(EjbRefType.ENTITY_LITERAL);
- ejbLocalRefToMerge.setEjbLink("link2");
- ejbLocalRefToMerge.setLocalHome("home2");
- ejbLocalRefToMerge.setLocal("remote2");
-
-
- beanBase.getEjbLocalRefs().add(ejbLocalRefBase);
- beanToMerge.getEjbLocalRefs().add(ejbLocalRefBase);
- beanToMerge.getEjbLocalRefs().add(ejbLocalRefToMerge);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(2, beanBase.getEjbLocalRefs().size());
-
- EjbLocalRef test = getEjbLocalRef(beanBase.getEjbLocalRefs(), "refName1");
- EjbLocalRef test2 = getEjbLocalRef(beanBase.getEjbLocalRefs(), "refName2");
- assertEquals("mapped1", test.getMappedName());
- assertEquals(EjbRefType.SESSION_LITERAL, test.getEjbRefType());
- assertEquals("link1", ((EjbLocalRef)beanBase.getEjbLocalRefs().get(0)).getEjbLink());
- assertEquals("home1", test.getLocalHome());
- assertEquals("remote1", test.getLocal());
-
- assertEquals("mapped2", test2.getMappedName());
- assertEquals(EjbRefType.ENTITY_LITERAL, test2.getEjbRefType());
- assertEquals("link2", test2.getEjbLink());
- assertEquals("home2", test2.getLocalHome());
- assertEquals("remote2", test2.getLocal());
-
- }
-
- /**
- * ComplexOverlapped suffix means variety of information is present
- * in base and to merge: consistent information combined by base and toMerge
- * should be available at the end. There are artifacts with one and the same
- * name and different values: values should be merged into base.
- * @throws Exception
- */
- //@Test
- public void testEjbLocalRefsComplexOverlapped() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- SessionBean beanToLink = EjbFactory.eINSTANCE.createSessionBean();
-
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
- beanToLink.setEjbName("name");
-
- EjbLocalRef ejbLocalRefBase = JavaeeFactory.eINSTANCE.createEjbLocalRef();
- ejbLocalRefBase.setEjbRefName("refName1");
-
- EjbLocalRef ejbLocalRefToMerge = JavaeeFactory.eINSTANCE.createEjbLocalRef();
- ejbLocalRefToMerge.setMappedName("mapped2");
- ejbLocalRefToMerge.setEjbRefName("refName1");
- ejbLocalRefToMerge.setEjbRefType(EjbRefType.SESSION_LITERAL);
- ejbLocalRefToMerge.setEjbLink("link2");
- ejbLocalRefToMerge.setLocalHome("home2");
- ejbLocalRefToMerge.setLocal("remote2");
-
-
- EjbLocalRef ejbLocalRefToLink = JavaeeFactory.eINSTANCE.createEjbLocalRef();
- ejbLocalRefToLink.setEjbRefName("refName199");
- ejbLocalRefToLink.setEjbLink("link2");
-
-
- beanBase.getEjbLocalRefs().add(ejbLocalRefBase);
- beanToMerge.getEjbLocalRefs().add(ejbLocalRefBase);
- beanToMerge.getEjbLocalRefs().add(ejbLocalRefToMerge);
- beanToLink.getEjbLocalRefs().add(ejbLocalRefToLink);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getEjbLocalRefs().size());
-
- EjbLocalRef test = getEjbLocalRef(beanBase.getEjbLocalRefs(), "refName1");
- assertEquals(EjbRefType.SESSION_LITERAL, test.getEjbRefType());
- assertEquals("mapped2", test.getMappedName());
- assertEquals("link2", test.getEjbLink());
- assertEquals("home2", test.getLocalHome());
- assertEquals("remote2", test.getLocal());
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- }
-
- private EjbLocalRef getEjbLocalRef(List refs, String name){
- if (name == null){
- return null;
- }
- for (Object object : refs) {
- EjbLocalRef ref = (EjbLocalRef) object;
- if(name.equals(ref.getEjbRefName())){
- return ref;
- }
- }
- return null;
- }
-
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws Exception
- */
- //@Test
- public void testEnvEntrysBase() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- EnvEntry envEntryBase = JavaeeFactory.eINSTANCE.createEnvEntry();
- envEntryBase.setMappedName("mapped1");
- envEntryBase.setEnvEntryName("refName1");
- envEntryBase.setEnvEntryType(EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL);
- envEntryBase.setEnvEntryValue("true");
-
-
- EnvEntry envEntryMerge = JavaeeFactory.eINSTANCE.createEnvEntry();
- envEntryMerge.setMappedName("mapped2");
- envEntryMerge.setEnvEntryName("refName2");
- envEntryMerge.setEnvEntryType(EnvEntryType.JAVA_LANG_BYTE_LITERAL);
- envEntryMerge.setEnvEntryValue("00");
-
- beanBase.getEnvEntries().add(envEntryBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getEnvEntries().size());
- assertEquals("mapped1", ((EnvEntry)beanBase.getEnvEntries().get(0)).getMappedName());
- assertEquals("refName1", ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryName());
- assertEquals(EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL.getLiteral(), ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryType());
- assertEquals("true", ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryValue());
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws Exception
- */
- //@Test
- public void testEnvEntrysMerge() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- EnvEntry envEntryBase = JavaeeFactory.eINSTANCE.createEnvEntry();
- envEntryBase.setMappedName("mapped1");
- envEntryBase.setEnvEntryName("refName1");
- envEntryBase.setEnvEntryType(EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL);
- envEntryBase.setEnvEntryValue("true");
-
- EnvEntry envEntryMerge = JavaeeFactory.eINSTANCE.createEnvEntry();
- envEntryMerge.setMappedName("mapped2");
- envEntryMerge.setEnvEntryName("refName2");
- envEntryMerge.setEnvEntryType(EnvEntryType.JAVA_LANG_BYTE_LITERAL);
- envEntryMerge.setEnvEntryValue("00");
-
- beanToMerge.getEnvEntries().add(envEntryBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getEnvEntries().size());
- assertEquals("mapped1", ((EnvEntry)beanBase.getEnvEntries().get(0)).getMappedName());
- assertEquals("refName1", ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryName());
- assertEquals(EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL.getLiteral(), ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryType());
- assertEquals("true", ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryValue());
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws Exception
- */
- //@Test
- public void testEnvEntrysSame() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- EnvEntry envEntryBase = JavaeeFactory.eINSTANCE.createEnvEntry();
- envEntryBase.setMappedName("mapped1");
- envEntryBase.setEnvEntryName("refName1");
- envEntryBase.setEnvEntryType(EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL);
- envEntryBase.setEnvEntryValue("true");
-
-
- EnvEntry envEntryMerge = JavaeeFactory.eINSTANCE.createEnvEntry();
- envEntryMerge.setMappedName("mapped2");
- envEntryMerge.setEnvEntryName("refName2");
- envEntryMerge.setEnvEntryType(EnvEntryType.JAVA_LANG_BYTE_LITERAL);
- envEntryMerge.setEnvEntryValue("00");
-
- beanBase.getEnvEntries().add(envEntryBase);
- beanToMerge.getEnvEntries().add(envEntryBase);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getEnvEntries().size());
- assertEquals("mapped1", ((EnvEntry)beanBase.getEnvEntries().get(0)).getMappedName());
- assertEquals("refName1", ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryName());
- assertEquals(EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL.getLiteral(), ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryType());
- assertEquals("true", ((EnvEntry)beanBase.getEnvEntries().get(0)).getEnvEntryValue());
-
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws Exception
- */
- //@Test
- public void testEnvEntrysComplex() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- EnvEntry envEntryBase = JavaeeFactory.eINSTANCE.createEnvEntry();
- envEntryBase.setMappedName("mapped1");
- envEntryBase.setEnvEntryName("refName1");
- envEntryBase.setEnvEntryType(EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL);
- envEntryBase.setEnvEntryValue("true");
-
- EnvEntry envEntryMerge = JavaeeFactory.eINSTANCE.createEnvEntry();
- envEntryMerge.setMappedName("mapped2");
- envEntryMerge.setEnvEntryName("refName2");
- envEntryMerge.setEnvEntryType(EnvEntryType.JAVA_LANG_BYTE_LITERAL);
- envEntryMerge.setEnvEntryValue("00");
-
- beanBase.getEnvEntries().add(envEntryBase);
- beanToMerge.getEnvEntries().add(envEntryBase);
- beanToMerge.getEnvEntries().add(envEntryMerge);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(2, beanBase.getEnvEntries().size());
-
- EnvEntry test = getEnvEntry(beanBase.getEnvEntries(), "refName1");
- EnvEntry test2 = getEnvEntry(beanBase.getEnvEntries(), "refName2");
- assertEquals("mapped1", test.getMappedName());
- assertEquals(EnvEntryType.JAVA_LANG_BOOLEAN_LITERAL.getLiteral(), test.getEnvEntryType());
- assertEquals("true", test.getEnvEntryValue());
-
- assertEquals("mapped2", test2.getMappedName());
- assertEquals(EnvEntryType.JAVA_LANG_BYTE_LITERAL.getLiteral(), test2.getEnvEntryType());
- assertEquals("00", test2.getEnvEntryValue());
-
- }
-
- /**
- * ComplexOverlapped suffix means variety of information is present
- * in base and to merge: consistent information combined by base and toMerge
- * should be available at the end. There are artifacts with one and the same
- * name and different values: values should be merged into base.
- * @throws Exception
- */
- //@Test
- public void testEnvEntrysComplexOverlapped() throws Exception {
- SessionBean beanBase = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean beanToMerge = EjbFactory.eINSTANCE.createSessionBean();
-
- beanBase.setEjbName("name");
- beanToMerge.setEjbName("name");
-
- EnvEntry envEntryBase = JavaeeFactory.eINSTANCE.createEnvEntry();
- envEntryBase.setEnvEntryName("refName1");
-
- EnvEntry envEntryMerge = JavaeeFactory.eINSTANCE.createEnvEntry();
- envEntryMerge.setMappedName("mapped2");
- envEntryMerge.setEnvEntryName("refName1");
- envEntryMerge.setEnvEntryType(EnvEntryType.JAVA_LANG_BYTE_LITERAL);
- envEntryMerge.setEnvEntryValue("00");
-
- beanBase.getEnvEntries().add(envEntryBase);
- beanToMerge.getEnvEntries().add(envEntryBase);
- beanToMerge.getEnvEntries().add(envEntryMerge);
-
- (new JNDIRefsMerger(beanBase, beanToMerge, 0)).process();
-
- assertEquals(1, beanBase.getEnvEntries().size());
-
- EnvEntry test = getEnvEntry(beanBase.getEnvEntries(), "refName1");
- assertEquals(EnvEntryType.JAVA_LANG_BYTE_LITERAL.getLiteral(), test.getEnvEntryType());
- assertEquals("mapped2", test.getMappedName());
- assertEquals("00", test.getEnvEntryValue());
-
- }
-
- private EnvEntry getEnvEntry(List refs, String name){
- if (name == null){
- return null;
- }
- for (Object object : refs) {
- EnvEntry ref = (EnvEntry) object;
- if(name.equals(ref.getEnvEntryName())){
- return ref;
- }
- }
- return null;
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/MdbMergerTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/MdbMergerTest.java
deleted file mode 100644
index 258e2afc..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/MdbMergerTest.java
+++ /dev/null
@@ -1,721 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.mergers.tests;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.RunAs;
-import org.eclipse.jst.javaee.ejb.ActivationConfig;
-import org.eclipse.jst.javaee.ejb.ActivationConfigProperty;
-import org.eclipse.jst.javaee.ejb.EjbFactory;
-import org.eclipse.jst.javaee.ejb.MessageDrivenBean;
-import org.eclipse.jst.javaee.ejb.MethodParams;
-import org.eclipse.jst.javaee.ejb.NamedMethodType;
-import org.eclipse.jst.javaee.ejb.SecurityIdentityType;
-import org.eclipse.jst.javaee.ejb.TransactionType;
-import org.eclipse.jst.jee.model.internal.mergers.MessageDrivenBeanMerger;
-import org.eclipse.jst.jee.model.internal.mergers.ModelException;
-
-/**
- * Tester class for MessageDrivenBean artifact.
- *
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- *
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- *
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- *
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- *
- * ComplexOverlapped suffix means variety of information is present
- * in base and to merge: consistent information combined by base and toMerge
- * should be available at the end. There are artifacts with one and the same
- * name and different values: values should be merged into base.
- *
- *
- * @author Dimitar Giormov
- *
- */
-public class MdbMergerTest extends TestCase {
-
-
- /**
- *
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws ModelException
- */
- //@Test
- public void testActivationConfigPropComplex() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
-
- ActivationConfig base = EjbFactory.eINSTANCE.createActivationConfig();
- mdbBean.setActivationConfig(base);
- ActivationConfig merge = EjbFactory.eINSTANCE.createActivationConfig();
- mdbBean1.setActivationConfig(merge);
- ActivationConfigProperty property = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property.setActivationConfigPropertyName("n1");
- property.setActivationConfigPropertyValue("v1");
- base.getActivationConfigProperties().add(property);
-
- ActivationConfigProperty property1 = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property1.setActivationConfigPropertyName("n2");
- property1.setActivationConfigPropertyValue("v2");
- base.getActivationConfigProperties().add(property1);
-
- ActivationConfigProperty property2 = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property2.setActivationConfigPropertyName("n3");
- property2.setActivationConfigPropertyValue("v3");
- base.getActivationConfigProperties().add(property2);
-
- ActivationConfigProperty property3 = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property3.setActivationConfigPropertyName("n3");
- property3.setActivationConfigPropertyValue("v1");
- merge.getActivationConfigProperties().add(property3);
-
- ActivationConfigProperty property4 = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property4.setActivationConfigPropertyName("n4");
- property4.setActivationConfigPropertyValue("v4");
- merge.getActivationConfigProperties().add(property4);
- ActivationConfigProperty property5 = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property5.setActivationConfigPropertyName("n5");
- property5.setActivationConfigPropertyValue("v6");
- merge.getActivationConfigProperties().add(property5);
-
- ActivationConfigProperty property6 = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property6.setActivationConfigPropertyName("n6");
- property6.setActivationConfigPropertyValue("v6");
- base.getActivationConfigProperties().add(property6);
-
- (new MessageDrivenBeanMerger(mdbBean, mdbBean1, 0)).process();
-
- assertEquals(mdbBean.getActivationConfig().getActivationConfigProperties().size(), 6);
- assertEquals(mdbBean1.getActivationConfig().getActivationConfigProperties().size(), 3);
- assertTrue(checkActivationConfProp("n1", "v1", base.getActivationConfigProperties()));
- assertTrue(checkActivationConfProp("n2", "v2", base.getActivationConfigProperties()));
- assertTrue(checkActivationConfProp("n3", "v3", base.getActivationConfigProperties()));
- assertTrue(checkActivationConfProp("n4", "v4", base.getActivationConfigProperties()));
- assertTrue(checkActivationConfProp("n5", "v6", base.getActivationConfigProperties()));
- assertTrue(checkActivationConfProp("n6", "v6", base.getActivationConfigProperties()));
-
- }
-
-
- /**
- *
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws ModelException
- */
- //@Test
- public void testActivationConfigPropComplex2() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
-
- ActivationConfig base = EjbFactory.eINSTANCE.createActivationConfig();
- mdbBean.setActivationConfig(base);
- ActivationConfig merge = EjbFactory.eINSTANCE.createActivationConfig();
- mdbBean1.setActivationConfig(merge);
- ActivationConfigProperty property = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property.setActivationConfigPropertyName("n1");
- property.setActivationConfigPropertyValue("v1");
- base.getActivationConfigProperties().add(property);
-
- ActivationConfigProperty property1 = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property1.setActivationConfigPropertyName("n2");
- property1.setActivationConfigPropertyValue("v2");
- base.getActivationConfigProperties().add(property1);
-
- ActivationConfigProperty property2 = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property2.setActivationConfigPropertyName("n3");
- property2.setActivationConfigPropertyValue("v3");
- base.getActivationConfigProperties().add(property2);
-
- ActivationConfigProperty property3 = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property3.setActivationConfigPropertyName("n3");
- property3.setActivationConfigPropertyValue("v1");
- merge.getActivationConfigProperties().add(property3);
-
- ActivationConfigProperty property4 = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property4.setActivationConfigPropertyName("n4");
- property4.setActivationConfigPropertyValue("v4");
- merge.getActivationConfigProperties().add(property4);
- ActivationConfigProperty property5 = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property5.setActivationConfigPropertyName("n5");
- property5.setActivationConfigPropertyValue("v6");
- merge.getActivationConfigProperties().add(property5);
-
- ActivationConfigProperty property6 = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property6.setActivationConfigPropertyName("n6");
- property6.setActivationConfigPropertyValue("v6");
- base.getActivationConfigProperties().add(property6);
-
- (new MessageDrivenBeanMerger(mdbBean1, mdbBean, 0)).process();
-
- assertEquals(mdbBean.getActivationConfig().getActivationConfigProperties().size(), 4);
- assertEquals(mdbBean1.getActivationConfig().getActivationConfigProperties().size(), 6);
- assertTrue(checkActivationConfProp("n1", "v1", merge.getActivationConfigProperties()));
- assertTrue(checkActivationConfProp("n2", "v2", merge.getActivationConfigProperties()));
- assertTrue(checkActivationConfProp("n3", "v1", merge.getActivationConfigProperties()));
- assertTrue(checkActivationConfProp("n4", "v4", merge.getActivationConfigProperties()));
- assertTrue(checkActivationConfProp("n5", "v6", merge.getActivationConfigProperties()));
- assertTrue(checkActivationConfProp("n6", "v6", merge.getActivationConfigProperties()));
-
- }
-
- private boolean checkActivationConfProp(String key, String value, List properties){
- for (Object acProp : properties) {
- ActivationConfigProperty p = (ActivationConfigProperty) acProp;
- if (p.getActivationConfigPropertyName().equals(key) && p.getActivationConfigPropertyValue().equals(value)){
- return true;
- }
- }
- return false;
-
- }
-
-
-
- /**
- *
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws ModelException
- */
- //@Test
- public void testActivationConfigPropBase() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
-
- ActivationConfig base = EjbFactory.eINSTANCE.createActivationConfig();
- mdbBean.setActivationConfig(base);
- ActivationConfig merge = EjbFactory.eINSTANCE.createActivationConfig();
- mdbBean1.setActivationConfig(merge);
- ActivationConfigProperty property = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property.setActivationConfigPropertyName("n1");
- property.setActivationConfigPropertyValue("v1");
- base.getActivationConfigProperties().add(property);
-
-
- (new MessageDrivenBeanMerger(mdbBean, mdbBean1, 0)).process();
-
- assertEquals(mdbBean.getActivationConfig().getActivationConfigProperties().size(), 1);
- assertEquals(mdbBean1.getActivationConfig().getActivationConfigProperties().size(), 0);
- assertTrue(checkActivationConfProp("n1", "v1", base.getActivationConfigProperties()));
-
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws ModelException
- */
- //@Test
- public void testActivationConfigPropMerge() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
-
- ActivationConfig base = EjbFactory.eINSTANCE.createActivationConfig();
- mdbBean.setActivationConfig(base);
- ActivationConfig merge = EjbFactory.eINSTANCE.createActivationConfig();
- mdbBean1.setActivationConfig(merge);
- ActivationConfigProperty property = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property.setActivationConfigPropertyName("n1");
- property.setActivationConfigPropertyValue("v1");
- merge.getActivationConfigProperties().add(property);
-
-
- (new MessageDrivenBeanMerger(mdbBean, mdbBean1, 0)).process();
-
- assertEquals(mdbBean.getActivationConfig().getActivationConfigProperties().size(), 1);
- assertEquals(mdbBean1.getActivationConfig().getActivationConfigProperties().size(), 1);
- assertTrue(checkActivationConfProp("n1", "v1", base.getActivationConfigProperties()));
-
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws ModelException
- */
- //@Test
- public void testActivationConfigPropSameBean() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
-
- ActivationConfig base = EjbFactory.eINSTANCE.createActivationConfig();
- mdbBean.setActivationConfig(base);
- ActivationConfig merge = EjbFactory.eINSTANCE.createActivationConfig();
- mdbBean1.setActivationConfig(merge);
- ActivationConfigProperty property = EjbFactory.eINSTANCE.createActivationConfigProperty();
- property.setActivationConfigPropertyName("n1");
- property.setActivationConfigPropertyValue("v1");
- base.getActivationConfigProperties().add(property);
- merge.getActivationConfigProperties().add(property);
-
- (new MessageDrivenBeanMerger(mdbBean, mdbBean1, 0)).process();
-
- assertEquals(mdbBean.getActivationConfig().getActivationConfigProperties().size(), 1);
- assertEquals(mdbBean1.getActivationConfig().getActivationConfigProperties().size(), 1);
- assertTrue(checkActivationConfProp("n1", "v1", base.getActivationConfigProperties()));
-
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- //Timeout
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws ModelException
- */
- //@Test
- public void testTimeOutComplexNoParams() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
-
-
- NamedMethodType base = EjbFactory.eINSTANCE.createNamedMethodType();
- String value = "getMethod";
- base.setMethodName(value);
-
- mdbBean.setTimeoutMethod(base);
-
- (new MessageDrivenBeanMerger(mdbBean, mdbBean1, 0)).process();
-
- assertNotNull(mdbBean.getTimeoutMethod());
- assertNotNull(mdbBean.getTimeoutMethod().getMethodName().equals(value));
- assertNull(mdbBean.getTimeoutMethod().getMethodParams());
-
-
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws ModelException
- */
- //@Test
- public void testTimeOutComplexWithParams() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
-
-
- NamedMethodType base = EjbFactory.eINSTANCE.createNamedMethodType();
- String value = "getMethod";
- base.setMethodName(value);
- MethodParams params = EjbFactory.eINSTANCE.createMethodParams();
- params.getMethodParams().add("java.lang.String");
- base.setMethodParams(params);
-
- NamedMethodType merge = EjbFactory.eINSTANCE.createNamedMethodType();
- merge.setMethodName(value);
-
- mdbBean.setTimeoutMethod(base);
- mdbBean1.setTimeoutMethod(merge);
-
- (new MessageDrivenBeanMerger(mdbBean, mdbBean1, 0)).process();
-
- assertNotNull(mdbBean.getTimeoutMethod());
- assertNotNull(mdbBean.getTimeoutMethod().getMethodName().equals(value));
- assertNotNull(mdbBean.getTimeoutMethod().getMethodParams());
- assertEquals(1, mdbBean.getTimeoutMethod().getMethodParams().getMethodParams().size());
-
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws ModelException
- */
- //@Test
- public void testTimeOutComplexWithParams2() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
-
-
- NamedMethodType base = EjbFactory.eINSTANCE.createNamedMethodType();
- String value = "getMethod";
- base.setMethodName(value);
- MethodParams params = EjbFactory.eINSTANCE.createMethodParams();
- String string = "java.lang.String";
- params.getMethodParams().add(string);
- base.setMethodParams(params);
-
- NamedMethodType merge = EjbFactory.eINSTANCE.createNamedMethodType();
- merge.setMethodName(value);
-
- mdbBean.setTimeoutMethod(base);
- mdbBean1.setTimeoutMethod(merge);
-
- (new MessageDrivenBeanMerger(mdbBean1, mdbBean, 0)).process();
-
- assertNotNull(mdbBean.getTimeoutMethod());
- assertNotNull(mdbBean.getTimeoutMethod().getMethodName().equals(value));
- assertNotNull(mdbBean.getTimeoutMethod().getMethodParams());
- assertNotNull(mdbBean.getTimeoutMethod().getMethodParams().getMethodParams().get(0).equals(string));
-
- }
-
- /**
- *
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws ModelException
- */
- //@Test
- public void testTimeOutBase() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
-
-
- NamedMethodType base = EjbFactory.eINSTANCE.createNamedMethodType();
- String value = "getMethod";
- base.setMethodName(value);
- MethodParams params = EjbFactory.eINSTANCE.createMethodParams();
- String string = "java.lang.String";
- params.getMethodParams().add(string);
- base.setMethodParams(params);
-
- mdbBean.setTimeoutMethod(base);
-
- (new MessageDrivenBeanMerger(mdbBean, mdbBean1, 0)).process();
-
- assertNotNull(mdbBean.getTimeoutMethod());
- assertNotNull(mdbBean.getTimeoutMethod().getMethodName().equals(value));
- assertNotNull(mdbBean.getTimeoutMethod().getMethodParams());
- assertNotNull(mdbBean.getTimeoutMethod().getMethodParams().getMethodParams().get(0).equals(string));
-
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws ModelException
- */
- //@Test
- public void testTimeOutMerge() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
-
-
- NamedMethodType base = EjbFactory.eINSTANCE.createNamedMethodType();
- String value = "getMethod";
- base.setMethodName(value);
- MethodParams params = EjbFactory.eINSTANCE.createMethodParams();
- String string = "java.lang.String";
- params.getMethodParams().add(string);
- base.setMethodParams(params);
-
- mdbBean.setTimeoutMethod(base);
-
- (new MessageDrivenBeanMerger(mdbBean1, mdbBean, 0)).process();
-
- assertNotNull(mdbBean.getTimeoutMethod());
- assertNotNull(mdbBean1.getTimeoutMethod());
- assertNotNull(mdbBean1.getTimeoutMethod().getMethodName().equals(value));
- assertNotNull(mdbBean1.getTimeoutMethod().getMethodParams());
- assertNotNull(mdbBean1.getTimeoutMethod().getMethodParams().getMethodParams().get(0).equals(string));
- }
-
- /**
- *
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws ModelException
- */
- //@Test
- public void testSecurityIdentityBase() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
- SecurityIdentityType type = EjbFactory.eINSTANCE.createSecurityIdentityType();
- type.setUseCallerIdentity(JavaeeFactory.eINSTANCE.createEmptyType());
- mdbBean1.setSecurityIdentity(type);
-
- (new MessageDrivenBeanMerger(mdbBean1, mdbBean, 0)).process();
- assertNotNull(mdbBean1.getSecurityIdentity().getUseCallerIdentity());
-
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws ModelException
- */
- //@Test
- public void testSecurityIdentityMerge() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
- SecurityIdentityType type = EjbFactory.eINSTANCE.createSecurityIdentityType();
- type.setUseCallerIdentity(JavaeeFactory.eINSTANCE.createEmptyType());
- mdbBean1.setSecurityIdentity(type);
-
- (new MessageDrivenBeanMerger(mdbBean, mdbBean1, 0)).process();
- assertNotNull(mdbBean.getSecurityIdentity().getUseCallerIdentity());
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws ModelException
- */
- //@Test
- public void testSecurityIdentitySame() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
- SecurityIdentityType type = EjbFactory.eINSTANCE.createSecurityIdentityType();
- type.setUseCallerIdentity(JavaeeFactory.eINSTANCE.createEmptyType());
- mdbBean1.setSecurityIdentity(type);
- mdbBean.setSecurityIdentity(type);
-
- (new MessageDrivenBeanMerger(mdbBean, mdbBean1, 0)).process();
- assertNotNull(mdbBean.getSecurityIdentity().getUseCallerIdentity());
-
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws ModelException
- */
- //@Test
- public void testSecurityIdentityComplex() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
- SecurityIdentityType type = EjbFactory.eINSTANCE.createSecurityIdentityType();
- type.setUseCallerIdentity(JavaeeFactory.eINSTANCE.createEmptyType());
-
- SecurityIdentityType type2 = EjbFactory.eINSTANCE.createSecurityIdentityType();
- RunAs createRunAs = JavaeeFactory.eINSTANCE.createRunAs();
- createRunAs.setRoleName("ttt");
- type2.setRunAs(createRunAs);
-
- mdbBean1.setSecurityIdentity(type);
- mdbBean.setSecurityIdentity(type2);
-
- (new MessageDrivenBeanMerger(mdbBean, mdbBean1, 0)).process();
- assertNull(mdbBean.getSecurityIdentity().getUseCallerIdentity());
- assertNotNull(mdbBean.getSecurityIdentity().getRunAs().getRoleName());
-
-
- }
-
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws ModelException
- */
- //@Test
- public void testTransactionTypeBase() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
- mdbBean1.setTransactionType(TransactionType.BEAN_LITERAL);
-
- (new MessageDrivenBeanMerger(mdbBean1, mdbBean, 0)).process();
- assertEquals(TransactionType.BEAN_LITERAL, mdbBean1.getTransactionType());
-
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws ModelException
- */
- //@Test
- public void testTransactionTypeMerge() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
- mdbBean.setTransactionType(TransactionType.BEAN_LITERAL);
-
- (new MessageDrivenBeanMerger(mdbBean1, mdbBean, 0)).process();
- assertEquals(TransactionType.BEAN_LITERAL, mdbBean1.getTransactionType());
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws ModelException
- */
- //@Test
- public void testTransactionTypeSame() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
- mdbBean1.setTransactionType(TransactionType.BEAN_LITERAL);
- mdbBean.setTransactionType(TransactionType.BEAN_LITERAL);
- (new MessageDrivenBeanMerger(mdbBean1, mdbBean, 0)).process();
- assertEquals(TransactionType.BEAN_LITERAL, mdbBean1.getTransactionType());
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws ModelException
- */
- //@Test
- public void testTransactionTypeComplex() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
- mdbBean1.setTransactionType(TransactionType.CONTAINER_LITERAL);
- mdbBean.setTransactionType(TransactionType.BEAN_LITERAL);
- (new MessageDrivenBeanMerger(mdbBean1, mdbBean, 0)).process();
- assertEquals(TransactionType.CONTAINER_LITERAL, mdbBean1.getTransactionType());
-
- }
-
-
- /**
- *
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws ModelException
- */
- //@Test
- public void testMessagingTypeBase() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
- mdbBean1.setMessagingType("test");
-
- (new MessageDrivenBeanMerger(mdbBean1, mdbBean, 0)).process();
- assertEquals("test", mdbBean1.getMessagingType());
-
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws ModelException
- */
- //@Test
- public void testMessagingTypeMerge() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
- mdbBean.setMessagingType("test");
-
- (new MessageDrivenBeanMerger(mdbBean1, mdbBean, 0)).process();
- assertEquals("test", mdbBean1.getMessagingType());
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws ModelException
- */
- //@Test
- public void testMessagingTypeSame() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
- mdbBean1.setMessagingType("test");
- mdbBean.setMessagingType("test");
- (new MessageDrivenBeanMerger(mdbBean1, mdbBean, 0)).process();
- assertEquals("test", mdbBean1.getMessagingType());
- }
-
- /**
- *
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws ModelException
- */
- //@Test
- public void testMessagingTypeComplex() throws ModelException{
- MessageDrivenBean mdbBean = EjbFactory.eINSTANCE.createMessageDrivenBean();
- MessageDrivenBean mdbBean1 = EjbFactory.eINSTANCE.createMessageDrivenBean();
- mdbBean.setEjbName("name");
- mdbBean1.setEjbName("name");
- mdbBean1.setMessagingType("zero");
- mdbBean.setMessagingType("test");
- (new MessageDrivenBeanMerger(mdbBean1, mdbBean, 0)).process();
- assertEquals("zero", mdbBean1.getMessagingType());
-
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/MergersTestSuite.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/MergersTestSuite.java
deleted file mode 100644
index 5073ef38..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/MergersTestSuite.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.mergers.tests;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-/**
- * @author Dimitar Giormov
- *
- */
-//@SuiteClasses({ EjbJarMergerTest.class, SessionMergerTest.class, MdbMergerTest.class, AssemblyDescriptorMergerTest.class, JndiRefsTest.class, WebAppMergerTest.class })
-//@RunWith(Suite.class)
-public class MergersTestSuite {
-
- public static Test suite() {
- TestSuite suite = new TestSuite(MergersTestSuite.class.getName());
- suite.addTestSuite(EjbJarMergerTest.class);
- suite.addTestSuite(SessionMergerTest.class);
- suite.addTestSuite(MdbMergerTest.class);
- suite.addTestSuite(AssemblyDescriptorMergerTest.class);
- suite.addTestSuite(JndiRefsTest.class);
- suite.addTestSuite(WebAppMergerTest.class);
- suite.addTestSuite(WebApp3MergerTest.class);
- return suite;
- }
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/SessionMergerTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/SessionMergerTest.java
deleted file mode 100644
index e275c9f6..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/SessionMergerTest.java
+++ /dev/null
@@ -1,1212 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.mergers.tests;
-
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.RunAs;
-import org.eclipse.jst.javaee.core.SecurityRoleRef;
-import org.eclipse.jst.javaee.ejb.EjbFactory;
-import org.eclipse.jst.javaee.ejb.InitMethodType;
-import org.eclipse.jst.javaee.ejb.MethodParams;
-import org.eclipse.jst.javaee.ejb.NamedMethodType;
-import org.eclipse.jst.javaee.ejb.RemoveMethodType;
-import org.eclipse.jst.javaee.ejb.SecurityIdentityType;
-import org.eclipse.jst.javaee.ejb.SessionBean;
-import org.eclipse.jst.javaee.ejb.TransactionType;
-import org.eclipse.jst.jee.model.internal.mergers.ModelException;
-import org.eclipse.jst.jee.model.internal.mergers.SessionBeanMerger;
-
-/**
- * Tester class for SessionBean artifact.
- *
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- *
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- *
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- *
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- *
- * ComplexOverlapped suffix means variety of information is present
- * in base and to merge: consistent information combined by base and toMerge
- * should be available at the end. There are artifacts with one and the same
- * name and different values: values should be merged into base.
- *
- *
- * @author Dimitar Giormov
- *
- */
-public class SessionMergerTest extends TestCase{
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws ModelException
- */
- //@Test
- public void testTimeOutComplexNoParams() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
-
- NamedMethodType base = EjbFactory.eINSTANCE.createNamedMethodType();
- String value = "getMethod";
- base.setMethodName(value);
-
- baseBean1.setTimeoutMethod(base);
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertNotNull(baseBean1.getTimeoutMethod());
- assertNotNull(baseBean1.getTimeoutMethod().getMethodName().equals(value));
- assertNull(baseBean1.getTimeoutMethod().getMethodParams());
-
-
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws ModelException
- */
- //@Test
- public void testTimeOutComplexWithParams() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
-
- NamedMethodType base = EjbFactory.eINSTANCE.createNamedMethodType();
- String value = "getMethod";
- base.setMethodName(value);
- MethodParams params = EjbFactory.eINSTANCE.createMethodParams();
- params.getMethodParams().add("java.lang.String");
- base.setMethodParams(params);
-
- NamedMethodType merge = EjbFactory.eINSTANCE.createNamedMethodType();
- merge.setMethodName(value);
-
- baseBean1.setTimeoutMethod(base);
- toMergeBean1.setTimeoutMethod(merge);
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertNotNull(baseBean1.getTimeoutMethod());
- assertNotNull(baseBean1.getTimeoutMethod().getMethodName().equals(value));
- assertNotNull(baseBean1.getTimeoutMethod().getMethodParams());
- assertEquals(1, baseBean1.getTimeoutMethod().getMethodParams().getMethodParams().size());
-
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws ModelException
- */
- //@Test
- public void testTimeOutComplexWithParams2() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
-
- NamedMethodType base = EjbFactory.eINSTANCE.createNamedMethodType();
- String value = "getMethod";
- base.setMethodName(value);
- MethodParams params = EjbFactory.eINSTANCE.createMethodParams();
- String string = "java.lang.String";
- params.getMethodParams().add(string);
- base.setMethodParams(params);
-
- NamedMethodType merge = EjbFactory.eINSTANCE.createNamedMethodType();
- merge.setMethodName(value);
-
- baseBean1.setTimeoutMethod(base);
- toMergeBean1.setTimeoutMethod(merge);
-
- (new SessionBeanMerger(toMergeBean1, baseBean1, 0)).process();
-
- assertNotNull(baseBean1.getTimeoutMethod());
- assertNotNull(baseBean1.getTimeoutMethod().getMethodName().equals(value));
- assertNotNull(baseBean1.getTimeoutMethod().getMethodParams());
- assertNotNull(baseBean1.getTimeoutMethod().getMethodParams().getMethodParams().get(0).equals(string));
-
- }
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws ModelException
- */
- //@Test
- public void testTimeOutBase() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
-
- NamedMethodType base = EjbFactory.eINSTANCE.createNamedMethodType();
- String value = "getMethod";
- base.setMethodName(value);
- MethodParams params = EjbFactory.eINSTANCE.createMethodParams();
- String string = "java.lang.String";
- params.getMethodParams().add(string);
- base.setMethodParams(params);
-
- baseBean1.setTimeoutMethod(base);
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertNotNull(baseBean1.getTimeoutMethod());
- assertNotNull(baseBean1.getTimeoutMethod().getMethodName().equals(value));
- assertNotNull(baseBean1.getTimeoutMethod().getMethodParams());
- assertNotNull(baseBean1.getTimeoutMethod().getMethodParams().getMethodParams().get(0).equals(string));
-
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws ModelException
- */
- //@Test
- public void testTimeOutMerge() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
-
- NamedMethodType base = EjbFactory.eINSTANCE.createNamedMethodType();
- String value = "getMethod";
- base.setMethodName(value);
- MethodParams params = EjbFactory.eINSTANCE.createMethodParams();
- String string = "java.lang.String";
- params.getMethodParams().add(string);
- base.setMethodParams(params);
-
- baseBean1.setTimeoutMethod(base);
-
- (new SessionBeanMerger(toMergeBean1, baseBean1, 0)).process();
-
- assertNotNull(baseBean1.getTimeoutMethod());
- assertNotNull(toMergeBean1.getTimeoutMethod());
- assertNotNull(toMergeBean1.getTimeoutMethod().getMethodName().equals(value));
- assertNotNull(toMergeBean1.getTimeoutMethod().getMethodParams());
- assertNotNull(toMergeBean1.getTimeoutMethod().getMethodParams().getMethodParams().get(0).equals(string));
- }
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws ModelException
- */
- //@Test
- public void testSecurityIdentityBase() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
- SecurityIdentityType type = EjbFactory.eINSTANCE.createSecurityIdentityType();
- type.setUseCallerIdentity(JavaeeFactory.eINSTANCE.createEmptyType());
- toMergeBean1.setSecurityIdentities(type);
-
- (new SessionBeanMerger(toMergeBean1, baseBean1, 0)).process();
- assertNotNull(toMergeBean1.getSecurityIdentities().getUseCallerIdentity());
-
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws ModelException
- */
- //@Test
- public void testSecurityIdentityMerge() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
- SecurityIdentityType type = EjbFactory.eINSTANCE.createSecurityIdentityType();
- type.setUseCallerIdentity(JavaeeFactory.eINSTANCE.createEmptyType());
- toMergeBean1.setSecurityIdentities(type);
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
- assertNotNull(baseBean1.getSecurityIdentities().getUseCallerIdentity());
- }
-
- /**
- *
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws ModelException
- */
- //@Test
- public void testSecurityIdentitySame() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
- SecurityIdentityType type = EjbFactory.eINSTANCE.createSecurityIdentityType();
- type.setUseCallerIdentity(JavaeeFactory.eINSTANCE.createEmptyType());
- toMergeBean1.setSecurityIdentities(type);
- baseBean1.setSecurityIdentities(type);
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
- assertNotNull(baseBean1.getSecurityIdentities().getUseCallerIdentity());
-
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws ModelException
- */
- //@Test
- public void testSecurityIdentityComplex() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
- SecurityIdentityType type = EjbFactory.eINSTANCE.createSecurityIdentityType();
- type.setUseCallerIdentity(JavaeeFactory.eINSTANCE.createEmptyType());
-
- SecurityIdentityType type2 = EjbFactory.eINSTANCE.createSecurityIdentityType();
- RunAs createRunAs = JavaeeFactory.eINSTANCE.createRunAs();
- createRunAs.setRoleName("ttt");
- type2.setRunAs(createRunAs);
-
- toMergeBean1.setSecurityIdentities(type);
- baseBean1.setSecurityIdentities(type2);
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
- assertNull(baseBean1.getSecurityIdentities().getUseCallerIdentity());
- assertNotNull(baseBean1.getSecurityIdentities().getRunAs().getRoleName());
-
-
- }
-
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws ModelException
- */
- //@Test
- public void testTransactionTypeBase() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
- toMergeBean1.setTransactionType(TransactionType.BEAN_LITERAL);
-
- (new SessionBeanMerger(toMergeBean1, baseBean1, 0)).process();
- assertEquals(TransactionType.BEAN_LITERAL, toMergeBean1.getTransactionType());
-
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws ModelException
- */
- //@Test
- public void testTransactionTypeMerge() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
- baseBean1.setTransactionType(TransactionType.BEAN_LITERAL);
-
- (new SessionBeanMerger(toMergeBean1, baseBean1, 0)).process();
- assertEquals(TransactionType.BEAN_LITERAL, toMergeBean1.getTransactionType());
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws ModelException
- */
- //@Test
- public void testTransactionTypeSame() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
- toMergeBean1.setTransactionType(TransactionType.BEAN_LITERAL);
- baseBean1.setTransactionType(TransactionType.BEAN_LITERAL);
- (new SessionBeanMerger(toMergeBean1, baseBean1, 0)).process();
- assertEquals(TransactionType.BEAN_LITERAL, toMergeBean1.getTransactionType());
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws ModelException
- */
- //@Test
- public void testTransactionTypeComplex() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
- toMergeBean1.setTransactionType(TransactionType.CONTAINER_LITERAL);
- baseBean1.setTransactionType(TransactionType.BEAN_LITERAL);
- (new SessionBeanMerger(toMergeBean1, baseBean1, 0)).process();
- assertEquals(TransactionType.CONTAINER_LITERAL, toMergeBean1.getTransactionType());
-
- }
-
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws ModelException
- */
- //@Test
- public void testInitMethodBase() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
-
-
-
- String value = "getMethod";
-
-
- String mParam1 = "java.lang.String";
-
- InitMethodType methodType = generateInitType(value, new String[]{mParam1});
-
- baseBean1.getInitMethods().add(methodType);
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertNotNull(baseBean1.getInitMethods());
- assertEquals(1, baseBean1.getInitMethods().size());
-
- InitMethodType aMethod = findInitMethod(baseBean1.getInitMethods(), methodType.getBeanMethod());
-
- assertNotNull(aMethod);
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws ModelException
- */
- //@Test
- public void testInitMethodToMerge() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
-
- String value = "getMethod";
- String mParam1 = "java.lang.String";
- InitMethodType methodType = generateInitType(value, new String[]{mParam1});
-
- baseBean1.getInitMethods().add(methodType);
-
- (new SessionBeanMerger(toMergeBean1, baseBean1, 0)).process();
-
- assertNotNull(toMergeBean1.getInitMethods());
- assertEquals(1, toMergeBean1.getInitMethods().size());
-
- InitMethodType aMethod = findInitMethod(toMergeBean1.getInitMethods(), methodType.getBeanMethod());
- assertNotNull(aMethod);
-
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws ModelException
- */
- //@Test
- public void testInitMethodSame() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
-
- String value = "getMethod";
- String mParam1 = "java.lang.String";
- InitMethodType methodType = generateInitType(value, new String[]{mParam1});
-
- baseBean1.getInitMethods().add(methodType);
- toMergeBean1.getInitMethods().add(methodType);
-
- (new SessionBeanMerger(toMergeBean1, baseBean1, 0)).process();
-
- assertNotNull(toMergeBean1.getInitMethods());
- assertEquals(1, toMergeBean1.getInitMethods().size());
-
- InitMethodType aMethod = findInitMethod(toMergeBean1.getInitMethods(), methodType.getBeanMethod());
- assertNotNull(aMethod);
-
- }
-
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws ModelException
- */
- //@Test
- public void testInitMethodComplex() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- String value = "getMethod";
- String mParam1 = "java.lang.String";
- InitMethodType methodType = generateInitType(value, new String[]{mParam1});
- InitMethodType methodType2 = generateInitType(value, new String[]{mParam1, mParam1});
- InitMethodType methodType3 = generateInitType(value, new String[]{mParam1});
-
- baseBean1.getInitMethods().add(methodType);
- toMergeBean1.getInitMethods().add(methodType2);
- toMergeBean1.getInitMethods().add(methodType3);
-
- (new SessionBeanMerger(toMergeBean1, baseBean1, 0)).process();
-
- assertNotNull(toMergeBean1.getInitMethods());
- assertEquals(2, toMergeBean1.getInitMethods().size());
-
- InitMethodType aMethod = findInitMethod(toMergeBean1.getInitMethods(), methodType.getBeanMethod());
- assertNotNull(aMethod);
- InitMethodType aMethod2 = findInitMethod(toMergeBean1.getInitMethods(), methodType2.getBeanMethod());
- assertNotNull(aMethod2);
-
-
- }
-
- private InitMethodType findInitMethod(List namedMethodsBase, NamedMethodType object) {
- for (Object base: namedMethodsBase) {
- InitMethodType tmpBase = (InitMethodType)base;
- if ( tmpBase.getBeanMethod().getMethodName().equals(object.getMethodName())
- && sameParams(tmpBase.getBeanMethod().getMethodParams(), object.getMethodParams())) {
- return (InitMethodType) base;
- }
- }
- return null;
- }
-
-
- private boolean sameParams(MethodParams methodParams,
- MethodParams methodParams2) {
- if(methodParams == null && methodParams2 == null){
- return true;
- }
- if(methodParams == null | methodParams2 == null){
- return false;
- }
-
- if (methodParams.getMethodParams().size() != methodParams2.getMethodParams().size()){
- return false;
- }
-
- for (int i = 0; i < methodParams.getMethodParams().size(); i++) {
- if(!methodParams.getMethodParams().get(i).equals(methodParams2.getMethodParams().get(i))){
- return false;
- }
- }
- return true;
- }
-
- private InitMethodType generateInitType(String name, String[] parameters) {
- InitMethodType methodType3 = EjbFactory.eINSTANCE.createInitMethodType();
- NamedMethodType nMethodType3 = EjbFactory.eINSTANCE.createNamedMethodType();
-
- nMethodType3.setMethodName(name);
- MethodParams params3 = EjbFactory.eINSTANCE.createMethodParams();
- if (parameters != null){
- for (int i = 0; i < parameters.length; i++) {
- params3.getMethodParams().add(parameters[i]);
- }
- nMethodType3.setMethodParams(params3);
- }
-
- methodType3.setBeanMethod(nMethodType3);
- return methodType3;
- }
-
-
- private RemoveMethodType generateRemoveMethodType(String name, String[] parameters) {
- RemoveMethodType methodType3 = EjbFactory.eINSTANCE.createRemoveMethodType();
- NamedMethodType nMethodType3 = EjbFactory.eINSTANCE.createNamedMethodType();
-
- nMethodType3.setMethodName(name);
- MethodParams params3 = EjbFactory.eINSTANCE.createMethodParams();
- if (parameters != null){
- for (int i = 0; i < parameters.length; i++) {
- params3.getMethodParams().add(parameters[i]);
- }
- nMethodType3.setMethodParams(params3);
- }
-
- methodType3.setBeanMethod(nMethodType3);
- return methodType3;
- }
-
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws ModelException
- */
- //@Test
- public void testRemoveMethodBase() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- String value = "getMethod";
-
- String mParam1 = "java.lang.String";
-
- RemoveMethodType methodType = generateRemoveMethodType(value, new String[]{mParam1});
-
- baseBean1.getRemoveMethods().add(methodType);
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertNotNull(baseBean1.getRemoveMethods());
- assertEquals(1, baseBean1.getRemoveMethods().size());
-
- RemoveMethodType aMethod = findRemoveMethod(baseBean1.getRemoveMethods(), methodType.getBeanMethod());
-
- assertNotNull(aMethod);
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws ModelException
- */
- //@Test
- public void testRemoveMethodToMerge() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
-
- String value = "getMethod";
- String mParam1 = "java.lang.String";
- RemoveMethodType methodType = generateRemoveMethodType(value, new String[]{mParam1});
-
- baseBean1.getRemoveMethods().add(methodType);
-
- (new SessionBeanMerger(toMergeBean1, baseBean1, 0)).process();
-
- assertNotNull(toMergeBean1.getRemoveMethods());
- assertEquals(1, toMergeBean1.getRemoveMethods().size());
-
- RemoveMethodType aMethod = findRemoveMethod(toMergeBean1.getRemoveMethods(), methodType.getBeanMethod());
- assertNotNull(aMethod);
-
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws ModelException
- */
- //@Test
- public void testRemoveMethodSame() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
-
- String value = "getMethod";
- String mParam1 = "java.lang.String";
- RemoveMethodType methodType = generateRemoveMethodType(value, new String[]{mParam1});
-
- baseBean1.getRemoveMethods().add(methodType);
- toMergeBean1.getRemoveMethods().add(methodType);
-
- (new SessionBeanMerger(toMergeBean1, baseBean1, 0)).process();
-
- assertNotNull(toMergeBean1.getRemoveMethods());
- assertEquals(1, toMergeBean1.getRemoveMethods().size());
-
- RemoveMethodType aMethod = findRemoveMethod(toMergeBean1.getRemoveMethods(), methodType.getBeanMethod());
- assertNotNull(aMethod);
-
- }
-
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws ModelException
- */
- //@Test
- public void testRemoveMethodComplex() throws ModelException{
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- String value = "getMethod";
- String mParam1 = "java.lang.String";
- RemoveMethodType methodType = generateRemoveMethodType(value, new String[]{mParam1});
- RemoveMethodType methodType2 = generateRemoveMethodType(value, new String[]{mParam1, mParam1});
- RemoveMethodType methodType3 = generateRemoveMethodType(value, new String[]{mParam1});
-
- baseBean1.getRemoveMethods().add(methodType);
- toMergeBean1.getRemoveMethods().add(methodType2);
- toMergeBean1.getRemoveMethods().add(methodType3);
-
- (new SessionBeanMerger(toMergeBean1, baseBean1, 0)).process();
-
- assertNotNull(toMergeBean1.getRemoveMethods());
- assertEquals(2, toMergeBean1.getRemoveMethods().size());
-
- RemoveMethodType aMethod = findRemoveMethod(toMergeBean1.getRemoveMethods(), methodType.getBeanMethod());
- assertNotNull(aMethod);
- RemoveMethodType aMethod2 = findRemoveMethod(toMergeBean1.getRemoveMethods(), methodType2.getBeanMethod());
- assertNotNull(aMethod2);
-
-
- }
-
- private RemoveMethodType findRemoveMethod(List namedMethodsBase, NamedMethodType object) {
- for (Object base: namedMethodsBase) {
- RemoveMethodType tmpBase = (RemoveMethodType)base;
- if ( tmpBase.getBeanMethod().getMethodName().equals(object.getMethodName())
- && sameParams(tmpBase.getBeanMethod().getMethodParams(), object.getMethodParams())) {
- return (RemoveMethodType) base;
- }
- }
- return null;
- }
-
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws Exception
- */
- //@Test
- public void testSecurityRoleRefsBase() throws Exception {
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- SecurityRoleRef ref = JavaeeFactory.eINSTANCE.createSecurityRoleRef();
- String name0 = "roleName1";
- ref.setRoleName(name0);
- String link0 = "roleLink1";
- ref.setRoleLink(link0);
-
- baseBean1.getSecurityRoleRefs().add(ref);
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertNotNull(baseBean1.getSecurityRoleRefs());
- assertEquals(1, baseBean1.getSecurityRoleRefs().size());
- assertNotNull(getSecurityRoleRefByName(baseBean1.getSecurityRoleRefs(), name0));
- }
-
- private SecurityRoleRef getSecurityRoleRefByName(List securityRoleRefs, String name0) {
- for (Object object : securityRoleRefs) {
- SecurityRoleRef sr = (SecurityRoleRef) object;
- if (sr.getRoleName().equals(name0)){
- return sr;
- }
- }
- return null;
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws Exception
- */
- //@Test
- public void testSecurityRoleRefsMerge() throws Exception {
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- SecurityRoleRef ref = JavaeeFactory.eINSTANCE.createSecurityRoleRef();
- String name0 = "roleName1";
- ref.setRoleName(name0);
- String link0 = "roleLink1";
- ref.setRoleLink(link0);
-
- toMergeBean1.getSecurityRoleRefs().add(ref);
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertEquals(1, baseBean1.getSecurityRoleRefs().size());
- assertNotNull(getSecurityRoleRefByName(baseBean1.getSecurityRoleRefs(), name0));
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- *
- * @throws Exception
- */
- //@Test
- public void testSecurityRoleRefsSame() throws Exception {
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- SecurityRoleRef ref = JavaeeFactory.eINSTANCE.createSecurityRoleRef();
- String name0 = "roleName1";
- ref.setRoleName(name0);
- String link0 = "roleLink1";
- ref.setRoleLink(link0);
-
- baseBean1.getSecurityRoleRefs().add(ref);
- toMergeBean1.getSecurityRoleRefs().add(ref);
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertEquals(1, baseBean1.getSecurityRoleRefs().size());
- assertNotNull(getSecurityRoleRefByName(baseBean1.getSecurityRoleRefs(), name0));
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws Exception
- */
- //@Test
- public void testSecurityRoleRefsComplex() throws Exception {
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- SecurityRoleRef ref = JavaeeFactory.eINSTANCE.createSecurityRoleRef();
- String name0 = "roleName1";
- ref.setRoleName(name0);
- String link0 = "roleLink1";
- ref.setRoleLink(link0);
-
- SecurityRoleRef ref2 = JavaeeFactory.eINSTANCE.createSecurityRoleRef();
- String name1 = "roleName2";
- ref2.setRoleName(name1);
- ref2.setRoleLink(link0);
-
- baseBean1.getSecurityRoleRefs().add(ref);
- toMergeBean1.getSecurityRoleRefs().add(ref2);
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertEquals(2, baseBean1.getSecurityRoleRefs().size());
- assertNotNull(getSecurityRoleRefByName(baseBean1.getSecurityRoleRefs(), name0));
-
- assertNotNull(getSecurityRoleRefByName(baseBean1.getSecurityRoleRefs(), name1));
- }
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws Exception
- */
- //@Test
- public void testBeanClassBase() throws Exception {
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- String expected = "test.Test";
- baseBean1.setEjbClass(expected);
- String notExpected = "test.Test2";
- toMergeBean1.setEjbClass(notExpected);
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
- assertEquals(expected,baseBean1.getEjbClass());
-
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws Exception
- */
- //@Test
- public void testBeanClassMerge() throws Exception {
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- String expected = "test.Test";
- toMergeBean1.setEjbClass(expected);
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
- assertEquals(expected,baseBean1.getEjbClass());
-
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws Exception
- */
- //@Test
- public void testBeanClassSame() throws Exception {
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- String expected = "test.Test";
- baseBean1.setEjbClass(expected);
- toMergeBean1.setEjbClass(expected);
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
- assertEquals(expected,baseBean1.getEjbClass());
- }
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws Exception
- */
- //@Test
- public void testBussinessInterfacesBase() throws Exception {
-
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- baseBean1.getBusinessLocals().add("intfs1");
- baseBean1.getBusinessRemotes().add("intfs2");
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertEquals(1, baseBean1.getBusinessLocals().size());
- assertEquals(1, baseBean1.getBusinessRemotes().size());
- assertEquals("intfs1", baseBean1.getBusinessLocals().get(0));
- assertEquals("intfs2", baseBean1.getBusinessRemotes().get(0));
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws Exception
- */
- //@Test
- public void testBussinessInterfacesMerge() throws Exception {
-
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- toMergeBean1.getBusinessLocals().add("intfs1");
- toMergeBean1.getBusinessRemotes().add("intfs2");
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertEquals(1, baseBean1.getBusinessLocals().size());
- assertEquals(1, baseBean1.getBusinessRemotes().size());
- assertEquals("intfs1", baseBean1.getBusinessLocals().get(0));
- assertEquals("intfs2", baseBean1.getBusinessRemotes().get(0));
- }
-
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws Exception
- */
- //@Test
- public void testBussinessInterfacesSame() throws Exception {
-
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- toMergeBean1.getBusinessLocals().add("intfs1");
- toMergeBean1.getBusinessRemotes().add("intfs2");
-
- baseBean1.getBusinessLocals().add("intfs1");
- baseBean1.getBusinessRemotes().add("intfs2");
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertEquals(1, baseBean1.getBusinessLocals().size());
- assertEquals(1, baseBean1.getBusinessRemotes().size());
- assertEquals("intfs1", baseBean1.getBusinessLocals().get(0));
- assertEquals("intfs2", baseBean1.getBusinessRemotes().get(0));
- }
-
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws Exception
- */
- //@Test
- public void testBussinessInterfacesComplex() throws Exception {
-
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- toMergeBean1.getBusinessLocals().add("intfs1");
- toMergeBean1.getBusinessRemotes().add("intfs2");
- toMergeBean1.getBusinessLocals().add("intfs3");
- toMergeBean1.getBusinessRemotes().add("intfs4");
- toMergeBean1.getBusinessLocals().add("intfs5");
- toMergeBean1.getBusinessRemotes().add("intfs6");
-
- baseBean1.getBusinessLocals().add("intfs1");
- baseBean1.getBusinessRemotes().add("intfs9");
- baseBean1.getBusinessLocals().add("intfs0");
- baseBean1.getBusinessRemotes().add("intfs2");
-
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertEquals(4, baseBean1.getBusinessLocals().size());
- assertEquals(4, baseBean1.getBusinessRemotes().size());
- assertTrue(baseBean1.getBusinessLocals().contains("intfs1"));
- assertTrue(baseBean1.getBusinessLocals().contains("intfs3"));
- assertTrue(baseBean1.getBusinessLocals().contains("intfs5"));
- assertTrue(baseBean1.getBusinessLocals().contains("intfs0"));
-
- assertTrue(baseBean1.getBusinessRemotes().contains("intfs2"));
- assertTrue(baseBean1.getBusinessRemotes().contains("intfs4"));
- assertTrue(baseBean1.getBusinessRemotes().contains("intfs6"));
- assertTrue(baseBean1.getBusinessRemotes().contains("intfs9"));
-
- }
-
-
- /**
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- * @throws Exception
- */
- //@Test
- public void test2xInterfacesBase() throws Exception {
-
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- String l = "local1";
- baseBean1.setLocal(l);
- String lh = "localhome1";
- baseBean1.setLocalHome(lh);
- String r = "remote1";
- baseBean1.setRemote(r);
- String h = "home1";
- baseBean1.setHome(h);
-
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertEquals(l, baseBean1.getLocal());
- assertEquals(lh, baseBean1.getLocalHome());
- assertEquals(r, baseBean1.getRemote());
- assertEquals(h, baseBean1.getHome());
- }
-
- /**
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- * @throws Exception
- */
- //@Test
- public void test2xInterfacesMerge() throws Exception {
-
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- String l = "local1";
- toMergeBean1.setLocal(l);
- String lh = "localhome1";
- toMergeBean1.setLocalHome(lh);
- String r = "remote1";
- toMergeBean1.setRemote(r);
- String h = "home1";
- toMergeBean1.setHome(h);
-
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertEquals(l, baseBean1.getLocal());
- assertEquals(lh, baseBean1.getLocalHome());
- assertEquals(r, baseBean1.getRemote());
- assertEquals(h, baseBean1.getHome());
- }
-
- /**
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- * @throws Exception
- */
- //@Test
- public void test2xInterfacesSame() throws Exception {
-
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- String l = "local1";
- baseBean1.setLocal(l);
- toMergeBean1.setLocal(l);
- String lh = "localhome1";
- baseBean1.setLocalHome(lh);
- toMergeBean1.setLocalHome(lh);
- String r = "remote1";
- baseBean1.setRemote(r);
- toMergeBean1.setRemote(r);
- String h = "home1";
- baseBean1.setHome(h);
- toMergeBean1.setHome(h);
-
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertEquals(l, baseBean1.getLocal());
- assertEquals(lh, baseBean1.getLocalHome());
- assertEquals(r, baseBean1.getRemote());
- assertEquals(h, baseBean1.getHome());
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws Exception
- */
- //@Test
- public void test2xInterfacesComplex() throws Exception {
-
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- String l = "local1";
- baseBean1.setLocal(l);
-
- String lh = "localhome1";
-
- toMergeBean1.setLocalHome(lh);
- String r = "remote1";
- baseBean1.setRemote(r);
-
- String h = "home1";
-
- toMergeBean1.setHome(h);
-
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertEquals(l, baseBean1.getLocal());
- assertEquals(lh, baseBean1.getLocalHome());
- assertEquals(r, baseBean1.getRemote());
- assertEquals(h, baseBean1.getHome());
- }
-
- /**
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- * @throws Exception
- */
- //@Test
- public void test2xInterfacesComplexInversed() throws Exception {
-
- SessionBean baseBean1 = EjbFactory.eINSTANCE.createSessionBean();
- SessionBean toMergeBean1 = EjbFactory.eINSTANCE.createSessionBean();
- baseBean1.setEjbName("name");
- toMergeBean1.setEjbName("name");
-
- String l = "local1";
- toMergeBean1.setLocal(l);
-
- String lh = "localhome1";
-
- baseBean1.setLocalHome(lh);
- String r = "remote1";
- toMergeBean1.setRemote(r);
-
- String h = "home1";
-
- baseBean1.setHome(h);
-
-
- (new SessionBeanMerger(baseBean1, toMergeBean1, 0)).process();
-
- assertEquals(l, baseBean1.getLocal());
- assertEquals(lh, baseBean1.getLocalHome());
- assertEquals(r, baseBean1.getRemote());
- assertEquals(h, baseBean1.getHome());
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/WebApp3MergerTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/WebApp3MergerTest.java
deleted file mode 100644
index 0a1ee291..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/WebApp3MergerTest.java
+++ /dev/null
@@ -1,1456 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.mergers.tests;
-
-import java.util.List;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.ParamValue;
-import org.eclipse.jst.javaee.core.RunAs;
-import org.eclipse.jst.javaee.core.SecurityRole;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.AuthConstraint;
-import org.eclipse.jst.javaee.web.Filter;
-import org.eclipse.jst.javaee.web.FilterMapping;
-import org.eclipse.jst.javaee.web.SecurityConstraint;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.TransportGuaranteeType;
-import org.eclipse.jst.javaee.web.UserDataConstraint;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.javaee.web.WebFactory;
-import org.eclipse.jst.jee.model.internal.mergers.ModelElementMerger;
-import org.eclipse.jst.jee.model.internal.mergers.ModelException;
-import org.eclipse.jst.jee.model.internal.mergers.WebApp3Merger;
-import org.eclipse.jst.jee.model.internal.mergers.WebAppMerger;
-
-/**
- * Tester class for WebAPp artifact.
- *
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- *
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- *
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- *
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- *
- * ComplexOverlapped suffix means variety of information is present
- * in base and to merge: consistent information combined by base and toMerge
- * should be available at the end. There are artifacts with one and the same
- * name and different values: values should be merged into base.
- *
- *
- * @author Dimitar Giormov
- *
- */
-public class WebApp3MergerTest extends TestCase{
-
- /**
- * Tests the merger with Base security role only.
- * No merge is necessary
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleSecurityRoleCaseBase() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- SecurityRole role = JavaeeFactory.eINSTANCE.createSecurityRole();
- role.setRoleName("test1");
-
- descriptorBase.getSecurityRoles().add(role);
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(descriptorBase.getSecurityRoles());
- Assert.assertTrue(descriptorBase.getSecurityRoles().size() == 1);
- Assert.assertTrue(descriptorToMerge.getSecurityRoles().size() == 0);
- Assert.assertTrue(((SecurityRole)descriptorBase.getSecurityRoles().get(0)).getRoleName().equals("test1"));
- }
-
- /**
- * Tests the merger with toMerge security role only.
- * The role should be copied in base.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleSecurityRoleCaseToMerge() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- SecurityRole role = JavaeeFactory.eINSTANCE.createSecurityRole();
- role.setRoleName("test1");
-
- descriptorToMerge.getSecurityRoles().add(role);
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(descriptorBase.getSecurityRoles());
- Assert.assertEquals(1, descriptorBase.getSecurityRoles().size());
- Assert.assertEquals(1, descriptorToMerge.getSecurityRoles().size());
- Assert.assertTrue(((SecurityRole)descriptorBase.getSecurityRoles().get(0)).getRoleName().equals("test1"));
- }
-
- /**
- * Tests the merger with one and the same security role.
- * The result should be non merged 1 security role.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleSecurityRoleCaseSameRole() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- SecurityRole role = JavaeeFactory.eINSTANCE.createSecurityRole();
- role.setRoleName("test1");
- descriptorBase.getSecurityRoles().add(role);
- descriptorToMerge.getSecurityRoles().add(role);
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(descriptorBase.getSecurityRoles());
- Assert.assertTrue(descriptorBase.getSecurityRoles().size() == 1);
- Assert.assertTrue(descriptorToMerge.getSecurityRoles().size() == 1);
- Assert.assertTrue(((SecurityRole)descriptorBase.getSecurityRoles().get(0)).getRoleName().equals("test1"));
- }
-
- /**
- * Tests the merger with variety of security roles.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleSecurityRoleCaseComplex() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- SecurityRole role0 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role1 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role2 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role3 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role4 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role5 = JavaeeFactory.eINSTANCE.createSecurityRole();
- role0.setRoleName("test1");
- role1.setRoleName("test2");
- role2.setRoleName("test3");
- role3.setRoleName("test4");
- role4.setRoleName("test5");
- role5.setRoleName("test6");
-
-
-
- descriptorBase.getSecurityRoles().add(role1);
- descriptorBase.getSecurityRoles().add(role3);
- descriptorBase.getSecurityRoles().add(role4);
- descriptorBase.getSecurityRoles().add(role5);
-
-
- descriptorToMerge.getSecurityRoles().add(role0);
- descriptorToMerge.getSecurityRoles().add(role1);
- descriptorToMerge.getSecurityRoles().add(role2);
-
-
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(descriptorBase.getSecurityRoles());
- Assert.assertTrue(descriptorBase.getSecurityRoles().size() == 6);
- Assert.assertTrue(descriptorToMerge.getSecurityRoles().size() == 3);
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role0.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role1.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role2.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role3.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role4.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role5.getRoleName()));
- }
-
- private boolean containsSecRole(List list, String roleName) {
-
-
- for (Object object : list) {
- SecurityRole role = (SecurityRole) object;
- if(roleName == null){
- if(roleName == role.getRoleName()){
- return true;
- }
- } else if(roleName.equals(role.getRoleName())){
- return true;
- }
- }
- return false;
- }
-
-
- /**
- * Tests the merger with Base security role only.
- * No merge is necessary
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleRunAsCaseBase() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- RunAs role = JavaeeFactory.eINSTANCE.createRunAs();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- servletBase.setServletName("servName");
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
- servletMerge.setServletName("servName");
- role.setRoleName("test1");
- servletBase.setRunAs(role);
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(servletBase.getRunAs());
- Assert.assertTrue(((RunAs)servletBase.getRunAs()).getRoleName().equals("test1"));
- }
-
- /**
- * Tests the merger with toMerge security role only.
- * The role should be copied in base.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleRunAsCaseToMerge() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- RunAs role = JavaeeFactory.eINSTANCE.createRunAs();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- servletBase.setServletName("servName");
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
- servletMerge.setServletName("servName");
- role.setRoleName("test1");
- servletMerge.setRunAs(role);
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(servletBase.getRunAs());
- Assert.assertTrue(((RunAs)servletBase.getRunAs()).getRoleName().equals("test1"));
- Assert.assertEquals(1, descriptorBase.getServlets().size());
- }
-
-
- /**
- * Tests the merger with null named servlet in toMerge array, the merger should ignore such entries.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleNullServletToMerge() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
-
- descriptorToMerge.getServlets().add(servletBase);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertEquals(0, descriptorBase.getServlets().size());
- }
-
- /**
- * Tests the merger with null named servlet in Base, as this is extremely unlikely
- * the merger should not stop merging because of such error.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleNullNamedServletInBase() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
- servletMerge.setServletName("servName");
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertEquals(2, descriptorBase.getServlets().size());
- }
-
- /**
- * Tests the merger with one and the same security role.
- * The result should be non merged 1 security role.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleRunAsCaseSameRole() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- RunAs role = JavaeeFactory.eINSTANCE.createRunAs();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- servletBase.setServletName("servName");
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
- servletMerge.setServletName("servName");
- role.setRoleName("test1");
- servletBase.setRunAs(role);
- servletMerge.setRunAs(role);
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(servletBase.getRunAs());
- Assert.assertTrue(((RunAs)servletBase.getRunAs()).getRoleName().equals("test1"));
- }
-
-
-
- /**
- * Tests the merger with Base security constraints only.
- * No merge is necessary
- *
- * @throws ModelException
- */
-// @Test
- @SuppressWarnings("unchecked")
- public void testSingleSecurityConstraintCaseBase() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- SecurityConstraint sc = WebFactory.eINSTANCE.createSecurityConstraint();
- AuthConstraint createAuthConstraint = WebFactory.eINSTANCE.createAuthConstraint();
- createAuthConstraint.getRoleNames().add("test");
- sc.setAuthConstraint(createAuthConstraint);
- UserDataConstraint userDataConstraint = WebFactory.eINSTANCE.createUserDataConstraint();
- userDataConstraint.setTransportGuarantee(TransportGuaranteeType.CONFIDENTIAL_LITERAL);
- sc.setUserDataConstraint(userDataConstraint);
-
- descriptorBase.getSecurityConstraints().add(sc);
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(descriptorBase.getSecurityConstraints());
- Assert.assertTrue(descriptorBase.getSecurityConstraints().size() == 1);
- Assert.assertTrue(descriptorToMerge.getSecurityConstraints().size() == 0);
- Assert.assertTrue(((SecurityConstraint)descriptorBase.getSecurityConstraints().get(0)).getAuthConstraint().getRoleNames().get(0).equals("test"));
- }
-
- /**
- * Tests the merger with toMerge security constraints only.
- * The role should be copied in base.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleSecurityConstraintCaseToMerge() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- SecurityConstraint sc = WebFactory.eINSTANCE.createSecurityConstraint();
- AuthConstraint createAuthConstraint = WebFactory.eINSTANCE.createAuthConstraint();
- createAuthConstraint.getRoleNames().add("test");
- sc.setAuthConstraint(createAuthConstraint);
- UserDataConstraint userDataConstraint = WebFactory.eINSTANCE.createUserDataConstraint();
- userDataConstraint.setTransportGuarantee(TransportGuaranteeType.CONFIDENTIAL_LITERAL);
- sc.setUserDataConstraint(userDataConstraint);
-
- descriptorBase.getSecurityConstraints().add(sc);
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- WebApp3Merger result = new WebApp3Merger(descriptorToMerge, descriptorBase, 0);
- result.process();
- Assert.assertNotNull(descriptorToMerge.getSecurityConstraints());
- Assert.assertTrue(descriptorToMerge.getSecurityConstraints().size() == 1);
- Assert.assertTrue(((SecurityConstraint)descriptorToMerge.getSecurityConstraints().get(0)).getAuthConstraint().getRoleNames().get(0).equals("test"));
- }
-
-
- //@Test
- public void testSingleServletMappingInBase() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
-
- String sname = "servName";
- servletBase.setServletName(sname);
- servletMerge.setServletName(sname);
-
- ServletMapping servletMappingBase = WebFactory.eINSTANCE.createServletMapping();
- UrlPatternType urlPatternType = JavaeeFactory.eINSTANCE.createUrlPatternType();
- String value = "/1";
- urlPatternType.setValue(value);
-
- servletMappingBase.setServletName(sname);
- servletMappingBase.getUrlPatterns().add(urlPatternType);
-
- descriptorBase.getServletMappings().add(servletMappingBase);
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertEquals(1, descriptorBase.getServletMappings().size());
- ServletMapping mapping = descriptorBase.getServletMappings().get(0);
-
- Assert.assertEquals(sname, mapping.getServletName());
-
- Assert.assertEquals(1, mapping.getUrlPatterns().size());
- Assert.assertEquals(value, mapping.getUrlPatterns().get(0).getValue());
- }
-
-
- //@Test
- public void testSingleServletMappingInToMerge() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
-
- String sname = "servName";
- servletBase.setServletName(sname);
- servletMerge.setServletName(sname);
-
- ServletMapping servletMappingBase = WebFactory.eINSTANCE.createServletMapping();
- UrlPatternType urlPatternType = JavaeeFactory.eINSTANCE.createUrlPatternType();
- String value = "/1";
- urlPatternType.setValue(value);
-
- servletMappingBase.setServletName(sname);
- servletMappingBase.getUrlPatterns().add(urlPatternType);
-
- descriptorToMerge.getServletMappings().add(servletMappingBase);
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertEquals(1, descriptorBase.getServletMappings().size());
- ServletMapping mapping = descriptorBase.getServletMappings().get(0);
-
- Assert.assertEquals(sname, mapping.getServletName());
-
- Assert.assertEquals(1, mapping.getUrlPatterns().size());
- Assert.assertEquals(value, mapping.getUrlPatterns().get(0).getValue());
- }
-
- //@Test
- public void testSingleServletMappingSame() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
-
- String sname = "servName";
- servletBase.setServletName(sname);
- servletMerge.setServletName(sname);
-
- ServletMapping servletMappingBase = WebFactory.eINSTANCE.createServletMapping();
- UrlPatternType urlPatternType = JavaeeFactory.eINSTANCE.createUrlPatternType();
- String value = "/1";
- urlPatternType.setValue(value);
-
- servletMappingBase.setServletName(sname);
- servletMappingBase.getUrlPatterns().add(urlPatternType);
-
- descriptorToMerge.getServletMappings().add(servletMappingBase);
- descriptorBase.getServletMappings().add(servletMappingBase);
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertEquals(1, descriptorBase.getServletMappings().size());
- ServletMapping mapping = descriptorBase.getServletMappings().get(0);
-
- Assert.assertEquals(sname, mapping.getServletName());
-
- Assert.assertEquals(1, mapping.getUrlPatterns().size());
- Assert.assertEquals(value, mapping.getUrlPatterns().get(0).getValue());
- }
-
- //@Test
- public void testSingleServletMappingAdditive() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
-
- String sname = "servName";
- servletBase.setServletName(sname);
- servletMerge.setServletName(sname);
-
- String value = "/1";
- String value2 = "/2";
-
- UrlPatternType urlPatternType = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPatternType.setValue(value);
-
- UrlPatternType urlPatternType2 = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPatternType2.setValue(value2);
-
- ServletMapping servletMappingBase = WebFactory.eINSTANCE.createServletMapping();
- ServletMapping servletMappingMerge = WebFactory.eINSTANCE.createServletMapping();
-
- servletMappingBase.setServletName(sname);
- servletMappingBase.getUrlPatterns().add(urlPatternType);
-
- servletMappingMerge.setServletName(sname);
- servletMappingMerge.getUrlPatterns().add(urlPatternType2);
-
- descriptorBase.getServletMappings().add(servletMappingBase);
- descriptorToMerge.getServletMappings().add(servletMappingMerge);
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertEquals(1, descriptorBase.getServletMappings().size());
- ServletMapping mapping = descriptorBase.getServletMappings().get(0);
-
- Assert.assertEquals(sname, mapping.getServletName());
- Assert.assertEquals(2, mapping.getUrlPatterns().size());
- Assert.assertEquals(value, mapping.getUrlPatterns().get(0).getValue());
- }
-
- //@Test
- public void testSingleServletMappingDifferentServletName() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
-
- String sname = "servName";
- String sname1 = "servName1";
- servletBase.setServletName(sname);
- servletMerge.setServletName(sname1);
-
- String value = "/1";
- String value2 = "/2";
-
- UrlPatternType urlPatternType = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPatternType.setValue(value);
-
- UrlPatternType urlPatternType2 = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPatternType2.setValue(value2);
-
- ServletMapping servletMappingBase = WebFactory.eINSTANCE.createServletMapping();
- ServletMapping servletMappingMerge = WebFactory.eINSTANCE.createServletMapping();
-
- servletMappingBase.setServletName(sname);
- servletMappingBase.getUrlPatterns().add(urlPatternType);
-
- servletMappingMerge.setServletName(sname1);
- servletMappingMerge.getUrlPatterns().add(urlPatternType2);
-
- descriptorBase.getServletMappings().add(servletMappingBase);
- descriptorToMerge.getServletMappings().add(servletMappingMerge);
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertEquals(2, descriptorBase.getServletMappings().size());
- }
-
-
-
-
-
-
-
-
- //@Test
- public void testSingleFilterMappingInBase() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Filter servletBase = WebFactory.eINSTANCE.createFilter();
- Filter servletMerge = WebFactory.eINSTANCE.createFilter();
-
- String sname = "servName";
- servletBase.setFilterName(sname);
- servletMerge.setFilterName(sname);
-
- FilterMapping FilterMappingBase = WebFactory.eINSTANCE.createFilterMapping();
- UrlPatternType urlPatternType = JavaeeFactory.eINSTANCE.createUrlPatternType();
- String value = "/1";
- urlPatternType.setValue(value);
-
- FilterMappingBase.setFilterName(sname);
- FilterMappingBase.getUrlPatterns().add(urlPatternType);
-
- descriptorBase.getFilterMappings().add(FilterMappingBase);
-
- descriptorBase.getFilters().add(servletBase);
- descriptorToMerge.getFilters().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertEquals(1, descriptorBase.getFilterMappings().size());
- FilterMapping mapping = descriptorBase.getFilterMappings().get(0);
-
- Assert.assertEquals(sname, mapping.getFilterName());
-
- Assert.assertEquals(1, mapping.getUrlPatterns().size());
- Assert.assertEquals(value, mapping.getUrlPatterns().get(0).getValue());
- }
-
-
- //@Test
- public void testSingleFilterMappingInToMerge() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Filter servletBase = WebFactory.eINSTANCE.createFilter();
- Filter servletMerge = WebFactory.eINSTANCE.createFilter();
-
- String sname = "servName";
- servletBase.setFilterName(sname);
- servletMerge.setFilterName(sname);
-
- FilterMapping FilterMappingBase = WebFactory.eINSTANCE.createFilterMapping();
- UrlPatternType urlPatternType = JavaeeFactory.eINSTANCE.createUrlPatternType();
- String value = "/1";
- urlPatternType.setValue(value);
-
- FilterMappingBase.setFilterName(sname);
- FilterMappingBase.getUrlPatterns().add(urlPatternType);
-
- descriptorToMerge.getFilterMappings().add(FilterMappingBase);
-
- descriptorBase.getFilters().add(servletBase);
- descriptorToMerge.getFilters().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertEquals(1, descriptorBase.getFilterMappings().size());
- FilterMapping mapping = descriptorBase.getFilterMappings().get(0);
-
- Assert.assertEquals(sname, mapping.getFilterName());
-
- Assert.assertEquals(1, mapping.getUrlPatterns().size());
- Assert.assertEquals(value, mapping.getUrlPatterns().get(0).getValue());
- }
-
- //@Test
- public void testSingleFilterMappingSame() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Filter servletBase = WebFactory.eINSTANCE.createFilter();
- Filter servletMerge = WebFactory.eINSTANCE.createFilter();
-
- String sname = "servName";
- servletBase.setFilterName(sname);
- servletMerge.setFilterName(sname);
-
- FilterMapping FilterMappingBase = WebFactory.eINSTANCE.createFilterMapping();
- UrlPatternType urlPatternType = JavaeeFactory.eINSTANCE.createUrlPatternType();
- String value = "/1";
- urlPatternType.setValue(value);
-
- FilterMappingBase.setFilterName(sname);
- FilterMappingBase.getUrlPatterns().add(urlPatternType);
-
- descriptorToMerge.getFilterMappings().add(FilterMappingBase);
- descriptorBase.getFilterMappings().add(FilterMappingBase);
-
- descriptorBase.getFilters().add(servletBase);
- descriptorToMerge.getFilters().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertEquals(1, descriptorBase.getFilterMappings().size());
- FilterMapping mapping = descriptorBase.getFilterMappings().get(0);
-
- Assert.assertEquals(sname, mapping.getFilterName());
-
- Assert.assertEquals(1, mapping.getUrlPatterns().size());
- Assert.assertEquals(value, mapping.getUrlPatterns().get(0).getValue());
- }
-
- //@Test
- public void testSingleFilterMappingAdditive() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Filter servletBase = WebFactory.eINSTANCE.createFilter();
- Filter servletMerge = WebFactory.eINSTANCE.createFilter();
-
- String sname = "servName";
- servletBase.setFilterName(sname);
- servletMerge.setFilterName(sname);
-
- String value = "/1";
- String value2 = "/2";
-
- UrlPatternType urlPatternType = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPatternType.setValue(value);
-
- UrlPatternType urlPatternType2 = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPatternType2.setValue(value2);
-
- FilterMapping filterMappingBase = WebFactory.eINSTANCE.createFilterMapping();
- FilterMapping filterMappingMerge = WebFactory.eINSTANCE.createFilterMapping();
-
- filterMappingBase.setFilterName(sname);
- filterMappingBase.getUrlPatterns().add(urlPatternType);
-
- filterMappingMerge.setFilterName(sname);
- filterMappingMerge.getUrlPatterns().add(urlPatternType2);
-
- descriptorBase.getFilterMappings().add(filterMappingBase);
- descriptorToMerge.getFilterMappings().add(filterMappingMerge);
-
- descriptorBase.getFilters().add(servletBase);
- descriptorToMerge.getFilters().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertEquals(1, descriptorBase.getFilterMappings().size());
- FilterMapping mapping = descriptorBase.getFilterMappings().get(0);
-
- Assert.assertEquals(sname, mapping.getFilterName());
- Assert.assertEquals(2, mapping.getUrlPatterns().size());
- Assert.assertEquals(value, mapping.getUrlPatterns().get(0).getValue());
- }
-
- //@Test
- public void testSingleFilterMappingDifferentFilterName() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Filter servletBase = WebFactory.eINSTANCE.createFilter();
- Filter servletMerge = WebFactory.eINSTANCE.createFilter();
-
- String sname = "servName";
- String sname1 = "servName1";
- servletBase.setFilterName(sname);
- servletMerge.setFilterName(sname1);
-
- String value = "/1";
- String value2 = "/2";
-
- UrlPatternType urlPatternType = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPatternType.setValue(value);
-
- UrlPatternType urlPatternType2 = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPatternType2.setValue(value2);
-
- FilterMapping FilterMappingBase = WebFactory.eINSTANCE.createFilterMapping();
- FilterMapping FilterMappingMerge = WebFactory.eINSTANCE.createFilterMapping();
-
- FilterMappingBase.setFilterName(sname);
- FilterMappingBase.getUrlPatterns().add(urlPatternType);
-
- FilterMappingMerge.setFilterName(sname1);
- FilterMappingMerge.getUrlPatterns().add(urlPatternType2);
-
- descriptorBase.getFilterMappings().add(FilterMappingBase);
- descriptorToMerge.getFilterMappings().add(FilterMappingMerge);
-
- descriptorBase.getFilters().add(servletBase);
- descriptorToMerge.getFilters().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertEquals(2, descriptorBase.getFilterMappings().size());
- }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- //@Test
- public void testSingleInitParamsInBase() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
-
- String sname = "servName";
- servletBase.setServletName(sname);
- servletMerge.setServletName(sname);
-
- ParamValue initParamsType = JavaeeFactory.eINSTANCE.createParamValue();
- String value = "/1";
- initParamsType.setParamName(sname);
- initParamsType.setParamValue(value);
-
- servletBase.getInitParams().add(initParamsType);
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
-
- Assert.assertEquals(1, descriptorBase.getServlets().size());
- Servlet rservlet = descriptorBase.getServlets().get(0);
-
- Assert.assertEquals(1, rservlet.getInitParams().size());
- Assert.assertEquals(sname, rservlet.getInitParams().get(0).getParamName());
- Assert.assertEquals(value, rservlet.getInitParams().get(0).getParamValue());
- }
-
-
- //@Test
- public void testSingleInitParamsInToMerge() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
-
- String sname = "servName";
- servletBase.setServletName(sname);
- servletMerge.setServletName(sname);
-
- ParamValue initParamsType = JavaeeFactory.eINSTANCE.createParamValue();
- String value = "/1";
- initParamsType.setParamName(sname);
- initParamsType.setParamValue(value);
-
- servletMerge.getInitParams().add(initParamsType);
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
-
- Assert.assertEquals(1, descriptorBase.getServlets().size());
- Servlet rservlet = descriptorBase.getServlets().get(0);
-
- Assert.assertEquals(1, rservlet.getInitParams().size());
- Assert.assertEquals(sname, rservlet.getInitParams().get(0).getParamName());
- Assert.assertEquals(value, rservlet.getInitParams().get(0).getParamValue());
- }
-
- //@Test
- public void testSingleInitParamsSame() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
-
- String sname = "servName";
- servletBase.setServletName(sname);
- servletMerge.setServletName(sname);
-
- ParamValue initParamsType = JavaeeFactory.eINSTANCE.createParamValue();
- String value = "/1";
- initParamsType.setParamName(sname);
- initParamsType.setParamValue(value);
-
- servletBase.getInitParams().add(initParamsType);
- servletMerge.getInitParams().add(initParamsType);
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
-
- Assert.assertEquals(1, descriptorBase.getServlets().size());
- Servlet rservlet = descriptorBase.getServlets().get(0);
-
- Assert.assertEquals(1, rservlet.getInitParams().size());
- Assert.assertEquals(sname, rservlet.getInitParams().get(0).getParamName());
- Assert.assertEquals(value, rservlet.getInitParams().get(0).getParamValue());
- }
-
- //@Test
- public void testSingleInitParamsAdditive() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
-
- String sname = "servName";
-
- servletBase.setServletName(sname);
- servletMerge.setServletName(sname);
-
-
- String value = "/1";
- String value2 = "/2";
-
- ParamValue initParamsType = JavaeeFactory.eINSTANCE.createParamValue();
- initParamsType.setParamName(sname);
- initParamsType.setParamValue(value);
-
- ParamValue initParamsType2 = JavaeeFactory.eINSTANCE.createParamValue();
- initParamsType2.setParamName(sname);
- initParamsType2.setParamValue(value2);
-
- servletBase.getInitParams().add(initParamsType);
- servletMerge.getInitParams().add(initParamsType2);
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
-
- Assert.assertEquals(1, descriptorBase.getServlets().size());
- Servlet rservlet = descriptorBase.getServlets().get(0);
-
- Assert.assertEquals(1, rservlet.getInitParams().size());
- Assert.assertEquals(sname, rservlet.getInitParams().get(0).getParamName());
- Assert.assertEquals(value2, rservlet.getInitParams().get(0).getParamValue());
- }
-
- //@Test
- public void testSingleInitParamsDifferentServletName() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
-
- String sname = "servName";
- String sname2 = "servName2";
-
- servletBase.setServletName(sname);
- servletMerge.setServletName(sname);
-
-
- String value = "/1";
- String value2 = "/2";
-
- ParamValue initParamsType = JavaeeFactory.eINSTANCE.createParamValue();
- initParamsType.setParamName(sname);
- initParamsType.setParamValue(value);
-
- ParamValue initParamsType2 = JavaeeFactory.eINSTANCE.createParamValue();
- initParamsType2.setParamName(sname2);
- initParamsType2.setParamValue(value2);
-
- servletBase.getInitParams().add(initParamsType);
- servletMerge.getInitParams().add(initParamsType2);
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
-
- Assert.assertEquals(1, descriptorBase.getServlets().size());
- Servlet rservlet = descriptorBase.getServlets().get(0);
-
- Assert.assertEquals(2, rservlet.getInitParams().size());
- }
-
-
-
-
-
-
-
-
- //@Test
- public void testSingleFilterInitParamsInBase() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Filter servletBase = WebFactory.eINSTANCE.createFilter();
- Filter servletMerge = WebFactory.eINSTANCE.createFilter();
-
- String sname = "servName";
-
- servletBase.setFilterName(sname);
- servletMerge.setFilterName(sname);
-
-
- String value = "/1";
-
- ParamValue initParamsType = JavaeeFactory.eINSTANCE.createParamValue();
- initParamsType.setParamName(sname);
- initParamsType.setParamValue(value);
-
- ParamValue initParamsType2 = JavaeeFactory.eINSTANCE.createParamValue();
- initParamsType2.setParamName(sname);
- initParamsType2.setParamValue(value);
-
- servletBase.getInitParams().add(initParamsType);
-
- descriptorBase.getFilters().add(servletBase);
- descriptorToMerge.getFilters().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
-
- Assert.assertEquals(1, descriptorBase.getFilters().size());
- Filter rservlet = descriptorBase.getFilters().get(0);
-
- Assert.assertEquals(1, rservlet.getInitParams().size());
- Assert.assertEquals(sname, rservlet.getInitParams().get(0).getParamName());
- Assert.assertEquals(value, rservlet.getInitParams().get(0).getParamValue());
- }
-
-
- //@Test
- public void testSingleFilterInitParamsInToMerge() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Filter servletBase = WebFactory.eINSTANCE.createFilter();
- Filter servletMerge = WebFactory.eINSTANCE.createFilter();
-
- String sname = "servName";
-
- servletBase.setFilterName(sname);
- servletMerge.setFilterName(sname);
-
-
- String value = "/1";
-
- ParamValue initParamsType = JavaeeFactory.eINSTANCE.createParamValue();
- initParamsType.setParamName(sname);
- initParamsType.setParamValue(value);
-
- ParamValue initParamsType2 = JavaeeFactory.eINSTANCE.createParamValue();
- initParamsType2.setParamName(sname);
- initParamsType2.setParamValue(value);
-
- servletMerge.getInitParams().add(initParamsType2);
-
- descriptorBase.getFilters().add(servletBase);
- descriptorToMerge.getFilters().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
-
- Assert.assertEquals(1, descriptorBase.getFilters().size());
- Filter rservlet = descriptorBase.getFilters().get(0);
-
- Assert.assertEquals(1, rservlet.getInitParams().size());
- Assert.assertEquals(sname, rservlet.getInitParams().get(0).getParamName());
- Assert.assertEquals(value, rservlet.getInitParams().get(0).getParamValue());
- }
-
- //@Test
- public void testSingleFilterInitParamsSame() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Filter servletBase = WebFactory.eINSTANCE.createFilter();
- Filter servletMerge = WebFactory.eINSTANCE.createFilter();
-
- String sname = "servName";
-
- servletBase.setFilterName(sname);
- servletMerge.setFilterName(sname);
-
-
- String value = "/1";
-
- ParamValue initParamsType = JavaeeFactory.eINSTANCE.createParamValue();
- initParamsType.setParamName(sname);
- initParamsType.setParamValue(value);
-
- ParamValue initParamsType2 = JavaeeFactory.eINSTANCE.createParamValue();
- initParamsType2.setParamName(sname);
- initParamsType2.setParamValue(value);
-
- servletBase.getInitParams().add(initParamsType);
- servletMerge.getInitParams().add(initParamsType2);
-
- descriptorBase.getFilters().add(servletBase);
- descriptorToMerge.getFilters().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
-
- Assert.assertEquals(1, descriptorBase.getFilters().size());
- Filter rservlet = descriptorBase.getFilters().get(0);
-
- Assert.assertEquals(1, rservlet.getInitParams().size());
- Assert.assertEquals(sname, rservlet.getInitParams().get(0).getParamName());
- Assert.assertEquals(value, rservlet.getInitParams().get(0).getParamValue());
- }
-
- //@Test
- public void testSingleFilterInitParamsAdditive() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Filter servletBase = WebFactory.eINSTANCE.createFilter();
- Filter servletMerge = WebFactory.eINSTANCE.createFilter();
-
- String sname = "servName";
-
- servletBase.setFilterName(sname);
- servletMerge.setFilterName(sname);
-
-
- String value = "/1";
- String value2 = "/2";
-
- ParamValue initParamsType = JavaeeFactory.eINSTANCE.createParamValue();
- initParamsType.setParamName(sname);
- initParamsType.setParamValue(value);
-
- ParamValue initParamsType2 = JavaeeFactory.eINSTANCE.createParamValue();
- initParamsType2.setParamName(sname);
- initParamsType2.setParamValue(value2);
-
- servletBase.getInitParams().add(initParamsType);
- servletMerge.getInitParams().add(initParamsType2);
-
- descriptorBase.getFilters().add(servletBase);
- descriptorToMerge.getFilters().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
-
- Assert.assertEquals(1, descriptorBase.getFilters().size());
- Filter rservlet = descriptorBase.getFilters().get(0);
-
- Assert.assertEquals(1, rservlet.getInitParams().size());
- Assert.assertEquals(sname, rservlet.getInitParams().get(0).getParamName());
- Assert.assertEquals(value2, rservlet.getInitParams().get(0).getParamValue());
- }
-
- //@Test
- public void testSingleFilterInitParamDifferentFilterName() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Filter servletBase = WebFactory.eINSTANCE.createFilter();
- Filter servletMerge = WebFactory.eINSTANCE.createFilter();
-
- String sname = "servName";
-
- servletBase.setFilterName(sname);
- servletMerge.setFilterName(sname);
-
-
- String value = "/1";
- String value2 = "/2";
-
- ParamValue initParamsType = JavaeeFactory.eINSTANCE.createParamValue();
- initParamsType.setParamName(sname);
- initParamsType.setParamValue(value);
-
- ParamValue initParamsType2 = JavaeeFactory.eINSTANCE.createParamValue();
- initParamsType2.setParamName(sname);
- initParamsType2.setParamValue(value2);
-
- servletBase.getInitParams().add(initParamsType);
- servletMerge.getInitParams().add(initParamsType2);
-
- descriptorBase.getFilters().add(servletBase);
- descriptorToMerge.getFilters().add(servletMerge);
-
-
- WebApp3Merger result = new WebApp3Merger(descriptorBase, descriptorToMerge, 0);
- result.process();
-
- Assert.assertEquals(1, descriptorBase.getFilters().size());
- Filter rservlet = descriptorBase.getFilters().get(0);
-
- Assert.assertEquals(1, rservlet.getInitParams().size());
- }
-
- /**
- * Tests the merger "add" behavior with filter mappings with
- * different url-patterns
- * No merge is necessary
- *
- * @throws ModelException
- */
- //@Test
- public void testFilterMappingsCaseSameAdd() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
-
- Filter filter = WebFactory.eINSTANCE.createFilter();
- filter.setFilterName("TestFilter");
- filter.setFilterClass("test.TestFilter");
- List<Filter> filters = descriptorBase.getFilters();
- filters.add(filter);
-
- UrlPatternType urlPattern = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern.setValue("/pattern1/*");
- FilterMapping filterMapping = WebFactory.eINSTANCE.createFilterMapping();
- filterMapping.setFilterName("TestFilter");
- List<UrlPatternType> urlPatterns = filterMapping.getUrlPatterns();
- urlPatterns.add(urlPattern);
- List<FilterMapping> filterMappings = descriptorBase.getFilterMappings();
- filterMappings.add(filterMapping);
-
- Filter filter2 = WebFactory.eINSTANCE.createFilter();
- filter2.setFilterName("TestFilter");
- filter2.setFilterClass("test.TestFilter2");
- List<Filter> filters2 = descriptorToMerge.getFilters();
- filters2.add(filter2);
-
- UrlPatternType urlPattern2 = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern2.setValue("/pattern2/*");
- FilterMapping filterMapping2 = WebFactory.eINSTANCE.createFilterMapping();
- filterMapping2.setFilterName("TestFilter");
- List<UrlPatternType> urlPatterns2 = filterMapping2.getUrlPatterns();
- urlPatterns2.add(urlPattern2);
- List<FilterMapping> filterMappings2 = descriptorToMerge.getFilterMappings();
- filterMappings2.add(filterMapping2);
-
- WebAppMerger result = new WebApp3Merger(descriptorBase, descriptorToMerge, ModelElementMerger.ADD);
- result.process();
- Assert.assertNotNull(descriptorBase.getFilters());
- Assert.assertEquals(1, descriptorBase.getFilters().size());
- Assert.assertEquals(1, descriptorToMerge.getFilters().size());
- Assert.assertEquals(1, descriptorToMerge.getFilterMappings().size());
- Filter f = descriptorBase.getFilters().get(0);
- Assert.assertNotNull(f);
- Assert.assertTrue(f.getFilterName().equals("TestFilter"));
- Assert.assertNotNull(descriptorBase.getFilterMappings());
- Assert.assertEquals(1, descriptorBase.getFilterMappings().size());
- FilterMapping m = descriptorBase.getFilterMappings().get(0);
- Assert.assertTrue(m.getFilterName().equals("TestFilter"));
- Assert.assertNotNull(m.getUrlPatterns());
- Assert.assertEquals(2, m.getUrlPatterns().size());
- Assert.assertTrue(m.getUrlPatterns().get(0).getValue().equals("/pattern1/*"));
- }
-
- /**
- * Tests the merger "copy" behavior with filter mappings with
- * different url-patterns
- * The filter mapping should be copied to base
- *
- * @throws ModelException
- */
- //@Test
- public void testFilterMappingsCaseSameCopy() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
-
- Filter filter = WebFactory.eINSTANCE.createFilter();
- filter.setFilterName("TestFilter");
- filter.setFilterClass("test.TestFilter");
- List<Filter> filters = descriptorBase.getFilters();
- filters.add(filter);
-
- UrlPatternType urlPattern = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern.setValue("/pattern1/*");
- FilterMapping filterMapping = WebFactory.eINSTANCE.createFilterMapping();
- filterMapping.setFilterName("TestFilter");
- List<UrlPatternType> urlPatterns = filterMapping.getUrlPatterns();
- urlPatterns.add(urlPattern);
- List<FilterMapping> filterMappings = descriptorBase.getFilterMappings();
- filterMappings.add(filterMapping);
-
- Filter filter2 = WebFactory.eINSTANCE.createFilter();
- filter2.setFilterName("TestFilter");
- filter2.setFilterClass("test.TestFilter2");
- List<Filter> filters2 = descriptorToMerge.getFilters();
- filters2.add(filter2);
-
- UrlPatternType urlPattern2 = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern2.setValue("/pattern2/*");
- FilterMapping filterMapping2 = WebFactory.eINSTANCE.createFilterMapping();
- filterMapping2.setFilterName("TestFilter");
- List<UrlPatternType> urlPatterns2 = filterMapping2.getUrlPatterns();
- urlPatterns2.add(urlPattern2);
- List<FilterMapping> filterMappings2 = descriptorToMerge.getFilterMappings();
- filterMappings2.add(filterMapping2);
-
- WebAppMerger result = new WebApp3Merger(descriptorBase, descriptorToMerge, ModelElementMerger.COPY);
- result.process();
- Assert.assertNotNull(descriptorBase.getFilters());
- Assert.assertEquals(1, descriptorBase.getFilters().size());
- Assert.assertEquals(1, descriptorToMerge.getFilters().size());
- Assert.assertEquals(1, descriptorToMerge.getFilterMappings().size());
- Filter f = descriptorBase.getFilters().get(0);
- Assert.assertNotNull(f);
- Assert.assertTrue(f.getFilterName().equals("TestFilter"));
- Assert.assertNotNull(descriptorBase.getFilterMappings());
- Assert.assertEquals(1, descriptorBase.getFilterMappings().size());
- FilterMapping m = descriptorBase.getFilterMappings().get(0);
- Assert.assertTrue(m.getFilterName().equals("TestFilter"));
- Assert.assertNotNull(m.getUrlPatterns());
- Assert.assertEquals(2, m.getUrlPatterns().size());
- Assert.assertTrue(m.getUrlPatterns().get(0).getValue().equals("/pattern1/*"));
- m = descriptorBase.getFilterMappings().get(0);
- Assert.assertTrue(m.getFilterName().equals("TestFilter"));
- Assert.assertNotNull(m.getUrlPatterns());
- Assert.assertEquals(2, m.getUrlPatterns().size());
- Assert.assertTrue(m.getUrlPatterns().get(0).getValue().equals("/pattern1/*"));
- Assert.assertTrue(m.getUrlPatterns().get(1).getValue().equals("/pattern2/*"));
- }
-
- /**
- * Tests the merger "add" behavior with servlet mappings with
- * different url-patterns
- * No merge is necessary
- *
- * @throws ModelException
- */
- //@Test
- public void testServletMappingsCaseSameAdd() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
-
- Servlet servlet = WebFactory.eINSTANCE.createServlet();
- servlet.setServletName("TestServlet");
- servlet.setServletClass("test.TestServlet");
- List<Servlet> servlets = descriptorBase.getServlets();
- servlets.add(servlet);
-
- UrlPatternType urlPattern = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern.setValue("/pattern1");
- ServletMapping servletMapping = WebFactory.eINSTANCE.createServletMapping();
- servletMapping.setServletName("TestServlet");
- List<UrlPatternType> urlPatterns = servletMapping.getUrlPatterns();
- urlPatterns.add(urlPattern);
- List<ServletMapping> servletMappings = descriptorBase.getServletMappings();
- servletMappings.add(servletMapping);
-
- Servlet servlet2 = WebFactory.eINSTANCE.createServlet();
- servlet2.setServletName("TestServlet");
- servlet2.setServletClass("test.TestServlet2");
- List<Servlet> servlets2 = descriptorToMerge.getServlets();
- servlets2.add(servlet2);
-
- UrlPatternType urlPattern2 = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern2.setValue("/pattern2");
- ServletMapping servletMapping2 = WebFactory.eINSTANCE.createServletMapping();
- servletMapping2.setServletName("TestServlet");
- List<UrlPatternType> urlPatterns2 = servletMapping2.getUrlPatterns();
- urlPatterns2.add(urlPattern2);
- List<ServletMapping> servletMappings2 = descriptorToMerge.getServletMappings();
- servletMappings2.add(servletMapping2);
-
- WebAppMerger result = new WebApp3Merger(descriptorBase, descriptorToMerge, ModelElementMerger.ADD);
- result.process();
- Assert.assertNotNull(descriptorBase.getServlets());
- Assert.assertEquals(1, descriptorBase.getServlets().size());
- Assert.assertEquals(1, descriptorToMerge.getServlets().size());
- Assert.assertEquals(1, descriptorToMerge.getServletMappings().size());
- Servlet s = descriptorBase.getServlets().get(0);
- Assert.assertNotNull(s);
- Assert.assertTrue(s.getServletName().equals("TestServlet"));
- Assert.assertNotNull(descriptorBase.getServletMappings());
- Assert.assertEquals(1, descriptorBase.getServletMappings().size());
- ServletMapping m = descriptorBase.getServletMappings().get(0);
- Assert.assertTrue(m.getServletName().equals("TestServlet"));
- Assert.assertNotNull(m.getUrlPatterns());
- Assert.assertEquals(2, m.getUrlPatterns().size());
- Assert.assertTrue(m.getUrlPatterns().get(0).getValue().equals("/pattern1"));
- Assert.assertTrue(m.getUrlPatterns().get(1).getValue().equals("/pattern2"));
- }
-
- /**
- * Tests the merger "copy" behavior with servlet mappings with
- * different url-patterns
- * The servlet mapping should be copied to base
- *
- * @throws ModelException
- */
- //@Test
- public void testServletMappingsCaseSameCopy() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
-
- Servlet servlet = WebFactory.eINSTANCE.createServlet();
- servlet.setServletName("TestServlet");
- servlet.setServletClass("test.TestServlet");
- List<Servlet> servlets = descriptorBase.getServlets();
- servlets.add(servlet);
-
- UrlPatternType urlPattern = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern.setValue("/pattern1");
- ServletMapping servletMapping = WebFactory.eINSTANCE.createServletMapping();
- servletMapping.setServletName("TestServlet");
- List<UrlPatternType> urlPatterns = servletMapping.getUrlPatterns();
- urlPatterns.add(urlPattern);
- List<ServletMapping> servletMappings = descriptorBase.getServletMappings();
- servletMappings.add(servletMapping);
-
- Servlet servlet2 = WebFactory.eINSTANCE.createServlet();
- servlet2.setServletName("TestServlet");
- servlet2.setServletClass("test.TestServlet2");
- List<Servlet> servlets2 = descriptorToMerge.getServlets();
- servlets2.add(servlet2);
-
- UrlPatternType urlPattern2 = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern2.setValue("/pattern2");
- ServletMapping servletMapping2 = WebFactory.eINSTANCE.createServletMapping();
- servletMapping2.setServletName("TestServlet");
- List<UrlPatternType> urlPatterns2 = servletMapping2.getUrlPatterns();
- urlPatterns2.add(urlPattern2);
- List<ServletMapping> servletMappings2 = descriptorToMerge.getServletMappings();
- servletMappings2.add(servletMapping2);
-
- WebAppMerger result = new WebApp3Merger(descriptorBase, descriptorToMerge, ModelElementMerger.COPY);
- result.process();
- Assert.assertNotNull(descriptorBase.getServlets());
- Assert.assertEquals(1, descriptorBase.getServlets().size());
- Assert.assertEquals(1, descriptorToMerge.getServlets().size());
- Assert.assertEquals(1, descriptorToMerge.getServletMappings().size());
- Servlet s = descriptorBase.getServlets().get(0);
- Assert.assertNotNull(s);
- Assert.assertTrue(s.getServletName().equals("TestServlet"));
- Assert.assertNotNull(descriptorBase.getServletMappings());
- Assert.assertEquals(1, descriptorBase.getServletMappings().size());
- ServletMapping m = descriptorBase.getServletMappings().get(0);
- Assert.assertTrue(m.getServletName().equals("TestServlet"));
- Assert.assertNotNull(m.getUrlPatterns());
- Assert.assertEquals(2, m.getUrlPatterns().size());
- Assert.assertTrue(m.getUrlPatterns().get(0).getValue().equals("/pattern1"));
- Assert.assertTrue(m.getUrlPatterns().get(1).getValue().equals("/pattern2"));
-// m = descriptorBase.getServletMappings().get(1);
-// Assert.assertTrue(m.getServletName().equals("TestServlet"));
-// Assert.assertNotNull(m.getUrlPatterns());
-// Assert.assertEquals(1, m.getUrlPatterns().size());
-// Assert.assertTrue(m.getUrlPatterns().get(0).getValue().equals("/pattern2"));
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/WebAppMergerTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/WebAppMergerTest.java
deleted file mode 100644
index 690c1cfe..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/mergers/tests/WebAppMergerTest.java
+++ /dev/null
@@ -1,634 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.mergers.tests;
-
-import java.util.List;
-
-import junit.framework.Assert;
-import junit.framework.TestCase;
-
-import org.eclipse.jst.javaee.core.JavaeeFactory;
-import org.eclipse.jst.javaee.core.RunAs;
-import org.eclipse.jst.javaee.core.SecurityRole;
-import org.eclipse.jst.javaee.core.UrlPatternType;
-import org.eclipse.jst.javaee.web.AuthConstraint;
-import org.eclipse.jst.javaee.web.Filter;
-import org.eclipse.jst.javaee.web.FilterMapping;
-import org.eclipse.jst.javaee.web.SecurityConstraint;
-import org.eclipse.jst.javaee.web.Servlet;
-import org.eclipse.jst.javaee.web.ServletMapping;
-import org.eclipse.jst.javaee.web.TransportGuaranteeType;
-import org.eclipse.jst.javaee.web.UserDataConstraint;
-import org.eclipse.jst.javaee.web.WebApp;
-import org.eclipse.jst.javaee.web.WebFactory;
-import org.eclipse.jst.jee.model.internal.mergers.ModelElementMerger;
-import org.eclipse.jst.jee.model.internal.mergers.ModelException;
-import org.eclipse.jst.jee.model.internal.mergers.WebAppMerger;
-
-/**
- * Tester class for WebAPp artifact.
- *
- * Base suffix means that the base object has some info and
- * toMerge is empty: nothing should be merged
- *
- * ToMerge suffix means that the base is empty object and
- * toMerge has some info: all from merge should be present in base.
- *
- * Same suffix means that the information in merge and base is one
- * and the same: no merge should occurred and additional checks for
- * doubling of the elements are present.
- *
- * Complex suffix means variety of information is present in base
- * and to merge: consistent information combined by base and toMerge
- * should be available at the end.
- *
- * ComplexOverlapped suffix means variety of information is present
- * in base and to merge: consistent information combined by base and toMerge
- * should be available at the end. There are artifacts with one and the same
- * name and different values: values should be merged into base.
- *
- *
- * @author Dimitar Giormov
- *
- */
-public class WebAppMergerTest extends TestCase{
-
- /**
- * Tests the merger with Base security role only.
- * No merge is necessary
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleSecurityRoleCaseBase() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- SecurityRole role = JavaeeFactory.eINSTANCE.createSecurityRole();
- role.setRoleName("test1");
-
- descriptorBase.getSecurityRoles().add(role);
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- WebAppMerger result = new WebAppMerger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(descriptorBase.getSecurityRoles());
- Assert.assertTrue(descriptorBase.getSecurityRoles().size() == 1);
- Assert.assertTrue(descriptorToMerge.getSecurityRoles().size() == 0);
- Assert.assertTrue(((SecurityRole)descriptorBase.getSecurityRoles().get(0)).getRoleName().equals("test1"));
- }
-
- /**
- * Tests the merger with toMerge security role only.
- * The role should be copied in base.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleSecurityRoleCaseToMerge() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- SecurityRole role = JavaeeFactory.eINSTANCE.createSecurityRole();
- role.setRoleName("test1");
-
- descriptorToMerge.getSecurityRoles().add(role);
-
- WebAppMerger result = new WebAppMerger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(descriptorBase.getSecurityRoles());
- Assert.assertEquals(1, descriptorBase.getSecurityRoles().size());
- Assert.assertEquals(1, descriptorToMerge.getSecurityRoles().size());
- Assert.assertTrue(((SecurityRole)descriptorBase.getSecurityRoles().get(0)).getRoleName().equals("test1"));
- }
-
- /**
- * Tests the merger with one and the same security role.
- * The result should be non merged 1 security role.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleSecurityRoleCaseSameRole() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- SecurityRole role = JavaeeFactory.eINSTANCE.createSecurityRole();
- role.setRoleName("test1");
- descriptorBase.getSecurityRoles().add(role);
- descriptorToMerge.getSecurityRoles().add(role);
-
- WebAppMerger result = new WebAppMerger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(descriptorBase.getSecurityRoles());
- Assert.assertTrue(descriptorBase.getSecurityRoles().size() == 1);
- Assert.assertTrue(descriptorToMerge.getSecurityRoles().size() == 1);
- Assert.assertTrue(((SecurityRole)descriptorBase.getSecurityRoles().get(0)).getRoleName().equals("test1"));
- }
-
- /**
- * Tests the merger with variety of security roles.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleSecurityRoleCaseComplex() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- SecurityRole role0 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role1 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role2 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role3 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role4 = JavaeeFactory.eINSTANCE.createSecurityRole();
- SecurityRole role5 = JavaeeFactory.eINSTANCE.createSecurityRole();
- role0.setRoleName("test1");
- role1.setRoleName("test2");
- role2.setRoleName("test3");
- role3.setRoleName("test4");
- role4.setRoleName("test5");
- role5.setRoleName("test6");
-
-
-
- descriptorBase.getSecurityRoles().add(role1);
- descriptorBase.getSecurityRoles().add(role3);
- descriptorBase.getSecurityRoles().add(role4);
- descriptorBase.getSecurityRoles().add(role5);
-
-
- descriptorToMerge.getSecurityRoles().add(role0);
- descriptorToMerge.getSecurityRoles().add(role1);
- descriptorToMerge.getSecurityRoles().add(role2);
-
-
-
-
- WebAppMerger result = new WebAppMerger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(descriptorBase.getSecurityRoles());
- Assert.assertTrue(descriptorBase.getSecurityRoles().size() == 6);
- Assert.assertTrue(descriptorToMerge.getSecurityRoles().size() == 3);
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role0.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role1.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role2.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role3.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role4.getRoleName()));
- Assert.assertTrue(containsSecRole(descriptorBase.getSecurityRoles(), role5.getRoleName()));
- }
-
- private boolean containsSecRole(List list, String roleName) {
-
-
- for (Object object : list) {
- SecurityRole role = (SecurityRole) object;
- if(roleName == null){
- if(roleName == role.getRoleName()){
- return true;
- }
- } else if(roleName.equals(role.getRoleName())){
- return true;
- }
- }
- return false;
- }
-
-
- /**
- * Tests the merger with Base security role only.
- * No merge is necessary
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleRunAsCaseBase() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- RunAs role = JavaeeFactory.eINSTANCE.createRunAs();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- servletBase.setServletName("servName");
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
- servletMerge.setServletName("servName");
- role.setRoleName("test1");
- servletBase.setRunAs(role);
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebAppMerger result = new WebAppMerger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(servletBase.getRunAs());
- Assert.assertTrue(((RunAs)servletBase.getRunAs()).getRoleName().equals("test1"));
- }
-
- /**
- * Tests the merger with toMerge security role only.
- * The role should be copied in base.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleRunAsCaseToMerge() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- RunAs role = JavaeeFactory.eINSTANCE.createRunAs();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- servletBase.setServletName("servName");
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
- servletMerge.setServletName("servName");
- role.setRoleName("test1");
- servletMerge.setRunAs(role);
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebAppMerger result = new WebAppMerger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(servletBase.getRunAs());
- Assert.assertTrue(((RunAs)servletBase.getRunAs()).getRoleName().equals("test1"));
- Assert.assertEquals(1, descriptorBase.getServlets().size());
- }
-
-
- /**
- * Tests the merger with null named servlet in toMerge array, the merger should ignore such entries.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleNullServletToMerge() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
-
- descriptorToMerge.getServlets().add(servletBase);
-
-
- WebAppMerger result = new WebAppMerger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertEquals(0, descriptorBase.getServlets().size());
- }
-
- /**
- * Tests the merger with null named servlet in Base, as this is extremely unlikely
- * the merger should not stop merging because of such error.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleNullNamedServletInBase() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
- servletMerge.setServletName("servName");
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebAppMerger result = new WebAppMerger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertEquals(2, descriptorBase.getServlets().size());
- }
-
- /**
- * Tests the merger with one and the same security role.
- * The result should be non merged 1 security role.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleRunAsCaseSameRole() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- RunAs role = JavaeeFactory.eINSTANCE.createRunAs();
- Servlet servletBase = WebFactory.eINSTANCE.createServlet();
- servletBase.setServletName("servName");
- Servlet servletMerge = WebFactory.eINSTANCE.createServlet();
- servletMerge.setServletName("servName");
- role.setRoleName("test1");
- servletBase.setRunAs(role);
- servletMerge.setRunAs(role);
-
- descriptorBase.getServlets().add(servletBase);
- descriptorToMerge.getServlets().add(servletMerge);
-
-
- WebAppMerger result = new WebAppMerger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(servletBase.getRunAs());
- Assert.assertTrue(((RunAs)servletBase.getRunAs()).getRoleName().equals("test1"));
- }
-
-
-
- /**
- * Tests the merger with Base security constraints only.
- * No merge is necessary
- *
- * @throws ModelException
- */
-// @Test
- @SuppressWarnings("unchecked")
- public void testSingleSecurityConstraintCaseBase() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- SecurityConstraint sc = WebFactory.eINSTANCE.createSecurityConstraint();
- AuthConstraint createAuthConstraint = WebFactory.eINSTANCE.createAuthConstraint();
- createAuthConstraint.getRoleNames().add("test");
- sc.setAuthConstraint(createAuthConstraint);
- UserDataConstraint userDataConstraint = WebFactory.eINSTANCE.createUserDataConstraint();
- userDataConstraint.setTransportGuarantee(TransportGuaranteeType.CONFIDENTIAL_LITERAL);
- sc.setUserDataConstraint(userDataConstraint);
-
- descriptorBase.getSecurityConstraints().add(sc);
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- WebAppMerger result = new WebAppMerger(descriptorBase, descriptorToMerge, 0);
- result.process();
- Assert.assertNotNull(descriptorBase.getSecurityConstraints());
- Assert.assertTrue(descriptorBase.getSecurityConstraints().size() == 1);
- Assert.assertTrue(descriptorToMerge.getSecurityConstraints().size() == 0);
- Assert.assertTrue(((SecurityConstraint)descriptorBase.getSecurityConstraints().get(0)).getAuthConstraint().getRoleNames().get(0).equals("test"));
- }
-
- /**
- * Tests the merger with toMerge security constraints only.
- * The role should be copied in base.
- *
- * @throws ModelException
- */
- //@Test
- public void testSingleSecurityConstraintCaseToMerge() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- SecurityConstraint sc = WebFactory.eINSTANCE.createSecurityConstraint();
- AuthConstraint createAuthConstraint = WebFactory.eINSTANCE.createAuthConstraint();
- createAuthConstraint.getRoleNames().add("test");
- sc.setAuthConstraint(createAuthConstraint);
- UserDataConstraint userDataConstraint = WebFactory.eINSTANCE.createUserDataConstraint();
- userDataConstraint.setTransportGuarantee(TransportGuaranteeType.CONFIDENTIAL_LITERAL);
- sc.setUserDataConstraint(userDataConstraint);
-
- descriptorBase.getSecurityConstraints().add(sc);
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
- WebAppMerger result = new WebAppMerger(descriptorToMerge, descriptorBase, 0);
- result.process();
- Assert.assertNotNull(descriptorToMerge.getSecurityConstraints());
- Assert.assertTrue(descriptorToMerge.getSecurityConstraints().size() == 1);
- Assert.assertTrue(((SecurityConstraint)descriptorToMerge.getSecurityConstraints().get(0)).getAuthConstraint().getRoleNames().get(0).equals("test"));
- }
-
- /**
- * Tests the merger "add" behavior with filter mappings with
- * different url-patterns
- * No merge is necessary
- *
- * @throws ModelException
- */
- //@Test
- public void testFilterMappingsCaseSameAdd() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
-
- Filter filter = WebFactory.eINSTANCE.createFilter();
- filter.setFilterName("TestFilter");
- filter.setFilterClass("test.TestFilter");
- List<Filter> filters = descriptorBase.getFilters();
- filters.add(filter);
-
- UrlPatternType urlPattern = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern.setValue("/pattern1/*");
- FilterMapping filterMapping = WebFactory.eINSTANCE.createFilterMapping();
- filterMapping.setFilterName("TestFilter");
- List<UrlPatternType> urlPatterns = filterMapping.getUrlPatterns();
- urlPatterns.add(urlPattern);
- List<FilterMapping> filterMappings = descriptorBase.getFilterMappings();
- filterMappings.add(filterMapping);
-
- Filter filter2 = WebFactory.eINSTANCE.createFilter();
- filter2.setFilterName("TestFilter");
- filter2.setFilterClass("test.TestFilter2");
- List<Filter> filters2 = descriptorToMerge.getFilters();
- filters2.add(filter2);
-
- UrlPatternType urlPattern2 = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern2.setValue("/pattern2/*");
- FilterMapping filterMapping2 = WebFactory.eINSTANCE.createFilterMapping();
- filterMapping2.setFilterName("TestFilter");
- List<UrlPatternType> urlPatterns2 = filterMapping2.getUrlPatterns();
- urlPatterns2.add(urlPattern2);
- List<FilterMapping> filterMappings2 = descriptorToMerge.getFilterMappings();
- filterMappings2.add(filterMapping2);
-
- WebAppMerger result = new WebAppMerger(descriptorBase, descriptorToMerge, ModelElementMerger.ADD);
- result.process();
- Assert.assertNotNull(descriptorBase.getFilters());
- Assert.assertEquals(1, descriptorBase.getFilters().size());
- Assert.assertEquals(1, descriptorToMerge.getFilters().size());
- Assert.assertEquals(1, descriptorToMerge.getFilterMappings().size());
- Filter f = descriptorBase.getFilters().get(0);
- Assert.assertNotNull(f);
- Assert.assertTrue(f.getFilterName().equals("TestFilter"));
- Assert.assertNotNull(descriptorBase.getFilterMappings());
- Assert.assertEquals(1, descriptorBase.getFilterMappings().size());
- FilterMapping m = descriptorBase.getFilterMappings().get(0);
- Assert.assertTrue(m.getFilterName().equals("TestFilter"));
- Assert.assertNotNull(m.getUrlPatterns());
- Assert.assertEquals(1, m.getUrlPatterns().size());
- Assert.assertTrue(m.getUrlPatterns().get(0).getValue().equals("/pattern1/*"));
- }
-
- /**
- * Tests the merger "copy" behavior with filter mappings with
- * different url-patterns
- * The filter mapping should be copied to base
- *
- * @throws ModelException
- */
- //@Test
- public void testFilterMappingsCaseSameCopy() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
-
- Filter filter = WebFactory.eINSTANCE.createFilter();
- filter.setFilterName("TestFilter");
- filter.setFilterClass("test.TestFilter");
- List<Filter> filters = descriptorBase.getFilters();
- filters.add(filter);
-
- UrlPatternType urlPattern = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern.setValue("/pattern1/*");
- FilterMapping filterMapping = WebFactory.eINSTANCE.createFilterMapping();
- filterMapping.setFilterName("TestFilter");
- List<UrlPatternType> urlPatterns = filterMapping.getUrlPatterns();
- urlPatterns.add(urlPattern);
- List<FilterMapping> filterMappings = descriptorBase.getFilterMappings();
- filterMappings.add(filterMapping);
-
- Filter filter2 = WebFactory.eINSTANCE.createFilter();
- filter2.setFilterName("TestFilter");
- filter2.setFilterClass("test.TestFilter2");
- List<Filter> filters2 = descriptorToMerge.getFilters();
- filters2.add(filter2);
-
- UrlPatternType urlPattern2 = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern2.setValue("/pattern2/*");
- FilterMapping filterMapping2 = WebFactory.eINSTANCE.createFilterMapping();
- filterMapping2.setFilterName("TestFilter");
- List<UrlPatternType> urlPatterns2 = filterMapping2.getUrlPatterns();
- urlPatterns2.add(urlPattern2);
- List<FilterMapping> filterMappings2 = descriptorToMerge.getFilterMappings();
- filterMappings2.add(filterMapping2);
-
- WebAppMerger result = new WebAppMerger(descriptorBase, descriptorToMerge, ModelElementMerger.COPY);
- result.process();
- Assert.assertNotNull(descriptorBase.getFilters());
- Assert.assertEquals(1, descriptorBase.getFilters().size());
- Assert.assertEquals(1, descriptorToMerge.getFilters().size());
- Assert.assertEquals(1, descriptorToMerge.getFilterMappings().size());
- Filter f = descriptorBase.getFilters().get(0);
- Assert.assertNotNull(f);
- Assert.assertTrue(f.getFilterName().equals("TestFilter"));
- Assert.assertNotNull(descriptorBase.getFilterMappings());
- Assert.assertEquals(2, descriptorBase.getFilterMappings().size());
- FilterMapping m = descriptorBase.getFilterMappings().get(0);
- Assert.assertTrue(m.getFilterName().equals("TestFilter"));
- Assert.assertNotNull(m.getUrlPatterns());
- Assert.assertEquals(1, m.getUrlPatterns().size());
- Assert.assertTrue(m.getUrlPatterns().get(0).getValue().equals("/pattern1/*"));
- m = descriptorBase.getFilterMappings().get(1);
- Assert.assertTrue(m.getFilterName().equals("TestFilter"));
- Assert.assertNotNull(m.getUrlPatterns());
- Assert.assertEquals(1, m.getUrlPatterns().size());
- Assert.assertTrue(m.getUrlPatterns().get(0).getValue().equals("/pattern2/*"));
- }
-
- /**
- * Tests the merger "add" behavior with servlet mappings with
- * different url-patterns
- * No merge is necessary
- *
- * @throws ModelException
- */
- //@Test
- public void testServletMappingsCaseSame() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
-
- Servlet servlet = WebFactory.eINSTANCE.createServlet();
- servlet.setServletName("TestServlet");
- servlet.setServletClass("test.TestServlet");
- List<Servlet> servlets = descriptorBase.getServlets();
- servlets.add(servlet);
-
- UrlPatternType urlPattern = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern.setValue("/pattern1");
- ServletMapping servletMapping = WebFactory.eINSTANCE.createServletMapping();
- servletMapping.setServletName("TestServlet");
- List<UrlPatternType> urlPatterns = servletMapping.getUrlPatterns();
- urlPatterns.add(urlPattern);
- List<ServletMapping> servletMappings = descriptorBase.getServletMappings();
- servletMappings.add(servletMapping);
-
- Servlet servlet2 = WebFactory.eINSTANCE.createServlet();
- servlet2.setServletName("TestServlet");
- servlet2.setServletClass("test.TestServlet2");
- List<Servlet> servlets2 = descriptorToMerge.getServlets();
- servlets2.add(servlet2);
-
- UrlPatternType urlPattern2 = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern2.setValue("/pattern2");
- ServletMapping servletMapping2 = WebFactory.eINSTANCE.createServletMapping();
- servletMapping2.setServletName("TestServlet");
- List<UrlPatternType> urlPatterns2 = servletMapping2.getUrlPatterns();
- urlPatterns2.add(urlPattern2);
- List<ServletMapping> servletMappings2 = descriptorToMerge.getServletMappings();
- servletMappings2.add(servletMapping2);
-
- WebAppMerger result = new WebAppMerger(descriptorBase, descriptorToMerge, ModelElementMerger.ADD);
- result.process();
- Assert.assertNotNull(descriptorBase.getServlets());
- Assert.assertEquals(1, descriptorBase.getServlets().size());
- Assert.assertEquals(1, descriptorToMerge.getServlets().size());
- Assert.assertEquals(1, descriptorToMerge.getServletMappings().size());
- Servlet s = descriptorBase.getServlets().get(0);
- Assert.assertNotNull(s);
- Assert.assertTrue(s.getServletName().equals("TestServlet"));
- Assert.assertNotNull(descriptorBase.getServletMappings());
- Assert.assertEquals(1, descriptorBase.getServletMappings().size());
- ServletMapping m = descriptorBase.getServletMappings().get(0);
- Assert.assertTrue(m.getServletName().equals("TestServlet"));
- Assert.assertNotNull(m.getUrlPatterns());
- Assert.assertEquals(1, m.getUrlPatterns().size());
- Assert.assertTrue(m.getUrlPatterns().get(0).getValue().equals("/pattern1"));
- }
-
- /**
- * Tests the merger "copy" behavior with servlet mappings with
- * different url-patterns
- * The servlet mapping should be copied to base
- *
- * @throws ModelException
- */
- //@Test
- public void testServletMappingsCaseSameCopy() throws ModelException{
- WebApp descriptorBase = WebFactory.eINSTANCE.createWebApp();
- WebApp descriptorToMerge = WebFactory.eINSTANCE.createWebApp();
-
- Servlet servlet = WebFactory.eINSTANCE.createServlet();
- servlet.setServletName("TestServlet");
- servlet.setServletClass("test.TestServlet");
- List<Servlet> servlets = descriptorBase.getServlets();
- servlets.add(servlet);
-
- UrlPatternType urlPattern = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern.setValue("/pattern1");
- ServletMapping servletMapping = WebFactory.eINSTANCE.createServletMapping();
- servletMapping.setServletName("TestServlet");
- List<UrlPatternType> urlPatterns = servletMapping.getUrlPatterns();
- urlPatterns.add(urlPattern);
- List<ServletMapping> servletMappings = descriptorBase.getServletMappings();
- servletMappings.add(servletMapping);
-
- Servlet servlet2 = WebFactory.eINSTANCE.createServlet();
- servlet2.setServletName("TestServlet");
- servlet2.setServletClass("test.TestServlet2");
- List<Servlet> servlets2 = descriptorToMerge.getServlets();
- servlets2.add(servlet2);
-
- UrlPatternType urlPattern2 = JavaeeFactory.eINSTANCE.createUrlPatternType();
- urlPattern2.setValue("/pattern2");
- ServletMapping servletMapping2 = WebFactory.eINSTANCE.createServletMapping();
- servletMapping2.setServletName("TestServlet");
- List<UrlPatternType> urlPatterns2 = servletMapping2.getUrlPatterns();
- urlPatterns2.add(urlPattern2);
- List<ServletMapping> servletMappings2 = descriptorToMerge.getServletMappings();
- servletMappings2.add(servletMapping2);
-
- WebAppMerger result = new WebAppMerger(descriptorBase, descriptorToMerge, ModelElementMerger.COPY);
- result.process();
- Assert.assertNotNull(descriptorBase.getServlets());
- Assert.assertEquals(1, descriptorBase.getServlets().size());
- Assert.assertEquals(1, descriptorToMerge.getServlets().size());
- Assert.assertEquals(1, descriptorToMerge.getServletMappings().size());
- Servlet s = descriptorBase.getServlets().get(0);
- Assert.assertNotNull(s);
- Assert.assertTrue(s.getServletName().equals("TestServlet"));
- Assert.assertNotNull(descriptorBase.getServletMappings());
- Assert.assertEquals(2, descriptorBase.getServletMappings().size());
- ServletMapping m = descriptorBase.getServletMappings().get(0);
- Assert.assertTrue(m.getServletName().equals("TestServlet"));
- Assert.assertNotNull(m.getUrlPatterns());
- Assert.assertEquals(1, m.getUrlPatterns().size());
- Assert.assertTrue(m.getUrlPatterns().get(0).getValue().equals("/pattern1"));
- m = descriptorBase.getServletMappings().get(1);
- Assert.assertTrue(m.getServletName().equals("TestServlet"));
- Assert.assertNotNull(m.getUrlPatterns());
- Assert.assertEquals(1, m.getUrlPatterns().size());
- Assert.assertTrue(m.getUrlPatterns().get(0).getValue().equals("/pattern2"));
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AbstractAnnotationFactoryTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AbstractAnnotationFactoryTest.java
deleted file mode 100644
index a6a4ca57..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AbstractAnnotationFactoryTest.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.core.WorkingCopyOwner;
-import org.eclipse.jst.jee.model.internal.EjbAnnotationFactory;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public class AbstractAnnotationFactoryTest extends TestCase{
-
- protected EjbAnnotationFactory fixture;
-
-// @Before
- @Override
- protected void setUp() throws Exception {
- fixture = EjbAnnotationFactory.createFactory();
- }
-
-// @After
- @Override
- protected void tearDown() {
- }
-
- protected ICompilationUnit createCompilationUnit(final String name, final String content) throws JavaModelException {
- WorkingCopyOwner owner = new WorkingCopyOwner() {
- @Override
- public IBuffer createBuffer(ICompilationUnit workingCopy) {
- IBuffer buffer = super.createBuffer(workingCopy);
- buffer.setContents(content);
- return buffer;
- }
- };
- return owner.newWorkingCopy(name, new IClasspathEntry[0], null);
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AbstractAnnotationModelTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AbstractAnnotationModelTest.java
deleted file mode 100644
index 96166f3e..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AbstractAnnotationModelTest.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.tests;
-
-import junit.framework.TestCase;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.jdt.core.IPackageFragment;
-import org.eclipse.jst.j2ee.model.IModelProvider;
-import org.eclipse.jst.javaee.ejb.EJBJar;
-import org.eclipse.wst.common.project.facet.core.IFacetedProject;
-import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-
-/**
- * @author Kiril Mitov k.mitov@sap.com
- *
- */
-public abstract class AbstractAnnotationModelTest extends TestCase {
-
- protected static final String localInterfaceContent = "package com.sap;" + "import javax.ejb.Local;"
- + "@Local public interface SessionBeanLocal {}";
- protected static final String beanContent = "package com.sap;" + "import javax.ejb.Stateless;"
- + "@Stateless public class SessionBean implements SessionBeanLocal {}";
-
- protected IFacetedProject facetedProject;
-
- protected IProject clientProject;
-
- protected IModelProvider fixture;
-
- @Override
- protected void setUp() throws Exception {
- super.setUp();
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(this.getClass().getSimpleName());
- facetedProject = ProjectFacetsManager.create(project);
- }
-
- protected void saveFileAndUpdate(IFile beanFile, String beanContent) throws Exception {
- saveFileAndUpdate(beanFile, beanContent, getFixture());
- }
-
- protected void saveFileAndUpdate(IFile beanFile, String beanContent, IModelProvider provider) throws Exception {
- SynchronousModelChangedListener listener = new SynchronousModelChangedListener(1);
- provider.addListener(listener);
- AbstractTest.saveFile(beanFile, beanContent);
- assertTrue(listener.waitForEvents());
- provider.removeListener(listener);
- }
-
- protected void deleteFileAndUpdate(IFile beanFile) throws Exception, InterruptedException {
- SynchronousModelChangedListener listener = new SynchronousModelChangedListener(1);
- getFixture().addListener(listener);
- AbstractTest.deleteFile(beanFile);
- assertTrue(listener.waitForEvents());
- getFixture().removeListener(listener);
- }
-
- protected static void createSessionBeanLocal(IPackageFragment fragment) throws Exception {
- IFile file = ((IContainer) fragment.getResource()).getFile(new Path("SessionBeanLocal.java"));
- AbstractTest.saveFile(file, localInterfaceContent);
- }
-
- protected static void createSessionBean(IPackageFragment fragment) throws Exception {
- IFile file = ((IContainer) fragment.getResource()).getFile(new Path("SessionBean.java"));
- AbstractTest.saveFile(file, beanContent);
- }
-
- /**
- * @return the reader
- */
- protected IModelProvider getFixture() {
- return fixture;
- }
-
- protected EJBJar getEJBJar() {
- return (EJBJar) getFixture().getModelObject();
- }
-
-}
diff --git a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AbstractTest.java b/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AbstractTest.java
deleted file mode 100644
index 468233f3..00000000
--- a/tests/org.eclipse.jst.j2ee.tests/j2ee-tests/org/eclipse/jst/jee/model/tests/AbstractTest.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/***********************************************************************
- * Copyright (c) 2008 by SAP AG, Walldorf.
- * 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:
- * SAP AG - initial API and implementation
- ***********************************************************************/
-package org.eclipse.jst.jee.model.tests;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.TimeUnit;
-
-import junit.framework.AssertionFailedError;
-
-import org.eclipse.core.filebuffers.FileBuffers;
-import org.eclipse.core.filebuffers.ITextFileBuffer;
-import org.eclipse.core.filebuffers.ITextFileBufferManager;
-import org.eclipse.core.filebuffers.LocationKind;
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IWorkspaceRunnable;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.resources.WorkspaceJob;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.core.runtime.Path;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.core.runtime.jobs.Job;
-import org.eclipse.jdt.core.IClasspathEntry;
-import org.eclipse.jdt.core.IJavaProject;
-import org.eclipse.jdt.core.JavaCore;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jface.text.IDocument;
-import org.eclipse.jst.common.project.facet.IJavaFacetInstallDataModelProperties;
-import org.eclipse.jst.common.project.facet.JavaFacetInstallDataModelProvider;
-import org.eclipse.jst.common.project.facet.JavaFacetUtils;