JBoss Tools SVN: r36612 - in trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test: .settings and 9 other directories.
by jbosstools-commits＠lists.jboss.org
Author: sbunciak
Date: 2011-11-24 07:27:29 -0500 (Thu, 24 Nov 2011)
New Revision: 36612
Added:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/.classpath
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/.project
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/.settings/
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/.settings/org.eclipse.jdt.core.prefs
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/META-INF/
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/META-INF/MANIFEST.MF
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/build.properties
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/Activator.java
Log:
Set-up of OpenShift SWTBot tests
Added: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/.classpath
===================================================================
--- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/.classpath (rev 0)
+++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/.classpath 2011-11-24 12:27:29 UTC (rev 36612)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ <classpathentry kind="src" path="src"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Added: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/.project
===================================================================
--- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/.project (rev 0)
+++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/.project 2011-11-24 12:27:29 UTC (rev 36612)
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.jboss.tools.openshift.ui.bot.test</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>
Added: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/.settings/org.eclipse.jdt.core.prefs 2011-11-24 12:27:29 UTC (rev 36612)
@@ -0,0 +1,8 @@
+#Thu Nov 24 11:09:03 CET 2011
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
Added: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/META-INF/MANIFEST.MF
===================================================================
--- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/META-INF/MANIFEST.MF (rev 0)
+++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/META-INF/MANIFEST.MF 2011-11-24 12:27:29 UTC (rev 36612)
@@ -0,0 +1,11 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: OpenShift SWTBot Tests
+Bundle-SymbolicName: org.jboss.tools.openshift.ui.bot.test
+Bundle-Version: 1.0.0.qualifier
+Bundle-Activator: org.jboss.tools.openshift.ui.bot.test.Activator
+Bundle-Vendor: Red Hat
+Require-Bundle: org.eclipse.ui,
+ org.eclipse.core.runtime
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
Added: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/build.properties
===================================================================
--- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/build.properties (rev 0)
+++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/build.properties 2011-11-24 12:27:29 UTC (rev 36612)
@@ -0,0 +1,4 @@
+source.. = src/
+output.. = bin/
+bin.includes = META-INF/,\
+ .
Added: trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/Activator.java
===================================================================
--- trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/Activator.java (rev 0)
+++ trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/src/org/jboss/tools/openshift/ui/bot/test/Activator.java 2011-11-24 12:27:29 UTC (rev 36612)
@@ -0,0 +1,50 @@
+package org.jboss.tools.openshift.ui.bot.test;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+/**
+ * The activator class controls the plug-in life cycle
+ */
+public class Activator extends AbstractUIPlugin {
+
+ // The plug-in ID
+ public static final String PLUGIN_ID = "org.jboss.tools.openshift.ui.bot.test"; //$NON-NLS-1$
+
+ // The shared instance
+ private static Activator plugin;
+
+ /**
+ * The constructor
+ */
+ public Activator() {
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
+ */
+ public void start(BundleContext context) throws Exception {
+ super.start(context);
+ plugin = this;
+ }
+
+ /*
+ * (non-Javadoc)
+ * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
+ */
+ public void stop(BundleContext context) throws Exception {
+ plugin = null;
+ super.stop(context);
+ }
+
+ /**
+ * Returns the shared instance
+ *
+ * @return the shared instance
+ */
+ public static Activator getDefault() {
+ return plugin;
+ }
+
+}
14 years, 4 months
JBoss Tools SVN: r36611 - trunk/openshift/tests.
by jbosstools-commits＠lists.jboss.org
Author: sbunciak
Date: 2011-11-24 07:25:57 -0500 (Thu, 24 Nov 2011)
New Revision: 36611
Added:
trunk/openshift/tests/org.jboss.tools.openshift.ui.bot.test/
Log:
Initial import.
14 years, 4 months
JBoss Tools SVN: r36609 - in trunk: jmx/features/org.jboss.tools.jmx.source.feature and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-11-24 07:04:12 -0500 (Thu, 24 Nov 2011)
New Revision: 36609
Modified:
trunk/common/features/org.jboss.tools.common.mylyn.source.feature/
trunk/jmx/features/org.jboss.tools.jmx.source.feature/
trunk/jmx/features/org.jboss.tools.jmx.test.source.feature/
Log:
more missing svnignores
Property changes on: trunk/common/features/org.jboss.tools.common.mylyn.source.feature
___________________________________________________________________
Added: svn:ignore
+ build
bin
target
buildlog.latest.txt
Property changes on: trunk/jmx/features/org.jboss.tools.jmx.source.feature
___________________________________________________________________
Added: svn:ignore
+ build
bin
target
buildlog.latest.txt
Property changes on: trunk/jmx/features/org.jboss.tools.jmx.test.source.feature
___________________________________________________________________
Added: svn:ignore
+ build
bin
target
buildlog.latest.txt
14 years, 4 months
JBoss Tools SVN: r36608 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot: test and 3 other directories.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-11-24 06:20:11 -0500 (Thu, 24 Nov 2011)
New Revision: 36608
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/AbstractPortletCreationTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JSFPortletCreationTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletCreationTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletWizardPageFillingTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortlet.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java
Removed:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletCreationTask.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletWizardPageFillingTask.java
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JSFPortletTestSuite.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java
Log:
created CreateJSFPortlet (and refactored CreatedJavaPortlet)
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/AbstractPortletCreationTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/AbstractPortletCreationTask.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/AbstractPortletCreationTask.java 2011-11-24 11:20:11 UTC (rev 36608)
@@ -0,0 +1,28 @@
+package org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss;
+
+import org.jboss.tools.portlet.ui.bot.task.wizard.WizardFillingTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.WizardOpeningTask;
+
+/**
+ *
+ * Common ancestor for tasks creating portlets.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class AbstractPortletCreationTask extends WizardFillingTask {
+
+ private static final String PORTLET_WIZARD_PATH = "JBoss Tools Web/Portlet";
+
+ private String portletWizardName;
+
+ public AbstractPortletCreationTask(String portletWizardName) {
+ this.portletWizardName = portletWizardName;
+ }
+
+ @Override
+ public void perform() {
+ performInnerTask(new WizardOpeningTask(portletWizardName, PORTLET_WIZARD_PATH));
+ super.perform();
+ }
+}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JSFPortletCreationTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JSFPortletCreationTask.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JSFPortletCreationTask.java 2011-11-24 11:20:11 UTC (rev 36608)
@@ -0,0 +1,15 @@
+package org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss;
+
+
+/**
+ * Creates a new java portlet using a JBoss wizard.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class JSFPortletCreationTask extends AbstractPortletCreationTask {
+
+ public JSFPortletCreationTask() {
+ super("JBoss JSF/Seam Portlet");
+ }
+}
Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletCreationTask.java (from rev 36592, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletCreationTask.java)
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletCreationTask.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletCreationTask.java 2011-11-24 11:20:11 UTC (rev 36608)
@@ -0,0 +1,39 @@
+package org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss;
+
+
+/**
+ * Creates a new java portlet using a JBoss wizard.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class JavaPortletCreationTask extends AbstractPortletCreationTask {
+
+ private JavaPortletWizardPageFillingTask firstPage;
+
+ public JavaPortletCreationTask() {
+ super("Java Portlet");
+ firstPage = new JavaPortletWizardPageFillingTask();
+ addWizardPage(firstPage);
+ }
+
+ public void setProject(String project) {
+ firstPage.setProject(project);
+ }
+
+ public void setSourceFolder(String sourceFolder) {
+ firstPage.setSourceFolder(sourceFolder);
+ }
+
+ public void setPackageName(String packageName) {
+ firstPage.setPackageName(packageName);
+ }
+
+ public void setClassName(String className) {
+ firstPage.setClassName(className);
+ }
+
+ public void setSuperclass(String superclass) {
+ firstPage.setSuperclass(superclass);
+ }
+}
Copied: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletWizardPageFillingTask.java (from rev 36592, trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletWizardPageFillingTask.java)
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletWizardPageFillingTask.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/JavaPortletWizardPageFillingTask.java 2011-11-24 11:20:11 UTC (rev 36608)
@@ -0,0 +1,60 @@
+package org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss;
+
+import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageFillingTask;
+
+public class JavaPortletWizardPageFillingTask extends AbstractSWTTask implements WizardPageFillingTask {
+
+ private String project;
+
+ private String sourceFolder;
+
+ private String packageName;
+
+ private String className;
+
+ private String superclass;
+
+ @Override
+ public void perform() {
+ if (project != null){
+ getBot().comboBoxWithLabel("Project:").setSelection(project);
+ }
+
+ if (sourceFolder != null){
+ getBot().textWithLabel("Source folder:").setText(sourceFolder);
+ }
+
+ if (packageName != null){
+ getBot().textWithLabel("Java package:").setText(packageName);
+ }
+
+ if (className != null){
+ getBot().textWithLabel("Class name:").setText(className);
+ }
+
+ if (superclass != null){
+ getBot().textWithLabel("Superclass:").setText(superclass);
+ }
+ }
+
+ public void setProject(String project) {
+ this.project = project;
+ }
+
+ public void setSourceFolder(String sourceFolder) {
+ this.sourceFolder = sourceFolder;
+ }
+
+ public void setPackageName(String packageName) {
+ this.packageName = packageName;
+ }
+
+ public void setClassName(String className) {
+ this.className = className;
+ }
+
+ public void setSuperclass(String superclass) {
+ this.superclass = superclass;
+ }
+}
Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletCreationTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletCreationTask.java 2011-11-24 11:19:07 UTC (rev 36607)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletCreationTask.java 2011-11-24 11:20:11 UTC (rev 36608)
@@ -1,47 +0,0 @@
-package org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss;
-
-import org.jboss.tools.portlet.ui.bot.task.wizard.WizardFillingTask;
-import org.jboss.tools.portlet.ui.bot.task.wizard.WizardOpeningTask;
-
-/**
- * Creates a new portlet using a JBoss wizard.
- *
- * @author Lucia Jelinkova
- *
- */
-public class PortletCreationTask extends WizardFillingTask {
-
- private PortletWizardPageFillingTask firstPage;
-
- public PortletCreationTask() {
- super();
- firstPage = new PortletWizardPageFillingTask();
- addWizardPage(firstPage);
- }
-
- @Override
- public void perform() {
- performInnerTask(new WizardOpeningTask("Java Portlet", "JBoss Tools Web/Portlet"));
- super.perform();
- }
-
- public void setProject(String project) {
- firstPage.setProject(project);
- }
-
- public void setSourceFolder(String sourceFolder) {
- firstPage.setSourceFolder(sourceFolder);
- }
-
- public void setPackageName(String packageName) {
- firstPage.setPackageName(packageName);
- }
-
- public void setClassName(String className) {
- firstPage.setClassName(className);
- }
-
- public void setSuperclass(String superclass) {
- firstPage.setSuperclass(superclass);
- }
-}
Deleted: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletWizardPageFillingTask.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletWizardPageFillingTask.java 2011-11-24 11:19:07 UTC (rev 36607)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/task/wizard/web/jboss/PortletWizardPageFillingTask.java 2011-11-24 11:20:11 UTC (rev 36608)
@@ -1,60 +0,0 @@
-package org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss;
-
-import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
-import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageFillingTask;
-
-public class PortletWizardPageFillingTask extends AbstractSWTTask implements WizardPageFillingTask {
-
- private String project;
-
- private String sourceFolder;
-
- private String packageName;
-
- private String className;
-
- private String superclass;
-
- @Override
- public void perform() {
- if (project != null){
- getBot().comboBoxWithLabel("Project:").setSelection(project);
- }
-
- if (sourceFolder != null){
- getBot().textWithLabel("Source folder:").setText(sourceFolder);
- }
-
- if (packageName != null){
- getBot().textWithLabel("Java package:").setText(packageName);
- }
-
- if (className != null){
- getBot().textWithLabel("Class name:").setText(className);
- }
-
- if (superclass != null){
- getBot().textWithLabel("Superclass:").setText(superclass);
- }
- }
-
- public void setProject(String project) {
- this.project = project;
- }
-
- public void setSourceFolder(String sourceFolder) {
- this.sourceFolder = sourceFolder;
- }
-
- public void setPackageName(String packageName) {
- this.packageName = packageName;
- }
-
- public void setClassName(String className) {
- this.className = className;
- }
-
- public void setSuperclass(String superclass) {
- this.superclass = superclass;
- }
-}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2011-11-24 11:19:07 UTC (rev 36607)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/AllTestsSuite.java 2011-11-24 11:20:11 UTC (rev 36608)
@@ -3,6 +3,7 @@
import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortlet;
import org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject;
import org.jboss.tools.portlet.ui.bot.test.core.RunJavaPortletOnServer;
+import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortlet;
import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -12,7 +13,8 @@
CreateJavaPortletProject.class,
CreateJavaPortlet.class,
RunJavaPortletOnServer.class,
- CreateJSFPortletProject.class
+ CreateJSFPortletProject.class,
+ CreateJSFPortlet.class
})
public class AllTestsSuite {
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JSFPortletTestSuite.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JSFPortletTestSuite.java 2011-11-24 11:19:07 UTC (rev 36607)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/JSFPortletTestSuite.java 2011-11-24 11:20:11 UTC (rev 36608)
@@ -1,5 +1,6 @@
package org.jboss.tools.portlet.ui.bot.test;
+import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortlet;
import org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -7,6 +8,7 @@
@RunWith(RequirementAwareUsageWindowClosingSuite.class)
@Suite.SuiteClasses({
CreateJSFPortletProject.class,
+ CreateJSFPortlet.class
})
public class JSFPortletTestSuite {
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java 2011-11-24 11:19:07 UTC (rev 36607)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortlet.java 2011-11-24 11:20:11 UTC (rev 36608)
@@ -1,26 +1,24 @@
package org.jboss.tools.portlet.ui.bot.test.core;
-import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.file;
-import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors;
-import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.containsNodes;
-import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.exists;
import static org.jboss.tools.portlet.ui.bot.test.core.CreateJavaPortletProject.PROJECT_NAME;
+import java.util.Arrays;
+import java.util.List;
+
import org.jboss.tools.portlet.ui.bot.entity.XMLNode;
-import org.jboss.tools.portlet.ui.bot.task.SWTTask;
-import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.PortletCreationTask;
-import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase;
-import org.junit.Test;
+import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.AbstractPortletCreationTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JavaPortletCreationTask;
+import org.jboss.tools.portlet.ui.bot.test.template.CreatePortletTemplate;
/**
- * Creates a new java portlet.
+ * Creates a new java portlet and checks if the right files are generated.
*
* @author Lucia Jelinkova
*
*/
-public class CreateJavaPortlet extends SWTTaskBasedTestCase {
+public class CreateJavaPortlet extends CreatePortletTemplate {
- private static final String CLASS_NAME = "UITestingPortlet";
+ private static final String CLASS_NAME = "UITestingJavaPortlet";
private static final String PACKAGE_NAME = "org.jboss.tools.tests.ui.portlet";
@@ -30,22 +28,29 @@
private static final String FULL_CLASS_NAME = PACKAGE_NAME + "." + CLASS_NAME;
- @Test
- public void testCreate(){
- doPerform(getCreatePortletTask());
-
- doAssertThat(0, isNumberOfErrors());
- doAssertThat(file(PROJECT_NAME, CLASS_FILE), exists());
- doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/default-object.xml"), exists());
- doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/portlet-instances.xml"), exists());
- doAssertThat(file(PROJECT_NAME, "WebContent/WEB-INF/portlet.xml"), containsNodes(new XMLNode("portlet-app/portlet/portlet-class", FULL_CLASS_NAME)));
+ @Override
+ protected String getProjectName() {
+ return PROJECT_NAME;
}
-
- private SWTTask getCreatePortletTask() {
- PortletCreationTask task = new PortletCreationTask();
+
+ protected AbstractPortletCreationTask getCreatePortletTask() {
+ JavaPortletCreationTask task = new JavaPortletCreationTask();
task.setProject(PROJECT_NAME);
task.setPackageName(PACKAGE_NAME);
task.setClassName(CLASS_NAME);
return task;
}
+
+ @Override
+ protected List<String> getExpectedFiles() {
+ return Arrays.asList(
+ "WebContent/WEB-INF/default-object.xml",
+ "WebContent/WEB-INF/portlet-instances.xml",
+ CLASS_FILE);
+ }
+
+ @Override
+ protected List<XMLNode> getExpectedXMLNodes() {
+ return Arrays.asList(new XMLNode("portlet-app/portlet/portlet-class", FULL_CLASS_NAME));
+ }
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java 2011-11-24 11:19:07 UTC (rev 36607)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/core/CreateJavaPortletProject.java 2011-11-24 11:20:11 UTC (rev 36608)
@@ -1,6 +1,7 @@
package org.jboss.tools.portlet.ui.bot.test.core;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition;
@@ -40,4 +41,9 @@
tasks.add(new JBossPortletCapabilitiesWizardPageFillingTask(JBossPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER));
return tasks;
}
+
+ @Override
+ public List<String> getExpectedFiles() {
+ return Arrays.asList(WEB_XML, PORTLET_XML, PORTLET_LIBRARIES);
+ }
}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortlet.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortlet.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortlet.java 2011-11-24 11:20:11 UTC (rev 36608)
@@ -0,0 +1,47 @@
+package org.jboss.tools.portlet.ui.bot.test.jsf;
+
+import static org.jboss.tools.portlet.ui.bot.test.jsf.CreateJSFPortletProject.PROJECT_NAME;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.jboss.tools.portlet.ui.bot.entity.XMLNode;
+import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.AbstractPortletCreationTask;
+import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.JSFPortletCreationTask;
+import org.jboss.tools.portlet.ui.bot.test.template.CreatePortletTemplate;
+
+/**
+ * Creates a new jsf portlet and checks if the right files are generated.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public class CreateJSFPortlet extends CreatePortletTemplate {
+
+ private static final String FACES_CLASS_NAME = "javax.portlet.faces.GenericFacesPortlet";
+
+ private static final String JSF_FOLDER = "WebContent/jsf/";
+
+ @Override
+ protected String getProjectName() {
+ return PROJECT_NAME;
+ }
+
+ @Override
+ protected AbstractPortletCreationTask getCreatePortletTask() {
+ return new JSFPortletCreationTask();
+ }
+
+ @Override
+ protected List<String> getExpectedFiles() {
+ return Arrays.asList(
+ JSF_FOLDER + "edit.jsp",
+ JSF_FOLDER + "view.jsp",
+ JSF_FOLDER + "help.jsp");
+ }
+
+ @Override
+ protected List<XMLNode> getExpectedXMLNodes() {
+ return Arrays.asList(new XMLNode("portlet-app/portlet/portlet-class", FACES_CLASS_NAME));
+ }
+}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java 2011-11-24 11:19:07 UTC (rev 36607)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/jsf/CreateJSFPortletProject.java 2011-11-24 11:20:11 UTC (rev 36608)
@@ -1,6 +1,7 @@
package org.jboss.tools.portlet.ui.bot.test.jsf;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition;
@@ -25,6 +26,10 @@
protected static final FacetDefinition JSF_FACET = new FacetDefinition("JavaServer Faces");
+ protected static final String FACES_CONFIG_XML = "WebContent/WEB-INF/faces-config.xml";
+
+ protected static final String WEB_APP_LIBRARIES = "Web App Libraries";
+
@Override
public String getProjectName() {
return PROJECT_NAME;
@@ -50,4 +55,9 @@
tasks.add(new JBossJSFPortletCapabilitiesWizardPageFillingTask(JBossJSFPortletCapabilitiesWizardPageFillingTask.Type.RUNTIME_PROVIDER));
return tasks;
}
+
+ @Override
+ public List<String> getExpectedFiles() {
+ return Arrays.asList(WEB_XML, PORTLET_XML, PORTLET_LIBRARIES, FACES_CONFIG_XML, WEB_APP_LIBRARIES);
+ }
}
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2011-11-24 11:19:07 UTC (rev 36607)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletProjectTemplate.java 2011-11-24 11:20:11 UTC (rev 36608)
@@ -1,14 +1,15 @@
package org.jboss.tools.portlet.ui.bot.test.template;
-import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.file;
import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors;
-import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.exists;
+import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.exist;
import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.hasFacets;
import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.isExistingProject;
+import java.util.ArrayList;
import java.util.List;
import org.jboss.tools.portlet.ui.bot.entity.FacetDefinition;
+import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile;
import org.jboss.tools.portlet.ui.bot.task.AbstractSWTTask;
import org.jboss.tools.portlet.ui.bot.task.facet.FacetsSelectionTask;
import org.jboss.tools.portlet.ui.bot.task.wizard.WizardPageFillingTask;
@@ -37,21 +38,28 @@
protected static final FacetDefinition JAVA_FACET = new FacetDefinition("Java", null, "1.6");
+ protected static final String WEB_XML = "WebContent/WEB-INF/web.xml";
+
+ protected static final String PORTLET_XML = "WebContent/WEB-INF/portlet.xml";
+
+ protected static final String PORTLET_LIBRARIES = "JBoss Portlet Libraries";
+
public abstract String getProjectName();
public abstract List<FacetDefinition> getRequiredFacets();
public abstract List<WizardPageFillingTask> getAdditionalWizardPages();
+ public abstract List<String> getExpectedFiles();
+
@Test
public void testcreate(){
doPerform(getCreateDynamicWebProjectTask());
doAssertThat(0, isNumberOfErrors());
doAssertThat(getProjectName(), isExistingProject());
- doAssertThat(file(getProjectName(), "WebContent/WEB-INF/portlet.xml"), exists());
- doAssertThat(file(getProjectName(), "JBoss Portlet Libraries"), exists());
doAssertThat(getProjectName(), hasFacets(getRequiredFacets()));
+ doAssertThat(getExpectedWorkspaceFiles(), exist());
}
protected AbstractSWTTask getCreateDynamicWebProjectTask() {
@@ -69,4 +77,14 @@
task.addAllFacets(getRequiredFacets());
return task;
}
+
+ private List<WorkspaceFile> getExpectedWorkspaceFiles(){
+ List<WorkspaceFile> expectedWorkspaceFiles = new ArrayList<WorkspaceFile>();
+
+ for (String file : getExpectedFiles()){
+ expectedWorkspaceFiles.add(new WorkspaceFile(getProjectName(), file));
+ }
+
+ return expectedWorkspaceFiles;
+ }
}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/test/template/CreatePortletTemplate.java 2011-11-24 11:20:11 UTC (rev 36608)
@@ -0,0 +1,53 @@
+package org.jboss.tools.portlet.ui.bot.test.template;
+
+import static org.jboss.tools.portlet.ui.bot.entity.EntityFactory.file;
+import static org.jboss.tools.portlet.ui.bot.matcher.factory.DefaultMatchersFactory.isNumberOfErrors;
+import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.containsNodes;
+import static org.jboss.tools.portlet.ui.bot.matcher.factory.WorkspaceMatchersFactory.exist;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile;
+import org.jboss.tools.portlet.ui.bot.entity.XMLNode;
+import org.jboss.tools.portlet.ui.bot.task.wizard.web.jboss.AbstractPortletCreationTask;
+import org.jboss.tools.portlet.ui.bot.test.testcase.SWTTaskBasedTestCase;
+import org.junit.Test;
+
+/**
+ * template test that creates a portlet (specified by subclasses) and asserts
+ * if the right files have been generated.
+ *
+ * @author Lucia Jelinkova
+ *
+ */
+public abstract class CreatePortletTemplate extends SWTTaskBasedTestCase {
+
+ protected abstract String getProjectName();
+
+ protected abstract AbstractPortletCreationTask getCreatePortletTask();
+
+ protected abstract List<String> getExpectedFiles();
+
+ protected abstract List<XMLNode> getExpectedXMLNodes();
+
+ @Test
+ public void testCreate(){
+ doPerform(getCreatePortletTask());
+
+ doAssertThat(0, isNumberOfErrors());
+ doAssertThat(getExpectedWorkspaceFiles(), exist());
+ doAssertThat(file(getProjectName(), "WebContent/WEB-INF/portlet.xml"),
+ containsNodes(getExpectedXMLNodes()));
+ }
+
+ private List<WorkspaceFile> getExpectedWorkspaceFiles(){
+ List<WorkspaceFile> expectedWorkspaceFiles = new ArrayList<WorkspaceFile>();
+
+ for (String file : getExpectedFiles()){
+ expectedWorkspaceFiles.add(new WorkspaceFile(getProjectName(), file));
+ }
+
+ return expectedWorkspaceFiles;
+ }
+}
14 years, 4 months
JBoss Tools SVN: r36607 - in trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher: workspace/file and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: ljelinko
Date: 2011-11-24 06:19:07 -0500 (Thu, 24 Nov 2011)
New Revision: 36607
Added:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFilesMatcher.java
Modified:
trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/WorkspaceMatchersFactory.java
Log:
created a new matcher for testing the list of files
Modified: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/WorkspaceMatchersFactory.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/WorkspaceMatchersFactory.java 2011-11-24 10:54:42 UTC (rev 36606)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/factory/WorkspaceMatchersFactory.java 2011-11-24 11:19:07 UTC (rev 36607)
@@ -10,6 +10,7 @@
import org.jboss.tools.portlet.ui.bot.matcher.workspace.ExistingProjectMatcher;
import org.jboss.tools.portlet.ui.bot.matcher.workspace.ProjectFacetsMatcher;
import org.jboss.tools.portlet.ui.bot.matcher.workspace.file.ExistingFileMatcher;
+import org.jboss.tools.portlet.ui.bot.matcher.workspace.file.ExistingFilesMatcher;
import org.jboss.tools.portlet.ui.bot.matcher.workspace.file.xml.XMLFileNodeContentMatcher;
/**
@@ -32,6 +33,10 @@
return new ExistingFileMatcher();
}
+ public static SWTMatcher<List<WorkspaceFile>> exist(){
+ return new ExistingFilesMatcher();
+ }
+
public static SWTMatcher<String> hasFacets(FacetDefinition... facets){
return new ProjectFacetsMatcher(facets);
}
@@ -43,4 +48,8 @@
public static SWTMatcher<WorkspaceFile> containsNodes(XMLNode... nodes){
return new XMLFileNodeContentMatcher(Arrays.asList(nodes));
}
+
+ public static SWTMatcher<WorkspaceFile> containsNodes(List<XMLNode> nodes){
+ return new XMLFileNodeContentMatcher(Arrays.asList(nodes.toArray(new XMLNode[nodes.size()])));
+ }
}
Added: trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFilesMatcher.java
===================================================================
--- trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFilesMatcher.java (rev 0)
+++ trunk/portlet/tests/org.jboss.tools.portlet.ui.bot.test/src/org/jboss/tools/portlet/ui/bot/matcher/workspace/file/ExistingFilesMatcher.java 2011-11-24 11:19:07 UTC (rev 36607)
@@ -0,0 +1,32 @@
+package org.jboss.tools.portlet.ui.bot.matcher.workspace.file;
+
+import java.util.List;
+
+import org.hamcrest.Description;
+import org.jboss.tools.portlet.ui.bot.entity.WorkspaceFile;
+import org.jboss.tools.portlet.ui.bot.matcher.AbstractSWTMatcher;
+import org.jboss.tools.ui.bot.ext.SWTBotFactory;
+import org.jboss.tools.ui.bot.ext.gen.ActionItem;
+
+public class ExistingFilesMatcher extends AbstractSWTMatcher<List<WorkspaceFile>> {
+
+ @Override
+ public boolean matchesSafely(List<WorkspaceFile> files) {
+ SWTBotFactory.getOpen().perspective(ActionItem.Perspective.JAVA.LABEL);
+
+ for (WorkspaceFile file : files){
+ boolean isPresent = SWTBotFactory.getPackageexplorer().isFilePresent(file.getProject(), file.getFilePathAsArray());
+
+ if (!isPresent){
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText("existing files");
+ }
+}
14 years, 4 months
JBoss Tools SVN: r36606 - in trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui: src/org/jboss/tools/ws/jaxrs/ui/cnf and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: xcoulon
Date: 2011-11-24 05:54:42 -0500 (Thu, 24 Nov 2011)
New Revision: 36606
Modified:
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/plugin.properties
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/plugin.xml
trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsLabelProvider.java
Log:
Fixing JBIDE-10211; JAX-RS RESTful label in the project & facets dialog should match
https://issues.jboss.org/browse/JBIDE-10211
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/plugin.properties
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/plugin.properties 2011-11-24 10:09:36 UTC (rev 36605)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/plugin.properties 2011-11-24 10:54:42 UTC (rev 36606)
@@ -1,2 +1,3 @@
PLUGIN_NAME=JBoss JAX-RS Tooling (UI)
PLUGIN_PROVIDER=JBoss by Red Hat
+navigatorContentName=JAX-RS REST Web Services
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/plugin.xml
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/plugin.xml 2011-11-24 10:09:36 UTC (rev 36605)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/plugin.xml 2011-11-24 10:54:42 UTC (rev 36606)
@@ -106,7 +106,7 @@
icon="icons/restful_web_services.gif"
id="org.jboss.tools.ws.jaxrs.ui.uriMappingsNavigatorContent"
labelProvider="org.jboss.tools.ws.jaxrs.ui.cnf.UriMappingsLabelProvider"
- name="RESTFul Web Services"
+ name="%navigatorContentName"
priority="highest"
providesSaveables="false">
<triggerPoints>
Modified: trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsLabelProvider.java
===================================================================
--- trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsLabelProvider.java 2011-11-24 10:09:36 UTC (rev 36605)
+++ trunk/ws/plugins/org.jboss.tools.ws.jaxrs.ui/src/org/jboss/tools/ws/jaxrs/ui/cnf/UriMappingsLabelProvider.java 2011-11-24 10:54:42 UTC (rev 36606)
@@ -112,7 +112,7 @@
@Override
public StyledString getStyledText(Object element) {
if (element instanceof UriPathTemplateCategory) {
- return new StyledString("RESTful Web Services");
+ return new StyledString("JAX-RS REST Web Services");
}
if (element instanceof UriPathTemplateElement) {
14 years, 4 months
JBoss Tools SVN: r36605 - trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2011-11-24 05:09:36 -0500 (Thu, 24 Nov 2011)
New Revision: 36605
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RuntimeUtils.java
Log:
Added null check in RuntimeUtils.checkedGetJBossServerRuntime(IRuntime)
Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RuntimeUtils.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RuntimeUtils.java 2011-11-24 09:38:46 UTC (rev 36604)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/RuntimeUtils.java 2011-11-24 10:09:36 UTC (rev 36605)
@@ -60,7 +60,7 @@
IJBossServerRuntime jbossRuntime = getJBossServerRuntime(runtime);
if (jbossRuntime == null)
throw new CoreException(new Status(IStatus.ERROR, JBossServerCorePlugin.PLUGIN_ID,
- NLS.bind(Messages.ServerRuntimeNotFound, runtime.getName())));
+ NLS.bind(Messages.ServerRuntimeNotFound, ((runtime==null)?"null":runtime.getName())))); //$NON-NLS-1$
return jbossRuntime;
}
14 years, 4 months
JBoss Tools SVN: r36604 - trunk/build/target-platform.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-11-24 04:38:46 -0500 (Thu, 24 Nov 2011)
New Revision: 36604
Modified:
trunk/build/target-platform/
Log:
removed REPO accidentally, now it is back.
Property changes on: trunk/build/target-platform
___________________________________________________________________
Modified: svn:ignore
- target
buildlog.latest.txt
bin
+ target
buildlog.latest.txt
bin
REPO
14 years, 4 months
JBoss Tools SVN: r36603 - trunk/openshift/plugins/org.jboss.tools.openshift.express.client.
by jbosstools-commits＠lists.jboss.org
Author: adietish
Date: 2011-11-24 04:38:09 -0500 (Thu, 24 Nov 2011)
New Revision: 36603
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar
Log:
[JBIDE-9929] added IApplication#waitForAccessible
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.client/org.jboss.tools.openshift.express.client-2.3.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
14 years, 4 months
JBoss Tools SVN: r36602 - in trunk: archives/features/org.jboss.ide.eclipse.archives.test.source.feature and 39 other directories.
by jbosstools-commits＠lists.jboss.org
Author: max.andersen(a)jboss.com
Date: 2011-11-24 04:34:12 -0500 (Thu, 24 Nov 2011)
New Revision: 36602
Modified:
trunk/archives/features/org.jboss.ide.eclipse.archives.source.feature/
trunk/archives/features/org.jboss.ide.eclipse.archives.test.source.feature/
trunk/as/features/org.jboss.ide.eclipse.as.source.feature/
trunk/as/features/org.jboss.ide.eclipse.as.test.source.feature/
trunk/birt/features/org.jboss.tools.birt.source.feature/
trunk/birt/features/org.jboss.tools.birt.test.source.feature/
trunk/bpel/features/org.jboss.tools.bpel.feature/
trunk/bpel/features/org.jboss.tools.bpel.source.feature/
trunk/bpel/features/org.jboss.tools.bpel.test.feature/
trunk/bpel/features/org.jboss.tools.bpel.test.source.feature/
trunk/bpel/plugins/org.jboss.tools.bpel.runtimes/
trunk/bpel/site/
trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test/
trunk/bpel/tests/org.jboss.tools.bpel.ui.test/
trunk/build/target-platform/
trunk/build/util/svnignore.sh
trunk/central/features/org.jboss.tools.central.discovery.feature/
trunk/central/features/org.jboss.tools.central.feature/
trunk/central/plugins/org.jboss.tools.central.discovery/
trunk/central/plugins/org.jboss.tools.central/
trunk/central/site/
trunk/common/features/org.jboss.tools.common.all.source.feature/
trunk/common/features/org.jboss.tools.common.all.test.feature/
trunk/common/features/org.jboss.tools.common.all.test.source.feature/
trunk/common/features/org.jboss.tools.common.jdt.source.feature/
trunk/common/plugins/org.jboss.tools.common.jdt.debug.ui/
trunk/common/plugins/org.jboss.tools.common.jdt.debug/
trunk/common/plugins/org.jboss.tools.common.validation/
trunk/common/tests/org.jboss.tools.common.ui.test/
trunk/common/tests/org.jboss.tools.common.validation.test/
trunk/forge/plugins/org.jboss.tools.forge.runtime.ext/
trunk/forge/tests/org.jboss.tools.forge.core.test/
trunk/forge/tests/org.jboss.tools.forge.ui.test/
trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test/
trunk/openshift/features/org.jboss.tools.openshift.egit.integration.feature/
trunk/openshift/features/org.jboss.tools.openshift.egit.integration.source.feature/
trunk/openshift/features/org.jboss.tools.openshift.express.feature/
trunk/openshift/features/org.jboss.tools.openshift.express.source.feature/
trunk/openshift/site/
trunk/runtime/plugins/org.jboss.tools.runtime.esb.detector/
trunk/tests/features/org.jboss.tools.test.source.feature/
Log:
missing svnignores and *.class should not be ignored by default since if there are *.class files outside bin something is wrong
Property changes on: trunk/archives/features/org.jboss.ide.eclipse.archives.source.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/archives/features/org.jboss.ide.eclipse.archives.test.source.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/as/features/org.jboss.ide.eclipse.as.source.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/as/features/org.jboss.ide.eclipse.as.test.source.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/birt/features/org.jboss.tools.birt.source.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/birt/features/org.jboss.tools.birt.test.source.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/bpel/features/org.jboss.tools.bpel.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/bpel/features/org.jboss.tools.bpel.source.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/bpel/features/org.jboss.tools.bpel.test.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/bpel/features/org.jboss.tools.bpel.test.source.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/bpel/plugins/org.jboss.tools.bpel.runtimes
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/bpel/site
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/bpel/tests/org.jboss.tools.bpel.ui.bot.test
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/bpel/tests/org.jboss.tools.bpel.ui.test
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/build/target-platform
___________________________________________________________________
Modified: svn:ignore
- REPO*
*target.zip
log*.txt
eclipse*
.target
local.target*
target
+ target
buildlog.latest.txt
bin
Modified: trunk/build/util/svnignore.sh
===================================================================
--- trunk/build/util/svnignore.sh 2011-11-24 09:24:46 UTC (rev 36601)
+++ trunk/build/util/svnignore.sh 2011-11-24 09:34:12 UTC (rev 36602)
@@ -4,7 +4,6 @@
buildlog.latest.txt
bin
build
-*.class
" > $tmpfile
dir="."; if [[ $1 ]]; then dir=$1; fi
Property changes on: trunk/central/features/org.jboss.tools.central.discovery.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/central/features/org.jboss.tools.central.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/central/plugins/org.jboss.tools.central
___________________________________________________________________
Modified: svn:ignore
- bin
bin
+ target
buildlog.latest.txt
bin
Property changes on: trunk/central/plugins/org.jboss.tools.central.discovery
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/central/site
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/common/features/org.jboss.tools.common.all.source.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/common/features/org.jboss.tools.common.all.test.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/common/features/org.jboss.tools.common.all.test.source.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/common/features/org.jboss.tools.common.jdt.source.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/common/plugins/org.jboss.tools.common.jdt.debug
___________________________________________________________________
Modified: svn:ignore
- target
+ target
buildlog.latest.txt
bin
Property changes on: trunk/common/plugins/org.jboss.tools.common.jdt.debug.ui
___________________________________________________________________
Modified: svn:ignore
- target
+ target
buildlog.latest.txt
bin
Property changes on: trunk/common/plugins/org.jboss.tools.common.validation
___________________________________________________________________
Modified: svn:ignore
- target
+ target
buildlog.latest.txt
bin
Property changes on: trunk/common/tests/org.jboss.tools.common.ui.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
buildlog.latest.txt
bin
Property changes on: trunk/common/tests/org.jboss.tools.common.validation.test
___________________________________________________________________
Modified: svn:ignore
- target
+ target
buildlog.latest.txt
bin
Property changes on: trunk/forge/plugins/org.jboss.tools.forge.runtime.ext
___________________________________________________________________
Modified: svn:ignore
- bin
*.index
+ target
buildlog.latest.txt
bin
Property changes on: trunk/forge/tests/org.jboss.tools.forge.core.test
___________________________________________________________________
Modified: svn:ignore
- bin
+ target
buildlog.latest.txt
bin
Property changes on: trunk/forge/tests/org.jboss.tools.forge.ui.test
___________________________________________________________________
Modified: svn:ignore
- bin
+ target
buildlog.latest.txt
bin
Property changes on: trunk/modeshape/tests/org.jboss.tools.modeshape.rest.ui.bot.test
___________________________________________________________________
Modified: svn:ignore
- bin screenshots *.log
+ target
buildlog.latest.txt
bin
Property changes on: trunk/openshift/features/org.jboss.tools.openshift.egit.integration.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/openshift/features/org.jboss.tools.openshift.egit.integration.source.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/openshift/features/org.jboss.tools.openshift.express.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/openshift/features/org.jboss.tools.openshift.express.source.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/openshift/site
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
Property changes on: trunk/runtime/plugins/org.jboss.tools.runtime.esb.detector
___________________________________________________________________
Modified: svn:ignore
- target
+ target
buildlog.latest.txt
bin
Property changes on: trunk/tests/features/org.jboss.tools.test.source.feature
___________________________________________________________________
Added: svn:ignore
+ target
buildlog.latest.txt
bin
14 years, 4 months