JBoss Tools SVN: r38368 - trunk/maven/plugins/org.jboss.tools.maven.core/META-INF.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-02-01 09:17:36 -0500 (Wed, 01 Feb 2012)
New Revision: 38368
Modified:
trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF
Log:
Add support for m2e-wtp 0.16.0
Modified: trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2012-02-01 14:14:53 UTC (rev 38367)
+++ trunk/maven/plugins/org.jboss.tools.maven.core/META-INF/MANIFEST.MF 2012-02-01 14:17:36 UTC (rev 38368)
@@ -23,7 +23,7 @@
org.eclipse.ui.workbench;visibility:=reexport,
org.eclipse.m2e.model.edit;bundle-version="[1.0,1.2)";visibility:=reexport,
org.eclipse.core.expressions,
- org.maven.ide.eclipse.wtp;bundle-version="[0.13.0,0.16.0)";visibility:=reexport,
+ org.maven.ide.eclipse.wtp;bundle-version="[0.13.0,0.17.0)";visibility:=reexport,
org.eclipse.jdt.ui;bundle-version="3.7.0"
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: J2SE-1.5
12 years, 11 months
JBoss Tools SVN: r38367 - trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-02-01 09:14:53 -0500 (Wed, 01 Feb 2012)
New Revision: 38367
Modified:
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizard.java
trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizardPage.java
Log:
https://issues.jboss.org/browse/JBIDE-10635
Create layout folder automatically
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizard.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizard.java 2012-02-01 13:06:03 UTC (rev 38366)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizard.java 2012-02-01 14:14:53 UTC (rev 38367)
@@ -18,6 +18,7 @@
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.operations.IUndoableOperation;
+import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
@@ -25,6 +26,7 @@
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.debug.core.DebugPlugin;
@@ -110,6 +112,11 @@
params.get(ISeamParameter.HIBERNATE_CONFIGURATION_NAME).getValueAsString());
SeamProjectsSet seamProjectsSet = SeamProjectsSet.create(project);
+
+ IFolder layoutFolder = seamProjectsSet.getViewsFolder().getFolder(new Path("layout"));
+ if(!layoutFolder.exists()){
+ layoutFolder.create(true, true, monitor);
+ }
wc.setAttribute(HibernateLaunchConstants.ATTR_OUTPUT_DIR,
seamProjectsSet.getModelFolder()==null?
Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizardPage.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizardPage.java 2012-02-01 13:06:03 UTC (rev 38366)
+++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEntitiesWizardPage.java 2012-02-01 14:14:53 UTC (rev 38367)
@@ -16,13 +16,11 @@
import java.util.HashMap;
import java.util.Map;
-import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IAdaptable;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.internal.ui.wizards.dialogfields.DialogField;
@@ -45,7 +43,6 @@
import org.hibernate.eclipse.console.utils.ProjectUtils;
import org.hibernate.eclipse.launch.HibernateLaunchConstants;
import org.hibernate.eclipse.launch.PathHelper;
-import org.jboss.tools.common.ui.CommonUIMessages;
import org.jboss.tools.common.ui.IValidator;
import org.jboss.tools.common.ui.widget.editor.IFieldEditor;
import org.jboss.tools.common.ui.widget.editor.INamedElement;
@@ -314,18 +311,6 @@
return;
}
- IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(projectName);
- SeamProjectsSet seamProjectsSet = SeamProjectsSet.create(project);
- IContainer viewsFolder = seamProjectsSet.getViewsFolder();
- if (viewsFolder != null){
- if (!viewsFolder.getFolder(new Path("layout")).exists()){//$NON-NLS-1$
- setErrorMessage(CommonUIMessages.bind(CommonUIMessages.VALIDATOR_FACTORY_FOLDER_DOES_NOT_EXIST,
- viewsFolder.getName() + "/layout"));//$NON-NLS-1$
- setPageComplete(false);
- return;
- }
- }
-
if ("reverse".equals(radios.getValue()) && existingReveng.isSelected() && reverseEngineeringSettings.getText().trim().length() == 0){
setErrorMessage("Select reveng.xml file");//$NON-NLS-1$
setPageComplete(false);
12 years, 11 months
JBoss Tools SVN: r38366 - trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench.
by jbosstools-commits＠lists.jboss.org
Author: dgeraskov
Date: 2012-02-01 08:06:03 -0500 (Wed, 01 Feb 2012)
New Revision: 38366
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/BaseNodeWorkbenchAdapter.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/BasicWorkbenchAdapter.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ColumnWorkbenchAdapter.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationAdapterFactory.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PersistentClassWorkbenchAdapter.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PrimaryKeyWorkbenchAdapter.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PropertyWorkbenchAdapter.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableWorkbenchAdapter.java
trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ValueWorkbenchAdapter.java
Log:
https://issues.jboss.org/browse/JBIDE-10135
Do not use deferred adapter where not necessary
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/BaseNodeWorkbenchAdapter.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/BaseNodeWorkbenchAdapter.java 2012-02-01 12:56:05 UTC (rev 38365)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/BaseNodeWorkbenchAdapter.java 2012-02-01 13:06:03 UTC (rev 38366)
@@ -22,16 +22,15 @@
package org.hibernate.eclipse.console.workbench;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.progress.IDeferredWorkbenchAdapter;
+import org.eclipse.ui.model.IWorkbenchAdapter;
import org.hibernate.console.node.BaseNode;
import org.hibernate.eclipse.console.utils.EclipseImages;
-public class BaseNodeWorkbenchAdapter extends BasicWorkbenchAdapter implements
- IDeferredWorkbenchAdapter {
+public class BaseNodeWorkbenchAdapter implements IWorkbenchAdapter {
public Object[] getChildren(Object o) {
BaseNode bn = (BaseNode) o;
- return toArray(bn.children(),BaseNode.class);
+ return BasicWorkbenchAdapter.toArray(bn.children(),BaseNode.class);
}
public ImageDescriptor getImageDescriptor(Object object) {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/BasicWorkbenchAdapter.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/BasicWorkbenchAdapter.java 2012-02-01 12:56:05 UTC (rev 38365)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/BasicWorkbenchAdapter.java 2012-02-01 13:06:03 UTC (rev 38366)
@@ -69,7 +69,7 @@
@SuppressWarnings("unchecked")
- protected <T> T[] toArray(Iterator<? extends T> iterator, Class<T> clazz, Comparator<? super T> comparator) {
+ protected static <T> T[] toArray(Iterator<? extends T> iterator, Class<T> clazz, Comparator<? super T> comparator) {
List<T> obj = toList( iterator );
T[] array = obj.toArray((T[])Array.newInstance(clazz, obj.size()) );
@@ -79,7 +79,7 @@
return array;
}
- private <T> List<T> toList(Iterator<? extends T> iterator) {
+ private static <T> List<T> toList(Iterator<? extends T> iterator) {
List<T> obj = new ArrayList<T>();
while ( iterator.hasNext() ) {
obj.add(iterator.next());
@@ -87,7 +87,7 @@
return obj;
}
- protected Object[] toArray(Enumeration<?> enumeration, Class<?> clazz) {
+ protected static Object[] toArray(Enumeration<?> enumeration, Class<?> clazz) {
List<Object> obj = new ArrayList<Object>();
while ( enumeration.hasMoreElements() ) {
obj.add(enumeration.nextElement());
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ColumnWorkbenchAdapter.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ColumnWorkbenchAdapter.java 2012-02-01 12:56:05 UTC (rev 38365)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ColumnWorkbenchAdapter.java 2012-02-01 13:06:03 UTC (rev 38366)
@@ -22,15 +22,16 @@
package org.hibernate.eclipse.console.workbench;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.model.IWorkbenchAdapter;
import org.hibernate.cfg.reveng.JDBCToHibernateTypeHelper;
import org.hibernate.console.ImageConstants;
import org.hibernate.eclipse.console.utils.EclipseImages;
import org.hibernate.mapping.Column;
-public class ColumnWorkbenchAdapter extends BasicWorkbenchAdapter {
+public class ColumnWorkbenchAdapter implements IWorkbenchAdapter {
public Object[] getChildren(Object o) {
- return NO_CHILDREN;
+ return new Object[0];
}
public ImageDescriptor getImageDescriptor(Object object) {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationAdapterFactory.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationAdapterFactory.java 2012-02-01 12:56:05 UTC (rev 38365)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ConfigurationAdapterFactory.java 2012-02-01 13:06:03 UTC (rev 38366)
@@ -44,42 +44,62 @@
public class ConfigurationAdapterFactory implements IAdapterFactory {
private Class<?>[] classes;
- private IDeferredWorkbenchAdapter[] adapters;
+ private IWorkbenchAdapter[] adapters;
+ private Class<?>[] deferredClasses;
+ private IDeferredWorkbenchAdapter[] deferredAdapters;
+
public ConfigurationAdapterFactory() {
- Map<Class<?>, IDeferredWorkbenchAdapter> map = new HashMap<Class<?>, IDeferredWorkbenchAdapter>();
+ Map<Class<?>, IDeferredWorkbenchAdapter> deferredMap = new HashMap<Class<?>, IDeferredWorkbenchAdapter>();
- map.put(ConsoleConfiguration.class, new ConsoleConfigurationWorkbenchAdapter());
- map.put(Configuration.class, new ConfigurationWorkbenchAdapter());
- map.put(KnownConfigurations.class, new KnownConfigurationsWorkbenchAdapter());
+ deferredMap.put(ConsoleConfiguration.class, new ConsoleConfigurationWorkbenchAdapter());
+ deferredMap.put(Configuration.class, new ConfigurationWorkbenchAdapter());
+ deferredMap.put(KnownConfigurations.class, new KnownConfigurationsWorkbenchAdapter());
+ deferredMap.put(LazyDatabaseSchema.class, new LazyDatabaseSchemaWorkbenchAdapter());
+ deferredMap.put( LazySessionFactory.class, new LazySessionFactoryAdapter() );
+
+
+ deferredClasses = new Class[deferredMap.size()];
+ deferredAdapters = new IDeferredWorkbenchAdapter[deferredMap.size()];
+
+ int cnt = 0;
+ for (Map.Entry<Class<?>, IDeferredWorkbenchAdapter> entry : deferredMap.entrySet()) {
+ deferredClasses[cnt] = entry.getKey();
+ deferredAdapters[cnt] = entry.getValue();
+ cnt++;
+ }
+
+ Map<Class<?>, IWorkbenchAdapter> map = new HashMap<Class<?>, IWorkbenchAdapter>();
+ map.put(TableContainer.class, new TableContainerWorkbenchAdapter());
map.put(PersistentClass.class, new PersistentClassWorkbenchAdapter());
map.put(Property.class, new PropertyWorkbenchAdapter());
map.put(Value.class, new ValueWorkbenchAdapter());
- map.put(BaseNode.class, new BaseNodeWorkbenchAdapter());
- map.put(LazyDatabaseSchema.class, new LazyDatabaseSchemaWorkbenchAdapter());
- map.put( LazySessionFactory.class, new LazySessionFactoryAdapter() );
- map.put(TableContainer.class, new TableContainerWorkbenchAdapter());
map.put(Table.class, new TableWorkbenchAdapter());
map.put(PrimaryKey.class, new PrimaryKeyWorkbenchAdapter());
- map.put(Column.class, new ColumnWorkbenchAdapter());
+ map.put(Column.class, new ColumnWorkbenchAdapter());
+ map.put(BaseNode.class, new BaseNodeWorkbenchAdapter());
+
+
classes = new Class[map.size()];
- adapters = new IDeferredWorkbenchAdapter[map.size()];
-
- int cnt = 0;
- for (Map.Entry<Class<?>, IDeferredWorkbenchAdapter> entry : map.entrySet()) {
+ adapters = new IWorkbenchAdapter[map.size()];
+ cnt = 0;
+ for (Map.Entry<Class<?>, IWorkbenchAdapter> entry : map.entrySet()) {
classes[cnt] = entry.getKey();
adapters[cnt] = entry.getValue();
cnt++;
}
}
- @SuppressWarnings("unchecked")
+ @SuppressWarnings("rawtypes")
public Object getAdapter(Object adaptableObject, Class adapterType) {
- if((adapterType==IDeferredWorkbenchAdapter.class || adapterType==IWorkbenchAdapter.class)) {
- return getAdapter( adaptableObject );
- }
+ if(adapterType==IDeferredWorkbenchAdapter.class){
+ return getDeferredAdapter( adaptableObject );
+ } else if (adapterType==IWorkbenchAdapter.class){
+ Object adapter = getAdapter( adaptableObject );
+ return adapter != null ? adapter : getDeferredAdapter( adaptableObject );
+ }
if(adapterType==IPropertySource2.class || adapterType==IPropertySource.class) {
return getPropertySource(adaptableObject);
}
@@ -90,6 +110,16 @@
private Object getPropertySource(Object adaptableObject) {
return null;//new GenericPropertySource(adaptableObject);
}
+
+ private Object getDeferredAdapter(Object adaptableObject) {
+ for (int i = 0; i < deferredClasses.length; i++) {
+ Class<?> clazz = deferredClasses[i];
+ if (clazz.isInstance(adaptableObject)) {
+ return deferredAdapters[i];
+ }
+ }
+ return null;
+ }
private Object getAdapter(Object adaptableObject) {
for (int i = 0; i < classes.length; i++) {
@@ -109,7 +139,11 @@
for (int i = 0; i < classes.length; i++) {
Class<?> clazz = classes[i];
adapterManager.registerAdapters(this, clazz);
- }
+ }
+ for (int i = 0; i < deferredClasses.length; i++) {
+ Class<?> clazz = deferredClasses[i];
+ adapterManager.registerAdapters(this, clazz);
+ }
}
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PersistentClassWorkbenchAdapter.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PersistentClassWorkbenchAdapter.java 2012-02-01 12:56:05 UTC (rev 38365)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PersistentClassWorkbenchAdapter.java 2012-02-01 13:06:03 UTC (rev 38366)
@@ -26,13 +26,14 @@
import java.util.List;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.model.IWorkbenchAdapter;
import org.hibernate.console.ImageConstants;
import org.hibernate.eclipse.console.utils.EclipseImages;
import org.hibernate.mapping.PersistentClass;
import org.hibernate.mapping.Property;
import org.hibernate.util.JoinedIterator;
-public class PersistentClassWorkbenchAdapter extends BasicWorkbenchAdapter {
+public class PersistentClassWorkbenchAdapter implements IWorkbenchAdapter {
@SuppressWarnings("unchecked")
public Object[] getChildren(Object o) {
@@ -45,7 +46,7 @@
}
Iterator<Property> propertyClosureIterator = new JoinedIterator(properties.iterator(), pc.getPropertyClosureIterator());
- return toArray(propertyClosureIterator, Property.class, null);
+ return BasicWorkbenchAdapter.toArray(propertyClosureIterator, Property.class, null);
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PrimaryKeyWorkbenchAdapter.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PrimaryKeyWorkbenchAdapter.java 2012-02-01 12:56:05 UTC (rev 38365)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PrimaryKeyWorkbenchAdapter.java 2012-02-01 13:06:03 UTC (rev 38366)
@@ -22,19 +22,21 @@
package org.hibernate.eclipse.console.workbench;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.model.IWorkbenchAdapter;
import org.hibernate.console.ImageConstants;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.utils.EclipseImages;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.PrimaryKey;
-public class PrimaryKeyWorkbenchAdapter extends BasicWorkbenchAdapter {
+public class PrimaryKeyWorkbenchAdapter implements IWorkbenchAdapter {
+ @SuppressWarnings("unchecked")
public Object[] getChildren(Object o) {
PrimaryKey t = getPrimaryKey( o );
if(t.getColumnSpan()==1) {
- return NO_CHILDREN;
+ return new Object[0];
} else {
return t.getColumns().toArray(new Column[0]);
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PropertyWorkbenchAdapter.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PropertyWorkbenchAdapter.java 2012-02-01 12:56:05 UTC (rev 38365)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/PropertyWorkbenchAdapter.java 2012-02-01 13:06:03 UTC (rev 38366)
@@ -22,7 +22,7 @@
package org.hibernate.eclipse.console.workbench;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.progress.IDeferredWorkbenchAdapter;
+import org.eclipse.ui.model.IWorkbenchAdapter;
import org.hibernate.mapping.Any;
import org.hibernate.mapping.Array;
import org.hibernate.mapping.Bag;
@@ -41,8 +41,9 @@
import org.hibernate.mapping.Value;
import org.hibernate.mapping.ValueVisitor;
-public class PropertyWorkbenchAdapter extends BasicWorkbenchAdapter implements
- IDeferredWorkbenchAdapter {
+public class PropertyWorkbenchAdapter implements IWorkbenchAdapter {
+
+ final static Object[] NO_CHILDREN = new Object[0];
public Object[] getChildren(Object o) {
Property p = (Property) o;
@@ -57,8 +58,9 @@
return NO_CHILDREN;
}
+ @SuppressWarnings("unchecked")
public Object accept(Component component) {
- return toArray(component.getPropertyIterator(), Property.class, null);
+ return BasicWorkbenchAdapter.toArray(component.getPropertyIterator(), Property.class, null);
}
public Object accept(DependantValue value) {
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java 2012-02-01 12:56:05 UTC (rev 38365)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableContainerWorkbenchAdapter.java 2012-02-01 13:06:03 UTC (rev 38366)
@@ -24,16 +24,17 @@
import java.util.Comparator;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.model.IWorkbenchAdapter;
import org.hibernate.console.ImageConstants;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.utils.EclipseImages;
import org.hibernate.mapping.Table;
-public class TableContainerWorkbenchAdapter extends BasicWorkbenchAdapter {
+public class TableContainerWorkbenchAdapter implements IWorkbenchAdapter {
public Object[] getChildren(Object o) {
TableContainer tc = getTableContainer( o );
- return toArray(tc.getTables().iterator(), Table.class, new Comparator<Table>() {
+ return BasicWorkbenchAdapter.toArray(tc.getTables().iterator(), Table.class, new Comparator<Table>() {
public int compare(Table arg0, Table arg1) {
@@ -60,5 +61,4 @@
return null;
}
-
}
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableWorkbenchAdapter.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableWorkbenchAdapter.java 2012-02-01 12:56:05 UTC (rev 38365)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/TableWorkbenchAdapter.java 2012-02-01 13:06:03 UTC (rev 38366)
@@ -26,13 +26,14 @@
import java.util.List;
import org.eclipse.jface.resource.ImageDescriptor;
+import org.eclipse.ui.model.IWorkbenchAdapter;
import org.hibernate.console.ImageConstants;
import org.hibernate.eclipse.console.utils.EclipseImages;
import org.hibernate.mapping.Column;
import org.hibernate.mapping.PrimaryKey;
import org.hibernate.mapping.Table;
-public class TableWorkbenchAdapter extends BasicWorkbenchAdapter {
+public class TableWorkbenchAdapter implements IWorkbenchAdapter {
public Object[] getChildren(Object o) {
Table t = getTable( o );
Modified: trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ValueWorkbenchAdapter.java
===================================================================
--- trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ValueWorkbenchAdapter.java 2012-02-01 12:56:05 UTC (rev 38365)
+++ trunk/hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/console/workbench/ValueWorkbenchAdapter.java 2012-02-01 13:06:03 UTC (rev 38366)
@@ -22,13 +22,12 @@
package org.hibernate.eclipse.console.workbench;
import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.progress.IDeferredWorkbenchAdapter;
+import org.eclipse.ui.model.IWorkbenchAdapter;
import org.hibernate.console.ImageConstants;
import org.hibernate.eclipse.console.HibernateConsoleMessages;
import org.hibernate.eclipse.console.utils.EclipseImages;
-public class ValueWorkbenchAdapter extends BasicWorkbenchAdapter implements
- IDeferredWorkbenchAdapter {
+public class ValueWorkbenchAdapter implements IWorkbenchAdapter {
public Object[] getChildren(Object o) {
return new Object[0];
12 years, 11 months
JBoss Tools SVN: r38365 - trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext.
by jbosstools-commits＠lists.jboss.org
Author: rhopp
Date: 2012-02-01 07:56:05 -0500 (Wed, 01 Feb 2012)
New Revision: 38365
Modified:
trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java
Log:
Added Twistie control to SWTBotExt
Modified: trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2012-02-01 10:05:38 UTC (rev 38364)
+++ trunk/tests/plugins/org.jboss.tools.ui.bot.ext/src/org/jboss/tools/ui/bot/ext/SWTBotExt.java 2012-02-01 12:56:05 UTC (rev 38365)
@@ -37,11 +37,13 @@
import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
import org.eclipse.ui.forms.widgets.Hyperlink;
import org.eclipse.ui.forms.widgets.Section;
+import org.eclipse.ui.forms.widgets.Twistie;
import org.hamcrest.Matcher;
import org.jboss.tools.ui.bot.ext.parts.SWTBotBrowserExt;
import org.jboss.tools.ui.bot.ext.parts.SWTBotEditorExt;
import org.jboss.tools.ui.bot.ext.parts.SWTBotHyperlinkExt;
import org.jboss.tools.ui.bot.ext.parts.SWTBotScaleExt;
+import org.jboss.tools.ui.bot.ext.parts.SWTBotTwistie;
import org.jboss.tools.ui.bot.ext.widgets.SWTBotSection;
/**
@@ -195,6 +197,19 @@
"Could not find widget of type Section", ex);
}
}
+
+ @SuppressWarnings("unchecked")
+ public SWTBotTwistie twistieByLabel(String label){
+ List<Twistie> list = (List<Twistie>)widgets(widgetOfType(Twistie.class));
+ SWTBotTwistie twistieBot = null;
+ for (Twistie twistie : list) {
+ twistieBot = new SWTBotTwistie(twistie);
+ if (twistieBot.getLabelText().equals(label)) return twistieBot;
+ }
+ //SWTBotTwistie twistie = new SWTBotTwistie((Twistie)widget(allOf(widgetOfType(Twistie.class), WidgetMatcherFactory.withLabel(label))));
+ //twistie.getId();
+ throw new WidgetNotFoundException("Widget of type Twistie with label \""+label+"\" was not found");
+ }
/**
* Waits for shell with given title.
12 years, 11 months
JBoss Tools SVN: r38364 - trunk/build/aggregate/soa-site.
by jbosstools-commits＠lists.jboss.org
Author: dpalmer
Date: 2012-02-01 05:05:38 -0500 (Wed, 01 Feb 2012)
New Revision: 38364
Modified:
trunk/build/aggregate/soa-site/site.xml
Log:
[JBIDE-10670] Removed runtime and usage features from soa-site
Modified: trunk/build/aggregate/soa-site/site.xml
===================================================================
--- trunk/build/aggregate/soa-site/site.xml 2012-02-01 09:48:01 UTC (rev 38363)
+++ trunk/build/aggregate/soa-site/site.xml 2012-02-01 10:05:38 UTC (rev 38364)
@@ -55,12 +55,6 @@
<category name="GeneralTools" />
</feature>
- <feature url="features/org.jboss.tools.runtime.feature_0.0.0.jar" id="org.jboss.tools.runtime.feature" version="0.0.0">
- <category name="AbridgedTools" />
- </feature>
- <feature url="features/org.jboss.tools.runtime.core.feature_0.0.0.jar" id="org.jboss.tools.runtime.core.feature" version="0.0.0">
- <category name="AbridgedTools" />
- </feature>
<feature url="features/org.jboss.tools.runtime.drools.detector.feature_0.0.0.jar" id="org.jboss.tools.runtime.drools.detector.feature" version="0.0.0">
<category name="AbridgedTools" />
</feature>
@@ -70,9 +64,6 @@
<feature url="features/org.jboss.tools.runtime.jbpm.detector.feature_0.0.0.jar" id="org.jboss.tools.runtime.jbpm.detector.feature" version="0.0.0">
<category name="AbridgedTools" />
</feature>
- <feature url="features/org.jboss.tools.usage.feature_0.0.0.jar" id="org.jboss.tools.usage.feature" version="0.0.0">
- <category name="AbridgedTools" />
- </feature>
<category-def name="AbridgedTools" label="Abridged JBoss Tools - SOA Tooling 3.3">
<description>
12 years, 11 months
JBoss Tools SVN: r38363 - in trunk/maven: tests/org.jboss.tools.maven.configurators.tests/projects/seam and 6 other directories.
by jbosstools-commits＠lists.jboss.org
Author: fbricon
Date: 2012-02-01 04:48:01 -0500 (Wed, 01 Feb 2012)
New Revision: 38363
Added:
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/JBIDE-10764/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/JBIDE-10764/pom.xml
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/JBIDE-10764/src/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/JBIDE-10764/src/main/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/JBIDE-10764/src/main/java/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/JBIDE-10764/src/main/resources/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/JBIDE-10764/src/main/resources/META-INF/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/JBIDE-10764/src/test/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/JBIDE-10764/src/test/java/
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/JBIDE-10764/src/test/resources/
Modified:
trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java
trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/SeamConfiguratorTest.java
Log:
JBIDE-10764 : Use Seam core API to add enable seam on projects
Modified: trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java
===================================================================
--- trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2012-02-01 09:45:08 UTC (rev 38362)
+++ trunk/maven/plugins/org.jboss.tools.maven.seam/src/org/jboss/tools/maven/seam/configurators/SeamProjectConfigurator.java 2012-02-01 09:48:01 UTC (rev 38363)
@@ -12,13 +12,11 @@
import java.io.File;
import java.util.ArrayList;
-import java.util.Iterator;
import java.util.List;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.project.MavenProject;
-import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ProjectScope;
@@ -28,7 +26,6 @@
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.preferences.IEclipsePreferences;
import org.eclipse.core.runtime.preferences.IScopeContext;
-import org.eclipse.emf.common.util.EList;
import org.eclipse.jdt.core.IClasspathEntry;
import org.eclipse.jdt.core.IJavaProject;
import org.eclipse.jdt.core.IPackageFragment;
@@ -36,13 +33,7 @@
import org.eclipse.jdt.core.JavaCore;
import org.eclipse.jdt.core.JavaModelException;
import org.eclipse.jface.preference.IPreferenceStore;
-import org.eclipse.jst.j2ee.application.Application;
-import org.eclipse.jst.j2ee.application.Module;
-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.RemoveComponentFromEnterpriseApplicationOperation;
-import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
-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.jst.jsf.core.internal.project.facet.IJSFFacetInstallDataModelProperties;
@@ -55,25 +46,19 @@
import org.eclipse.m2e.core.project.configurator.ProjectConfigurationRequest;
import org.eclipse.wst.common.componentcore.ComponentCore;
import org.eclipse.wst.common.componentcore.ModuleCoreNature;
-import org.eclipse.wst.common.componentcore.datamodel.properties.ICreateReferenceComponentsDataModelProperties;
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.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.IProjectFacet;
import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion;
import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager;
-import org.jboss.tools.common.model.util.EclipseResourceUtil;
-import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.maven.core.IJBossMavenConstants;
import org.jboss.tools.maven.core.internal.project.facet.MavenFacetInstallDataModelProvider;
import org.jboss.tools.maven.jsf.MavenJSFActivator;
import org.jboss.tools.maven.seam.MavenSeamActivator;
import org.jboss.tools.maven.ui.Activator;
-import org.jboss.tools.seam.core.ISeamProject;
import org.jboss.tools.seam.core.SeamCorePlugin;
import org.jboss.tools.seam.core.SeamUtil;
import org.jboss.tools.seam.core.project.facet.SeamRuntime;
@@ -179,7 +164,6 @@
IDataModel model = createSeamDataModel(deploying, seamVersion, project);
installWarFacets(fproj, model, seamVersion, monitor);
} else if ("ear".equals(packaging)) { //$NON-NLS-1$
- configureApplicationXml(project, monitor);
installEarFacets(fproj, monitor);
installM2Facet(fproj, monitor);
IProject webProject = getReferencingSeamWebProject(project);
@@ -385,12 +369,7 @@
return;
}
try {
- if (!project.hasNature(ISeamProject.NATURE_ID)) {
- EclipseResourceUtil.addNatureToProject(project, ISeamProject.NATURE_ID);
- }
- if(!project.hasNature(IKbProject.NATURE_ID)) {
- EclipseResourceUtil.addNatureToProject(project, IKbProject.NATURE_ID);
- }
+ SeamUtil.enableSeamSupport(project);
for (int i = 0; i < earProjects.length; i++) {
IEclipsePreferences prefs = SeamCorePlugin
.getSeamPreferences(project);
@@ -636,107 +615,6 @@
return seamRuntime3;
}
- private void configureApplicationXml(IProject project, IProgressMonitor monitor) {
- EARArtifactEdit earArtifactEdit = null;
- try {
- earArtifactEdit = EARArtifactEdit.getEARArtifactEditForWrite(project);
- if(earArtifactEdit!=null) {
- Application application = earArtifactEdit.getApplication();
- if (application == null) {
- return;
- }
- EList modules = application.getModules();
- for (Iterator iterator = modules.iterator(); iterator.hasNext();) {
- Object object = iterator.next();
- if (object instanceof Module) {
- Module module = (Module) object;
- String uri = module.getUri();
- if (uri != null && (uri.startsWith("mvel14") || uri.startsWith("mvel2"))) { //$NON-NLS-1$ //$NON-NLS-2$
- iterator.remove();
- }
- if (uri != null && (uri.equals("jboss-seam.jar"))) { //$NON-NLS-1$ //$NON-NLS-2$
- iterator.remove();
- }
- }
- }
-
- }
- } finally {
- if(earArtifactEdit!=null) {
- earArtifactEdit.saveIfNecessary(monitor);
- earArtifactEdit.dispose();
- }
- }
- try {
- final IFacetedProject fproj = ProjectFacetsManager.create(project);
- if (fproj != null && fproj.hasProjectFacet(earFacet)) {
- IVirtualComponent earComponent = ComponentCore.createComponent(project);
- IVirtualReference[] refs = earComponent.getReferences();
- IVirtualReference mvelReference = null;
- for (IVirtualReference ref:refs) {
- String archiveName = ref.getArchiveName();
- if (archiveName != null && archiveName.startsWith("/lib/mvel2")) { //$NON-NLS-1$
- mvelReference = ref;
- break;
- }
- }
- if (mvelReference != null) {
- changeReference(earComponent, mvelReference);
- }
- }
- } catch (CoreException e) {
- MavenSeamActivator.log(e);
- }
-
- }
-
- /**
- * @param earComponent
- * @param mvelReference
- */
- private void changeReference(IVirtualComponent earComponent,
- IVirtualReference mvelReference) {
- List<IVirtualComponent> list = new ArrayList<IVirtualComponent>();
- list.add(mvelReference.getReferencedComponent());
-
- IDataModel model = DataModelFactory.createDataModel(new RemoveComponentFromEnterpriseApplicationDataModelProvider() {
-
- @Override
- public IDataModelOperation getDefaultOperation() {
- return new RemoveComponentFromEnterpriseApplicationOperationEx(model);
- }
-
- });
- model.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);
-
- model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, list);
- model.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, "/lib"); //$NON-NLS-1$
- IDataModelOperation op = model.getDefaultOperation();
- try {
- op.execute(null, null);
- J2EEComponentClasspathUpdater.getInstance().queueUpdateEAR(earComponent.getProject());
- } catch (ExecutionException e) {
- MavenSeamActivator.log(e);
- }
-
-
- String archiveName = mvelReference.getArchiveName();
- archiveName = archiveName.substring(4);
- mvelReference.setArchiveName(archiveName);
- IDataModel dm = DataModelFactory.createDataModel(new AddComponentToEnterpriseApplicationDataModelProvider());
-
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.SOURCE_COMPONENT, earComponent);
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENT_LIST, list);
-
- dm.setProperty(ICreateReferenceComponentsDataModelProperties.TARGET_COMPONENTS_DEPLOY_PATH, "/lib"); //$NON-NLS-1$
-
- try {
- dm.getDefaultOperation().execute(null, null);
- } catch (ExecutionException e) {
- MavenSeamActivator.log(e);
- }
- }
-
private static class RemoveComponentFromEnterpriseApplicationOperationEx extends RemoveComponentFromEnterpriseApplicationOperation {
public RemoveComponentFromEnterpriseApplicationOperationEx(
Added: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/JBIDE-10764/pom.xml
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/JBIDE-10764/pom.xml (rev 0)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/projects/seam/JBIDE-10764/pom.xml 2012-02-01 09:48:01 UTC (rev 38363)
@@ -0,0 +1,44 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.tools.tests</groupId>
+ <artifactId>JBIDE-10764</artifactId>
+ <version>0.0.1-SNAPSHOT</version>
+ <packaging>ejb</packaging>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-ejb-plugin</artifactId>
+ <version>2.3</version>
+ <configuration>
+ <ejbVersion>3.0</ejbVersion>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.seam</groupId>
+ <artifactId>jboss-seam</artifactId>
+ <version>2.2.2.Final</version>
+ <type>ejb</type>
+ </dependency>
+ </dependencies>
+ <repositories>
+ <!-- You should seriously consider using a repository manager or declare repositories in your settings.xml.
+ See http://www.sonatype.com/people/2009/02/why-putting-repositories-in-your-p... -->
+ <repository>
+ <!-- The JBoss Release repository mostly contains JBoss projects artifacts.
+ See http://community.jboss.org/wiki/MavenGettingStarted-Users -->
+ <id>jboss-releases-repository</id>
+ <url>https://repository.jboss.org/nexus/content/repositories/releases/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+</project>
\ No newline at end of file
Modified: trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/SeamConfiguratorTest.java
===================================================================
--- trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/SeamConfiguratorTest.java 2012-02-01 09:45:08 UTC (rev 38362)
+++ trunk/maven/tests/org.jboss.tools.maven.configurators.tests/src/org/jboss/tools/maven/configurators/tests/SeamConfiguratorTest.java 2012-02-01 09:48:01 UTC (rev 38363)
@@ -4,7 +4,9 @@
import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
+import org.jboss.tools.jst.web.kb.IKbProject;
import org.jboss.tools.maven.jsf.configurators.JSFProjectConfigurator;
+import org.jboss.tools.seam.core.ISeamProject;
import org.junit.Test;
@SuppressWarnings("restriction")
@@ -37,4 +39,12 @@
return seamProject;
}
+ @Test
+ public void testJBIDE10764_builderOrder() throws Exception {
+ IProject ejb = importProject("projects/seam/JBIDE-10764/pom.xml");
+ waitForJobsToComplete();
+ assertNoErrors(ejb);
+ assertTrue("Seam nature is missing", ejb.hasNature(ISeamProject.NATURE_ID));
+ assertTrue("KB nature is missing", ejb.hasNature(IKbProject.NATURE_ID));
+ }
}
12 years, 11 months
JBoss Tools SVN: r38362 - in trunk/requirements: jboss-riftsaw-2.3.0.Final and 1 other directory.
by jbosstools-commits＠lists.jboss.org
Author: psrna
Date: 2012-02-01 04:45:08 -0500 (Wed, 01 Feb 2012)
New Revision: 38362
Added:
trunk/requirements/jboss-riftsaw-2.3.0.Final/
trunk/requirements/jboss-riftsaw-2.3.0.Final/buildRequirement.xml
Log:
* added requirement jboss-riftsaw-2.3.0.Final to have riftsaw-2.3.0.Final installed in jboss server profile.
Added: trunk/requirements/jboss-riftsaw-2.3.0.Final/buildRequirement.xml
===================================================================
--- trunk/requirements/jboss-riftsaw-2.3.0.Final/buildRequirement.xml (rev 0)
+++ trunk/requirements/jboss-riftsaw-2.3.0.Final/buildRequirement.xml 2012-02-01 09:45:08 UTC (rev 38362)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+download required dependencies
+-jbossas
+-jbossesb
+-riftsaw
+
+unpack jbossas to location different from default
+install jbossesb
+install riftsaw
+
+-->
+<project name="projectroject" default="build.requirement">
+ <property file="build.properties" />
+
+ <target name="build.requirement" depends="unpack.requirement,install-jbossas,install-jbossesb,install-riftsaw" />
+ <target name="download.requirement" />
+ <target name="unpack.requirement" >
+ <ant dir="../jbossas" antfile="buildRequirement.xml" target="download.requirement" inheritall="true">
+ <property name="requirement" value="jbossas"/>
+ </ant>
+ <ant dir="../jbossesb-4.10" antfile="../generic/build.xml" target="build.requirement" inheritall="true">
+ <property name="requirement" value="jbossesb-4.10"/>
+ </ant>
+ <ant dir="../riftsaw-2.3.0.Final" antfile="../generic/build.xml" target="build.requirement" inheritall="true">
+ <property name="requirement" value="riftsaw-2.3.0.Final"/>
+ </ant>
+ </target>
+ <target name="install-jbossas" >
+ <property file="../jbossas/build.properties" />
+ <unzip src="${requirement.build.root}/../download/jbossas/${jboss51.build.archive}" dest="${unzip.dest}" >
+ <mapper type="glob" from="${jboss51.build.name}/*" to="${jboss51.build.name}-riftsaw-2.3.0.Final/*"/>
+ </unzip>
+ </target>
+ <target name="install-jbossesb" >
+ <property file="../jbossesb-4.10/build.properties" prefix="jbossesb-4.10" />
+ <ant dir="${unzip.dest}/${jbossesb-4.10.build.archive.root}/install" target="deploy">
+ <property name="org.jboss.esb.server.home" value="${unzip.dest}/${jboss51.build.name}-riftsaw-2.3.0.Final" />
+ <property name="org.jboss.esb.server.config" value="default" />
+ </ant>
+ </target>
+ <target name="install-riftsaw" >
+ <property file="../riftsaw-2.3.0.Final/build.properties" prefix="riftsaw-2.3.0.Final" />
+ <ant dir="${unzip.dest}/${riftsaw-2.3.0.Final.build.archive.root}/install" target="deploy">
+ <property name="org.jboss.as.home" value="${unzip.dest}/${jboss51.build.name}-riftsaw-2.3.0.Final" />
+ <property name="org.jboss.as.config" value="default" />
+ <property name="org.jboss.esb.home" value="${unzip.dest}/${jbossesb.build.archive.root}" />
+ <property name="databasev" value="hsql" />
+ </ant>
+ </target>
+
+
+</project>
12 years, 11 months
JBoss Tools SVN: r38361 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest: completion and 2 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-02-01 03:40:16 -0500 (Wed, 01 Feb 2012)
New Revision: 38361
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java
Log:
Moved all resources for REST tests to RESTfulTestBase
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-02-01 08:38:15 UTC (rev 38360)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/RESTfulTestBase.java 2012-02-01 08:40:16 UTC (rev 38361)
@@ -48,6 +48,14 @@
protected final String REST_EXPLORER_LABEL = "JAX-RS REST Web Services";
protected final String REST_EXPLORER_LABEL_BUILD = "Building RESTful Web Services...";
protected final String VALIDATION_SETTINGS_CHANGED = "Validation Settings Changed";
+
+ protected final String BASIC_WS_RESOURCE = "/resources/restful/BasicRestfulWS.java.ws";
+
+ protected final String ADVANCED_WS_RESOURCE = "/resources/restful/AdvancedRestfulWS.java.ws";
+
+ protected final String EMPTY_WS_RESOURCE = "/resources/restful/EmptyRestfulWS.java.ws";
+
+ protected final String SIMPLE_REST_WS_RESOURCE = "/resources/restful/SimpleRestWS.java.ws";
private enum ConfigureOption {
ADD, REMOVE;
@@ -90,7 +98,7 @@
*/
protected void modifyRESTValidation(ConfigureOption option) {
- SWTBot validationBot = openValidationPreference(VALIDATION_PREFERENCE,
+ SWTBot validationBot = openPreferencePage(VALIDATION_PREFERENCE,
new ArrayList<String>());
validationBot.button(ENABLE_ALL).click();
@@ -147,13 +155,15 @@
BuildPathHelper buildPathHelper = new BuildPathHelper();
for (File f : restLibsPaths) {
- buildPathHelper.addExternalJar(f.getPath(), getWsProjectName());
+ buildPathHelper.addExternalJar(f.getPath(), getWsProjectName(), true);
}
}
private List<File> getPathForRestLibs() {
+ assertTrue(TestConfigurator.currentConfig.getServer().type.equals("EAP"));
+
String runtimeHome = TestConfigurator.currentConfig.getServer().runtimeHome;
// index of last occurence of "/" in EAP runtime path: jboss-eap-5.1/jboss-as
@@ -186,7 +196,7 @@
util.waitForNonIgnoredJobs();
}
- private SWTBot openValidationPreference(final String name,
+ private SWTBot openPreferencePage(final String name,
final List<String> groupPath) {
return open.preferenceOpen(new IPreference() {
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java 2012-02-01 08:38:15 UTC (rev 38360)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/completion/RESTfulCompletionTest.java 2012-02-01 08:40:16 UTC (rev 38361)
@@ -26,8 +26,6 @@
*/
public class RESTfulCompletionTest extends RESTfulTestBase{
- private final String SIMPLE_REST_WS_RESOURCE = "/resources/restful/SimpleRestWS.java.ws";
-
private final String GET_METHOD_PATH = "/{userId}";
private final String EMPTY_PATH_PARAM = "";
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java 2012-02-01 08:38:15 UTC (rev 38360)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/explorer/RESTfulExplorerTest.java 2012-02-01 08:40:16 UTC (rev 38361)
@@ -28,12 +28,6 @@
private RESTFullExplorerWizard restfulWizard = null;
- private final String BASIC_WS_RESOURCE_PATH = "/resources/restful/BasicRestfulWS.java.ws";
-
- private final String ADVANCED_WS_RESOURCE_PATH = "/resources/restful/AdvancedRestfulWS.java.ws";
-
- private final String EMPTY_WS_RESOURCE_PATH = "/resources/restful/EmptyRestfulWS.java.ws";
-
protected String getWsProjectName() {
return "RestServicesExplorer";
}
@@ -51,7 +45,7 @@
resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
RESTfulExplorerTest.class.
- getResourceAsStream(BASIC_WS_RESOURCE_PATH),
+ getResourceAsStream(BASIC_WS_RESOURCE),
false, getWsPackage(), getWsName());
bot.sleep(Timing.time2S());
@@ -75,7 +69,7 @@
resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
RESTfulExplorerTest.class.
- getResourceAsStream(ADVANCED_WS_RESOURCE_PATH),
+ getResourceAsStream(ADVANCED_WS_RESOURCE),
false, getWsPackage(), getWsName());
bot.sleep(Timing.time2S());
@@ -117,7 +111,7 @@
resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
RESTfulExplorerTest.class.
- getResourceAsStream(BASIC_WS_RESOURCE_PATH),
+ getResourceAsStream(BASIC_WS_RESOURCE),
false, getWsPackage(), getWsName());
bot.sleep(Timing.time2S());
@@ -149,7 +143,7 @@
resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
RESTfulExplorerTest.class.
- getResourceAsStream(ADVANCED_WS_RESOURCE_PATH),
+ getResourceAsStream(ADVANCED_WS_RESOURCE),
false, getWsPackage(), getWsName());
bot.sleep(Timing.time2S());
@@ -186,7 +180,7 @@
resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
RESTfulExplorerTest.class.
- getResourceAsStream(BASIC_WS_RESOURCE_PATH),
+ getResourceAsStream(BASIC_WS_RESOURCE),
false, getWsPackage(), getWsName());
bot.sleep(Timing.time2S());
@@ -198,7 +192,7 @@
resourceHelper.copyResourceToClass(bot.editorByTitle(getWsName() + ".java"),
RESTfulExplorerTest.class.
- getResourceAsStream(EMPTY_WS_RESOURCE_PATH),
+ getResourceAsStream(EMPTY_WS_RESOURCE),
false, getWsPackage(), getWsName());
bot.sleep(Timing.time2S());
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-02-01 08:38:15 UTC (rev 38360)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/rest/validation/RESTfulValidationTest.java 2012-02-01 08:40:16 UTC (rev 38361)
@@ -25,7 +25,6 @@
private final String GET_METHOD_PATH = "/{id}";
private final String CORRECT_PATH_PARAM = "id";
private final String BAD_PATH_PARAM = "customerId";
- private final String SIMPLE_REST_WS_RESOURCE = "/resources/restful/SimpleRestWS.java.ws";
protected String getWsProjectName() {
return "RestServicesValidation";
12 years, 11 months
JBoss Tools SVN: r38360 - in trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test: sample/test and 1 other directories.
by jbosstools-commits＠lists.jboss.org
Author: jjankovi
Date: 2012-02-01 03:38:15 -0500 (Wed, 01 Feb 2012)
New Revision: 38360
Modified:
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleWSBase.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleRESTWebServiceTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleRESTWebServiceTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleSoapWebServiceTest.java
trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java
Log:
CreateDD moved from SampleWSBase to ProjectHelper
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleWSBase.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleWSBase.java 2012-02-01 07:11:41 UTC (rev 38359)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/SampleWSBase.java 2012-02-01 08:38:15 UTC (rev 38360)
@@ -23,12 +23,9 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
-import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.ws.ui.bot.test.WSTestBase;
import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewSampleWSWizardAction;
import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewSimpleWSWizardAction;
-import org.jboss.tools.ws.ui.bot.test.uiutils.actions.TreeItemAction;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.SampleWSWizard;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.SimpleWSWizard;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.Type;
@@ -44,17 +41,6 @@
protected static final String SOAP_REQUEST = getSoapRequest("<ns1:sayHello xmlns:ns1=\"http://{0}/\"><arg0>{1}</arg0></ns1:sayHello>");
protected static final String SERVER_URL = "localhost:8080";
- protected void createDD(String project) {
- SWTBotTree tree = projectExplorer.bot().tree();
- SWTBotTreeItem ti = tree.expandNode(project);
- bot.sleep(1500);
- ti = ti.getNode("Deployment Descriptor: " + project);
- new TreeItemAction(ti, "Generate Deployment Descriptor Stub").run();
- bot.sleep(1500);
- util.waitForNonIgnoredJobs();
- bot.sleep(1500);
- }
-
protected IProject getProject(String project) {
return ResourcesPlugin.getWorkspace().getRoot().getProject(project);
}
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleRESTWebServiceTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleRESTWebServiceTest.java 2012-02-01 07:11:41 UTC (rev 38359)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleRESTWebServiceTest.java 2012-02-01 08:38:15 UTC (rev 38360)
@@ -30,7 +30,7 @@
public void testSampleRestWS() {
IFile dd = getDD(getWsProjectName());
if (!dd.exists()) {
- createDD(getWsProjectName());
+ projectHelper.createDD(getWsProjectName());
}
assertTrue(dd.exists());
createSampleRESTWS(getWsProjectName(), "RESTSample", "rest.sample", "Sample", "RESTApp");
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java 2012-02-01 07:11:41 UTC (rev 38359)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SampleSoapWebServiceTest.java 2012-02-01 08:38:15 UTC (rev 38360)
@@ -30,7 +30,7 @@
public void testSampleSoapWS() {
IFile dd = getDD(getWsProjectName());
if (!dd.exists()) {
- createDD(getWsProjectName());
+ projectHelper.createDD(getWsProjectName());
}
assertTrue(dd.exists());
createSampleSOAPWS(getWsProjectName(), "HelloService", "sample", "SampleService");
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleRESTWebServiceTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleRESTWebServiceTest.java 2012-02-01 07:11:41 UTC (rev 38359)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleRESTWebServiceTest.java 2012-02-01 08:38:15 UTC (rev 38360)
@@ -31,7 +31,7 @@
public void testSimpleRestWS() {
IFile dd = getDD(getWsProjectName());
if (!dd.exists()) {
- createDD(getWsProjectName());
+ projectHelper.createDD(getWsProjectName());
}
assertTrue(dd.exists());
createSimpleRESTWS(getWsProjectName(), "RESTSample", "rest.sample", "Sample", "RESTApp");
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleSoapWebServiceTest.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleSoapWebServiceTest.java 2012-02-01 07:11:41 UTC (rev 38359)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/sample/test/SimpleSoapWebServiceTest.java 2012-02-01 08:38:15 UTC (rev 38360)
@@ -31,7 +31,7 @@
public void testSimpleSoapWS() {
IFile dd = getDD(getWsProjectName());
if (!dd.exists()) {
- createDD(getWsProjectName());
+ projectHelper.createDD(getWsProjectName());
}
assertTrue(dd.exists());
createSimpleSOAPWS(getWsProjectName(), "HelloService", "sample", "SampleService");
Modified: trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java
===================================================================
--- trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java 2012-02-01 07:11:41 UTC (rev 38359)
+++ trunk/ws/tests/org.jboss.tools.ws.ui.bot.test/src/org/jboss/tools/ws/ui/bot/test/utils/ProjectHelper.java 2012-02-01 08:38:15 UTC (rev 38360)
@@ -14,11 +14,14 @@
import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotEditor;
import org.eclipse.swtbot.swt.finder.SWTBot;
import org.eclipse.swtbot.swt.finder.widgets.SWTBotCombo;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTree;
+import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
import org.jboss.tools.ui.bot.ext.SWTTestExt;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.JavaEEEnterpriseApplicationProject;
import org.jboss.tools.ui.bot.ext.gen.ActionItem.NewObject.WebServicesWSDL;
import org.jboss.tools.ui.bot.ext.types.IDELabel;
import org.jboss.tools.ws.ui.bot.test.uiutils.actions.NewFileWizardAction;
+import org.jboss.tools.ws.ui.bot.test.uiutils.actions.TreeItemAction;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.DynamicWebProjectWizard;
import org.jboss.tools.ws.ui.bot.test.uiutils.wizards.Wizard;
@@ -94,4 +97,19 @@
projectExplorer.selectProject(name);
}
+ /**
+ * Method generates Deployment Descriptor for entered project
+ * @param project
+ */
+ public void createDD(String project) {
+ SWTBotTree tree = projectExplorer.bot().tree();
+ SWTBotTreeItem ti = tree.expandNode(project);
+ bot.sleep(1500);
+ ti = ti.getNode("Deployment Descriptor: " + project);
+ new TreeItemAction(ti, "Generate Deployment Descriptor Stub").run();
+ bot.sleep(1500);
+ util.waitForNonIgnoredJobs();
+ bot.sleep(1500);
+ }
+
}
12 years, 11 months
JBoss Tools SVN: r38359 - trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour.
by jbosstools-commits＠lists.jboss.org
Author: rob.stryker(a)jboss.com
Date: 2012-02-01 02:11:41 -0500 (Wed, 01 Feb 2012)
New Revision: 38359
Modified:
trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
Log:
JBIDE-10769 - moved an inner-class interface out to its own class.
Modified: trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java
===================================================================
--- trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-02-01 07:10:22 UTC (rev 38358)
+++ trunk/openshift/plugins/org.jboss.tools.openshift.express.ui/src/org/jboss/tools/openshift/express/internal/core/behaviour/ExpressPublishMethod.java 2012-02-01 07:11:41 UTC (rev 38359)
@@ -32,9 +32,9 @@
import org.eclipse.wst.server.core.IServer;
import org.eclipse.wst.server.core.model.ServerBehaviourDelegate;
import org.jboss.ide.eclipse.as.core.server.IJBossServerPublishMethod;
+import org.jboss.ide.eclipse.as.core.server.IPublishCopyCallbackHandler;
import org.jboss.ide.eclipse.as.core.server.IServerAlreadyStartedHandler;
import org.jboss.ide.eclipse.as.core.server.internal.DeployableServerBehavior;
-import org.jboss.ide.eclipse.as.core.server.xpl.PublishCopyUtil.IPublishCopyCallbackHandler;
import org.jboss.tools.openshift.egit.core.EGitUtils;
import org.jboss.tools.openshift.express.internal.ui.console.ConsoleUtils;
12 years, 11 months