Author: akazakov
Date: 2010-03-26 15:23:00 -0400 (Fri, 26 Mar 2010)
New Revision: 21064
Modified:
branches/modular_build/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
branches/modular_build/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java
branches/modular_build/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFModelTest.java
branches/modular_build/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ModelFormat_2_0_0_Test.java
branches/modular_build/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF
branches/modular_build/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java
branches/modular_build/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF
branches/modular_build/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FacesConfigNewWizardTest.java
branches/modular_build/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java
branches/modular_build/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.MF
branches/modular_build/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/JSFVerificationTest.java
Log:
JBDS-486
Modified: branches/modular_build/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF
===================================================================
---
branches/modular_build/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-03-26
19:18:16 UTC (rev 21063)
+++
branches/modular_build/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-03-26
19:23:00 UTC (rev 21064)
@@ -11,16 +11,12 @@
Require-Bundle:
org.junit,
org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
org.jboss.tools.tests,
- org.jboss.tools.common.test,
- org.jboss.tools.common.model,
org.jboss.tools.jsf,
org.jboss.tools.jsf.ui,
- org.jboss.tools.jst.web.ui,
org.jboss.tools.common.model.ui,
- org.eclipse.ui.ide
+ org.eclipse.ui.ide,
+ org.jboss.tools.jst.web.ui
Bundle-Activator: org.jboss.tools.jsf.plugin.JsfTestPlugin
Bundle-ActivationPolicy: lazy
Bundle-Localization: plugin
Modified:
branches/modular_build/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java
===================================================================
---
branches/modular_build/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java 2010-03-26
19:18:16 UTC (rev 21063)
+++
branches/modular_build/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFBeansTest.java 2010-03-26
19:23:00 UTC (rev 21064)
@@ -10,12 +10,12 @@
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.test.util.TestProjectProvider;
import org.jboss.tools.jsf.model.pv.JSFProjectsRoot;
import org.jboss.tools.jsf.model.pv.JSFProjectsTree;
import org.jboss.tools.jst.web.model.pv.WebProjectNode;
import org.jboss.tools.jst.web.project.list.IWebPromptingProvider;
import org.jboss.tools.jst.web.project.list.WebPromptingProvider;
+import org.jboss.tools.test.util.TestProjectProvider;
import junit.framework.TestCase;
Modified:
branches/modular_build/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFModelTest.java
===================================================================
---
branches/modular_build/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFModelTest.java 2010-03-26
19:18:16 UTC (rev 21063)
+++
branches/modular_build/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JSFModelTest.java 2010-03-26
19:23:00 UTC (rev 21064)
@@ -15,8 +15,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.jboss.tools.common.test.util.TestDescription;
-import org.jboss.tools.common.test.util.TestProjectProvider;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
@@ -27,6 +25,8 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jsf.model.pv.JSFProjectsRoot;
import org.jboss.tools.jsf.model.pv.JSFProjectsTree;
+import org.jboss.tools.test.util.TestDescription;
+import org.jboss.tools.test.util.TestProjectProvider;
import junit.framework.TestCase;
Modified:
branches/modular_build/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ModelFormat_2_0_0_Test.java
===================================================================
---
branches/modular_build/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ModelFormat_2_0_0_Test.java 2010-03-26
19:18:16 UTC (rev 21063)
+++
branches/modular_build/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/ModelFormat_2_0_0_Test.java 2010-03-26
19:23:00 UTC (rev 21064)
@@ -16,7 +16,6 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.NullProgressMonitor;
-import org.jboss.tools.common.test.util.TestProjectProvider;
import org.jboss.tools.common.model.XModel;
import org.jboss.tools.common.model.XModelObject;
@@ -25,6 +24,7 @@
import org.jboss.tools.common.model.util.EclipseResourceUtil;
import org.jboss.tools.jsf.model.pv.JSFProjectsRoot;
import org.jboss.tools.jsf.model.pv.JSFProjectsTree;
+import org.jboss.tools.test.util.TestProjectProvider;
import junit.framework.TestCase;
Modified:
branches/modular_build/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF
===================================================================
---
branches/modular_build/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF 2010-03-26
19:18:16 UTC (rev 21063)
+++
branches/modular_build/jsf/tests/org.jboss.tools.jsf.text.ext.test/META-INF/MANIFEST.MF 2010-03-26
19:23:00 UTC (rev 21064)
@@ -3,19 +3,13 @@
Bundle-Name: %Bundle-Name.0
Bundle-SymbolicName: org.jboss.tools.jsf.text.ext.test
Bundle-Version: 2.0.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.junit,
+Require-Bundle: org.junit,
org.jboss.tools.jsf.text.ext,
- org.eclipse.wst.sse.ui,
org.eclipse.ui.workbench.texteditor,
org.eclipse.jface.text,
- org.eclipse.core.resources,
org.eclipse.ui.ide,
org.jboss.tools.common.text.ext,
- org.eclipse.wst.sse.core,
org.jboss.tools.common.model,
- org.jboss.tools.common.test,
org.jboss.tools.tests
Bundle-ActivationPolicy: lazy
Bundle-Vendor: %Bundle-Vendor.0
Modified:
branches/modular_build/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java
===================================================================
---
branches/modular_build/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java 2010-03-26
19:18:16 UTC (rev 21063)
+++
branches/modular_build/jsf/tests/org.jboss.tools.jsf.text.ext.test/src/org/jboss/tools/jsf/text/ext/test/ELExprPartitionerTest.java 2010-03-26
19:23:00 UTC (rev 21064)
@@ -32,11 +32,11 @@
import org.eclipse.wst.sse.core.internal.provisional.IStructuredModel;
import org.eclipse.wst.sse.core.internal.provisional.text.IStructuredDocument;
import org.eclipse.wst.sse.ui.internal.editor.EditorModelUtil;
-import org.jboss.tools.common.test.util.TestProjectProvider;
import org.jboss.tools.common.text.ext.hyperlink.IHyperlinkRegion;
import org.jboss.tools.common.text.ext.util.AxisUtil;
import org.jboss.tools.jsf.text.ext.hyperlink.JSPExprHyperlinkPartitioner;
import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.TestProjectProvider;
public class ELExprPartitionerTest extends TestCase {
TestProjectProvider provider = null;
Modified:
branches/modular_build/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF
===================================================================
---
branches/modular_build/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2010-03-26
19:18:16 UTC (rev 21063)
+++
branches/modular_build/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2010-03-26
19:23:00 UTC (rev 21064)
@@ -5,20 +5,16 @@
Bundle-Version: 1.0.0
Bundle-Vendor: %Bundle-Vendor.0
Require-Bundle: org.junit,
- org.eclipse.core.resources;bundle-version="3.4.0",
- org.jboss.tools.tests;bundle-version="2.0.0",
- org.eclipse.core.runtime;bundle-version="3.4.0",
- org.eclipse.jface;bundle-version="3.4.0",
- org.jboss.tools.common.test;bundle-version="2.0.0",
- org.eclipse.ui.workbench;bundle-version="3.4.0",
- org.jboss.tools.jsf.ui;bundle-version="2.0.0",
- org.jboss.tools.jst.web.ui;bundle-version="2.0.0",
- org.jboss.tools.jst.jsp;bundle-version="2.0.0",
- org.jboss.tools.common.model.ui;bundle-version="2.0.0",
- org.eclipse.ui.ide;bundle-version="3.4.1",
- org.eclipse.ltk.core.refactoring;bundle-version="3.5.0",
- org.eclipse.jst.j2ee;bundle-version="1.1.300",
- org.jboss.tools.common.ui
+ org.jboss.tools.tests,
+ org.eclipse.jface,
+ org.eclipse.ui.workbench,
+ org.jboss.tools.jsf.ui,
+ org.jboss.tools.jst.web.ui,
+ org.jboss.tools.jst.jsp,
+ org.jboss.tools.common.model.ui,
+ org.eclipse.ui.ide,
+ org.eclipse.ltk.core.refactoring,
+ org.eclipse.jst.j2ee
Bundle-Localization: plugin
Bundle-ClassPath: jsf-ui-test.jar
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified:
branches/modular_build/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FacesConfigNewWizardTest.java
===================================================================
---
branches/modular_build/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FacesConfigNewWizardTest.java 2010-03-26
19:18:16 UTC (rev 21063)
+++
branches/modular_build/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/FacesConfigNewWizardTest.java 2010-03-26
19:23:00 UTC (rev 21064)
@@ -15,8 +15,8 @@
import org.jboss.tools.common.model.ui.wizard.newfile.NewFileContextEx;
import org.jboss.tools.common.model.ui.wizard.newfile.NewFileWizardEx;
import org.jboss.tools.common.util.FileUtil;
-import org.jboss.tools.common.util.WorkbenchUtils;
import org.jboss.tools.test.util.JobUtils;
+import org.jboss.tools.test.util.WorkbenchUtils;
public class FacesConfigNewWizardTest extends WizardTest {
Modified:
branches/modular_build/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java
===================================================================
---
branches/modular_build/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java 2010-03-26
19:18:16 UTC (rev 21063)
+++
branches/modular_build/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/WizardTest.java 2010-03-26
19:23:00 UTC (rev 21064)
@@ -14,8 +14,8 @@
import org.jboss.tools.common.meta.action.impl.SpecialWizardSupport;
import org.jboss.tools.common.model.ui.wizard.newfile.NewFileContextEx;
import org.jboss.tools.common.model.ui.wizard.newfile.NewFileWizardEx;
-import org.jboss.tools.common.util.WorkbenchUtils;
import org.jboss.tools.jst.jsp.outline.cssdialog.CSSClassDialog;
+import org.jboss.tools.test.util.WorkbenchUtils;
public abstract class WizardTest extends TestCase {
protected String id;
Modified:
branches/modular_build/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.MF
===================================================================
---
branches/modular_build/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.MF 2010-03-26
19:18:16 UTC (rev 21063)
+++
branches/modular_build/jsf/tests/org.jboss.tools.jsf.verification.test/META-INF/MANIFEST.MF 2010-03-26
19:23:00 UTC (rev 21064)
@@ -8,14 +8,10 @@
Export-Package: org.jboss.tools.jsf.verification.test
Require-Bundle:
org.junit,
- org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.jboss.tools.common.model,
org.jboss.tools.common.verification,
org.jboss.tools.jsf,
- org.jboss.tools.jsf.verification,
org.jboss.tools.common.model.ui,
- org.jboss.tools.common.test,
- org.jboss.tools.common.verification.test
+ org.jboss.tools.common.verification.test,
+ org.jboss.tools.tests
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
Modified:
branches/modular_build/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/JSFVerificationTest.java
===================================================================
---
branches/modular_build/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/JSFVerificationTest.java 2010-03-26
19:18:16 UTC (rev 21063)
+++
branches/modular_build/jsf/tests/org.jboss.tools.jsf.verification.test/src/org/jboss/tools/jsf/verification/test/JSFVerificationTest.java 2010-03-26
19:23:00 UTC (rev 21064)
@@ -19,10 +19,10 @@
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.project.IModelNature;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.common.test.util.TestDescription;
-import org.jboss.tools.common.test.util.TestProjectProvider;
import org.jboss.tools.common.verification.test.VerificationUtil;
import org.jboss.tools.common.verification.vrules.VResult;
+import org.jboss.tools.test.util.TestDescription;
+import org.jboss.tools.test.util.TestProjectProvider;
public class JSFVerificationTest extends TestCase {
TestProjectProvider provider = null;